media: s5p-jpeg: Correct step and max values for V4L2_CID_JPEG_RESTART_INTERVAL
Subsystems (51)
Sasha Levin
maintainerPATCH 58/371 media: s5p-jpeg: Correct step and max values for V4L2_CID_JPEG_RESTART_INTERVAL
From: Pawe? Chmiel <[email protected]>
[ Upstream commit 19c624c6b29e244c418f8b44a711cbf5e82e3cd4 ]
This commit corrects max and step values for v4l2 control for V4L2_CID_JPEG_RESTART_INTERVAL. Max should be 0xffff and step should be 1. It was found by using v4l2-compliance tool and checking result of VIDIOC_QUERY_EXT_CTRL/QUERYMENU test.
Previously it was complaining that step was bigger than difference between max and min.
--- drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/s5p-jpeg/jpeg-core.c +1 -1
@@ -2005,7 +2005,7 @@ static int s5p_jpeg_controls_create(struct s5p_jpeg_ctx *ctx)v4l2_ctrl_new_std (&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops,V4L2_CID_JPEG_RESTART_INTERVAL , -0 ,3 ,0xffff ,0 ); +0 ,0xffff ,1 ,0 );if (ctx->jpeg->variant->version ==SJPEG_S5P ) mask = ~0x06 ;/* 422, 420 */ }
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 59/371 kbuild: mark prepare0 as PHONY to fix external module build
From: Masahiro Yamada <[email protected]>
[ Upstream commit e00d8880481497474792d28c14479a9fb6752046 ]
Commit c3ff2a5193fa ("powerpc/32: add stack protector support") caused kernel panic on PowerPC when an external module is used with CONFIG_STACKPROTECTOR because the 'prepare' target was not executed for the external module build.
Commit e07db28eea38 ("kbuild: fix single target build for external module") turned it into a build error because the 'prepare' target is now executed but the 'prepare0' target is missing for the external module build.
External module on arm/arm64 with CONFIG_STACKPROTECTOR_PER_TASK is also broken in the same way.
Move 'PHONY += prepare0' to the common place. GNU Make is fine with missing rule for phony targets. I also removed the comment which is wrong irrespective of this commit.
I minimize the change so it can be easily backported to 4.20.x
To fix v4.20, please backport e07db28eea38 ("kbuild: fix single target build for external module"), and then this commit.
--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
@@ -971,6 +971,7 @@ ifdef CONFIG_STACK_VALIDATION endif endif +PHONY += prepare0 ifeq ($(KBUILD_EXTMOD),) core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
@@ -1065,8 +1066,7 @@ include/config/kernel.release: include/config/auto.conf FORCE # archprepare is used in arch Makefiles and when processed asm symlink, # version.h and scripts_basic is processed / created. -# Listed in dependency order -PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3 +PHONY += prepare archprepare prepare1 prepare2 prepare3 # prepare3 is used to check if we are building in a separate output directory, # and if so do:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 60/371 crypto: brcm - Fix some set-but-not-used warning
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 707d0cf8f7cff6dfee9197002859912310532c4f ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/crypto/bcm/cipher.c: In function 'handle_ahash_req':drivers/crypto/bcm/cipher.c:720:15: warning:
variable 'chunk_start' set but not used [-Wunused-but-set-variable]
drivers/crypto/bcm/cipher.c: In function 'spu_rx_callback':drivers/crypto/bcm/cipher.c:1679:31: warning:
variable 'areq' set but not used [-Wunused-but-set-variable]
drivers/crypto/bcm/cipher.c:1678:22: warning:
variable 'ctx' set but not used [-Wunused-but-set-variable]
--- drivers/crypto/bcm/cipher.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/crypto/bcm/cipher.c +1 -5
@@ -718,7 +718,7 @@ static int handle_ahash_req(struct iproc_reqctx_s *rctx)*/ unsigned int new_data_len; -unsigned int chunk_start =0 ; +unsigned int __maybe_unused chunk_start =0 ;u32 db_size;/* Length of data field, incl gcm and hash padding */ int pad_len =0 ;/* total pad len, including gcm, hash, stat padding */ u32 data_pad_len =0 ;/* length of GCM/CCM padding */
@@ -1676,8 +1676,6 @@ static void spu_rx_callback(struct mbox_client *cl, void *msg)struct spu_hw *spu = &iproc_priv.spu;struct brcm_message *mssg = msg;struct iproc_reqctx_s *rctx; -struct iproc_ctx_s *ctx; -struct crypto_async_request *areq;int err =0 ; rctx = mssg->ctx;
@@ -1687,8 +1685,6 @@ static void spu_rx_callback(struct mbox_client *cl, void *msg) err = -EFAULT ; goto cb_finish; } - areq = rctx->parent; - ctx = rctx->ctx;/* process the SPU status */ err = spu->spu_status_process (rctx->msg_buf.rx_stat);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 61/371 crypto: tgr192 - fix unaligned memory access
In reply to Sasha LevinFrom: Eric Biggers <[email protected]>
[ Upstream commit f990f7fb58ac8ac9a43316f09a48cff1a49dda42 ]
Fix an unaligned memory access in tgr192_transform() by using the unaligned access helpers.
--- crypto/tgr192.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
crypto/tgr192.c +3 -3
@@ -25,8 +25,9 @@#include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> -#include <asm/byteorder.h> #include <linux/types.h> +#include <asm/byteorder.h> +#include <asm/unaligned.h> #define TGR192_DIGEST_SIZE 24#define TGR160_DIGEST_SIZE 20
@@ -468,10 +469,9 @@ static void tgr192_transform(struct tgr192_ctx *tctx, const u8 * data)u64 a, b, c, aa, bb, cc;u64 x[8 ];int i; -const __le64 *ptr = (const __le64 *)data;for (i =0 ; i <8 ; i++) - x[i] =le64_to_cpu (ptr[i]); + x[i] =get_unaligned_le64 (data + i *sizeof (__le64));/* save */ a = aa = tctx->a;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 62/371 ASoC: imx-sgtl5000: put of nodes if finding codec fails
In reply to Sasha LevinFrom: Stefan Agner <[email protected]>
[ Upstream commit d9866572486802bc598a3e8576a5231378d190de ]
Make sure to properly put the of node in case finding the codec fails.
--- sound/soc/fsl/imx-sgtl5000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/fsl/imx-sgtl5000.c +2 -1
@@ -119,7 +119,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) codec_dev =of_find_i2c_device_by_node (codec_np);if (!codec_dev) {dev_err (&pdev->dev,"failed to find codec platform device\n" ); -return -EPROBE_DEFER ; + ret = -EPROBE_DEFER ; + goto fail; } data =devm_kzalloc (&pdev->dev,sizeof (*data),GFP_KERNEL );
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 63/371 IB/iser: Pass the correct number of entries for dma mapped SGL
In reply to Sasha LevinFrom: Israel Rukshin <[email protected]>
[ Upstream commit 57b26497fabe1b9379b59fbc7e35e608e114df16 ]
ib_dma_map_sg() augments the SGL into a 'dma mapped SGL'. This process may change the number of entries and the lengths of each entry.
Code that touches dma_address is iterating over the 'dma mapped SGL' and must use dma_nents which returned from ib_dma_map_sg().
ib_sg_to_pages() and ib_map_mr_sg() are using dma_address so they must use dma_nents.
--- drivers/infiniband/ulp/iser/iser_memory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/infiniband/ulp/iser/iser_memory.c +5 -5
@@ -240,8 +240,8 @@ int iser_fast_reg_fmr(struct iscsi_iser_task *iser_task, page_vec->npages =0 ; page_vec->fake_mr.page_size =SIZE_4K ; plen =ib_sg_to_pages (&page_vec->fake_mr, mem->sg, - mem->size,NULL , iser_set_page); -if (unlikely (plen < mem->size)) { + mem->dma_nents,NULL , iser_set_page); +if (unlikely (plen < mem->dma_nents)) {iser_err ("page vec too short to hold this SG\n" );iser_data_buf_dump (mem, device->ib_device);iser_dump_page_vec (page_vec);
@@ -450,10 +450,10 @@ static int iser_fast_reg_mr(struct iscsi_iser_task *iser_task,ib_update_fast_reg_key (mr,ib_inc_rkey (mr->rkey)); - n =ib_map_mr_sg (mr, mem->sg, mem->size,NULL ,SIZE_4K ); -if (unlikely (n != mem->size)) { + n =ib_map_mr_sg (mr, mem->sg, mem->dma_nents,NULL ,SIZE_4K ); +if (unlikely (n != mem->dma_nents)) {iser_err ("failed to map sg (%d/%d)\n" , - n, mem->size); + n, mem->dma_nents);return n <0 ? n : -EINVAL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 64/371 rtc: cmos: ignore bogus century byte
In reply to Sasha LevinFrom: Eric Wong <[email protected]>
[ Upstream commit 2a4daadd4d3e507138f8937926e6a4df49c6bfdc ]
Older versions of Libreboot and Coreboot had an invalid value (`3' in my case) in the century byte affecting the GM45 in the Thinkpad X200. Not everybody's updated their firmwares, and Linux <= 4.2 was able to read the RTC without problems, so workaround this by ignoring invalid values.
--- drivers/rtc/rtc-mc146818-lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-mc146818-lib.c +1 -1
@@ -82,7 +82,7 @@ unsigned int mc146818_get_time(struct rtc_time *time) time->tm_year += real_year -72 ;#endif -if (century) +if (century >20 ) time->tm_year += (century -19 ) *100 ;/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 65/371 spi/topcliff_pch: Fix potential NULL dereference on allocation error
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit e902cdcb5112b89ee445588147964723fd69ffb4 ]
In pch_spi_handle_dma, it doesn't check for NULL returns of kcalloc so it would result in an Oops.
--- drivers/spi/spi-topcliff-pch.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/spi/spi-topcliff-pch.c +6 -0
@@ -1008,6 +1008,9 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)/* RX */ dma->sg_rx_p =kcalloc (num,sizeof (*dma->sg_rx_p),GFP_ATOMIC ); +if (!dma->sg_rx_p) +return ; +sg_init_table (dma->sg_rx_p, num);/* Initialize SG table */ /* offset, length setting */ sg = dma->sg_rx_p;
@@ -1068,6 +1071,9 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw) } dma->sg_tx_p =kcalloc (num,sizeof (*dma->sg_tx_p),GFP_ATOMIC ); +if (!dma->sg_tx_p) +return ; +sg_init_table (dma->sg_tx_p, num);/* Initialize SG table */ /* offset, length setting */ sg = dma->sg_tx_p;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 66/371 clk: sunxi-ng: sun8i-a23: Enable PLL-MIPI LDOs when ungating it
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 108a459ef4cd17a28711d81092044e597b5c7618 ]
The PLL-MIPI clock is somewhat special as it has its own LDOs which need to be turned on for this PLL to actually work and output a clock signal.
Add the 2 LDO enable bits to the gate bits.
--- drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu-sun8i-a23.c +1 -1
@@ -132,7 +132,7 @@ static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_mipi_clk, "pll-mipi",8 ,4 ,/* N */ 4 ,2 ,/* K */ 0 ,4 ,/* M */ -BIT (31 ),/* gate */ +BIT (31 ) |BIT (23 ) |BIT (22 ),/* gate */ BIT (28 ),/* lock */ CLK_SET_RATE_UNGATE);
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 67/371 iwlwifi: mvm: avoid possible access out of array.
In reply to Sasha LevinFrom: Mordechay Goodstein <[email protected]>
[ Upstream commit b0d795a9ae558209656b18930c2b4def5f8fdfb8 ]
The value in txq_id can be out of array scope,
validate it before accessing the array.
--- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +13 -6
@@ -2417,7 +2417,7 @@ int iwl_mvm_sta_tx_agg_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,struct iwl_mvm_sta *mvmsta =iwl_mvm_sta_from_mac80211 (sta);struct iwl_mvm_tid_data *tid_data;u16 normalized_ssn; -int txq_id; +u16 txq_id;int ret;if (WARN_ON_ONCE (tid >=IWL_MAX_TID_COUNT ))
@@ -2452,17 +2452,24 @@ int iwl_mvm_sta_tx_agg_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,*/ txq_id = mvmsta->tid_data[tid].txq_id;if (txq_id ==IWL_MVM_INVALID_QUEUE ) { - txq_id =iwl_mvm_find_free_queue (mvm, mvmsta->sta_id, -IWL_MVM_DQA_MIN_DATA_QUEUE , -IWL_MVM_DQA_MAX_DATA_QUEUE ); -if (txq_id <0 ) { - ret = txq_id; + ret =iwl_mvm_find_free_queue (mvm, mvmsta->sta_id, +IWL_MVM_DQA_MIN_DATA_QUEUE , +IWL_MVM_DQA_MAX_DATA_QUEUE ); +if (ret <0 ) {IWL_ERR (mvm,"Failed to allocate agg queue\n" ); goto release_locks; } + txq_id = ret; +/* TXQ hasn't yet been enabled, so mark it only as reserved */ mvm->queue_info[txq_id].status =IWL_MVM_QUEUE_RESERVED ; + }else if (WARN_ON (txq_id >=IWL_MAX_HW_QUEUES )) { + ret = -ENXIO ; +IWL_ERR (mvm,"tid_id %d out of range (0, %d)!\n" , + tid,IWL_MAX_HW_QUEUES -1 ); + goto out; + }else if (unlikely (mvm->queue_info[txq_id].status ==IWL_MVM_QUEUE_SHARED )) { ret = -ENXIO ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 68/371 net/mlx5: Take lock with IRQs disabled to avoid deadlock
In reply to Sasha LevinFrom: Moni Shoua <[email protected]>
[ Upstream commit 33814e5d127e21f53b52e17b0722c1b57d4f4d29 ]
The lock in qp_table might be taken from process context or from interrupt context. This may lead to a deadlock unless it is taken with IRQs disabled.
Discovered by lockdep
================================
WARNING: inconsistent lock state
4.20.0-rc6
--------------------------------
inconsistent {HARDIRQ-ON-W} -> {IN-HARDIRQ-W}
python/12572 [HC1[1]:SC0[0]:HE0:SE1] takes:00000000052a4df4 (&(&table->lock)->rlock#2){?.+.}, /0x50 [mlx5_core] {HARDIRQ-ON-W} state was registered at:
_raw_spin_lock+0x33/0x70 mlx5_get_rsc+0x1a/0x50 [mlx5_core] mlx5_ib_eqe_pf_action+0x493/0x1be0 [mlx5_ib] process_one_work+0x90c/0x1820 worker_thread+0x87/0xbb0 kthread+0x320/0x3e0 ret_from_fork+0x24/0x30 irq event stamp: 103928 hardirqs last enabled at (103927): [] nk+0x1a/0x1c hardirqs last disabled at (103928): [] unk+0x1a/0x1c softirqs last enabled at (103924): [] tcp_sendmsg+0x31/0x40 softirqs last disabled at (103922): [] 80
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----lock(&(&table->lock)->rlock#2);
lock(&(&table->lock)->rlock#2);
*** DEADLOCK ***
--- drivers/net/ethernet/mellanox/mlx5/core/qp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/qp.c +3 -2
@@ -44,14 +44,15 @@ static struct mlx5_core_rsc_common *mlx5_get_rsc(struct mlx5_core_dev *dev, {struct mlx5_qp_table *table = &dev->priv.qp_table;struct mlx5_core_rsc_common *common; +unsigned long flags; -spin_lock (&table->lock); +spin_lock_irqsave (&table->lock, flags); common =radix_tree_lookup (&table->tree, rsn);if (common)atomic_inc (&common->refcount); -spin_unlock (&table->lock); +spin_unlock_irqrestore (&table->lock, flags);if (!common) { mlx5_core_warn(dev, "Async event for bogus resource 0x%x\n",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 69/371 iwlwifi: mvm: fix A-MPDU reference assignment
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit 1f7698abedeeb3fef3cbcf78e16f925df675a179 ]
The current code assigns the reference, and then goes to increment it if the toggle bit has changed. That way, we get
Toggle 0 0 0 0 1 1 1 1 ID 1 1 1 1 1 2 2 2
Fix that by assigning the post-toggle ID to get
Toggle 0 0 0 0 1 1 1 1 ID 1 1 1 1 2 2 2 2
--- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +1 -1
@@ -871,12 +871,12 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi,bool toggle_bit = phy_info &IWL_RX_MPDU_PHY_AMPDU_TOGGLE ; rx_status->flag |=RX_FLAG_AMPDU_DETAILS ; - rx_status->ampdu_reference = mvm->ampdu_ref;/* toggle is switched whenever new aggregation starts */ if (toggle_bit != mvm->ampdu_toggle) { mvm->ampdu_ref++; mvm->ampdu_toggle = toggle_bit; } + rx_status->ampdu_reference = mvm->ampdu_ref; }rcu_read_lock ();
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 70/371 tty: ipwireless: Fix potential NULL pointer dereference
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 7dd50e205b3348dc7784efbdf85723551de64a25 ]
There is a potential NULL pointer dereference in case alloc_ctrl_packet() fails and returns NULL.
--- drivers/tty/ipwireless/hardware.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/ipwireless/hardware.c +2 -0
@@ -1516,6 +1516,8 @@ static void ipw_send_setup_packet(struct ipw_hardware *hw)sizeof (struct ipw_setup_get_version_query_packet ),ADDR_SETUP_PROT ,TL_PROTOCOLID_SETUP , TL_SETUP_SIGNO_GET_VERSION_QRY); +if (!ver_packet) +return ; ver_packet->header.length =sizeof (struct tl_setup_get_version_qry );/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 71/371 driver: uio: fix possible memory leak in __uio_register_device
In reply to Sasha LevinFrom: Liu Jian <[email protected]>
[ Upstream commit 1a392b3de7c5747506b38fc14b2e79977d3c7770 ]
'idev' is malloced in __uio_register_device() and leak free it before leaving from the uio_get_minor() error handing case, it will cause memory leak.
--- drivers/uio/uio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/uio/uio.c +3 -1
@@ -939,8 +939,10 @@ int __uio_register_device(struct module *owner,atomic_set (&idev->event,0 ); ret =uio_get_minor (idev); -if (ret) +if (ret) { +kfree (idev);return ret; + } idev->dev.devt =MKDEV (uio_major, idev->minor); idev->dev.class = &uio_class;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 72/371 driver: uio: fix possible use-after-free in __uio_register_device
In reply to Sasha LevinFrom: Liu Jian <[email protected]>
[ Upstream commit 221a1f4ac12d2ab46246c160b2e00d1b1160d5d9 ]
In uio_dev_add_attributes() error handing case, idev is used after device_unregister(), in which 'idev' has been released, touch idev cause use-after-free.
--- drivers/uio/uio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/uio/uio.c +4 -2
@@ -944,6 +944,7 @@ int __uio_register_device(struct module *owner,return ret; } +device_initialize (&idev->dev); idev->dev.devt =MKDEV (uio_major, idev->minor); idev->dev.class = &uio_class; idev->dev.parent = parent;
@@ -954,7 +955,7 @@ int __uio_register_device(struct module *owner,if (ret) goto err_device_create; - ret =device_register (&idev->dev); + ret =device_add (&idev->dev);if (ret) goto err_device_create;
@@ -986,9 +987,10 @@ int __uio_register_device(struct module *owner, err_request_irq:uio_dev_del_attributes (idev); err_uio_dev_add_attributes: -device_unregister (&idev->dev); +device_del (&idev->dev); err_device_create:uio_free_minor (idev); +put_device (&idev->dev);return ret; }EXPORT_SYMBOL_GPL (__uio_register_device);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 73/371 crypto: crypto4xx - Fix wrong ppc4xx_trng_probe()/ppc4xx_trng_remove() arguments
In reply to Sasha LevinFrom: Corentin Labbe <[email protected]>
[ Upstream commit 6e88098ca43a3d80ae86908f7badba683c8a0d84 ]
When building without CONFIG_HW_RANDOM_PPC4XX, I hit the following build failure:drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_probe':drivers/crypto/amcc/crypto4xx_core.c:1407:20: error: passing argument 1 of 'ppc4xx_trng_probe' from incompatible pointer type [-Werror=incompatible-pointer-types] In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:drivers/crypto/amcc/crypto4xx_trng.h:28:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *' drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_remove':drivers/crypto/amcc/crypto4xx_core.c:1434:21: error: passing argument 1 of 'ppc4xx_trng_remove' from incompatible pointer type [-Werror=incompatible-pointer-types] In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:drivers/crypto/amcc/crypto4xx_trng.h:30:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *'
This patch fix the needed argument of ppc4xx_trng_probe()/ppc4xx_trng_remove() in that case.
--- drivers/crypto/amcc/crypto4xx_trng.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/amcc/crypto4xx_trng.h +2 -2
@@ -26,9 +26,9 @@ void ppc4xx_trng_probe(struct crypto4xx_core_device *core_dev);void ppc4xx_trng_remove (struct crypto4xx_core_device *core_dev);#else static inline void ppc4xx_trng_probe ( -struct crypto4xx_device *dev__maybe_unused ) { } +struct crypto4xx_core_device *dev__maybe_unused ) { }static inline void ppc4xx_trng_remove ( -struct crypto4xx_device *dev__maybe_unused ) { } +struct crypto4xx_core_device *dev__maybe_unused ) { }#endif #endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 74/371 driver core: Do not resume suppliers under device_links_write_lock()
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 5db25c9eb893df8f6b93c1d97b8006d768e1b6f5 ]
It is incorrect to call pm_runtime_get_sync() under device_links_write_lock(), because it may end up trying to take device_links_read_lock() while resuming the target device and that will deadlock in the non-SRCU case, so avoid that by resuming the supplier device in device_link_add() before calling device_links_write_lock().
--- drivers/base/core.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/base/core.c +14 -6
@@ -180,11 +180,20 @@ struct device_link *device_link_add(struct device *consumer, struct device *supplier, u32 flags) {struct device_link *link; +bool rpm_put_supplier = false;if (!consumer || !supplier || ((flags &DL_FLAG_STATELESS ) && (flags &DL_FLAG_AUTOREMOVE )))return NULL ; +if (flags &DL_FLAG_PM_RUNTIME && flags &DL_FLAG_RPM_ACTIVE ) { +if (pm_runtime_get_sync (supplier) <0 ) { +pm_runtime_put_noidle (supplier); +return NULL ; + } + rpm_put_supplier = true; + } +device_links_write_lock ();device_pm_lock ();
@@ -209,13 +218,8 @@ struct device_link *device_link_add(struct device *consumer,if (flags &DL_FLAG_PM_RUNTIME ) {if (flags &DL_FLAG_RPM_ACTIVE ) { -if (pm_runtime_get_sync (supplier) <0 ) { -pm_runtime_put_noidle (supplier); -kfree (link); - link =NULL ; - goto out; - } link->rpm_active = true; + rpm_put_supplier = false; }pm_runtime_new_link (consumer);/*
@@ -286,6 +290,10 @@ struct device_link *device_link_add(struct device *consumer, out:device_pm_unlock ();device_links_write_unlock (); + +if (rpm_put_supplier) +pm_runtime_put (supplier); +return link; }EXPORT_SYMBOL_GPL (device_link_add);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 75/371 ARM: dts: lpc32xx: add required clocks property to keypad device node
In reply to Sasha LevinFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 3e88bc38b9f6fe4b69cecf81badd3c19fde97f97 ]
NXP LPC32xx keypad controller requires a clock property to be defined.
The change fixes the driver initialization problem:
lpc32xx_keys 40050000.key: failed to get clock
lpc32xx_keys: probe of 40050000.key failed with error -2
--- arch/arm/boot/dts/lpc32xx.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/lpc32xx.dtsi +1 -0
@@ -462,6 +462,7 @@ key: key@40050000 { compatible = "nxp,lpc3220-key"; reg = <0x40050000 0x1000>; + clocks = <&clk LPC32XX_CLK_KEY>; interrupts = <54 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 76/371 ARM: dts: lpc32xx: reparent keypad controller to SIC1
In reply to Sasha LevinFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 489261c45f0ebbc1c2813f337bbdf858267f5033 ]
After switching to a new interrupt controller scheme by separating SIC1 and SIC2 from MIC interrupt controller just one SoC keypad controller was not taken into account, fix it now:
WARNING: CPU: 0 PID: 1 at kernel/irq/irqdomain.c:524 irq_domain_associate+0x50/0x1b0 error: hwirq 0x36 is too large for interrupt-controller@40008000 ... lpc32xx_keys 40050000.key: failed to get platform irq lpc32xx_keys: probe of 40050000.key failed with error -22
--- arch/arm/boot/dts/lpc32xx.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/lpc32xx.dtsi +2 -1
@@ -463,7 +463,8 @@ compatible = "nxp,lpc3220-key"; reg = <0x40050000 0x1000>; clocks = <&clk LPC32XX_CLK_KEY>; - interrupts = <54 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&sic1>; + interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 77/371 ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller variant
In reply to Sasha LevinFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 7a0790a4121cbcd111cc537cdc801c46ccb789ee ]
ARM PrimeCell PL111 LCD controller is found on On NXP LPC3230 and LPC3250 SoCs variants, the original reference in compatible property to an older one ARM PrimeCell PL110 is invalid.
--- arch/arm/boot/dts/lpc32xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/lpc32xx.dtsi +1 -1
@@ -139,7 +139,7 @@ }; clcd: clcd@31040000 { - compatible = "arm,pl110", "arm,primecell"; + compatible = "arm,pl111", "arm,primecell"; reg = <0x31040000 0x1000>; interrupts = <14 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk LPC32XX_CLK_LCD>;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 78/371 ARM: dts: lpc32xx: fix ARM PrimeCell LCD controller clocks property
In reply to Sasha LevinFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 30fc01bae3cda747e7d9c352b1aa51ca113c8a9d ]
The originally added ARM PrimeCell PL111 clocks property misses the required "clcdclk" clock, which is the same as a clock to enable the LCD controller on NXP LPC3230 and NXP LPC3250 SoCs.
--- arch/arm/boot/dts/lpc32xx.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/lpc32xx.dtsi +2 -2
@@ -142,8 +142,8 @@ compatible = "arm,pl111", "arm,primecell"; reg = <0x31040000 0x1000>; interrupts = <14 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clk LPC32XX_CLK_LCD>; - clock-names = "apb_pclk"; + clocks = <&clk LPC32XX_CLK_LCD>, <&clk LPC32XX_CLK_LCD>; + clock-names = "clcdclk", "apb_pclk"; status = "disabled"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 79/371 ARM: dts: lpc32xx: phy3250: fix SD card regulator voltage
In reply to Sasha LevinFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit dc141b99fc36cf910a1d8d5ee30f43f2442fd1bd ]
The fixed voltage regulator on Phytec phyCORE-LPC3250 board, which supplies SD/MMC card's power, has a constant output voltage level of either 3.15V or 3.3V, the actual value depends on JP4 position, the power rail is referenced as VCC_SDIO in the board hardware manual.
--- arch/arm/boot/dts/lpc3250-phy3250.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/lpc3250-phy3250.dts +2 -2
@@ -49,8 +49,8 @@ sd_reg: regulator@2 { compatible = "regulator-fixed"; regulator-name = "sd_reg"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; gpio = <&gpio 5 5 0>; enable-active-high; };
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 80/371 iwlwifi: mvm: fix RSS config command
In reply to Sasha LevinFrom: Sara Sharon <[email protected]>
[ Upstream commit 608dce95db10b8ee1a26dbce3f60204bb69812a5 ]
The hash mask is a bitmap, so we should use BIT() on the enum values.
--- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +6 -6
@@ -107,12 +107,12 @@ static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm)int i;struct iwl_rss_config_cmd cmd = { .flags =cpu_to_le32 (IWL_RSS_ENABLE ), - .hash_mask =IWL_RSS_HASH_TYPE_IPV4_TCP | -IWL_RSS_HASH_TYPE_IPV4_UDP | -IWL_RSS_HASH_TYPE_IPV4_PAYLOAD | -IWL_RSS_HASH_TYPE_IPV6_TCP | -IWL_RSS_HASH_TYPE_IPV6_UDP | -IWL_RSS_HASH_TYPE_IPV6_PAYLOAD , + .hash_mask =BIT (IWL_RSS_HASH_TYPE_IPV4_TCP ) | +BIT (IWL_RSS_HASH_TYPE_IPV4_UDP ) | +BIT (IWL_RSS_HASH_TYPE_IPV4_PAYLOAD ) | +BIT (IWL_RSS_HASH_TYPE_IPV6_TCP ) | +BIT (IWL_RSS_HASH_TYPE_IPV6_UDP ) | +BIT (IWL_RSS_HASH_TYPE_IPV6_PAYLOAD ), };if (mvm->trans->num_rx_queues ==1 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 81/371 staging: most: cdev: add missing check for cdev_add failure
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 5ae890780e1b4d08f2c0c5d4ea96fc3928fc0ee9 ]
Currently the call to cdev_add is missing a check for failure. Fix this by checking for failure and exiting via a new error path that ensures the allocated comp_channel struct is kfree'd.
Detected by CoverityScan, CID#1462359 ("Unchecked return value")
--- drivers/staging/most/aim-cdev/cdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/most/aim-cdev/cdev.c +4 -1
@@ -455,7 +455,9 @@ static int aim_probe(struct most_interface *iface, int channel_id, c->devno =MKDEV (major, current_minor);cdev_init (&c->cdev, &channel_fops); c->cdev.owner =THIS_MODULE ; -cdev_add (&c->cdev, c->devno,1 ); + retval =cdev_add (&c->cdev, c->devno,1 ); +if (retval <0 ) + goto err_free_c; c->iface = iface; c->cfg = cfg; c->channel_id = channel_id;
@@ -491,6 +493,7 @@ static int aim_probe(struct most_interface *iface, int channel_id,list_del (&c->list); error_alloc_kfifo:cdev_del (&c->cdev); +err_free_c:kfree (c); error_alloc_channel:ida_simple_remove (&minor_id, current_minor);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 82/371 rtc: ds1672: fix unintended sign extension
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit f0c04c276739ed8acbb41b4868e942a55b128dca ]
Shifting a u8 by 24 will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an unsigned long will sign extend the value causing the upper 32 bits to be set in the result.
Fix this by casting the u8 value to an unsigned long before the shift.
Detected by CoverityScan, CID#138801 ("Unintended sign extension")
--- drivers/rtc/rtc-ds1672.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/rtc-ds1672.c +2 -1
@@ -58,7 +58,8 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)"%s: raw read data - counters=%02x,%02x,%02x,%02x\n" , __func__, buf[0], buf[1], buf[2], buf[3]); - time = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + time = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ];rtc_time_to_tm (time, tm);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 83/371 thermal: mediatek: fix register index error
In reply to Sasha LevinFrom: Michael Kao <[email protected]>
[ Upstream commit eb9aecd90d1a39601e91cd08b90d5fee51d321a6 ]
The index of msr and adcpnp should match the sensor which belongs to the selected bank in the for loop.
--- drivers/thermal/mtk_thermal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/thermal/mtk_thermal.c +4 -2
@@ -407,7 +407,8 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank)u32 raw;for (i =0 ; i < conf->bank_data[bank->id].num_sensors; i++) { - raw =readl (mt->thermal_base + conf->msr[i]); + raw =readl (mt->thermal_base + + conf->msr[conf->bank_data[bank->id].sensors[i]]); temp = raw_to_mcelsius(mt, conf->bank_data[bank->id].sensors[i],
@@ -544,7 +545,8 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num,for (i =0 ; i < conf->bank_data[num].num_sensors; i++)writel (conf->sensor_mux_values[conf->bank_data[num].sensors[i]], - mt->thermal_base + conf->adcpnp[i]); + mt->thermal_base + + conf->adcpnp[conf->bank_data[num].sensors[i]]);writel ((1 << conf->bank_data[num].num_sensors) -1 , mt->thermal_base +TEMP_MONCTL0 );
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 84/371 net: phy: fixed_phy: Fix fixed_phy not checking GPIO
In reply to Sasha LevinFrom: Moritz Fischer <[email protected]>
[ Upstream commit 8f289805616e81f7c1690931aa8a586c76f4fa88 ]
Fix fixed_phy not checking GPIO if no link_update callback is registered.
In the original version all users registered a link_update callback so the issue was masked.
--- drivers/net/phy/fixed_phy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/phy/fixed_phy.c +3 -3
@@ -67,11 +67,11 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num)do { s =read_seqcount_begin (&fp->seqcount);/* Issue callback if user registered it. */ -if (fp->link_update) { +if (fp->link_update) fp->link_update (fp->phydev->attached_dev, &fp->status); -fixed_phy_update (fp); - } +/* Check the GPIO for change in status */ +fixed_phy_update (fp); state = fp->status; }while (read_seqcount_retry (&fp->seqcount, s));
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 85/371 rtc: ds1307: rx8130: Fix alarm handling
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 3f929cad943380370b6db31fcb7a38d898d91089 ]
When the EXTENSION.WADA bit is set, register 0x19 contains a bitmap of week days, not a day of month. As Linux only handles a single alarm without repetition using day of month is more flexible, so clear this bit. (Otherwise a value depending on time.tm_wday would have to be written to register 0x19.)
Also optimize setting the AIE bit to use a single register write instead of a bulk write of three registers.
--- drivers/rtc/rtc-ds1307.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/rtc/rtc-ds1307.c +3 -4
@@ -733,8 +733,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)if (ret <0 )return ret; - ctl[0 ] &= ~RX8130_REG_EXTENSION_WADA ; - ctl[1 ] |=RX8130_REG_FLAG_AF ; + ctl[0 ] &=RX8130_REG_EXTENSION_WADA ; + ctl[1 ] &= ~RX8130_REG_FLAG_AF ; ctl[2 ] &= ~RX8130_REG_CONTROL0_AIE ; ret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl,
@@ -757,8 +757,7 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t) ctl[2 ] |=RX8130_REG_CONTROL0_AIE ; -return regmap_bulk_write (ds1307->regmap,RX8130_REG_EXTENSION , ctl, -sizeof (ctl)); +return regmap_write (ds1307->regmap,RX8130_REG_CONTROL0 , ctl[2 ]); }static int rx8130_alarm_irq_enable (struct device *dev,unsigned int enabled)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 86/371 rtc: 88pm860x: fix unintended sign extension
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit dc9e47160626cdb58d5c39a4f43dcfdb27a5c004 ]
Shifting a u8 by 24 will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an unsigned long will sign extend the value causing the upper 32 bits to be set in the result.
Fix this by casting the u8 value to an unsigned long before the shift.
Detected by CoverityScan, CID#144925-144928 ("Unintended sign extension")
--- drivers/rtc/rtc-88pm860x.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/rtc/rtc-88pm860x.c +14 -7
@@ -115,11 +115,13 @@ static int pm860x_rtc_read_time(struct device *dev, struct rtc_time *tm)pm860x_page_bulk_read (info->i2c,REG0_ADDR ,8 , buf);dev_dbg (info->dev,"%x-%x-%x-%x-%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ], buf[4 ], buf[5 ], buf[6 ], buf[7 ]); - base = (buf[1 ] <<24 ) | (buf[3 ] <<16 ) | (buf[5 ] <<8 ) | buf[7 ]; + base = ((unsigned long )buf[1 ] <<24 ) | (buf[3 ] <<16 ) | + (buf[5 ] <<8 ) | buf[7 ];/* load 32-bit read-only counter */ pm860x_bulk_read (info->i2c,PM8607_RTC_COUNTER1 ,4 , buf); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -145,7 +147,8 @@ static int pm860x_rtc_set_time(struct device *dev, struct rtc_time *tm)/* load 32-bit read-only counter */ pm860x_bulk_read (info->i2c,PM8607_RTC_COUNTER1 ,4 , buf); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; base = ticks - data;dev_dbg (info->dev,"set base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -170,10 +173,12 @@ static int pm860x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)pm860x_page_bulk_read (info->i2c,REG0_ADDR ,8 , buf);dev_dbg (info->dev,"%x-%x-%x-%x-%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ], buf[4 ], buf[5 ], buf[6 ], buf[7 ]); - base = (buf[1 ] <<24 ) | (buf[3 ] <<16 ) | (buf[5 ] <<8 ) | buf[7 ]; + base = ((unsigned long )buf[1 ] <<24 ) | (buf[3 ] <<16 ) | + (buf[5 ] <<8 ) | buf[7 ];pm860x_bulk_read (info->i2c,PM8607_RTC_EXPIRE1 ,4 , buf); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -198,11 +203,13 @@ static int pm860x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)pm860x_page_bulk_read (info->i2c,REG0_ADDR ,8 , buf);dev_dbg (info->dev,"%x-%x-%x-%x-%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ], buf[4 ], buf[5 ], buf[6 ], buf[7 ]); - base = (buf[1 ] <<24 ) | (buf[3 ] <<16 ) | (buf[5 ] <<8 ) | buf[7 ]; + base = ((unsigned long )buf[1 ] <<24 ) | (buf[3 ] <<16 ) | + (buf[5 ] <<8 ) | buf[7 ];/* load 32-bit read-only counter */ pm860x_bulk_read (info->i2c,PM8607_RTC_COUNTER1 ,4 , buf); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 87/371 rtc: 88pm80x: fix unintended sign extension
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit fb0b322537a831b5b0cb948c56f8f958ce493d3a ]
Shifting a u8 by 24 will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an unsigned long will sign extend the value causing the upper 32 bits to be set in the result.
Fix this by casting the u8 value to an unsigned long before the shift.
Detected by CoverityScan, CID#714646-714649 ("Unintended sign extension")
--- drivers/rtc/rtc-88pm80x.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/rtc/rtc-88pm80x.c +14 -7
@@ -116,12 +116,14 @@ static int pm80x_rtc_read_time(struct device *dev, struct rtc_time *tm)unsigned char buf[4 ];unsigned long ticks, base, data;regmap_raw_read (info->map,PM800_RTC_EXPIRE2_1 , buf,4 ); - base = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + base = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ];dev_dbg (info->dev,"%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ]);/* load 32-bit read-only counter */ regmap_raw_read (info->map,PM800_RTC_COUNTER1 , buf,4 ); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -144,7 +146,8 @@ static int pm80x_rtc_set_time(struct device *dev, struct rtc_time *tm)/* load 32-bit read-only counter */ regmap_raw_read (info->map,PM800_RTC_COUNTER1 , buf,4 ); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; base = ticks - data;dev_dbg (info->dev,"set base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -165,11 +168,13 @@ static int pm80x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)int ret;regmap_raw_read (info->map,PM800_RTC_EXPIRE2_1 , buf,4 ); - base = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + base = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ];dev_dbg (info->dev,"%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ]);regmap_raw_read (info->map,PM800_RTC_EXPIRE1_1 , buf,4 ); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
@@ -192,12 +197,14 @@ static int pm80x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)regmap_update_bits (info->map,PM800_RTC_CONTROL ,PM800_ALARM1_EN ,0 );regmap_raw_read (info->map,PM800_RTC_EXPIRE2_1 , buf,4 ); - base = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + base = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ];dev_dbg (info->dev,"%x-%x-%x-%x\n" , buf[0 ], buf[1 ], buf[2 ], buf[3 ]);/* load 32-bit read-only counter */ regmap_raw_read (info->map,PM800_RTC_COUNTER1 , buf,4 ); - data = (buf[3 ] <<24 ) | (buf[2 ] <<16 ) | (buf[1 ] <<8 ) | buf[0 ]; + data = ((unsigned long )buf[3 ] <<24 ) | (buf[2 ] <<16 ) | + (buf[1 ] <<8 ) | buf[0 ]; ticks = base + data;dev_dbg (info->dev,"get base:0x%lx, RO count:0x%lx, ticks:0x%lx\n" , base, data, ticks);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 88/371 rtc: pm8xxx: fix unintended sign extension
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit e42280886018c6f77f0a90190f7cba344b0df3e0 ]
Shifting a u8 by 24 will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an unsigned long will sign extend the value causing the upper 32 bits to be set in the result.
Fix this by casting the u8 value to an unsigned long before the shift.
Detected by CoverityScan, CID#1309693 ("Unintended sign extension")
--- drivers/rtc/rtc-pm8xxx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/rtc/rtc-pm8xxx.c +4 -2
@@ -186,7 +186,8 @@ static int pm8xxx_rtc_read_time(struct device *dev, struct rtc_time *tm) } } - secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | (value[3 ] <<24 ); + secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | + ((unsigned long )value[3 ] <<24 );rtc_time_to_tm (secs, tm);
@@ -267,7 +268,8 @@ static int pm8xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)return rc; } - secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | (value[3 ] <<24 ); + secs = value[0 ] | (value[1 ] <<8 ) | (value[2 ] <<16 ) | + ((unsigned long )value[3 ] <<24 );rtc_time_to_tm (secs, &alarm->time);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 89/371 fbdev: chipsfb: remove set but not used variable 'size'
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 8e71fa5e4d86bedfd26df85381d65d6b4c860020 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/video/fbdev/chipsfb.c: In function 'chipsfb_pci_init':drivers/video/fbdev/chipsfb.c:352:22: warning:
variable 'size' set but not used [-Wunused-but-set-variable]
--- drivers/video/fbdev/chipsfb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/chipsfb.c +1 -2
@@ -350,7 +350,7 @@ static void init_chips(struct fb_info *p, unsigned long addr)static int chipsfb_pci_init (struct pci_dev *dp,const struct pci_device_id *ent) {struct fb_info *p; -unsigned long addr, size; +unsigned long addr;unsigned short cmd;int rc = -ENODEV ;
@@ -362,7 +362,6 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)if ((dp->resource[0 ].flags &IORESOURCE_MEM ) =0 ) goto err_disable; addr =pci_resource_start (dp,0 ); - size =pci_resource_len (dp,0 );if (addr =0 ) goto err_disable;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 90/371 iw_cxgb4: use tos when importing the endpoint
In reply to Sasha LevinFrom: Steve Wise <[email protected]>
[ Upstream commit cb3ba0bde881f0cb7e3945d2a266901e2bd18c92 ]
import_ep() is passed the correct tos, but doesn't use it correctly.
--- drivers/infiniband/hw/cxgb4/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/cxgb4/cm.c +1 -1
@@ -2056,7 +2056,7 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, }else { pdev =get_real_dev (n->dev); ep->l2t =cxgb4_l2t_get (cdev->rdev.lldi.l2t, - n, pdev,0 ); + n, pdev,rt_tos2priority (tos));if (!ep->l2t) goto out; ep->mtu =dst_mtu (dst);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 91/371 iw_cxgb4: use tos when finding ipv6 routes
In reply to Sasha LevinFrom: Steve Wise <[email protected]>
[ Upstream commit c8a7eb554a83214c3d8ee5cb322da8c72810d2dc ]
When IPv6 support was added, the correct tos was not passed to cxgb_find_route6(). This potentially results in the wrong route entry.
--- drivers/infiniband/hw/cxgb4/cm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/hw/cxgb4/cm.c +3 -2
@@ -2147,7 +2147,8 @@ static int c4iw_reconnect(struct c4iw_ep *ep) laddr6->sin6_addr.s6_addr, raddr6->sin6_addr.s6_addr, laddr6->sin6_port, - raddr6->sin6_port,0 , + raddr6->sin6_port, + ep->com.cm_id->tos, raddr6->sin6_scope_id); iptype =6 ; ra = (__u8 *)&raddr6->sin6_addr;
@@ -3298,7 +3299,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) laddr6->sin6_addr.s6_addr, raddr6->sin6_addr.s6_addr, laddr6->sin6_port, - raddr6->sin6_port,0 , + raddr6->sin6_port, cm_id->tos, raddr6->sin6_scope_id); }if (!ep->dst) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 92/371 drm/etnaviv: potential NULL dereference
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 9e05352340d3a3e68c144136db9810b26ebb88c3 ]
The etnaviv_gem_prime_get_sg_table() is supposed to return error pointers. Otherwise it can lead to a NULL dereference when it's called from drm_gem_map_dma_buf().
--- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +1 -1
@@ -26,7 +26,7 @@ struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj)int npages = obj->size >>PAGE_SHIFT ;if (WARN_ON (!etnaviv_obj->pages))/* should have already pinned! */ -return NULL ; +return ERR_PTR (-EINVAL );return drm_prime_pages_to_sg (etnaviv_obj->pages, npages); }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 93/371 pinctrl: sh-pfc: emev2: Add missing pinmux functions
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 1ecd8c9cb899ae277e6986ae134635cb1a50f5de ]
The err_rst_reqb, ext_clki, lowpwr, and ref_clko pin groups are present, but no pinmux functions refer to them, hence they can not be selected.
--- drivers/pinctrl/sh-pfc/pfc-emev2.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/pinctrl/sh-pfc/pfc-emev2.c +20 -0
@@ -1263,6 +1263,14 @@ static const char * const dtv_groups[] = { "dtv_b", }; +static const char *const err_rst_reqb_groups[] = { +"err_rst_reqb" , +}; + +static const char *const ext_clki_groups[] = { +"ext_clki" , +}; +static const char *const iic0_groups[] = {"iic0" , };
@@ -1285,6 +1293,10 @@ static const char * const lcd_groups[] = { "yuv3", }; +static const char *const lowpwr_groups[] = { +"lowpwr" , +}; +static const char *const ntsc_groups[] = {"ntsc_clk" ,"ntsc_data" ,
@@ -1298,6 +1310,10 @@ static const char * const pwm1_groups[] = { "pwm1", }; +static const char *const ref_clko_groups[] = { +"ref_clko" , +}; +static const char *const sd_groups[] = {"sd_cki" , };
@@ -1391,13 +1407,17 @@ static const struct sh_pfc_function pinmux_functions[] = {SH_PFC_FUNCTION (cam),SH_PFC_FUNCTION (cf),SH_PFC_FUNCTION (dtv), +SH_PFC_FUNCTION (err_rst_reqb), +SH_PFC_FUNCTION (ext_clki),SH_PFC_FUNCTION (iic0),SH_PFC_FUNCTION (iic1),SH_PFC_FUNCTION (jtag),SH_PFC_FUNCTION (lcd), +SH_PFC_FUNCTION (lowpwr),SH_PFC_FUNCTION (ntsc),SH_PFC_FUNCTION (pwm0),SH_PFC_FUNCTION (pwm1), +SH_PFC_FUNCTION (ref_clko),SH_PFC_FUNCTION (sd),SH_PFC_FUNCTION (sdi0), SH_PFC_FUNCTION(sdi1),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 94/371 pinctrl: sh-pfc: r8a7791: Fix scifb2_data_c pin group
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit a4b0350047f1b10207e25e72d7cd3f7826e93769 ]
The entry for "scifb2_data_c" in the SCIFB2 pin group array contains a typo, thus the group cannot be selected.
--- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-r8a7791.c +1 -1
@@ -5209,7 +5209,7 @@ static const char * const scifb2_groups[] = {"scifb2_data_b" ,"scifb2_clk_b" ,"scifb2_ctrl_b" , -"scifb0_data_c" , +"scifb2_data_c" ,"scifb2_clk_c" , "scifb2_data_d", };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 95/371 pinctrl: sh-pfc: r8a7792: Fix vin1_data18_b pin group
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit b9fd50488b4939ce5b3a026d29e752e17c2d1800 ]
The vin1_data18_b pin group itself is present, but it is not listed in the VIN1 pin group array, and thus cannot be selected.
--- drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/sh-pfc/pfc-r8a7792.c +1 -0
@@ -1916,6 +1916,7 @@ static const char * const vin1_groups[] = {"vin1_data8" ,"vin1_data24_b" ,"vin1_data20_b" , +"vin1_data18_b" ,"vin1_data16_b" ,"vin1_sync" , "vin1_field",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 96/371 pinctrl: sh-pfc: sh73a0: Fix fsic_spdif pin groups
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0e6e448bdcf896d001a289a6112a704542d51516 ]
There are two pin groups for the FSIC SPDIF signal, but the FSIC pin group array lists only one, and it refers to a nonexistent group.
--- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-sh73a0.c +2 -1
@@ -3367,7 +3367,8 @@ static const char * const fsic_groups[] = {"fsic_sclk_out" ,"fsic_data_in" ,"fsic_data_out" , - "fsic_spdif", +"fsic_spdif_0" , + "fsic_spdif_1", }; static const char * const fsid_groups[] = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 97/371 PCI: endpoint: functions: Use memcpy_fromio()/memcpy_toio()
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit 726dabfde6aa35a4f1508e235ae37edbbf9fbc65 ]
Functions copying from/to IO addresses should use the memcpy_fromio()/memcpy_toio() API rather than plain memcpy().
Fix the issue detected through the sparse tool.
--- drivers/pci/endpoint/functions/pci-epf-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/endpoint/functions/pci-epf-test.c +2 -2
@@ -177,7 +177,7 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test) goto err_map_addr; } -memcpy (buf, src_addr, reg->size); +memcpy_fromio (buf, src_addr, reg->size); crc32 =crc32_le (~0 , buf, reg->size);if (crc32 != reg->checksum)
@@ -231,7 +231,7 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test)get_random_bytes (buf, reg->size); reg->checksum =crc32_le (~0 , buf, reg->size); -memcpy (dst_addr, buf, reg->size); +memcpy_toio (dst_addr, buf, reg->size);/* * wait 1ms inorder for the write to complete. Without this delay L3
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 98/371 usb: phy: twl6030-usb: fix possible use-after-free on remove
In reply to Sasha LevinFrom: Sven Van Asbroeck <[email protected]>
[ Upstream commit 5895d311d28f2605e2f71c1a3e043ed38f3ac9d2 ]
In remove(), use cancel_delayed_work_sync() to cancel the delayed work. Otherwise there's a chance that this work will continue to run until after the device has been removed.
This issue was detected with the help of Coccinelle.
--- drivers/usb/phy/phy-twl6030-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/phy/phy-twl6030-usb.c +1 -1
@@ -413,7 +413,7 @@ static int twl6030_usb_remove(struct platform_device *pdev) {struct twl6030_usb *twl =platform_get_drvdata (pdev); -cancel_delayed_work (&twl->get_status_work); +cancel_delayed_work_sync (&twl->get_status_work);twl6030_interrupt_mask (TWL6030_USBOTG_INT_MASK ,REG_INT_MSK_LINE_C ); twl6030_interrupt_mask(TWL6030_USBOTG_INT_MASK,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 99/371 block: don't use bio->bi_vcnt to figure out segment number
In reply to Sasha LevinFrom: Ming Lei <[email protected]>
[ Upstream commit 1a67356e9a4829da2935dd338630a550c59c8489 ]
It is wrong to use bio->bi_vcnt to figure out how many segments there are in the bio even though CLONED flag isn't set on this bio, because this bio may be splitted or advanced.
So always use bio_segments() in blk_recount_segments(), and it shouldn't cause any performance loss now because the physical segment number is figured out in blk_queue_split() and BIO_SEG_VALID is set meantime since bdced438acd83ad83a6c ("block: setup bi_phys_segments after splitting").
--- block/blk-merge.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
block/blk-merge.c +1 -7
@@ -299,13 +299,7 @@ void blk_recalc_rq_segments(struct request *rq)void blk_recount_segments (struct request_queue *q,struct bio *bio) { -unsigned short seg_cnt; - -/* estimate segment number by bi_vcnt for non-cloned bio */ -if (bio_flagged (bio,BIO_CLONED )) - seg_cnt =bio_segments (bio); -else - seg_cnt = bio->bi_vcnt; +unsigned short seg_cnt =bio_segments (bio);if (test_bit (QUEUE_FLAG_NO_SG_MERGE , &q->queue_flags) && (seg_cnt <queue_max_segments (q)))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 100/371 keys: Timestamp new keys
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 7c1857bdbdf1e4c541e45eab477ee23ed4333ea4 ]
Set the timestamp on new keys rather than leaving it unset.
--- security/keys/key.c | 1 + 1 file changed, 1 insertion(+)
security/keys/key.c +1 -0
@@ -297,6 +297,7 @@ struct key *key_alloc(struct key_type *type, const char *desc, key->gid = gid; key->perm = perm; key->restrict_link = restrict_link; + key->last_used_at =ktime_get_real_seconds ();if (!(flags &KEY_ALLOC_NOT_IN_QUOTA )) key->flags |=1 <<KEY_FLAG_IN_QUOTA ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 101/371 vfio_pci: Enable memory accesses before calling pci_map_rom
In reply to Sasha LevinFrom: Eric Auger <[email protected]>
[ Upstream commit 0cfd027be1d6def4a462cdc180c055143af24069 ]
pci_map_rom/pci_get_rom_size() performs memory access in the ROM. In case the Memory Space accesses were disabled, readw() is likely to trigger a synchronous external abort on some platforms.
In case memory accesses were disabled, re-enable them before the call and disable them back again just after.
--- drivers/vfio/pci/vfio_pci.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/vfio/pci/vfio_pci.c +14 -5
@@ -717,6 +717,7 @@ static long vfio_pci_ioctl(void *device_data, {void __iomem *io;size_t size; +u16 orig_cmd; info.offset =VFIO_PCI_INDEX_TO_OFFSET (info.index); info.flags =0 ;
@@ -732,15 +733,23 @@ static long vfio_pci_ioctl(void *device_data,break ; } -/* Is it really there? */ +/* +* Is it really there? Enable memory decode for +* implicit access in pci_map_rom(). +*/ +pci_read_config_word (pdev,PCI_COMMAND , &orig_cmd); +pci_write_config_word (pdev,PCI_COMMAND , + orig_cmd |PCI_COMMAND_MEMORY ); + io =pci_map_rom (pdev, &size); -if (!io || !size) { +if (io) { + info.flags =VFIO_REGION_INFO_FLAG_READ ; +pci_unmap_rom (pdev, io); + }else { info.size =0 ; -break ; } -pci_unmap_rom (pdev, io); - info.flags =VFIO_REGION_INFO_FLAG_READ ; +pci_write_config_word (pdev,PCI_COMMAND , orig_cmd);break ; }case VFIO_PCI_VGA_REGION_INDEX :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 102/371 hwmon: (pmbus/tps53679) Fix driver info initialization in probe routine
In reply to Sasha LevinFrom: Vadim Pasternak <[email protected]>
[ Upstream commit ff066653aeed8ee2d4dadb1e35774dd91ecbb19f ]
Fix tps53679_probe() by using dynamically allocated "pmbus_driver_info" structure instead of static. Usage of static structures causes overwritten of the field "vrm_version", in case the system is equipped with several tps53679 devices with the different "vrm_version". In such case the last probed device overwrites this field for all others.
--- drivers/hwmon/pmbus/tps53679.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/tps53679.c +8 -1
@@ -80,7 +80,14 @@ static struct pmbus_driver_info tps53679_info = {static int tps53679_probe (struct i2c_client *client,const struct i2c_device_id *id) { -return pmbus_do_probe (client, id, &tps53679_info); +struct pmbus_driver_info *info; + + info =devm_kmemdup (&client->dev, &tps53679_info,sizeof (*info), +GFP_KERNEL ); +if (!info) +return -ENOMEM ; + +return pmbus_do_probe (client, id, info); }static const struct i2c_device_id tps53679_id[] = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 103/371 KVM: PPC: Release all hardware TCE tables attached to a group
In reply to Sasha LevinFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit a67614cc05a5052b265ea48196dab2fce11f5f2e ]
The SPAPR TCE KVM device references all hardware IOMMU tables assigned to some IOMMU group to ensure that in-kernel KVM acceleration of H_PUT_TCE can work. The tables are references when an IOMMU group gets registered with the VFIO KVM device by the KVM_DEV_VFIO_GROUP_ADD ioctl; KVM_DEV_VFIO_GROUP_DEL calls into the dereferencing code
in kvm_spapr_tce_release_iommu_group() which walks through the list of LIOBNs, finds a matching IOMMU table and calls kref_put() when found.
However that code stops after the very first successful derefencing leaving other tables referenced till the SPAPR TCE KVM device is destroyed which normally happens on guest reboot or termination so if we do hotplug and unplug in a loop, we are leaking IOMMU tables here.
This removes a premature return to let kvm_spapr_tce_release_iommu_group() find and dereference all attached tables.
--- arch/powerpc/kvm/book3s_64_vio.c | 1 - 1 file changed, 1 deletion(-)
arch/powerpc/kvm/book3s_64_vio.c +0 -1
@@ -134,7 +134,6 @@ extern void kvm_spapr_tce_release_iommu_group(struct kvm *kvm,continue ;kref_put (&stit->kref, kvm_spapr_tce_liobn_put); -return ; } } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 104/371 staging: r8822be: check kzalloc return or bail
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit e4b08e16b7d9d030b6475ef48f94d734a39f3c81 ]
The kzalloc() in halmac_parse_psd_data_88xx() can fail and return NULL so check the psd_set->data after allocation and if allocation failed return HALMAC_CMD_PROCESS_ERROR.
--- .../staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c +4 -1
@@ -2492,8 +2492,11 @@ halmac_parse_psd_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf, segment_size = (u8 )PSD_DATA_GET_SEGMENT_SIZE (c2h_buf); psd_set->data_size = total_size; -if (!psd_set->data) +if (!psd_set->data) { psd_set->data =kzalloc (psd_set->data_size,GFP_KERNEL ); +if (!psd_set->data) +return HALMAC_CMD_PROCESS_ERROR ; + }if (segment_id ==0 ) psd_set->segment_size = segment_size;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 105/371 dmaengine: mv_xor: Use correct device for DMA API
In reply to Sasha LevinFrom: Robin Murphy <[email protected]>
[ Upstream commit 3e5daee5ecf314da33a890fabaa2404244cd2a36 ]
Using dma_dev->dev for mappings before it's assigned with the correct device is unlikely to work as expected, and with future dma-direct changes, passing a NULL device may end up crashing entirely. I don't know enough about this hardware or the mv_xor_prep_dma_interrupt() operation to implement the appropriate error-handling logic that would have revealed those dma_map_single() calls failing on arm64 for as long as the driver has been enabled there, but moving the assignment earlier will at least make the current code operate as intended.
--- drivers/dma/mv_xor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/mv_xor.c +1 -1
@@ -1059,6 +1059,7 @@ mv_xor_channel_add(struct mv_xor_device *xordev, mv_chan->op_in_desc =XOR_MODE_IN_DESC ; dma_dev = &mv_chan->dmadev; + dma_dev->dev = &pdev->dev; mv_chan->xordev = xordev;/*
@@ -1091,7 +1092,6 @@ mv_xor_channel_add(struct mv_xor_device *xordev, dma_dev->device_free_chan_resources = mv_xor_free_chan_resources; dma_dev->device_tx_status = mv_xor_status; dma_dev->device_issue_pending = mv_xor_issue_pending; - dma_dev->dev = &pdev->dev;/* set prep routines based on capability */ if (dma_has_cap (DMA_INTERRUPT , dma_dev->cap_mask))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 106/371 cdc-wdm: pass return value of recover_from_urb_loss
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 0742a338f5b3446a26de551ad8273fb41b2787f2 ]
'rv' is the correct return value, pass it upstream instead of 0
--- drivers/usb/class/cdc-wdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +1 -1
@@ -1085,7 +1085,7 @@ static int wdm_post_reset(struct usb_interface *intf) rv =recover_from_urb_loss (desc);mutex_unlock (&desc->wlock);mutex_unlock (&desc->rlock); -return 0 ; +return rv; }static struct usb_driver wdm_driver = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 107/371 regulator: pv88060: Fix array out-of-bounds access
In reply to Sasha LevinFrom: Axel Lin <[email protected]>
[ Upstream commit 7cd415f875591bc66c5ecb49bf84ef97e80d7b0e ]
Fix off-by-one while iterating current_limits array. The valid index should be 0 ~ n_current_limits -1.
--- drivers/regulator/pv88060-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/pv88060-regulator.c +1 -1
@@ -135,7 +135,7 @@ static int pv88060_set_current_limit(struct regulator_dev *rdev, int min,int i;/* search for closest to maximum */ -for (i = info->n_current_limits; i >=0 ; i--) { +for (i = info->n_current_limits -1 ; i >=0 ; i--) {if (min <= info->current_limits[i] && max >= info->current_limits[i]) { return regmap_update_bits(rdev->regmap,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 108/371 regulator: pv88080: Fix array out-of-bounds access
In reply to Sasha LevinFrom: Axel Lin <[email protected]>
[ Upstream commit 3c413f594c4f9df40061445667ca11a12bc8ee34 ]
Fix off-by-one while iterating current_limits array. The valid index should be 0 ~ n_current_limits -1.
--- drivers/regulator/pv88080-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/pv88080-regulator.c +1 -1
@@ -279,7 +279,7 @@ static int pv88080_set_current_limit(struct regulator_dev *rdev, int min,int i;/* search for closest to maximum */ -for (i = info->n_current_limits; i >=0 ; i--) { +for (i = info->n_current_limits -1 ; i >=0 ; i--) {if (min <= info->current_limits[i] && max >= info->current_limits[i]) { return regmap_update_bits(rdev->regmap,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 109/371 regulator: pv88090: Fix array out-of-bounds access
In reply to Sasha LevinFrom: Axel Lin <[email protected]>
[ Upstream commit a5455c9159414748bed4678184bf69989a4f7ba3 ]
Fix off-by-one while iterating current_limits array. The valid index should be 0 ~ n_current_limits -1.
--- drivers/regulator/pv88090-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/pv88090-regulator.c +1 -1
@@ -157,7 +157,7 @@ static int pv88090_set_current_limit(struct regulator_dev *rdev, int min,int i;/* search for closest to maximum */ -for (i = info->n_current_limits; i >=0 ; i--) { +for (i = info->n_current_limits -1 ; i >=0 ; i--) {if (min <= info->current_limits[i] && max >= info->current_limits[i]) { return regmap_update_bits(rdev->regmap,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 110/371 net: dsa: qca8k: Enable delay for RGMII_ID mode
In reply to Sasha LevinFrom: Vinod Koul <[email protected]>
[ Upstream commit a968b5e9d5879f9535d6099505f9e14abcafb623 ]
RGMII_ID specifies that we should have internal delay, so resurrect the delay addition routine but under the RGMII_ID mode.
--- drivers/net/dsa/qca8k.c | 12 ++++++++++++ drivers/net/dsa/qca8k.h | 1 + 2 files changed, 13 insertions(+)
drivers/net/dsa/qca8k.c +12 -0
@@ -459,6 +459,18 @@ qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode)qca8k_write (priv,QCA8K_REG_PORT5_PAD_CTRL ,QCA8K_PORT_PAD_RGMII_RX_DELAY_EN );break ; +case PHY_INTERFACE_MODE_RGMII_ID : +/* RGMII_ID needs internal delay. This is enabled through +* PORT5_PAD_CTRL for all ports, rather than individual port +* registers +*/ +qca8k_write (priv, reg, +QCA8K_PORT_PAD_RGMII_EN | +QCA8K_PORT_PAD_RGMII_TX_DELAY (QCA8K_MAX_DELAY ) | +QCA8K_PORT_PAD_RGMII_RX_DELAY (QCA8K_MAX_DELAY )); +qca8k_write (priv,QCA8K_REG_PORT5_PAD_CTRL , +QCA8K_PORT_PAD_RGMII_RX_DELAY_EN ); +break ;case PHY_INTERFACE_MODE_SGMII :qca8k_write (priv, reg,QCA8K_PORT_PAD_SGMII_EN );break ;
drivers/net/dsa/qca8k.h +1 -0
@@ -40,6 +40,7 @@ ((0x8 + (x & 0x3)) << 22)#define QCA8K_PORT_PAD_RGMII_RX_DELAY (x) \ ((0x10 + (x & 0x3)) << 20) +#define QCA8K_MAX_DELAY 3#define QCA8K_PORT_PAD_RGMII_RX_DELAY_EN BIT(24)#define QCA8K_PORT_PAD_SGMII_EN BIT(7)#define QCA8K_REG_MODULE_EN 0x030
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 111/371 drm/nouveau/bios/ramcfg: fix missing parentheses when calculating RON
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 13649101a25c53c87f4ab98a076dfe61f3636ab1 ]
Currently, the expression for calculating RON is always going to result in zero no matter the value of ram->mr[1] because the ! operator has higher precedence than the shift >> operator. I believe the missing parentheses around the expression before appying the ! operator will result in the desired result.
[ Note, not tested ]
Detected by CoveritScan, CID#1324005 ("Operands don't affect result")
--- drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c +1 -1
@@ -87,7 +87,7 @@ nvkm_gddr3_calc(struct nvkm_ram *ram)WR = (ram->next->bios.timing[2 ] &0x007f0000 ) >>16 ;/* XXX: Get these values from the VBIOS instead */ DLL = !(ram->mr[1 ] &0x1 ); -RON = !(ram->mr[1 ] &0x300 ) >>8 ; +RON = !((ram->mr[1 ] &0x300 ) >>8 );break ;default :return -ENOSYS ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 112/371 drm/nouveau/pmu: don't print reply values if exec is false
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit b1d03fc36ec9834465a08c275c8d563e07f6f6bf ]
Currently the uninitialized values in the array reply are printed out when exec is false and nvkm_pmu_send has not updated the array. Avoid confusion by only dumping out these values if they have been actually updated.
Detected by CoverityScan, CID#1271291 ("Uninitialized scaler variable")
--- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c +2 -2
@@ -88,10 +88,10 @@ nvkm_memx_fini(struct nvkm_memx **pmemx, bool exec)if (exec) {nvkm_pmu_send (pmu, reply,PROC_MEMX ,MEMX_MSG_EXEC , memx->base, finish); +nvkm_debug (subdev,"Exec took %uns, PMU_IN %08x\n" , + reply[0 ], reply[1 ]); } -nvkm_debug (subdev,"Exec took %uns, PMU_IN %08x\n" , - reply[0 ], reply[1 ]);kfree (memx);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 113/371 ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 8d1667200850f8753c0265fa4bd25c9a6e5f94ce ]
The apq8016 driver leaves the of-node refcount at aborting from the loop of for_each_child_of_node() in the error path. Not only the iterator node of for_each_child_of_node(), the children nodes referred from it for codec and cpu have to be properly unreferenced.
--- sound/soc/qcom/apq8016_sbc.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
sound/soc/qcom/apq8016_sbc.c +16 -5
@@ -163,41 +163,52 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card)if (!cpu || !codec) {dev_err (dev,"Can't find cpu/codec DT node\n" ); -return ERR_PTR (-EINVAL ); + ret = -EINVAL ; + goto error; } link->cpu_of_node =of_parse_phandle (cpu,"sound-dai" ,0 );if (!link->cpu_of_node) {dev_err (card->dev,"error getting cpu phandle\n" ); -return ERR_PTR (-EINVAL ); + ret = -EINVAL ; + goto error; } ret =snd_soc_of_get_dai_name (cpu, &link->cpu_dai_name);if (ret) {dev_err (card->dev,"error getting cpu dai name\n" ); -return ERR_PTR (ret); + goto error; } ret =snd_soc_of_get_dai_link_codecs (dev, codec, link);if (ret <0 ) {dev_err (card->dev,"error getting codec dai name\n" ); -return ERR_PTR (ret); + goto error; } link->platform_of_node = link->cpu_of_node; ret =of_property_read_string (np,"link-name" , &link->name);if (ret) {dev_err (card->dev,"error getting codec dai_link name\n" ); -return ERR_PTR (ret); + goto error; } link->stream_name = link->name; link->init = apq8016_sbc_dai_init; link++; + +of_node_put (cpu); +of_node_put (codec); }return data; + + error: +of_node_put (np); +of_node_put (cpu); +of_node_put (codec); +return ERR_PTR (ret); }static const struct snd_soc_dapm_widget apq8016_sbc_dapm_widgets[] = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 114/371 fs/nfs: Fix nfs_parse_devname to not modify it's argument
In reply to Sasha LevinFrom: "Eric W. Biederman" <[email protected]>
[ Upstream commit 40cc394be1aa18848b8757e03bd8ed23281f572e ]
In the rare and unsupported case of a hostname list nfs_parse_devname will modify dev_name. There is no need to modify dev_name as the all that is being computed is the length of the hostname, so the computed length can just be shorted.
--- fs/nfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/super.c +1 -1
@@ -1925,7 +1925,7 @@ static int nfs_parse_devname(const char *dev_name,/* kill possible hostname list: not supported */ comma =strchr (dev_name,',' );if (comma !=NULL && comma < end) - *comma =0 ; + len = comma - dev_name; }if (len > maxnamlen)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 115/371 staging: rtlwifi: Use proper enum for return in halmac_parse_psd_data_88xx
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit e8edc32d70a4e09160835792eb5d1af71a0eec14 ]
Clang warns:
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c:2472:11:
warning: implicit conversion from enumeration type 'enum halmac_cmd_process_status' to different enumeration type 'enum halmac_ret_status' [-Wenum-conversion]
return HALMAC_CMD_PROCESS_ERROR;
~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~1 warning generated.
Fix this by using the proper enum for allocation failures, HALMAC_RET_MALLOC_FAIL, which is used in the rest of this file.
--- drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c +1 -1
@@ -2495,7 +2495,7 @@ halmac_parse_psd_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,if (!psd_set->data) { psd_set->data =kzalloc (psd_set->data_size,GFP_KERNEL );if (!psd_set->data) -return HALMAC_CMD_PROCESS_ERROR ; +return HALMAC_RET_MALLOC_FAIL ; }if (segment_id ==0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 116/371 powerpc/64s: Fix logic when handling unknown CPU features
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 8cfaf106918a8c13abb24c641556172afbb9545c ]
In cpufeatures_process_feature(), if a provided CPU feature is unknown and enable_unknown is false, we erroneously print that the feature is being enabled and return true, even though no feature has been enabled, and may also set feature bits based on the last entry in the match table.
Fix this so that we only set feature bits from the match table if we have actually enabled a feature from that table, and when failing to enable an unknown feature, always print the "not enabling" message and return false.
Coincidentally, some older gccs (<GCC 7), when invoked with -fsanitize-coverage=trace-pc, cause a spurious uninitialised variable warning in this function:
arch/powerpc/kernel/dt_cpu_ftrs.c: In function ‘cpufeatures_process_feature’:
arch/powerpc/kernel/dt_cpu_ftrs.c:686:7: warning: ‘m’ may be used uninitialized in this function [-Wmaybe-uninitialized]
if (m->cpu_ftr_bit_mask)
An upcoming patch will enable support for kcov, which requires this option. This patch avoids the warning.
--- arch/powerpc/kernel/dt_cpu_ftrs.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
arch/powerpc/kernel/dt_cpu_ftrs.c +7 -10
@@ -705,8 +705,10 @@ static bool __init cpufeatures_process_feature(struct dt_cpu_feature *f) m = &dt_cpu_feature_match_table[i];if (!strcmp (f->name, m->name)) { known = true; -if (m->enable (f)) +if (m->enable (f)) { + cur_cpu_spec->cpu_features |= m->cpu_ftr_bit_mask;break ; + }pr_info ("not enabling: %s (disabled or unsupported by kernel)\n" , f->name);
@@ -714,17 +716,12 @@ static bool __init cpufeatures_process_feature(struct dt_cpu_feature *f) } } -if (!known && enable_unknown) { -if (!feat_try_enable_unknown (f)) { -pr_info ("not enabling: %s (unknown and unsupported by kernel)\n" , - f->name); -return false; - } +if (!known && (!enable_unknown || !feat_try_enable_unknown (f))) { +pr_info ("not enabling: %s (unknown and unsupported by kernel)\n" , + f->name); +return false; } -if (m->cpu_ftr_bit_mask) - cur_cpu_spec->cpu_features |= m->cpu_ftr_bit_mask; -if (known)pr_debug ("enabling: %s\n" , f->name);else
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 117/371 NFS: Fix a soft lockup in the delegation recovery code
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 6f9449be53f3ce383caed797708b332ede8d952c ]
Fix a soft lockup when NFS client delegation recovery is attempted but the inode is in the process of being freed. When the igrab(inode) call fails, and we have to restart the recovery process, we need to ensure that we won't attempt to recover the same delegation again.
--- fs/nfs/delegation.c | 20 ++++++++++++-------- fs/nfs/delegation.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-)
fs/nfs/delegation.c +12 -8
@@ -234,6 +234,8 @@ static struct inode *nfs_delegation_grab_inode(struct nfs_delegation *delegationspin_lock (&delegation->lock);if (delegation->inode !=NULL ) inode =igrab (delegation->inode); +if (!inode) +set_bit (NFS_DELEGATION_INODE_FREEING , &delegation->flags);spin_unlock (&delegation->lock);return inode; }
@@ -863,10 +865,11 @@ void nfs_delegation_reap_unclaimed(struct nfs_client *clp)list_for_each_entry_rcu (server, &clp->cl_superblocks, client_link) {list_for_each_entry_rcu (delegation, &server->delegations, super_list) { -if (test_bit (NFS_DELEGATION_RETURNING , - &delegation->flags)) -continue ; -if (test_bit (NFS_DELEGATION_NEED_RECLAIM , +if (test_bit (NFS_DELEGATION_INODE_FREEING , + &delegation->flags) || +test_bit (NFS_DELEGATION_RETURNING , + &delegation->flags) || +test_bit (NFS_DELEGATION_NEED_RECLAIM , &delegation->flags) ==0 )continue ;if (!nfs_sb_active (server->super))
@@ -971,10 +974,11 @@ void nfs_reap_expired_delegations(struct nfs_client *clp)list_for_each_entry_rcu (server, &clp->cl_superblocks, client_link) {list_for_each_entry_rcu (delegation, &server->delegations, super_list) { -if (test_bit (NFS_DELEGATION_RETURNING , - &delegation->flags)) -continue ; -if (test_bit (NFS_DELEGATION_TEST_EXPIRED , +if (test_bit (NFS_DELEGATION_INODE_FREEING , + &delegation->flags) || +test_bit (NFS_DELEGATION_RETURNING , + &delegation->flags) || +test_bit (NFS_DELEGATION_TEST_EXPIRED , &delegation->flags) ==0 )continue ;if (!nfs_sb_active (server->super))
fs/nfs/delegation.h +1 -0
@@ -34,6 +34,7 @@ enum {NFS_DELEGATION_RETURNING ,NFS_DELEGATION_REVOKED ,NFS_DELEGATION_TEST_EXPIRED , + NFS_DELEGATION_INODE_FREEING, };int nfs_inode_set_delegation (struct inode *inode,struct rpc_cred *cred,struct nfs_openres *res);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 118/371 clocksource/drivers/sun5i: Fail gracefully when clock rate is unavailable
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit e7e7e0d7beafebd11b0c065cd5fbc1e5759c5aab ]
If the clock tree is not fully populated when the timer-sun5i init code is called, attempts to get the clock rate for the timer would fail and return 0.
Make the init code for both clock events and clocksource check the returned clock rate and fail gracefully if the result is 0, instead of causing a divide by 0 exception later on.
--- drivers/clocksource/timer-sun5i.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/clocksource/timer-sun5i.c +10 -0
@@ -202,6 +202,11 @@ static int __init sun5i_setup_clocksource(struct device_node *node, } rate =clk_get_rate (clk); +if (!rate) { +pr_err ("Couldn't get parent clock rate\n" ); + ret = -EINVAL ; + goto err_disable_clk; + } cs->timer.base = base; cs->timer.clk = clk;
@@ -275,6 +280,11 @@ static int __init sun5i_setup_clockevent(struct device_node *node, void __iomem } rate =clk_get_rate (clk); +if (!rate) { +pr_err ("Couldn't get parent clock rate\n" ); + ret = -EINVAL ; + goto err_disable_clk; + } ce->timer.base = base; ce->timer.ticks_per_jiffy =DIV_ROUND_UP (rate,HZ );
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 119/371 clocksource/drivers/exynos_mct: Fix error path in timer resources initialization
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit b9307420196009cdf18bad55e762ac49fb9a80f4 ]
While freeing interrupt handlers in error path, don't assume that all requested interrupts are per-processor interrupts and properly release standard interrupts too.
--- drivers/clocksource/exynos_mct.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/clocksource/exynos_mct.c +13 -1
@@ -563,7 +563,19 @@ static int __init exynos4_timer_resources(struct device_node *np, void __iomem *return 0 ; out_irq: -free_percpu_irq (mct_irqs[MCT_L0_IRQ ], &percpu_mct_tick); +if (mct_int_type ==MCT_INT_PPI ) { +free_percpu_irq (mct_irqs[MCT_L0_IRQ ], &percpu_mct_tick); + }else { +for_each_possible_cpu (cpu) { +struct mct_clock_event_device *pcpu_mevt = +per_cpu_ptr (&percpu_mct_tick, cpu); + +if (pcpu_mevt->evt.irq !=-1 ) { +free_irq (pcpu_mevt->evt.irq, pcpu_mevt); + pcpu_mevt->evt.irq =-1 ; + } + } + }return err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 120/371 platform/x86: wmi: fix potential null pointer dereference
In reply to Sasha LevinFrom: Mattias Jacobsson <[email protected]>
[ Upstream commit c355ec651a8941864549f2586f969d0eb7bf499a ]
In the function wmi_dev_match() the variable id is dereferenced without first performing a NULL check. The variable can for example be NULL if a WMI driver is registered without specifying the id_table field in struct wmi_driver.
Add a NULL check and return that the driver can't handle the device if the variable is NULL.
--- drivers/platform/x86/wmi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/platform/x86/wmi.c +3 -0
@@ -748,6 +748,9 @@ static int wmi_dev_match(struct device *dev, struct device_driver *driver)struct wmi_block *wblock =dev_to_wblock (dev);const struct wmi_device_id *id = wmi_driver->id_table; +if (id ==NULL ) +return 0 ; +while (id->guid_string) {uuid_le driver_guid;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 121/371 NFS/pnfs: Bulk destroy of layouts needs to be safe w.r.t. umount
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 5085607d209102b37b169bc94d0aa39566a9842a ]
If a bulk layout recall or a metadata server reboot coincides with a umount, then holding a reference to an inode is unsafe unless we also hold a reference to the super block.
--- fs/nfs/pnfs.c | 33 +++++++++++++++++++++++---------- fs/nfs/pnfs.h | 1 + 2 files changed, 24 insertions(+), 10 deletions(-)
fs/nfs/pnfs.c +23 -10
@@ -725,22 +725,35 @@ static int pnfs_layout_bulk_destroy_byserver_locked(struct nfs_client *clp, struct nfs_server *server, struct list_head *layout_list) + __must_hold(&clp->cl_lock) + __must_hold(RCU) { struct pnfs_layout_hdr *lo, *next;struct inode *inode;list_for_each_entry_safe (lo, next, &server->layouts, plh_layouts) { -if (test_bit (NFS_LAYOUT_INVALID_STID , &lo->plh_flags)) +if (test_bit (NFS_LAYOUT_INVALID_STID , &lo->plh_flags) || +test_bit (NFS_LAYOUT_INODE_FREEING , &lo->plh_flags) || + !list_empty (&lo->plh_bulk_destroy))continue ; +/* If the sb is being destroyed, just bail */ +if (!nfs_sb_active (server->super)) +break ; inode =igrab (lo->plh_inode); -if (inode ==NULL ) -continue ; -list_del_init (&lo->plh_layouts); -if (pnfs_layout_add_bulk_destroy_list (inode, layout_list)) -continue ; -rcu_read_unlock (); -spin_unlock (&clp->cl_lock); -iput (inode); +if (inode !=NULL ) { +list_del_init (&lo->plh_layouts); +if (pnfs_layout_add_bulk_destroy_list (inode, + layout_list)) +continue ; +rcu_read_unlock (); +spin_unlock (&clp->cl_lock); +iput (inode); + }else { +rcu_read_unlock (); +spin_unlock (&clp->cl_lock); +set_bit (NFS_LAYOUT_INODE_FREEING , &lo->plh_flags); + } +nfs_sb_deactive (server->super);spin_lock (&clp->cl_lock);rcu_read_lock ();return -EAGAIN ;
@@ -778,7 +791,7 @@ pnfs_layout_free_bulk_destroy_list(struct list_head *layout_list,/* Free all lsegs that are attached to commit buckets */ nfs_commit_inode (inode,0 );pnfs_put_layout_hdr (lo); -iput (inode); +nfs_iput_and_deactive (inode); }return ret; }
fs/nfs/pnfs.h +1 -0
@@ -99,6 +99,7 @@ enum {NFS_LAYOUT_RETURN_REQUESTED ,/* Return this layout ASAP */ NFS_LAYOUT_INVALID_STID ,/* layout stateid id is invalid */ NFS_LAYOUT_FIRST_LAYOUTGET ,/* Serialize first layoutget */ + NFS_LAYOUT_INODE_FREEING, /* The inode is being freed */ }; enum layoutdriver_policy_flags {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 122/371 mmc: sdhci-brcmstb: handle mmc_of_parse() errors during probe
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit 1e20186e706da8446f9435f2924cd65ab1397e73 ]
We need to handle mmc_of_parse() errors during probe otherwise the MMC driver could start without proper initialization (e.g. power sequence).
--- drivers/mmc/host/sdhci-brcmstb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-brcmstb.c +3 -1
@@ -55,7 +55,9 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) }sdhci_get_of_property (pdev); -mmc_of_parse (host->mmc); + res =mmc_of_parse (host->mmc); +if (res) + goto err;/* * Supply the existing CAPS, but clear the UHS modes. This
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 123/371 ARM: 8847/1: pm: fix HYP/SVC mode mismatch when MCPM is used
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit ca70ea43f80c98582f5ffbbd1e6f4da2742da0c4 ]
MCPM does a soft reset of the CPUs and uses common cpu_resume() routine to perform low-level platform initialization. This results in a try to install HYP stubs for the second time for each CPU and results in false HYP/SVC mode mismatch detection. The HYP stubs are already installed at the beginning of the kernel initialization on the boot CPU (head.S) or in the secondary_startup() for other CPUs. To fix this issue MCPM code should use a cpu_resume() routine without HYP stubs installation.
This change fixes HYP/SVC mode mismatch on Samsung Exynos5422-based Odroid XU3/XU4/HC1 boards.
--- arch/arm/common/mcpm_entry.c | 2 +- arch/arm/include/asm/suspend.h | 1 + arch/arm/kernel/sleep.S | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
arch/arm/common/mcpm_entry.c +1 -1
@@ -379,7 +379,7 @@ static int __init nocache_trampoline(unsigned long _arg)unsigned int cluster =MPIDR_AFFINITY_LEVEL (mpidr,1 );phys_reset_t phys_reset; -mcpm_set_entry_vector (cpu, cluster, cpu_resume); +mcpm_set_entry_vector (cpu, cluster, cpu_resume_no_hyp);setup_mm_for_reboot ();__mcpm_cpu_going_down (cpu, cluster);
arch/arm/include/asm/suspend.h +1 -0
@@ -10,6 +10,7 @@ struct sleep_save_sp { };extern void cpu_resume (void ); +extern void cpu_resume_no_hyp (void );extern void cpu_resume_arm (void );extern int cpu_suspend (unsigned long ,int (*)(unsigned long ));
arch/arm/kernel/sleep.S +12 -0
@@ -120,6 +120,14 @@ ENDPROC(cpu_resume_after_mmu) .text .align +#ifdef CONFIG_MCPM + .arm +THUMB( .thumb ) +ENTRY(cpu_resume_no_hyp) +ARM_BE8(setend be) @ ensure we are in BE mode + b no_hyp +#endif + #ifdef CONFIG_MMU .arm ENTRY(cpu_resume_arm)
@@ -135,6 +143,7 @@ ARM_BE8(setend be) @ ensure we are in BE mode bl __hyp_stub_install_secondary #endif safe_svcmode_maskall r1 +no_hyp: mov r1, #0 ALT_SMP(mrc p15, 0, r0, c0, c0, 5) ALT_UP_B(1f)
@@ -163,6 +172,9 @@ ENDPROC(cpu_resume) #ifdef CONFIG_MMU ENDPROC(cpu_resume_arm) +#endif +#ifdef CONFIG_MCPM +ENDPROC(cpu_resume_no_hyp) #endif .align 2
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 124/371 ARM: 8848/1: virt: Align GIC version check with arm64 counterpart
In reply to Sasha LevinFrom: Vladimir Murzin <[email protected]>
[ Upstream commit 9db043d36bd379f4cc99054c079de0dabfc38d03 ]
arm64 has got relaxation on GIC version check at early boot stage due to update of the GIC architecture let's align ARM with that.
To help backports (even though the code was correct at the time of writing)
--- arch/arm/kernel/hyp-stub.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/hyp-stub.S +2 -2
@@ -180,8 +180,8 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE @ Check whether GICv3 system registers are available mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1 ubfx r7, r7, #28, #4 - cmp r7, #1 - bne 2f + teq r7, #0 + beq 2f @ Enable system register accesses mrc p15, 4, r7, c12, c9, 5 @ ICC_HSRE
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 125/371 regulator: wm831x-dcdc: Fix list of wm831x_dcdc_ilim from mA to uA
In reply to Sasha LevinFrom: Axel Lin <[email protected]>
[ Upstream commit c25d47888f0fb3d836d68322d4aea2caf31a75a6 ]
The wm831x_dcdc_ilim entries needs to be uA because it is used to compare with min_uA and max_uA.
While at it also make the array const and change to use unsigned int.
--- drivers/regulator/wm831x-dcdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/wm831x-dcdc.c +2 -2
@@ -327,8 +327,8 @@ static int wm831x_buckv_get_voltage_sel(struct regulator_dev *rdev) }/* Current limit options */ -static u16 wm831x_dcdc_ilim[] = { -125 ,250 ,375 ,500 ,625 ,750 ,875 ,1000 +static const unsigned int wm831x_dcdc_ilim[] = { +125000 ,250000 ,375000 ,500000 ,625000 ,750000 ,875000 ,1000000 }; static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 126/371 netfilter: nft_set_hash: fix lookups with fixed size hash on big endian
In reply to Sasha LevinFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 3b02b0adc242a72b5e46019b6a9e4f84823592f6 ]
Call jhash_1word() for the 4-bytes key case from the insertion and deactivation path, otherwise big endian arch set lookups fail.
--- net/netfilter/nft_set_hash.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
net/netfilter/nft_set_hash.c +19 -4
@@ -442,6 +442,23 @@ static bool nft_hash_lookup_fast(const struct net *net,return false; } +static u32 nft_jhash (const struct nft_set *set,const struct nft_hash *priv, +const struct nft_set_ext *ext) +{ +const struct nft_data *key =nft_set_ext_key (ext); +u32 hash, k1; + +if (set->klen ==4 ) { + k1 = *(u32 *)key; + hash =jhash_1word (k1, priv->seed); + }else { + hash =jhash (key, set->klen, priv->seed); + } + hash =reciprocal_scale (hash, priv->buckets); + +return hash; +} +static int nft_hash_insert (const struct net *net,const struct nft_set *set,const struct nft_set_elem *elem,struct nft_set_ext **ext)
@@ -451,8 +468,7 @@ static int nft_hash_insert(const struct net *net, const struct nft_set *set,u8 genmask =nft_genmask_next (net);u32 hash; - hash =jhash (nft_set_ext_key (&this->ext), set->klen, priv->seed); - hash =reciprocal_scale (hash, priv->buckets); + hash =nft_jhash (set, priv, &this->ext);hlist_for_each_entry (he, &priv->table[hash], node) { if (!memcmp(nft_set_ext_key(&this->ext), nft_set_ext_key(&he->ext), set->klen) &&
@@ -491,8 +507,7 @@ static void *nft_hash_deactivate(const struct net *net,u8 genmask =nft_genmask_next (net);u32 hash; - hash =jhash (nft_set_ext_key (&this->ext), set->klen, priv->seed); - hash =reciprocal_scale (hash, priv->buckets); + hash =nft_jhash (set, priv, &this->ext);hlist_for_each_entry (he, &priv->table[hash], node) { if (!memcmp(nft_set_ext_key(&this->ext), &elem->key.val, set->klen) ||
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 127/371 NFSv4/flexfiles: Fix invalid deref in FF_LAYOUT_DEVID_NODE()
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 108bb4afd351d65826648a47f11fa3104e250d9b ]
If the attempt to instantiate the mirror's layout DS pointer failed, then that pointer may hold a value of type ERR_PTR(), so we need to check that before we dereference it.
--- fs/nfs/flexfilelayout/flexfilelayout.h | 32 +++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.h +19 -13
@@ -131,16 +131,6 @@ FF_LAYOUT_LSEG(struct pnfs_layout_segment *lseg) generic_hdr); } -static inline struct nfs4_deviceid_node * -FF_LAYOUT_DEVID_NODE (struct pnfs_layout_segment *lseg,u32 idx) -{ -if (idx >=FF_LAYOUT_LSEG (lseg)->mirror_array_cnt || -FF_LAYOUT_LSEG (lseg)->mirror_array[idx] ==NULL || -FF_LAYOUT_LSEG (lseg)->mirror_array[idx]->mirror_ds ==NULL ) -return NULL ; -return &FF_LAYOUT_LSEG (lseg)->mirror_array[idx]->mirror_ds->id_node; -} -static inline struct nfs4_ff_layout_ds *FF_LAYOUT_MIRROR_DS (struct nfs4_deviceid_node *node) {
@@ -150,9 +140,25 @@ FF_LAYOUT_MIRROR_DS(struct nfs4_deviceid_node *node)static inline struct nfs4_ff_layout_mirror *FF_LAYOUT_COMP (struct pnfs_layout_segment *lseg,u32 idx) { -if (idx >=FF_LAYOUT_LSEG (lseg)->mirror_array_cnt) -return NULL ; -return FF_LAYOUT_LSEG (lseg)->mirror_array[idx]; +struct nfs4_ff_layout_segment *fls =FF_LAYOUT_LSEG (lseg); + +if (idx < fls->mirror_array_cnt) +return fls->mirror_array[idx]; +return NULL ; +} + +static inline struct nfs4_deviceid_node * +FF_LAYOUT_DEVID_NODE (struct pnfs_layout_segment *lseg,u32 idx) +{ +struct nfs4_ff_layout_mirror *mirror =FF_LAYOUT_COMP (lseg, idx); + +if (mirror !=NULL ) { +struct nfs4_ff_layout_ds *mirror_ds = mirror->mirror_ds; + +if (!IS_ERR_OR_NULL (mirror_ds)) +return &mirror_ds->id_node; + } +return NULL ; } static inline u32
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 128/371 net: aquantia: fixed instack structure overflow
In reply to Sasha LevinFrom: Igor Russkikh <[email protected]>
[ Upstream commit 8006e3730b6e900319411e35cee85b4513d298df ]
This is a real stack undercorruption found by kasan build.
The issue did no harm normally because it only overflowed 2 bytes after bitary array which on most architectures were mapped into err local.
--- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 4 ++-- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +2 -2
@@ -182,8 +182,8 @@ static int hw_atl_a0_hw_rss_set(struct aq_hw_s *self,u32 i =0U ;u32 num_rss_queues =max (1U , self->aq_nic_cfg->num_rss_queues);int err =0 ; -u16 bitary[(HW_ATL_A0_RSS_REDIRECTION_MAX * -HW_ATL_A0_RSS_REDIRECTION_BITS /16U )]; +u16 bitary[1 + (HW_ATL_A0_RSS_REDIRECTION_MAX * +HW_ATL_A0_RSS_REDIRECTION_BITS /16U )];memset (bitary,0 ,sizeof (bitary));
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +2 -2
@@ -183,8 +183,8 @@ static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,u32 i =0U ;u32 num_rss_queues =max (1U , self->aq_nic_cfg->num_rss_queues);int err =0 ; -u16 bitary[(HW_ATL_B0_RSS_REDIRECTION_MAX * -HW_ATL_B0_RSS_REDIRECTION_BITS /16U )]; +u16 bitary[1 + (HW_ATL_B0_RSS_REDIRECTION_MAX * +HW_ATL_B0_RSS_REDIRECTION_BITS /16U )];memset (bitary,0 ,sizeof (bitary));
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 129/371 powerpc/mm: Check secondary hash page table
In reply to Sasha LevinFrom: Rashmica Gupta <[email protected]>
[ Upstream commit 790845e2f12709d273d08ea7a2af7c2593689519 ]
We were always calling base_hpte_find() with primary = true, even when we wanted to check the secondary table.
mpe: I broke this when refactoring Rashmica's original patch.
--- arch/powerpc/mm/dump_hashpagetable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/dump_hashpagetable.c +1 -1
@@ -343,7 +343,7 @@ static unsigned long hpte_find(struct pg_state *st, unsigned long ea, int psize)/* Look in secondary table */ if (slot ==-1 ) - slot =base_hpte_find (ea, psize, true, &v, &r); + slot =base_hpte_find (ea, psize, false, &v, &r);/* No entry found */ if (slot ==-1 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 130/371 nios2: ksyms: Add missing symbol exports
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit 0f8ed994575429d6042cf5d7ef70081c94091587 ]
Building nios2:allmodconfig fails as follows (each symbol is only listed once).
ERROR: "__ashldi3" [drivers/md/dm-writecache.ko] undefined!
ERROR: "__ashrdi3" [fs/xfs/xfs.ko] undefined!
ERROR: "__ucmpdi2" [drivers/media/i2c/adv7842.ko] undefined!
ERROR: "__lshrdi3" [drivers/md/dm-zoned.ko] undefined!
ERROR: "flush_icache_range" [drivers/misc/lkdtm/lkdtm.ko] undefined!
ERROR: "empty_zero_page" [drivers/md/dm-mod.ko] undefined!
The problem is seen with gcc 7.3.0.
Export the missing symbols.
--- arch/nios2/kernel/nios2_ksyms.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/nios2/kernel/nios2_ksyms.c +12 -0
@@ -9,12 +9,20 @@#include <linux/export.h> #include <linux/string.h> +#include <asm/cacheflush.h> +#include <asm/pgtable.h> +/* string functions */ EXPORT_SYMBOL (memcpy);EXPORT_SYMBOL (memset);EXPORT_SYMBOL (memmove); +/* memory management */ + +EXPORT_SYMBOL (empty_zero_page); +EXPORT_SYMBOL (flush_icache_range); +/* * libgcc functions - functions that are used internally by the * compiler... (prototypes are not correct though, but that
@@ -31,3 +39,7 @@ DECLARE_EXPORT(__udivsi3);DECLARE_EXPORT (__umoddi3);DECLARE_EXPORT (__umodsi3);DECLARE_EXPORT (__muldi3); +DECLARE_EXPORT (__ucmpdi2); +DECLARE_EXPORT (__lshrdi3); +DECLARE_EXPORT (__ashldi3); +DECLARE_EXPORT (__ashrdi3);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 131/371 x86/mm: Remove unused variable 'cpu'
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 3609e31bc8dc03b701390f79c74fc7fe92b95039 ]
The commit a2055abe9c67 ("x86/mm: Pass flush_tlb_info to flush_tlb_others() etc") removed the unnecessary cpu parameter from uv_flush_tlb_others() but left an unused variable.
arch/x86/mm/tlb.c: In function 'native_flush_tlb_others':arch/x86/mm/tlb.c:688:16: warning: variable 'cpu' set but not used [-Wunused-but-set-variable]
unsigned int cpu;
^~~--- arch/x86/mm/tlb.c | 3 --- 1 file changed, 3 deletions(-)
arch/x86/mm/tlb.c +0 -3
@@ -651,9 +651,6 @@ void native_flush_tlb_others(const struct cpumask *cpumask,* that UV should be updated so that smp_call_function_many(), * etc, are optimal on UV. */ -unsigned int cpu; - - cpu =smp_processor_id (); cpumask =uv_flush_tlb_others (cpumask, info);if (cpumask) smp_call_function_many(cpumask, flush_tlb_func_remote,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 132/371 scsi: megaraid_sas: reduce module load time
In reply to Sasha LevinFrom: Steve Sistare <[email protected]>
[ Upstream commit 31b6a05f86e690e1818116fd23c3be915cc9d9ed ]
megaraid_sas takes 1+ seconds to load while waiting for firmware:
[2.822603] megaraid_sas 0000:03:00.0: Waiting for FW to come to ready state [3.871003] megaraid_sas 0000:03:00.0: FW now in Ready state
This is due to the following loop in megasas_transition_to_ready(), which waits a minimum of 1 second, even though the FW becomes ready in tens of millisecs:
/*
* The cur_state should not last for more than max_wait secs
*/
for (i = 0; i < max_wait; i++) {
...
msleep(1000);
...
dev_info(&instance->pdev->dev, "FW now in Ready state\n");This is a regression, caused by a change of the msleep granularity from 1 to 1000 due to concern about waiting too long on systems with coarse jiffies.
To fix, increase iterations and use msleep(20), which results in:
[2.670627] megaraid_sas 0000:03:00.0: Waiting for FW to come to ready state [2.739386] megaraid_sas 0000:03:00.0: FW now in Ready state
--- drivers/scsi/megaraid/megaraid_sas_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +2 -2
@@ -3823,12 +3823,12 @@ megasas_transition_to_ready(struct megasas_instance *instance, int ocr)/* * The cur_state should not last for more than max_wait secs */ -for (i =0 ; i < max_wait; i++) { +for (i =0 ; i < max_wait *50 ; i++) { curr_abs_state = instance->instancet->read_fw_status_reg (instance->reg_set);if (abs_state == curr_abs_state) { -msleep (1000 ); +msleep (20 ); }else break ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 133/371 drivers/rapidio/rio_cm.c: fix potential oops in riocm_ch_listen()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 5ac188b12e7cbdd92dee60877d1fac913fc1d074 ]
If riocm_get_channel() fails, then we should just return -EINVAL. Calling riocm_put_channel() will trigger a NULL dereference and generally we should call put() if the get() didn't succeed.
--- drivers/rapidio/rio_cm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/rapidio/rio_cm.c +3 -1
@@ -1215,7 +1215,9 @@ static int riocm_ch_listen(u16 ch_id)riocm_debug (CHOP ,"(ch_%d)" , ch_id); ch =riocm_get_channel (ch_id); -if (!ch || !riocm_cmp_exch (ch,RIO_CM_CHAN_BOUND ,RIO_CM_LISTEN )) +if (!ch) +return -EINVAL ; +if (!riocm_cmp_exch (ch,RIO_CM_CHAN_BOUND ,RIO_CM_LISTEN )) ret = -EINVAL ;riocm_put_channel (ch);return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 134/371 xen, cpu_hotplug: Prevent an out of bounds access
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 201676095dda7e5b31a5e1d116d10fc22985075e ]
The "cpu" variable comes from the sscanf() so Smatch marks it as untrusted data. We can't pass a higher value than "nr_cpu_ids" to cpu_possible() or it results in an out of bounds access.
--- drivers/xen/cpu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/xen/cpu_hotplug.c +1 -1
@@ -54,7 +54,7 @@ static int vcpu_online(unsigned int cpu) }static void vcpu_hotplug (unsigned int cpu) { -if (!cpu_possible (cpu)) +if (cpu >= nr_cpu_ids || !cpu_possible (cpu))return ;switch (vcpu_online (cpu)) {
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Sasha Levin
maintainerPATCH 135/371 net: sh_eth: fix a missing check of of_get_phy_mode
In reply to Sasha LevinFrom: Kangjie Lu <[email protected]>
[ Upstream commit 035a14e71f27eefa50087963b94cbdb3580d08bf ]
of_get_phy_mode may fail and return a negative error code; the fix checks the return value of of_get_phy_mode and returns NULL of it fails.
--- drivers/net/ethernet/renesas/sh_eth.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/renesas/sh_eth.c +5 -1
@@ -3046,12 +3046,16 @@ static struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)struct device_node *np = dev->of_node;struct sh_eth_plat_data *pdata;const char *mac_addr; +int ret; pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );if (!pdata)return NULL ; - pdata->phy_interface =of_get_phy_mode (np); + ret =of_get_phy_mode (np); +if (ret <0 ) +return NULL ; + pdata->phy_interface = ret; mac_addr =of_get_mac_address (np);if (mac_addr)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 136/371 regulator: lp87565: Fix missing register for LP87565_BUCK_0
In reply to Sasha LevinFrom: Axel Lin <[email protected]>
[ Upstream commit d1a6cbdf1e597917cb642c655512d91b71a35d22 ]
LP87565_BUCK_0 is missed, fix it.
--- drivers/regulator/lp87565-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/lp87565-regulator.c +1 -1
@@ -188,7 +188,7 @@ static int lp87565_regulator_probe(struct platform_device *pdev)struct lp87565 *lp87565 =dev_get_drvdata (pdev->dev.parent);struct regulator_config config = { };struct regulator_dev *rdev; -int i, min_idx =LP87565_BUCK_1 , max_idx =LP87565_BUCK_3 ; +int i, min_idx =LP87565_BUCK_0 , max_idx =LP87565_BUCK_3 ;platform_set_drvdata (pdev, lp87565);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 137/371 media: ivtv: update *pos correctly in ivtv_read_pos()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit f8e579f3ca0973daef263f513da5edff520a6c0d ]
We had intended to update *pos, but the current code is a no-op.
--- drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/ivtv/ivtv-fileops.c +1 -1
@@ -420,7 +420,7 @@ static ssize_t ivtv_read_pos(struct ivtv_stream *s, char __user *ubuf, size_t coIVTV_DEBUG_HI_FILE ("read %zd from %s, got %zd\n" , count, s->name, rc);if (rc >0 ) - pos += rc; + *pos += rc;return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 138/371 media: cx18: update *pos correctly in cx18_read_pos()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 7afb0df554292dca7568446f619965fb8153085d ]
We should be updating *pos. The current code is a no-op.
--- drivers/media/pci/cx18/cx18-fileops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/cx18/cx18-fileops.c +1 -1
@@ -484,7 +484,7 @@ static ssize_t cx18_read_pos(struct cx18_stream *s, char __user *ubuf,CX18_DEBUG_HI_FILE ("read %zd from %s, got %zd\n" , count, s->name, rc);if (rc >0 ) - pos += rc; + *pos += rc;return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 139/371 media: wl128x: Fix an error code in fm_download_firmware()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit ef4bb63dc1f7213c08e13f6943c69cd27f69e4a3 ]
We forgot to set "ret" on this error path.
--- drivers/media/radio/wl128x/fmdrv_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/radio/wl128x/fmdrv_common.c +3 -2
@@ -1271,8 +1271,9 @@ static int fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name)switch (action->type) {case ACTION_SEND_COMMAND :/* Send */ -if (fmc_send_cmd (fmdev,0 ,0 , action->data, - action->size,NULL ,NULL )) + ret =fmc_send_cmd (fmdev,0 ,0 , action->data, + action->size,NULL ,NULL ); +if (ret) goto rel_fw; cmd_cnt++;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 140/371 media: cx23885: check allocation return
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit a3d7f22ef34ec4206b50ee121384d5c8bebd5591 ]
Checking of kmalloc() seems to have been committed - as cx23885_dvb_register() is checking for != 0 return, returning -ENOMEM should be fine here. While at it address the coccicheck suggestion to move to kmemdup rather than using kmalloc+memcpy.
--- drivers/media/pci/cx23885/cx23885-dvb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/pci/cx23885/cx23885-dvb.c +3 -2
@@ -1460,8 +1460,9 @@ static int dvb_register(struct cx23885_tsport *port)if (fe0->dvb.frontend !=NULL ) {struct i2c_adapter *tun_i2c; - fe0->dvb.frontend->sec_priv =kmalloc (sizeof (dib7000p_ops),GFP_KERNEL ); -memcpy (fe0->dvb.frontend->sec_priv, &dib7000p_ops,sizeof (dib7000p_ops)); + fe0->dvb.frontend->sec_priv =kmemdup (&dib7000p_ops,sizeof (dib7000p_ops),GFP_KERNEL ); +if (!fe0->dvb.frontend->sec_priv) +return -ENOMEM ; tun_i2c = dib7000p_ops.get_i2c_master (fe0->dvb.frontend,DIBX000_I2C_INTERFACE_TUNER ,1 );if (!dvb_attach (dib0070_attach, fe0->dvb.frontend, tun_i2c, &dib7070p_dib0070_config))return -ENODEV ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 141/371 regulator: tps65086: Fix tps65086_ldoa1_ranges for selector 0xB
In reply to Sasha LevinFrom: Axel Lin <[email protected]>
[ Upstream commit e69b394703e032e56a140172440ec4f9890b536d ]
selector 0xB (1011) should be 2.6V rather than 2.7V, fit ix.
Table 5-4. LDOA1 Output Voltage Options
VID Bits VOUT VID Bits VOUT VID Bits VOUT VID Bits VOUT
0000 1.35 0100 1.8 1000 2.3 1100 2.85 0001 1.5 0101 1.9 1001 2.4 1101 3.0 0010 1.6 0110 2.0 1010 2.5 1110 3.3 0011 1.7 0111 2.1 1011 2.6 1111 Not Used
--- drivers/regulator/tps65086-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/tps65086-regulator.c +2 -2
@@ -90,8 +90,8 @@ static const struct regulator_linear_range tps65086_buck345_25mv_ranges[] = {static const struct regulator_linear_range tps65086_ldoa1_ranges[] = {REGULATOR_LINEAR_RANGE (1350000 ,0x0 ,0x0 ,0 ),REGULATOR_LINEAR_RANGE (1500000 ,0x1 ,0x7 ,100000 ), -REGULATOR_LINEAR_RANGE (2300000 ,0x8 ,0xA ,100000 ), -REGULATOR_LINEAR_RANGE (2700000 ,0xB ,0xD ,150000 ), +REGULATOR_LINEAR_RANGE (2300000 ,0x8 ,0xB ,100000 ), +REGULATOR_LINEAR_RANGE (2850000 ,0xC ,0xD ,150000 ),REGULATOR_LINEAR_RANGE (3300000 ,0xE ,0xE ,0 ), };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 142/371 jfs: fix bogus variable self-initialization
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit a5fdd713d256887b5f012608701149fa939e5645 ]
A statement was originally added in 2006 to shut up a gcc warning, now but now clang warns about it:
fs/jfs/jfs_txnmgr.c:1932:15: error: variable 'pxd' is uninitialized when used within its own initialization
[-Werror,-Wuninitialized]
pxd_t pxd = pxd; /* truncated extent of xad */
~~~ ^~~
Modern versions of gcc are fine without the silly assignment, so just drop it. Tested with gcc-4.6 (released 2011), 4.7, 4.8, and 4.9.
--- fs/jfs/jfs_txnmgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/jfs/jfs_txnmgr.c +1 -2
@@ -1928,8 +1928,7 @@ static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,* header ? */ if (tlck->type & tlckTRUNCATE) { -/* This odd declaration suppresses a bogus gcc warning */ -pxd_t pxd = pxd;/* truncated extent of xad */ +pxd_t pxd;/* truncated extent of xad */ int twm;/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 143/371 tipc: tipc clang warning
In reply to Sasha LevinFrom: Jon Maloy <[email protected]>
[ Upstream commit 737889efe9713a0f20a75fd0de952841d9275e6b ]
When checking the code with clang -Wsometimes-uninitialized we get the following warning:
if (!tipc_link_is_establishing(l)) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
net/tipc/node.c:847:46: note: uninitialized use occurs here
tipc_bearer_xmit(n->net, bearer_id, &xmitq, maddr);net/tipc/node.c:831:2: note: remove the 'if' if its condition is always true
if (!tipc_link_is_establishing(l)) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~net/tipc/node.c:821:31: note: initialize the variable 'maddr' to silence this warning
struct tipc_media_addr *maddr;
We fix this by initializing 'maddr' to NULL. For the matter of clarity, we also test if 'xmitq' is non-empty before we use it and 'maddr' further down in the function. It will never happen that 'xmitq' is non- empty at the same time as 'maddr' is NULL, so this is a sufficient test.
--- net/tipc/node.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/tipc/node.c +4 -3
@@ -688,10 +688,10 @@ static void __tipc_node_link_down(struct tipc_node *n, int *bearer_id,static void tipc_node_link_down (struct tipc_node *n,int bearer_id,bool delete) {struct tipc_link_entry *le = &n->links[bearer_id]; +struct tipc_media_addr *maddr =NULL ;struct tipc_link *l = le->link; -struct tipc_media_addr *maddr; -struct sk_buff_head xmitq;int old_bearer_id = bearer_id; +struct sk_buff_head xmitq;if (!l)return ;
@@ -713,7 +713,8 @@ static void tipc_node_link_down(struct tipc_node *n, int bearer_id, bool delete)tipc_node_write_unlock (n);if (delete)tipc_mon_remove_peer (n->net, n->addr, old_bearer_id); -tipc_bearer_xmit (n->net, bearer_id, &xmitq, maddr); +if (!skb_queue_empty (&xmitq)) +tipc_bearer_xmit (n->net, bearer_id, &xmitq, maddr);tipc_sk_rcv (n->net, &le->inputq); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 144/371 m68k: mac: Fix VIA timer counter accesses
In reply to Sasha LevinFrom: Finn Thain <[email protected]>
[ Upstream commit 0ca7ce7db771580433bf24454f7a1542bd326078 ]
This resolves some bugs that affect VIA timer counter accesses. Avoid lost interrupts caused by reading the counter low byte register. Make allowance for the fact that the counter will be decremented to 0xFFFF before being reloaded.
--- arch/m68k/mac/via.c | 102 +++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 49 deletions(-)
arch/m68k/mac/via.c +53 -49
@@ -54,16 +54,6 @@ static __u8 rbv_clear;static int gIER,gIFR,gBufA,gBufB; -/* -* Timer defs. -*/ - -#define TICK_SIZE 10000 -#define MAC_CLOCK_TICK (783300/HZ)/* ticks per HZ */ -#define MAC_CLOCK_LOW (MAC_CLOCK_TICK&0xFF) -#define MAC_CLOCK_HIGH (MAC_CLOCK_TICK>>8) - -/* * On Macs with a genuine VIA chip there is no way to mask an individual slot * interrupt. This limitation also seems to apply to VIA clone logic cores in
@@ -278,22 +268,6 @@ void __init via_init(void) } } -/* -* Start the 100 Hz clock -*/ - -void __init via_init_clock (irq_handler_t func) -{ - via1[vACR] |=0x40 ; - via1[vT1LL] =MAC_CLOCK_LOW ; - via1[vT1LH] =MAC_CLOCK_HIGH ; - via1[vT1CL] =MAC_CLOCK_LOW ; - via1[vT1CH] =MAC_CLOCK_HIGH ; - -if (request_irq (IRQ_MAC_TIMER_1 , func,0 ,"timer" , func)) -pr_err ("Couldn't register %s interrupt\n" ,"timer" ); -} -/* * Debugging dump, used in various places to see what's going on. */
@@ -321,29 +295,6 @@ void via_debug_dump(void) } } -/* -* This is always executed with interrupts disabled. -* -* TBI: get time offset between scheduling timer ticks -*/ - -u32 mac_gettimeoffset (void ) -{ -unsigned long ticks, offset =0 ; - -/* read VIA1 timer 2 current value */ - ticks = via1[vT1CL] | (via1[vT1CH] <<8 ); -/* The probability of underflow is less than 2% */ -if (ticks >MAC_CLOCK_TICK -MAC_CLOCK_TICK /50 ) -/* Check for pending timer interrupt in VIA1 IFR */ -if (via1[vIFR] &0x40 ) offset =TICK_SIZE ; - - ticks =MAC_CLOCK_TICK - ticks; - ticks = ticks *10000L /MAC_CLOCK_TICK ; - -return (ticks + offset) *1000 ; -} -/* * Flush the L2 cache on Macs that have it by flipping * the system into 24-bit mode for an instant.
@@ -612,3 +563,56 @@ int via2_scsi_drq_pending(void)return via2[gIFR] & (1 <<IRQ_IDX (IRQ_MAC_SCSIDRQ )); }EXPORT_SYMBOL (via2_scsi_drq_pending); + +/* timer and clock source */ + +#define VIA_CLOCK_FREQ 783360/* VIA "phase 2" clock in Hz */ +#define VIA_TIMER_INTERVAL (1000000 / HZ)/* microseconds per jiffy */ +#define VIA_TIMER_CYCLES (VIA_CLOCK_FREQ / HZ)/* clock cycles per jiffy */ + +#define VIA_TC (VIA_TIMER_CYCLES - 2)/* including 0 and -1 */ +#define VIA_TC_LOW (VIA_TC & 0xFF) +#define VIA_TC_HIGH (VIA_TC >> 8) + +void __init via_init_clock (irq_handler_t timer_routine) +{ +if (request_irq (IRQ_MAC_TIMER_1 , timer_routine,0 ,"timer" ,NULL )) { +pr_err ("Couldn't register %s interrupt\n" ,"timer" ); +return ; + } + + via1[vT1LL] =VIA_TC_LOW ; + via1[vT1LH] =VIA_TC_HIGH ; + via1[vT1CL] =VIA_TC_LOW ; + via1[vT1CH] =VIA_TC_HIGH ; + via1[vACR] |=0x40 ; +} + +u32 mac_gettimeoffset (void ) +{ +unsigned long flags; +u8 count_high; +u16 count, offset =0 ; + +/* +* Timer counter wrap-around is detected with the timer interrupt flag +* but reading the counter low byte (vT1CL) would reset the flag. +* Also, accessing both counter registers is essentially a data race. +* These problems are avoided by ignoring the low byte. Clock accuracy +* is 256 times worse (error can reach 0.327 ms) but CPU overhead is +* reduced by avoiding slow VIA register accesses. +*/ + +local_irq_save (flags); + count_high = via1[vT1CH]; +if (count_high ==0xFF ) + count_high =0 ; +if (count_high >0 && (via1[vIFR] &VIA_TIMER_1_INT )) + offset =VIA_TIMER_CYCLES ; +local_irq_restore (flags); + + count = count_high <<8 ; + count =VIA_TIMER_CYCLES - count + offset; + +return ((count *VIA_TIMER_INTERVAL ) /VIA_TIMER_CYCLES ) *1000 ; +}
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 145/371 arm64: dts: allwinner: a64: Add missing PIO clocks
In reply to Sasha LevinFrom: Maxime Ripard <[email protected]>
[ Upstream commit 562bf19611c000cb7219431c3cc78aa60c2b371e ]
The pinctrl binding mandates that we have the three clocks fed into the PIO described.
Even though the old case is still supported for backward compatibility, we should update our DTs to fix this.
--- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +2 -1
@@ -274,7 +274,8 @@ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&ccu 58>; + clocks = <&ccu 58>, <&osc24M>, <&rtc 0>; + clock-names = "apb", "hosc", "losc"; gpio-controller; #gpio-cells = <3>; interrupt-controller;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 146/371 ARM: OMAP2+: Fix potentially uninitialized return value for _setup_reset()
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 7f0d078667a494466991aa7133f49594f32ff6a2 ]
Commit 747834ab8347 ("ARM: OMAP2+: hwmod: revise hardreset behavior") made the call to _enable() conditional based on no oh->rst_lines_cnt. This caused the return value to be potentially uninitialized. Curiously we see no compiler warnings for this, probably as this gets inlined.
We call _setup_reset() from _setup() and only _setup_postsetup() if the return value is zero. Currently the return value can be uninitialized for cases where oh->rst_lines_cnt is set and HWMOD_INIT_NO_RESET is not set.
--- arch/arm/mach-omap2/omap_hwmod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod.c +1 -1
@@ -2530,7 +2530,7 @@ static void _setup_iclk_autoidle(struct omap_hwmod *oh)*/ static int _setup_reset (struct omap_hwmod *oh) { -int r; +int r =0 ;if (oh->_state != _HWMOD_STATE_INITIALIZED)return -EINVAL ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 147/371 media: davinci-isif: avoid uninitialized variable use
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 0e633f97162c1c74c68e2eb20bbd9259dce87cd9 ]
clang warns about a possible variable use that gcc never complained about:
drivers/media/platform/davinci/isif.c:982:32: error: variable 'frame_size' is uninitialized when used here
[-Werror,-Wuninitialized]
dm365_vpss_set_pg_frame_size(frame_size);
^~~~~~~~~~
drivers/media/platform/davinci/isif.c:887:2: note: variable 'frame_size' is declared here
struct vpss_pg_frame_size frame_size;
^1 error generated.
There is no initialization for this variable at all, and there has never been one in the mainline kernel, so we really should not put that stack data into an mmio register.
On the other hand, I suspect that gcc checks the condition more closely and notices that the global isif_cfg.bayer.config_params.test_pat_gen flag is initialized to zero and never written to from any code path, so anything depending on it can be eliminated.
To shut up the clang warning, just remove the dead code manually, it has probably never been used because any attempt to do so would have resulted in undefined behavior.
--- drivers/media/platform/davinci/isif.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/media/platform/davinci/isif.c +0 -9
@@ -886,9 +886,7 @@ static int isif_set_hw_if_params(struct vpfe_hw_if_param *params)static int isif_config_ycbcr (void ) {struct isif_ycbcr_config *params = &isif_cfg.ycbcr; -struct vpss_pg_frame_size frame_size;u32 modeset =0 , ccdcfg =0 ; -struct vpss_sync_pol sync;dev_dbg (isif_cfg.dev,"\nStarting isif_config_ycbcr..." );
@@ -976,13 +974,6 @@ static int isif_config_ycbcr(void)/* two fields are interleaved in memory */ regw (0x00000249 ,SDOFST ); -/* Setup test pattern if enabled */ -if (isif_cfg.bayer.config_params.test_pat_gen) { - sync.ccdpg_hdpol = params->hd_pol; - sync.ccdpg_vdpol = params->vd_pol; -dm365_vpss_set_sync_pol (sync); -dm365_vpss_set_pg_frame_size (frame_size); - }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 148/371 media: tw5864: Fix possible NULL pointer dereference in tw5864_handle_frame
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 2e7682ebfc750177a4944eeb56e97a3f05734528 ]
'vb' null check should be done before dereferencing it in tw5864_handle_frame, otherwise a NULL pointer dereference may occur.
--- drivers/media/pci/tw5864/tw5864-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/tw5864/tw5864-video.c +2 -2
@@ -1395,13 +1395,13 @@ static void tw5864_handle_frame(struct tw5864_h264_frame *frame) input->vb =NULL ;spin_unlock_irqrestore (&input->slock, flags); - v4l2_buf =to_vb2_v4l2_buffer (&vb->vb.vb2_buf); -if (!vb) {/* Gone because of disabling */ dev_dbg (&dev->pci->dev,"vb is empty, dropping frame\n" );return ; } + v4l2_buf =to_vb2_v4l2_buffer (&vb->vb.vb2_buf); +/* * Check for space. * Mind the overhead of startcode emulation prevention.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 149/371 spi: tegra114: clear packed bit for unpacked mode
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 7b3d10cdf54b8bc1dc0da21faed9789ac4da3684 ]
Packed bit is not cleared when not using packed mode. This results in transfer timeouts for the unpacked mode transfers followed by the packed mode transfers.
--- drivers/spi/spi-tegra114.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi-tegra114.c +2 -0
@@ -730,6 +730,8 @@ static int tegra_spi_start_transfer_one(struct spi_device *spi,if (tspi->is_packed) command1 |=SPI_PACKED ; +else + command1 &= ~SPI_PACKED ; command1 &= ~(SPI_CS_SEL_MASK |SPI_TX_EN |SPI_RX_EN ); tspi->cur_direction =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 150/371 spi: tegra114: fix for unpacked mode transfers
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 1a89ac5b91895127f7c586ec5075c3753ca25501 ]
Fixes: computation of actual bytes to fill/receive in/from FIFO in unpacked mode when transfer length is not a multiple of requested bits per word.
unpacked mode transfers fails when the transfer includes partial bytes in the last word.
Total words to be written/read to/from FIFO is computed based on transfer length and bits per word. Unpacked mode includes 0 padding bytes for partial words to align with bits per word and these extra bytes are also accounted for calculating bytes left to transfer in the current driver.
This causes extra bytes access of tx/rx buffers along with buffer index position crossing actual length where remain_len becomes negative and due to unsigned type, negative value is a 32 bit representation of signed value and transferred bytes never meets the actual transfer length resulting in transfer timeout and a hang.
This patch fixes this with proper computation of the actual bytes to fill in FIFO during transmit and the actual bytes to read from FIFO during receive ignoring 0 padded bytes.
--- drivers/spi/spi-tegra114.c | 43 +++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-)
drivers/spi/spi-tegra114.c +36 -7
@@ -307,10 +307,16 @@ static unsigned tegra_spi_fill_tx_fifo_from_client_txbuf( x |= (u32)(*tx_buf++) << (i *8 );tegra_spi_writel (tspi, x,SPI_TX_FIFO ); } + + tspi->cur_tx_pos += written_words * tspi->bytes_per_word; }else { +unsigned int write_bytes; max_n_32bit =min (tspi->curr_dma_words, tx_empty_count); written_words = max_n_32bit; nbytes = written_words * tspi->bytes_per_word; +if (nbytes > t->len - tspi->cur_pos) + nbytes = t->len - tspi->cur_pos; + write_bytes = nbytes;for (count =0 ; count < max_n_32bit; count++) {u32 x =0 ;
@@ -319,8 +325,10 @@ static unsigned tegra_spi_fill_tx_fifo_from_client_txbuf( x |= (u32)(*tx_buf++) << (i *8 );tegra_spi_writel (tspi, x,SPI_TX_FIFO ); } + + tspi->cur_tx_pos += write_bytes; } - tspi->cur_tx_pos += written_words * tspi->bytes_per_word; +return written_words; }
@@ -344,20 +352,27 @@ static unsigned int tegra_spi_read_rx_fifo_to_client_rxbuf(for (i =0 ; len && (i <4 ); i++, len--) *rx_buf++ = (x >> i*8 ) &0xFF ; } - tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; read_words += tspi->curr_dma_words; + tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {u32 rx_mask = ((u32 )1 << t->bits_per_word) -1 ; +u8 bytes_per_word = tspi->bytes_per_word; +unsigned int read_bytes; + len = rx_full_count * bytes_per_word; +if (len > t->len - tspi->cur_pos) + len = t->len - tspi->cur_pos; + read_bytes = len;for (count =0 ; count < rx_full_count; count++) {u32 x =tegra_spi_readl (tspi,SPI_RX_FIFO ) & rx_mask; -for (i =0 ; (i < tspi->bytes_per_word); i++) +for (i =0 ; len && (i < bytes_per_word); i++, len--) *rx_buf++ = (x >> (i*8 )) &0xFF ; } - tspi->cur_rx_pos += rx_full_count * tspi->bytes_per_word; read_words += rx_full_count; + tspi->cur_rx_pos += read_bytes; } +return read_words; }
@@ -372,12 +387,17 @@ static void tegra_spi_copy_client_txbuf_to_spi_txbuf(unsigned len = tspi->curr_dma_words * tspi->bytes_per_word;memcpy (tspi->tx_dma_buf, t->tx_buf + tspi->cur_pos, len); + tspi->cur_tx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {unsigned int i;unsigned int count;u8 *tx_buf = (u8 *)t->tx_buf + tspi->cur_tx_pos;unsigned consume = tspi->curr_dma_words * tspi->bytes_per_word; +unsigned int write_bytes; +if (consume > t->len - tspi->cur_pos) + consume = t->len - tspi->cur_pos; + write_bytes = consume;for (count =0 ; count < tspi->curr_dma_words; count++) {u32 x =0 ;
@@ -386,8 +406,9 @@ static void tegra_spi_copy_client_txbuf_to_spi_txbuf( x |= (u32)(*tx_buf++) << (i *8 ); tspi->tx_dma_buf[count] = x; } + + tspi->cur_tx_pos += write_bytes; } - tspi->cur_tx_pos += tspi->curr_dma_words * tspi->bytes_per_word;/* Make the dma buffer to read by dma */ dma_sync_single_for_device(tspi->dev, tspi->tx_dma_phys,
@@ -405,20 +426,28 @@ static void tegra_spi_copy_spi_rxbuf_to_client_rxbuf(unsigned len = tspi->curr_dma_words * tspi->bytes_per_word;memcpy (t->rx_buf + tspi->cur_rx_pos, tspi->rx_dma_buf, len); + tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word; }else {unsigned int i;unsigned int count;unsigned char *rx_buf = t->rx_buf + tspi->cur_rx_pos;u32 rx_mask = ((u32 )1 << t->bits_per_word) -1 ; +unsigned consume = tspi->curr_dma_words * tspi->bytes_per_word; +unsigned int read_bytes; +if (consume > t->len - tspi->cur_pos) + consume = t->len - tspi->cur_pos; + read_bytes = consume;for (count =0 ; count < tspi->curr_dma_words; count++) {u32 x = tspi->rx_dma_buf[count] & rx_mask; -for (i =0 ; (i < tspi->bytes_per_word); i++) +for (i =0 ; consume && (i < tspi->bytes_per_word); + i++, consume--) *rx_buf++ = (x >> (i*8 )) &0xFF ; } + + tspi->cur_rx_pos += read_bytes; } - tspi->cur_rx_pos += tspi->curr_dma_words * tspi->bytes_per_word;/* Make the dma buffer to read by dma */ dma_sync_single_for_device(tspi->dev, tspi->rx_dma_phys,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 151/371 spi: tegra114: terminate dma and reset on transfer timeout
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 32bd1a9551cae34e6889afa235c7afdfede9aeac ]
Fixes: terminate DMA and perform controller reset on transfer timeout to clear the FIFO's and errors.
--- drivers/spi/spi-tegra114.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/spi/spi-tegra114.c +9 -0
@@ -869,7 +869,16 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,if (WARN_ON (ret ==0 )) {dev_err (tspi->dev,"spi transfer timeout, err %d\n" , ret); +if (tspi->is_curr_dma_xfer && + (tspi->cur_direction &DATA_DIR_TX )) +dmaengine_terminate_all (tspi->tx_dma_chan); +if (tspi->is_curr_dma_xfer && + (tspi->cur_direction &DATA_DIR_RX )) +dmaengine_terminate_all (tspi->rx_dma_chan); ret = -EIO ; +reset_control_assert (tspi->rst); +udelay (2 ); +reset_control_deassert (tspi->rst); goto complete_xfer; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 152/371 spi: tegra114: flush fifos
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit c4fc9e5b28ff787e35137c2cc13316bb11d7657b ]
Fixes: Flush TX and RX FIFOs before start of new transfer and on FIFO overflow or underrun errors.
--- drivers/spi/spi-tegra114.c | 39 +++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-)
drivers/spi/spi-tegra114.c +30 -9
@@ -499,22 +499,37 @@ static int tegra_spi_start_rx_dma(struct tegra_spi_data *tspi, int len)return 0 ; } -static int tegra_spi_start_dma_based_transfer ( -struct tegra_spi_data *tspi,struct spi_transfer *t) +static int tegra_spi_flush_fifos (struct tegra_spi_data *tspi) { -u32 val; -unsigned int len; -int ret =0 ; +unsigned long timeout = jiffies +HZ ;u32 status; -/* Make sure that Rx and Tx fifo are empty */ status =tegra_spi_readl (tspi,SPI_FIFO_STATUS );if ((status &SPI_FIFO_EMPTY ) !=SPI_FIFO_EMPTY ) { -dev_err (tspi->dev,"Rx/Tx fifo are not empty status 0x%08x\n" , - (unsigned )status); -return -EIO ; + status |=SPI_RX_FIFO_FLUSH |SPI_TX_FIFO_FLUSH ; +tegra_spi_writel (tspi, status,SPI_FIFO_STATUS ); +while ((status &SPI_FIFO_EMPTY ) !=SPI_FIFO_EMPTY ) { + status =tegra_spi_readl (tspi,SPI_FIFO_STATUS ); +if (time_after (jiffies, timeout)) { +dev_err (tspi->dev, +"timeout waiting for fifo flush\n" ); +return -EIO ; + } + +udelay (1 ); + } } +return 0 ; +} + +static int tegra_spi_start_dma_based_transfer ( +struct tegra_spi_data *tspi,struct spi_transfer *t) +{ +u32 val; +unsigned int len; +int ret =0 ; + val =SPI_DMA_BLK_SET (tspi->curr_dma_words -1 );tegra_spi_writel (tspi, val,SPI_DMA_BLK );
@@ -779,6 +794,9 @@ static int tegra_spi_start_transfer_one(struct spi_device *spi,dev_dbg (tspi->dev,"The def 0x%x and written 0x%x\n" , tspi->def_command1_reg, (unsigned )command1); + ret =tegra_spi_flush_fifos (tspi); +if (ret <0 ) +return ret;if (total_fifo_words >SPI_FIFO_DEPTH ) ret =tegra_spi_start_dma_based_transfer (tspi, t);else
@@ -876,6 +894,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, (tspi->cur_direction & DATA_DIR_RX))dmaengine_terminate_all (tspi->rx_dma_chan); ret = -EIO ; +tegra_spi_flush_fifos (tspi);reset_control_assert (tspi->rst);udelay (2 );reset_control_deassert (tspi->rst);
@@ -929,6 +948,7 @@ static irqreturn_t handle_cpu_based_xfer(struct tegra_spi_data *tspi) tspi->status_reg);dev_err (tspi->dev,"CpuXfer 0x%08x:0x%08x\n" , tspi->command1_reg, tspi->dma_control_reg); +tegra_spi_flush_fifos (tspi);reset_control_assert (tspi->rst);udelay (2 );reset_control_deassert (tspi->rst);
@@ -1001,6 +1021,7 @@ static irqreturn_t handle_dma_based_xfer(struct tegra_spi_data *tspi) tspi->status_reg);dev_err (tspi->dev,"DmaXfer 0x%08x:0x%08x\n" , tspi->command1_reg, tspi->dma_control_reg); +tegra_spi_flush_fifos (tspi);reset_control_assert (tspi->rst);udelay (2 );reset_control_deassert (tspi->rst);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 153/371 spi: tegra114: configure dma burst size to fifo trig level
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit f4ce428c41fb22e3ed55496dded94df44cb920fa ]
Fixes: Configure DMA burst size to be same as SPI TX/RX trigger levels to avoid mismatch.
SPI FIFO trigger levels are calculated based on the transfer length. So this patch moves DMA slave configuration to happen before start of DMAs.
--- drivers/spi/spi-tegra114.c | 52 ++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 22 deletions(-)
drivers/spi/spi-tegra114.c +30 -22
@@ -529,6 +529,8 @@ static int tegra_spi_start_dma_based_transfer(u32 val;unsigned int len;int ret =0 ; +u8 dma_burst; +struct dma_slave_config dma_sconfig = {0 }; val =SPI_DMA_BLK_SET (tspi->curr_dma_words -1 );tegra_spi_writel (tspi, val,SPI_DMA_BLK );
@@ -540,12 +542,16 @@ static int tegra_spi_start_dma_based_transfer( len = tspi->curr_dma_words *4 ;/* Set attention level based on length of transfer */ -if (len &0xF ) +if (len &0xF ) { val |=SPI_TX_TRIG_1 |SPI_RX_TRIG_1 ; -else if (((len) >>4 ) &0x1 ) + dma_burst =1 ; + }else if (((len) >>4 ) &0x1 ) { val |=SPI_TX_TRIG_4 |SPI_RX_TRIG_4 ; -else + dma_burst =4 ; + }else { val |=SPI_TX_TRIG_8 |SPI_RX_TRIG_8 ; + dma_burst =8 ; + }if (tspi->cur_direction &DATA_DIR_TX ) val |=SPI_IE_TX ;
@@ -556,7 +562,18 @@ static int tegra_spi_start_dma_based_transfer(tegra_spi_writel (tspi, val,SPI_DMA_CTL ); tspi->dma_control_reg = val; + dma_sconfig.device_fc = true;if (tspi->cur_direction &DATA_DIR_TX ) { + dma_sconfig.dst_addr = tspi->phys +SPI_TX_FIFO ; + dma_sconfig.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; + dma_sconfig.dst_maxburst = dma_burst; + ret =dmaengine_slave_config (tspi->tx_dma_chan, &dma_sconfig); +if (ret <0 ) { +dev_err (tspi->dev, +"DMA slave config failed: %d\n" , ret); +return ret; + } +tegra_spi_copy_client_txbuf_to_spi_txbuf (tspi, t); ret =tegra_spi_start_tx_dma (tspi, len);if (ret <0 ) {
@@ -567,6 +584,16 @@ static int tegra_spi_start_dma_based_transfer( }if (tspi->cur_direction &DATA_DIR_RX ) { + dma_sconfig.src_addr = tspi->phys +SPI_RX_FIFO ; + dma_sconfig.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; + dma_sconfig.src_maxburst = dma_burst; + ret =dmaengine_slave_config (tspi->rx_dma_chan, &dma_sconfig); +if (ret <0 ) { +dev_err (tspi->dev, +"DMA slave config failed: %d\n" , ret); +return ret; + } +/* Make the dma buffer to read by dma */ dma_sync_single_for_device (tspi->dev, tspi->rx_dma_phys, tspi->dma_buf_size,DMA_FROM_DEVICE );
@@ -626,7 +653,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,u32 *dma_buf;dma_addr_t dma_phys;int ret; -struct dma_slave_config dma_sconfig; dma_chan =dma_request_slave_channel_reason (tspi->dev, dma_to_memory ?"rx" :"tx" );
@@ -646,19 +672,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi,return -ENOMEM ; } -if (dma_to_memory) { - dma_sconfig.src_addr = tspi->phys +SPI_RX_FIFO ; - dma_sconfig.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - dma_sconfig.src_maxburst =0 ; - }else { - dma_sconfig.dst_addr = tspi->phys +SPI_TX_FIFO ; - dma_sconfig.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - dma_sconfig.dst_maxburst =0 ; - } - - ret =dmaengine_slave_config (dma_chan, &dma_sconfig); -if (ret) - goto scrub;if (dma_to_memory) { tspi->rx_dma_chan = dma_chan; tspi->rx_dma_buf = dma_buf;
@@ -669,11 +682,6 @@ static int tegra_spi_init_dma_param(struct tegra_spi_data *tspi, tspi->tx_dma_phys = dma_phys; }return 0 ; - -scrub: -dma_free_coherent (tspi->dev, tspi->dma_buf_size, dma_buf, dma_phys); -dma_release_channel (dma_chan); -return ret; } static void tegra_spi_deinit_dma_param(struct tegra_spi_data *tspi,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 154/371 dccp: Fix memleak in __feat_register_sp
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 1d3ff0950e2b40dc861b1739029649d03f591820 ]
If dccp_feat_push_change fails, we forget free the mem which is alloced by kmemdup in dccp_feat_clone_sp_val.
--- net/dccp/feat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/dccp/feat.c +6 -1
@@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,if (dccp_feat_clone_sp_val (&fval, sp_val, sp_len))return -ENOMEM ; -return dccp_feat_push_change (fn, feat, is_local, mandatory, &fval); +if (dccp_feat_push_change (fn, feat, is_local, mandatory, &fval)) { +kfree (fval.sp.vec); +return -ENOMEM ; + } + +return 0 ; }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 155/371 soc/fsl/qe: Fix an error code in qe_pin_request()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 5674a92ca4b7e5a6a19231edd10298d30324cd27 ]
We forgot to set "err" on this error path.
--- drivers/soc/fsl/qe/gpio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soc/fsl/qe/gpio.c +3 -1
@@ -152,8 +152,10 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index)if (err <0 ) goto err0; gc =gpio_to_chip (err); -if (WARN_ON (!gc)) +if (WARN_ON (!gc)) { + err = -ENODEV ; goto err0; + }if (!of_device_is_compatible (gc->of_node,"fsl,mpc8323-qe-pario-bank" )) {pr_debug ("%s: tried to get a non-qe pin\n" , __func__);
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 156/371 spi: bcm2835aux: fix driver to not allow 65535 (=-1) cs-gpios
In reply to Sasha LevinFrom: Martin Sperl <[email protected]>
[ Upstream commit 509c583620e9053e43d611bf1614fc3d3abafa96 ]
The original driver by default defines num_chipselects as -1. This actually allicates an array of 65535 entries in of_spi_register_master.
There is a side-effect for buggy device trees that (contrary to dt-binding documentation) have no cs-gpio defined.
This mode was never supported by the driver due to limitations of native cs and additional code complexity and is explicitly not stated to be implemented.
To keep backwards compatibility with such buggy DTs we limit the number of chip_selects to 1, as for all practical purposes it is only ever realistic to use a single chip select in native cs mode without negative side-effects.
--- drivers/spi/spi-bcm2835aux.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/spi/spi-bcm2835aux.c +12 -1
@@ -416,7 +416,18 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)platform_set_drvdata (pdev, master); master->mode_bits = (SPI_CPOL |SPI_CS_HIGH |SPI_NO_CS ); master->bits_per_word_mask =SPI_BPW_MASK (8 ); - master->num_chipselect =-1 ; +/* even though the driver never officially supported native CS +* allow a single native CS for legacy DT support purposes when +* no cs-gpio is configured. +* Known limitations for native cs are: +* * multiple chip-selects: cs0-cs2 are all simultaniously asserted +* whenever there is a transfer - this even includes SPI_NO_CS +* * SPI_CS_HIGH: is ignores - cs are always asserted low +* * cs_change: cs is deasserted after each spi_transfer +* * cs_delay_usec: cs is always deasserted one SCK cycle after +* a spi_transfer +*/ + master->num_chipselect =1 ; master->transfer_one = bcm2835aux_spi_transfer_one; master->handle_err = bcm2835aux_spi_handle_err; master->prepare_message = bcm2835aux_spi_prepare_message;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 157/371 ehea: Fix a copy-paste err in ehea_init_port_res
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit c8f191282f819ab4e9b47b22a65c6c29734cefce ]
pr->tx_bytes should be assigned to tx_bytes other than rx_bytes.
--- drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ibm/ehea/ehea_main.c +1 -1
@@ -1475,7 +1475,7 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,memset (pr,0 ,sizeof (struct ehea_port_res )); - pr->tx_bytes = rx_bytes; + pr->tx_bytes = tx_bytes; pr->tx_packets = tx_packets; pr->rx_bytes = rx_bytes; pr->rx_packets = rx_packets;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 158/371 scsi: qla2xxx: Unregister chrdev if module initialization fails
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit c794d24ec9eb6658909955772e70f34bef5b5b91 ]
If module initialization fails after the character device has been registered, unregister the character device. Additionally, avoid duplicating error path code.
--- drivers/scsi/qla2xxx/qla_os.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +21 -13
@@ -6714,8 +6714,7 @@ qla2x00_module_init(void)/* Initialize target kmem_cache and mem_pools */ ret =qlt_init ();if (ret <0 ) { -kmem_cache_destroy (srb_cachep); -return ret; + goto destroy_cache; }else if (ret >0 ) {/* * If initiator mode is explictly disabled by qlt_init(),
@@ -6736,11 +6735,10 @@ qla2x00_module_init(void) qla2xxx_transport_template =fc_attach_transport (&qla2xxx_transport_functions);if (!qla2xxx_transport_template) { -kmem_cache_destroy (srb_cachep);ql_log (ql_log_fatal,NULL ,0x0002 ,"fc_attach_transport failed...Failing load!.\n" ); -qlt_exit (); -return -ENODEV ; + ret = -ENODEV ; + goto qlt_exit; } apidev_major =register_chrdev (0 ,QLA2XXX_APIDEV , &apidev_fops);
@@ -6752,27 +6750,37 @@ qla2x00_module_init(void) qla2xxx_transport_vport_template =fc_attach_transport (&qla2xxx_transport_vport_functions);if (!qla2xxx_transport_vport_template) { -kmem_cache_destroy (srb_cachep); -qlt_exit (); -fc_release_transport (qla2xxx_transport_template);ql_log (ql_log_fatal,NULL ,0x0004 ,"fc_attach_transport vport failed...Failing load!.\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto unreg_chrdev; }ql_log (ql_log_info,NULL ,0x0005 ,"QLogic Fibre Channel HBA Driver: %s.\n" , qla2x00_version_str); ret =pci_register_driver (&qla2xxx_pci_driver);if (ret) { -kmem_cache_destroy (srb_cachep); -qlt_exit (); -fc_release_transport (qla2xxx_transport_template); -fc_release_transport (qla2xxx_transport_vport_template);ql_log (ql_log_fatal,NULL ,0x0006 ,"pci_register_driver failed...ret=%d Failing load!.\n" , ret); + goto release_vport_transport; }return ret; + +release_vport_transport: +fc_release_transport (qla2xxx_transport_vport_template); + +unreg_chrdev: +if (apidev_major >=0 ) +unregister_chrdev (apidev_major,QLA2XXX_APIDEV ); +fc_release_transport (qla2xxx_transport_template); + +qlt_exit: +qlt_exit (); + +destroy_cache: +kmem_cache_destroy (srb_cachep); +return ret; }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 159/371 scsi: target/core: Fix a race condition in the LUN lookup code
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 63f7479439c95bcd49b7dd4af809862c316c71a3 ]
The rcu_dereference(deve->se_lun) expression occurs twice in the LUN lookup functions. Since these expressions are not serialized against deve->se_lun assignments each of these expressions may yield a different result. Avoid that the wrong LUN pointer is stored in se_cmd by reading deve->se_lun only once.
--- drivers/target/target_core_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/target/target_core_device.c +2 -2
@@ -85,7 +85,7 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd, u64 unpacked_lun) goto out_unlock; } - se_cmd->se_lun =rcu_dereference (deve->se_lun); + se_cmd->se_lun = se_lun; se_cmd->pr_res_key = deve->pr_res_key; se_cmd->orig_fe_lun = unpacked_lun; se_cmd->se_cmd_flags |=SCF_SE_LUN_CMD ;
@@ -176,7 +176,7 @@ int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u64 unpacked_lun) goto out_unlock; } - se_cmd->se_lun =rcu_dereference (deve->se_lun); + se_cmd->se_lun = se_lun; se_cmd->pr_res_key = deve->pr_res_key; se_cmd->orig_fe_lun = unpacked_lun; se_cmd->se_cmd_flags |=SCF_SE_LUN_CMD ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 160/371 ARM: pxa: ssp: Fix "WARNING: invalid free of devm_ allocated data"
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 9ee8578d953023cc57e7e736ae48502c707c0210 ]
Since commit 1c459de1e645 ("ARM: pxa: ssp: use devm_ functions") kfree, iounmap, clk_put etc are not needed anymore in remove path.
--- arch/arm/plat-pxa/ssp.c | 6 ------ 1 file changed, 6 deletions(-)
arch/arm/plat-pxa/ssp.c +0 -6
@@ -230,18 +230,12 @@ static int pxa_ssp_probe(struct platform_device *pdev)static int pxa_ssp_remove (struct platform_device *pdev) { -struct resource *res;struct ssp_device *ssp; ssp =platform_get_drvdata (pdev);if (ssp ==NULL )return -ENODEV ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -release_mem_region (res->start,resource_size (res)); - -clk_put (ssp->clk); -mutex_lock (&ssp_lock);list_del (&ssp->node);mutex_unlock (&ssp_lock);
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 161/371 net: hns3: fix for vport->bw_limit overflow problem
In reply to Sasha LevinFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 2566f10676ba996b745e138f54f3e2f974311692 ]
When setting vport->bw_limit to hdev->tm_info.pg_info[0].bw_limit in hclge_tm_vport_tc_info_update, vport->bw_limit can be as big as HCLGE_ETHER_MAX_RATE (100000), which can not fit into u16 (65535).
So this patch fixes it by using u32 for vport->bw_limit.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +1 -1
@@ -480,7 +480,7 @@ struct hclge_vport {u16 alloc_rss_size;u16 qs_offset; -u16 bw_limit;/* VSI BW Limit (0 = disabled) */ +u32 bw_limit;/* VSI BW Limit (0 = disabled) */ u8 dwrr;int vport_id;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 162/371 hwmon: (w83627hf) Use request_muxed_region for Super-IO accesses
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit e95fd518d05bfc087da6fcdea4900a57cfb083bd ]
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
--- drivers/hwmon/w83627hf.c | 42 +++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-)
drivers/hwmon/w83627hf.c +37 -5
@@ -130,17 +130,23 @@ superio_select(struct w83627hf_sio_data *sio, int ld)outb (ld, sio->sioaddr +1 ); } -static inline void +static inline int superio_enter (struct w83627hf_sio_data *sio) { +if (!request_muxed_region (sio->sioaddr,2 ,DRVNAME )) +return -EBUSY ; +outb (0x87 , sio->sioaddr);outb (0x87 , sio->sioaddr); + +return 0 ; }static inline void superio_exit (struct w83627hf_sio_data *sio) {outb (0xAA , sio->sioaddr); +release_region (sio->sioaddr,2 ); }#define W627_DEVID 0x52
@@ -1278,7 +1284,7 @@ static DEVICE_ATTR_RO(name);static int __init w83627hf_find (int sioaddr,unsigned short *addr,struct w83627hf_sio_data *sio_data) { -int err = -ENODEV ; +int err;u16 val;static __initconst char *const names[] = {
@@ -1290,7 +1296,11 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr, }; sio_data->sioaddr = sioaddr; -superio_enter (sio_data); + err =superio_enter (sio_data); +if (err) +return err; + + err = -ENODEV ; val = force_id ? force_id :superio_inb (sio_data,DEVID );switch (val) {case W627_DEVID :
@@ -1644,9 +1654,21 @@ static int w83627thf_read_gpio5(struct platform_device *pdev)struct w83627hf_sio_data *sio_data =dev_get_platdata (&pdev->dev);int res =0xff , sel; -superio_enter (sio_data); +if (superio_enter (sio_data)) { +/* +* Some other driver reserved the address space for itself. +* We don't want to fail driver instantiation because of that, +* so display a warning and keep going. +*/ +dev_warn (&pdev->dev, +"Can not read VID data: Failed to enable SuperIO access\n" ); +return res; + } +superio_select (sio_data,W83627HF_LD_GPIO5 ); + res =0xff ; +/* Make sure these GPIO pins are enabled */ if (!(superio_inb (sio_data,W83627THF_GPIO5_EN ) & (1 <<3 ))) {dev_dbg (&pdev->dev,"GPIO5 disabled, no VID function\n" );
@@ -1677,7 +1699,17 @@ static int w83687thf_read_vid(struct platform_device *pdev)struct w83627hf_sio_data *sio_data =dev_get_platdata (&pdev->dev);int res =0xff ; -superio_enter (sio_data); +if (superio_enter (sio_data)) { +/* +* Some other driver reserved the address space for itself. +* We don't want to fail driver instantiation because of that, +* so display a warning and keep going. +*/ +dev_warn (&pdev->dev, +"Can not read VID data: Failed to enable SuperIO access\n" ); +return res; + } +superio_select (sio_data,W83627HF_LD_HWM );/* Make sure these GPIO pins are enabled */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 163/371 platform/x86: alienware-wmi: fix kfree on potentially uninitialized pointer
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 98e2630284ab741804bd0713e932e725466f2f84 ]
Currently the kfree of output.pointer can be potentially freeing an uninitalized pointer in the case where out_data is NULL. Fix this by reworking the case where out_data is not-null to perform the ACPI status check and also the kfree of outpoint.pointer in one block and hence ensuring the pointer is only freed when it has been used.
Also replace the if (ptr != NULL) idiom with just if (ptr).
--- drivers/platform/x86/alienware-wmi.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/platform/x86/alienware-wmi.c +8 -9
@@ -505,23 +505,22 @@ static acpi_status alienware_wmax_command(struct wmax_basic_args *in_args, input.length = (acpi_size )sizeof (*in_args); input.pointer = in_args; -if (out_data !=NULL ) { +if (out_data) { output.length =ACPI_ALLOCATE_BUFFER ; output.pointer =NULL ; status =wmi_evaluate_method (WMAX_CONTROL_GUID ,0 , command, &input, &output); - }else +if (ACPI_SUCCESS (status)) { + obj = (union acpi_object *)output.pointer; +if (obj && obj->type ==ACPI_TYPE_INTEGER ) + *out_data = (u32 )obj->integer.value; + } +kfree (output.pointer); + }else { status =wmi_evaluate_method (WMAX_CONTROL_GUID ,0 , command, &input,NULL ); - -if (ACPI_SUCCESS (status) && out_data !=NULL ) { - obj = (union acpi_object *)output.pointer; -if (obj && obj->type ==ACPI_TYPE_INTEGER ) - *out_data = (u32 ) obj->integer.value; } -kfree (output.pointer);return status; - }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 164/371 tipc: set sysctl_tipc_rmem and named_timeout right range
In reply to Sasha LevinFrom: Jie Liu <[email protected]>
[ Upstream commit 4bcd4ec1017205644a2697bccbc3b5143f522f5f ]
We find that sysctl_tipc_rmem and named_timeout do not have the right minimum setting. sysctl_tipc_rmem should be larger than zero, like sysctl_tcp_rmem. And named_timeout as a timeout setting should be not less than zero.
--- net/tipc/sysctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/tipc/sysctl.c +6 -2
@@ -37,6 +37,8 @@#include <linux/sysctl.h> +static int zero; +static int one =1 ;static struct ctl_table_header *tipc_ctl_hdr;static struct ctl_table tipc_table[] = {
@@ -45,14 +47,16 @@ static struct ctl_table tipc_table[] = { .data = &sysctl_tipc_rmem, .maxlen = sizeof(sysctl_tipc_rmem), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, }, { .procname = "named_timeout", .data = &sysctl_tipc_named_timeout, .maxlen = sizeof(sysctl_tipc_named_timeout), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, }, {} };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 165/371 selftests/ipc: Fix msgque compiler warnings
In reply to Sasha LevinFrom: Kees Cook <[email protected]>
[ Upstream commit a147faa96f832f76e772b1e448e94ea84c774081 ]
This fixes the various compiler warnings when building the msgque selftest. The primary change is using sys/msg.h instead of linux/msg.h directly to gain the API declarations.
--- tools/testing/selftests/ipc/msgque.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
tools/testing/selftests/ipc/msgque.c +6 -5
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE#include <stdlib.h> #include <stdio.h> #include <string.h> #include <errno.h> -#include <linux/msg.h> +#include <sys/msg.h> #include <fcntl.h> #include "../kselftest.h"
@@ -73,7 +74,7 @@ int restore_queue(struct msgque_data *msgque)return 0 ; destroy: -if (msgctl (id,IPC_RMID ,0 )) +if (msgctl (id,IPC_RMID ,NULL ))printf ("Failed to destroy queue: %d\n" , -errno);return ret; }
@@ -120,7 +121,7 @@ int check_and_destroy_queue(struct msgque_data *msgque) ret =0 ; err: -if (msgctl (msgque->msq_id,IPC_RMID ,0 )) { +if (msgctl (msgque->msq_id,IPC_RMID ,NULL )) {printf ("Failed to destroy queue: %d\n" , -errno);return -errno; }
@@ -129,7 +130,7 @@ int check_and_destroy_queue(struct msgque_data *msgque)int dump_queue (struct msgque_data *msgque) { -struct msqid64_ds ds; +struct msqid_ds ds;int kern_id;int i, ret;
@@ -246,7 +247,7 @@ int main(int argc, char **argv)return ksft_exit_pass (); err_destroy: -if (msgctl (msgque.msq_id,IPC_RMID ,0 )) { +if (msgctl (msgque.msq_id,IPC_RMID ,NULL )) {printf ("Failed to destroy queue: %d\n" , -errno);return ksft_exit_fail (); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 166/371 powerpc: vdso: Make vdso32 installation conditional in vdso_install
In reply to Sasha LevinFrom: Ben Hutchings <[email protected]>
[ Upstream commit ff6d27823f619892ab96f7461764840e0d786b15 ]
The 32-bit vDSO is not needed and not normally built for 64-bit little-endian configurations. However, the vdso_install target still builds and installs it. Add the same config condition as is normally used for the build.
--- arch/powerpc/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/Makefile +2 -0
@@ -385,7 +385,9 @@ vdso_install: ifeq ($(CONFIG_PPC64),y) $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ endif +ifdef CONFIG_VDSO32 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@ +endif archclean: $(Q)$(MAKE) $(clean)=$(boot)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 167/371 ARM: dts: ls1021: Fix SGMII PCS link remaining down after PHY disconnect
In reply to Sasha LevinFrom: Vladimir Oltean <[email protected]>
[ Upstream commit c7861adbe37f576931650ad8ef805e0c47564b9a ]
Each eTSEC MAC has its own TBI (SGMII) PCS and private MDIO bus. But due to a DTS oversight, both SGMII-compatible MACs of the LS1021 SoC are pointing towards the same internal PCS. Therefore nobody is controlling the internal PCS of eTSEC0.
Upon initial ndo_open, the SGMII link is ok by virtue of U-boot initialization. But upon an ifdown/ifup sequence, the code path from ndo_open -> init_phy -> gfar_configure_serdes does not get executed for the PCS of eTSEC0 (and is executed twice for MAC eTSEC1). So the SGMII link remains down for eTSEC0. On the LS1021A-TWR board, to signal this failure condition, the PHY driver keeps printing '803x_aneg_done: SGMII link is not ok'.
Also, it changes compatible of mdio0 to "fsl,etsec2-mdio" to match mdio1 device.
--- arch/arm/boot/dts/ls1021a-twr.dts | 9 ++++++++- arch/arm/boot/dts/ls1021a.dtsi | 11 ++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)
arch/arm/boot/dts/ls1021a-twr.dts +8 -1
@@ -143,7 +143,7 @@ }; &enet0 { - tbi-handle = <&tbi1>; + tbi-handle = <&tbi0>; phy-handle = <&sgmii_phy2>; phy-connection-type = "sgmii"; status = "okay";
@@ -222,6 +222,13 @@ sgmii_phy2: ethernet-phy@2 { reg = <0x2>; }; + tbi0: tbi-phy@1f { + reg = <0x1f>; + device_type = "tbi-phy"; + }; +}; + +&mdio1 { tbi1: tbi-phy@1f { reg = <0x1f>; device_type = "tbi-phy";
arch/arm/boot/dts/ls1021a.dtsi +10 -1
@@ -562,13 +562,22 @@ }; mdio0: mdio@2d24000 { - compatible = "gianfar"; + compatible = "fsl,etsec2-mdio"; device_type = "mdio"; #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2d24000 0x0 0x4000>; }; + mdio1: mdio@2d64000 { + compatible = "fsl,etsec2-mdio"; + device_type = "mdio"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0 0x2d64000 0x0 0x4000>, + <0x0 0x2d50030 0x0 0x4>; + }; + ptp_clock@2d10e00 { compatible = "fsl,etsec-ptp"; reg = <0x0 0x2d10e00 0x0 0xb0>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 168/371 media: ov2659: fix unbalanced mutex_lock/unlock
In reply to Sasha LevinFrom: Akinobu Mita <[email protected]>
[ Upstream commit 384538bda10913e5c94ec5b5d34bd3075931bcf4 ]
Avoid returning with mutex locked.
--- drivers/media/i2c/ov2659.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov2659.c +1 -1
@@ -1136,7 +1136,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd, mf =v4l2_subdev_get_try_format (sd, cfg, fmt->pad); *mf = fmt->format;#else -return -ENOTTY ; + ret = -ENOTTY ;#endif }else {s64 val;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 169/371 6lowpan: Off by one handling ->nexthdr
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit f57c4bbf34439531adccd7d3a4ecc14f409c1399 ]
NEXTHDR_MAX is 255. What happens here is that we take a u8 value "hdr->nexthdr" from the network and then look it up in lowpan_nexthdr_nhcs[]. The problem is that if hdr->nexthdr is 0xff then we read one element beyond the end of the array so the array needs to be one element larger.
--- net/6lowpan/nhc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/6lowpan/nhc.c +1 -1
@@ -18,7 +18,7 @@#include "nhc.h" static struct rb_root rb_root =RB_ROOT ; -static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX ]; +static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX +1 ];static DEFINE_SPINLOCK (lowpan_nhc_lock);static int lowpan_nhc_insert (struct lowpan_nhc *nhc)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 170/371 dmaengine: axi-dmac: Don't check the number of frames for alignment
In reply to Sasha LevinFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit 648865a79d8ee3d1aa64aab5eb2a9d12eeed14f9 ]
In 2D transfers (for the AXI DMAC), the number of frames (numf) represents Y_LENGTH, and the length of a frame is X_LENGTH. 2D transfers are useful for video transfers where screen resolutions ( X * Y ) are typically aligned for X, but not for Y.
There is no requirement for Y_LENGTH to be aligned to the bus-width (or anything), and this is also true for AXI DMAC.
Checking the Y_LENGTH for alignment causes false errors when initiating DMA transfers. This change fixes this by checking only that the Y_LENGTH is non-zero.
--- drivers/dma/dma-axi-dmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dma-axi-dmac.c +1 -1
@@ -451,7 +451,7 @@ static struct dma_async_tx_descriptor *axi_dmac_prep_interleaved(if (chan->hw_2d) {if (!axi_dmac_check_len (chan, xt->sgl[0 ].size) || - !axi_dmac_check_len (chan, xt->numf)) + xt->numf ==0 )return NULL ;if (xt->sgl[0 ].size + dst_icg > chan->max_length || xt->sgl[0 ].size + src_icg > chan->max_length)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 171/371 ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk()
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 328e9f6973be2ee67862cb17bf6c0c5c5918cd72 ]
The error from snd_usb_mixer_apply_create_quirk() is ignored in the current usb-audio driver code, which will continue the probing even after the error. Let's take it more serious.
--- sound/usb/mixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/usb/mixer.c +3 -1
@@ -2632,7 +2632,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, (err = snd_usb_mixer_status_create(mixer)) < 0) goto _error; -snd_usb_mixer_apply_create_quirk (mixer); + err =snd_usb_mixer_apply_create_quirk (mixer); +if (err <0 ) + goto _error; err =snd_device_new (chip->card,SNDRV_DEV_CODEC , mixer, &dev_ops);if (err <0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 172/371 NFS: Don't interrupt file writeout due to fatal errors
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 14bebe3c90b326d2a0df78aed5e9de090c71d878 ]
When flushing out dirty pages, the fact that we may hit fatal errors is not a reason to stop writeback. Those errors are reported through fsync(), not through the flush mechanism.
--- fs/nfs/write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/write.c +1 -1
@@ -643,7 +643,7 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,return ret; out_launder:nfs_write_error_remove_page (req); -return ret; +return 0 ; } static int nfs_do_writepage(struct page *page, struct writeback_control *wbc,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 173/371 irqchip/gic-v3-its: fix some definitions of inner cacheability attributes
In reply to Sasha LevinFrom: Hongbo Yao <[email protected]>
[ Upstream commit 0f29456d08042134aff6e562d07a6365c841c4ad ]
Some definitions of Inner Cacheability attibutes need to be corrected.
--- include/linux/irqchip/arm-gic-v3.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/irqchip/arm-gic-v3.h +6 -6
@@ -152,7 +152,7 @@#define GICR_PROPBASER_nCnB GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, nCnB)#define GICR_PROPBASER_nC GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, nC)#define GICR_PROPBASER_RaWt GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWt) -#define GICR_PROPBASER_RaWb GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWt) +#define GICR_PROPBASER_RaWb GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWb)#define GICR_PROPBASER_WaWt GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, WaWt)#define GICR_PROPBASER_WaWb GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, WaWb)#define GICR_PROPBASER_RaWaWt GIC_BASER_CACHEABILITY(GICR_PROPBASER, INNER, RaWaWt)
@@ -179,7 +179,7 @@#define GICR_PENDBASER_nCnB GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, nCnB)#define GICR_PENDBASER_nC GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, nC)#define GICR_PENDBASER_RaWt GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, RaWt) -#define GICR_PENDBASER_RaWb GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, RaWt) +#define GICR_PENDBASER_RaWb GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, RaWb)#define GICR_PENDBASER_WaWt GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, WaWt)#define GICR_PENDBASER_WaWb GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, WaWb)#define GICR_PENDBASER_RaWaWt GIC_BASER_CACHEABILITY(GICR_PENDBASER, INNER, RaWaWt)
@@ -238,7 +238,7 @@#define GICR_VPROPBASER_nCnB GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, nCnB)#define GICR_VPROPBASER_nC GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, nC)#define GICR_VPROPBASER_RaWt GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, RaWt) -#define GICR_VPROPBASER_RaWb GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, RaWt) +#define GICR_VPROPBASER_RaWb GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, RaWb)#define GICR_VPROPBASER_WaWt GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, WaWt)#define GICR_VPROPBASER_WaWb GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, WaWb)#define GICR_VPROPBASER_RaWaWt GIC_BASER_CACHEABILITY(GICR_VPROPBASER, INNER, RaWaWt)
@@ -264,7 +264,7 @@#define GICR_VPENDBASER_nCnB GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, nCnB)#define GICR_VPENDBASER_nC GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, nC)#define GICR_VPENDBASER_RaWt GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, RaWt) -#define GICR_VPENDBASER_RaWb GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, RaWt) +#define GICR_VPENDBASER_RaWb GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, RaWb)#define GICR_VPENDBASER_WaWt GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, WaWt)#define GICR_VPENDBASER_WaWb GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, WaWb)#define GICR_VPENDBASER_RaWaWt GIC_BASER_CACHEABILITY(GICR_VPENDBASER, INNER, RaWaWt)
@@ -337,7 +337,7 @@#define GITS_CBASER_nCnB GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, nCnB)#define GITS_CBASER_nC GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, nC)#define GITS_CBASER_RaWt GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, RaWt) -#define GITS_CBASER_RaWb GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, RaWt) +#define GITS_CBASER_RaWb GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, RaWb)#define GITS_CBASER_WaWt GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, WaWt)#define GITS_CBASER_WaWb GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, WaWb)#define GITS_CBASER_RaWaWt GIC_BASER_CACHEABILITY(GITS_CBASER, INNER, RaWaWt)
@@ -361,7 +361,7 @@#define GITS_BASER_nCnB GIC_BASER_CACHEABILITY(GITS_BASER, INNER, nCnB)#define GITS_BASER_nC GIC_BASER_CACHEABILITY(GITS_BASER, INNER, nC)#define GITS_BASER_RaWt GIC_BASER_CACHEABILITY(GITS_BASER, INNER, RaWt) -#define GITS_BASER_RaWb GIC_BASER_CACHEABILITY(GITS_BASER, INNER, RaWt) +#define GITS_BASER_RaWb GIC_BASER_CACHEABILITY(GITS_BASER, INNER, RaWb)#define GITS_BASER_WaWt GIC_BASER_CACHEABILITY(GITS_BASER, INNER, WaWt)#define GITS_BASER_WaWb GIC_BASER_CACHEABILITY(GITS_BASER, INNER, WaWb)#define GITS_BASER_RaWaWt GIC_BASER_CACHEABILITY(GITS_BASER, INNER, RaWaWt)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 174/371 scsi: qla2xxx: Fix a format specifier
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 19ce192cd718e02f880197c0983404ca48236807 ]
Since mcmd->sess->port_name is eight bytes long, use %8phC to format that port name instead of %phC.
--- drivers/scsi/qla2xxx/qla_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_target.c +1 -1
@@ -2179,7 +2179,7 @@ void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd) mcmd->orig_iocb.imm_ntfy.u.isp24.status_subcode == ELS_TPRLO) {ql_dbg (ql_dbg_disc, vha,0x2106 , -"TM response logo %phC status %#x state %#x" , +"TM response logo %8phC status %#x state %#x" , mcmd->sess->port_name, mcmd->fc_tm_rsp, mcmd->flags);qlt_schedule_sess_for_deletion_lock (mcmd->sess);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 175/371 scsi: qla2xxx: Avoid that qlt_send_resp_ctio() corrupts memory
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit a861b49273578e255426a499842cf7f465456351 ]
The "(&ctio->u.status1.sense_data)[i]" where i >= 0 expressions in qlt_send_resp_ctio() are probably typos and should have been "(&ctio->u.status1.sense_data[4 * i])" instead. Instead of only fixing these typos, modify the code for storing sense data such that it becomes easy to read. This patch fixes a Coverity complaint about accessing an array outside its bounds.
--- drivers/scsi/qla2xxx/qla_target.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +6 -6
@@ -2122,14 +2122,14 @@ void qlt_send_resp_ctio(struct qla_qpair *qpair, struct qla_tgt_cmd *cmd, ctio->u.status1.scsi_status |=cpu_to_le16 (SS_RESIDUAL_UNDER ); -/* Response code and sense key */ -put_unaligned_le32 (((0x70 <<24 ) | (sense_key <<8 )), - (&ctio->u.status1.sense_data)[0 ]); +/* Fixed format sense data. */ + ctio->u.status1.sense_data[0 ] =0x70 ; + ctio->u.status1.sense_data[2 ] = sense_key;/* Additional sense length */ -put_unaligned_le32 (0x0a , (&ctio->u.status1.sense_data)[1 ]); + ctio->u.status1.sense_data[7 ] =0xa ;/* ASC and ASCQ */ -put_unaligned_le32 (((asc <<24 ) | (ascq <<16 )), - (&ctio->u.status1.sense_data)[3 ]); + ctio->u.status1.sense_data[12 ] = asc; + ctio->u.status1.sense_data[13 ] = ascq;/* Memory Barrier */ wmb ();
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 176/371 packet: in recvmsg msg_name return at least sizeof sockaddr_ll
In reply to Sasha LevinFrom: Willem de Bruijn <[email protected]>
[ Upstream commit b2cf86e1563e33a14a1c69b3e508d15dc12f804c ]
Packet send checks that msg_name is at least sizeof sockaddr_ll. Packet recv must return at least this length, so that its output can be passed unmodified to packet send.
This ceased to be true since adding support for lladdr longer than sll_addr. Since, the return value uses true address length.
Always return at least sizeof sockaddr_ll, even if address length is shorter. Zero the padding bytes.
Change v1->v2: do not overwrite zeroed padding again. use copy_len.
--- net/packet/af_packet.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/packet/af_packet.c +11 -2
@@ -3407,20 +3407,29 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,sock_recv_ts_and_drops (msg, sk, skb);if (msg->msg_name) { +int copy_len; +/* If the address length field is there to be filled * in, we fill it in now. */ if (sock->type ==SOCK_PACKET ) {__sockaddr_check_size (sizeof (struct sockaddr_pkt )); msg->msg_namelen =sizeof (struct sockaddr_pkt ); + copy_len = msg->msg_namelen; }else {struct sockaddr_ll *sll = &PACKET_SKB_CB (skb)->sa.ll; msg->msg_namelen = sll->sll_halen + offsetof(struct sockaddr_ll , sll_addr); + copy_len = msg->msg_namelen; +if (msg->msg_namelen <sizeof (struct sockaddr_ll )) { +memset (msg->msg_name + + offsetof(struct sockaddr_ll , sll_addr), +0 ,sizeof (sll->sll_addr)); + msg->msg_namelen =sizeof (struct sockaddr_ll ); + } } -memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, - msg->msg_namelen); +memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, copy_len); }if (pkt_sk (sk)->auxdata) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 177/371 ASoC: fix valid stream condition
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit 6a7c59c6d9f3b280e81d7a04bbe4e55e90152dce ]
A stream may specify a rate range using 'rate_min' and 'rate_max', so a stream may be valid and not specify any rates. However, as stream cannot be valid and not have any channel. Let's use this condition instead to determine if a stream is valid or not.
--- sound/soc/soc-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +2 -2
@@ -48,8 +48,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)else codec_stream = &dai->driver->capture; -/* If the codec specifies any rate at all, it supports the stream. */ -return codec_stream->rates; +/* If the codec specifies any channels at all, it supports the stream */ +return codec_stream->channels_min; }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 178/371 usb: gadget: fsl: fix link error against usb-gadget module
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 2100e3ca3676e894fa48b8f6f01d01733387fe81 ]
The dependency to ensure this driver links correctly fails since it can not be a loadable module:
drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_set_peripheral':
phy-fsl-usb.c:(.text+0x2224): undefined reference to `usb_gadget_vbus_disconnect'
Make the option 'tristate' so it can work correctly.
--- drivers/usb/phy/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/phy/Kconfig +1 -1
@@ -20,7 +20,7 @@ config AB8500_USB in host mode, low speed. config FSL_USB2_OTG - bool "Freescale USB OTG Transceiver Driver" + tristate "Freescale USB OTG Transceiver Driver" depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM=y && PM depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y' select USB_PHY
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 179/371 dwc2: gadget: Fix completed transfer size calculation in DDMA
In reply to Sasha LevinFrom: Minas Harutyunyan <[email protected]>
[ Upstream commit 5acb4b970184d189d901192d075997c933b82260 ]
Fix calculation of transfer size on completion in function dwc2_gadget_get_xfersize_ddma().
Added increment of descriptor pointer to move to next descriptor in the loop.
--- drivers/usb/dwc2/gadget.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/dwc2/gadget.c +1 -0
@@ -2276,6 +2276,7 @@ static unsigned int dwc2_gadget_get_xfersize_ddma(struct dwc2_hsotg_ep *hs_ep)if (status &DEV_DMA_STS_MASK )dev_err (hsotg->dev,"descriptor %d closed with %x\n" , i, status &DEV_DMA_STS_MASK ); + desc++; }return bytes_rem;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 180/371 IB/mlx5: Add missing XRC options to QP optional params mask
In reply to Sasha LevinFrom: Jack Morgenstein <[email protected]>
[ Upstream commit 8f4426aa19fcdb9326ac44154a117b1a3a5ae126 ]
The QP transition optional parameters for the various transition for XRC QPs are identical to those for RC QPs.
Many of the XRC QP transition optional parameter bits are missing from the QP optional mask table. These omissions caused failures when doing XRC QP state transitions.
For example, when trying to change the response timer of an XRC receive QP via the RTS2RTS transition, the new timer value was ignored because MLX5_QP_OPTPAR_RNR_TIMEOUT bit was missing from the optional params mask for XRC qps for the RTS2RTS transition.
Fix this by adding the missing XRC optional parameters for all QP transitions to the opt_mask table.
--- drivers/infiniband/hw/mlx5/qp.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/infiniband/hw/mlx5/qp.c +21 -0
@@ -2357,6 +2357,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q [MLX5_QP_ST_UD ] =MLX5_QP_OPTPAR_PKEY_INDEX |MLX5_QP_OPTPAR_Q_KEY | MLX5_QP_OPTPAR_PRI_PORT, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_PKEY_INDEX | +MLX5_QP_OPTPAR_PRI_PORT , }, [MLX5_QP_STATE_RTR] = { [MLX5_QP_ST_RC] = MLX5_QP_OPTPAR_ALT_ADDR_PATH |
@@ -2390,6 +2395,12 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_QMLX5_QP_OPTPAR_RWE | MLX5_QP_OPTPAR_PM_STATE, [MLX5_QP_ST_UD] = MLX5_QP_OPTPAR_Q_KEY, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_ALT_ADDR_PATH | +MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_PM_STATE | + MLX5_QP_OPTPAR_RNR_TIMEOUT, }, }, [MLX5_QP_STATE_RTS] = {
@@ -2406,6 +2417,12 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q [MLX5_QP_ST_UD ] =MLX5_QP_OPTPAR_Q_KEY |MLX5_QP_OPTPAR_SRQN | MLX5_QP_OPTPAR_CQN_RCV, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RRE | +MLX5_QP_OPTPAR_RAE | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_RNR_TIMEOUT | +MLX5_QP_OPTPAR_PM_STATE | + MLX5_QP_OPTPAR_ALT_ADDR_PATH, }, }, [MLX5_QP_STATE_SQER] = {
@@ -2417,6 +2434,10 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_QMLX5_QP_OPTPAR_RWE |MLX5_QP_OPTPAR_RAE | MLX5_QP_OPTPAR_RRE, + [MLX5_QP_ST_XRC ] =MLX5_QP_OPTPAR_RNR_TIMEOUT | +MLX5_QP_OPTPAR_RWE | +MLX5_QP_OPTPAR_RAE | + MLX5_QP_OPTPAR_RRE, }, }, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 181/371 iommu/vt-d: Make kernel parameter igfx_off work with vIOMMU
In reply to Sasha LevinFrom: Lu Baolu <[email protected]>
[ Upstream commit 5daab58043ee2bca861068e2595564828f3bc663 ]
The kernel parameter igfx_off is used by users to disable DMA remapping for the Intel integrated graphic device. It was designed for bare metal cases where a dedicated IOMMU is used for graphic. This doesn't apply to virtual IOMMU case where an include-all IOMMU is used. This makes the kernel parameter work with virtual IOMMU as well.
--- drivers/iommu/intel-iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +4 -1
@@ -3361,9 +3361,12 @@ static int __init init_dmars(void) iommu_identity_mapping |=IDENTMAP_ALL ;#ifdef CONFIG_INTEL_IOMMU_BROKEN_GFX_WA - iommu_identity_mapping |=IDENTMAP_GFX ; + dmar_map_gfx =0 ;#endif +if (!dmar_map_gfx) + iommu_identity_mapping |=IDENTMAP_GFX ; +check_tylersburg_isoch ();if (iommu_identity_mapping) {
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 182/371 net: ena: fix swapped parameters when calling ena_com_indirect_table_fill_entry
In reply to Sasha LevinFrom: Sameeh Jubran <[email protected]>
[ Upstream commit 3c6eeff295f01bdf1c6c3addcb0a04c0c6c029e9 ]
second parameter should be the index of the table rather than the value.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +2 -2
@@ -694,8 +694,8 @@ static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,if (indir) {for (i =0 ; i <ENA_RX_RSS_TABLE_SIZE ; i++) { rc =ena_com_indirect_table_fill_entry (ena_dev, -ENA_IO_RXQ_IDX (indir[i]), - i); + i, +ENA_IO_RXQ_IDX (indir[i]));if (unlikely (rc)) {netif_err (adapter, drv, netdev,"Cannot fill indirect table (index is too large)\n" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 183/371 net: ena: fix: Free napi resources when ena_up() fails
In reply to Sasha LevinFrom: Sameeh Jubran <[email protected]>
[ Upstream commit b287cdbd1cedfc9606682c6e02b58d00ff3a33ae ]
ena_up() calls ena_init_napi() but does not call ena_del_napi() in case of failure. This causes a segmentation fault upon rmmod when netif_napi_del() is called. Fix this bug by calling ena_del_napi() before returning error from ena_up().
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -0
@@ -1796,6 +1796,7 @@ static int ena_up(struct ena_adapter *adapter) err_setup_tx:ena_free_io_irq (adapter); err_req_irq: +ena_del_napi (adapter);return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 184/371 net: ena: fix incorrect test of supported hash function
In reply to Sasha LevinFrom: Sameeh Jubran <[email protected]>
[ Upstream commit d3cfe7ddbc3dfbb9b201615b7fef8fd66d1b5fe8 ]
ena_com_set_hash_function() tests if a hash function is supported by the device before setting it.
The test returns the opposite result than needed. Reverse the condition to return the correct value.
Also use the BIT macro instead of inline shift.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_com.c +1 -1
@@ -2002,7 +2002,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)if (unlikely (ret))return ret; -if (get_resp.u.flow_hash_func.supported_func & (1 << rss->hash_func)) { +if (!(get_resp.u.flow_hash_func.supported_func &BIT (rss->hash_func))) {pr_err ("Func hash %d isn't supported by device, abort\n" , rss->hash_func);return -EOPNOTSUPP ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 185/371 net: ena: fix ena_com_fill_hash_function() implementation
In reply to Sasha LevinFrom: Sameeh Jubran <[email protected]>
[ Upstream commit 11bd7a00c0d8ffe33d1e926f8e789b4aea787186 ]
ena_com_fill_hash_function() didn't configure the rss->hash_func.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/amazon/ena/ena_com.c +1 -0
@@ -2087,6 +2087,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,return -EINVAL ; } + rss->hash_func = func; rc =ena_com_set_hash_function (ena_dev);/* Restore the old function */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 186/371 dmaengine: tegra210-adma: restore channel status
In reply to Sasha LevinFrom: Sameer Pujar <[email protected]>
[ Upstream commit f33e7bb3eb922618612a90f0a828c790e8880773 ]
Status of ADMA channel registers is not saved and restored during system suspend. During active playback if system enters suspend, this results in wrong state of channel registers during system resume and playback fails to resume properly. Fix this by saving following channel registers in runtime suspend and restore during runtime resume.
* ADMA_CH_LOWER_SRC_ADDR
* ADMA_CH_LOWER_TRG_ADDR
* ADMA_CH_FIFO_CTRL
* ADMA_CH_CONFIG
* ADMA_CH_CTRL
* ADMA_CH_CMD
* ADMA_CH_TC
Runtime PM calls will be inovked during system resume path if a playback or capture needs to be resumed. Hence above changes work fine for system suspend case.
--- drivers/dma/tegra210-adma.c | 46 ++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-)
drivers/dma/tegra210-adma.c +45 -1
@@ -98,6 +98,7 @@ struct tegra_adma_chan_regs {unsigned int src_addr;unsigned int trg_addr;unsigned int fifo_ctrl; +unsigned int cmd;unsigned int tc; };
@@ -127,6 +128,7 @@ struct tegra_adma_chan {enum dma_transfer_direction sreq_dir;unsigned int sreq_index;bool sreq_reserved; +struct tegra_adma_chan_regs ch_regs;/* Transfer count and position info */ unsigned int tx_buf_count;
@@ -635,8 +637,30 @@ static struct dma_chan *tegra_dma_of_xlate(struct of_phandle_args *dma_spec,static int tegra_adma_runtime_suspend (struct device *dev) {struct tegra_adma *tdma =dev_get_drvdata (dev); +struct tegra_adma_chan_regs *ch_reg; +struct tegra_adma_chan *tdc; +int i; tdma->global_cmd =tdma_read (tdma,ADMA_GLOBAL_CMD ); +if (!tdma->global_cmd) + goto clk_disable; + +for (i =0 ; i < tdma->nr_channels; i++) { + tdc = &tdma->channels[i]; + ch_reg = &tdc->ch_regs; + ch_reg->cmd =tdma_ch_read (tdc,ADMA_CH_CMD ); +/* skip if channel is not active */ +if (!ch_reg->cmd) +continue ; + ch_reg->tc =tdma_ch_read (tdc,ADMA_CH_TC ); + ch_reg->src_addr =tdma_ch_read (tdc,ADMA_CH_LOWER_SRC_ADDR ); + ch_reg->trg_addr =tdma_ch_read (tdc,ADMA_CH_LOWER_TRG_ADDR ); + ch_reg->ctrl =tdma_ch_read (tdc,ADMA_CH_CTRL ); + ch_reg->fifo_ctrl =tdma_ch_read (tdc,ADMA_CH_FIFO_CTRL ); + ch_reg->config =tdma_ch_read (tdc,ADMA_CH_CONFIG ); + } + +clk_disable:clk_disable_unprepare (tdma->ahub_clk);return 0 ;
@@ -645,7 +669,9 @@ static int tegra_adma_runtime_suspend(struct device *dev)static int tegra_adma_runtime_resume (struct device *dev) {struct tegra_adma *tdma =dev_get_drvdata (dev); -int ret; +struct tegra_adma_chan_regs *ch_reg; +struct tegra_adma_chan *tdc; +int ret, i; ret =clk_prepare_enable (tdma->ahub_clk);if (ret) {
@@ -654,6 +680,24 @@ static int tegra_adma_runtime_resume(struct device *dev) }tdma_write (tdma,ADMA_GLOBAL_CMD , tdma->global_cmd); +if (!tdma->global_cmd) +return 0 ; + +for (i =0 ; i < tdma->nr_channels; i++) { + tdc = &tdma->channels[i]; + ch_reg = &tdc->ch_regs; +/* skip if channel was not active earlier */ +if (!ch_reg->cmd) +continue ; +tdma_ch_write (tdc,ADMA_CH_TC , ch_reg->tc); +tdma_ch_write (tdc,ADMA_CH_LOWER_SRC_ADDR , ch_reg->src_addr); +tdma_ch_write (tdc,ADMA_CH_LOWER_TRG_ADDR , ch_reg->trg_addr); +tdma_ch_write (tdc,ADMA_CH_CTRL , ch_reg->ctrl); +tdma_ch_write (tdc,ADMA_CH_FIFO_CTRL , ch_reg->fifo_ctrl); +tdma_ch_write (tdc,ADMA_CH_CONFIG , ch_reg->config); +tdma_ch_write (tdc,ADMA_CH_CMD , ch_reg->cmd); + } +return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 187/371 mmc: core: fix possible use after free of host
In reply to Sasha LevinFrom: Pan Bian <[email protected]>
[ Upstream commit 8e1943af2986db42bee2b8dddf49a36cdb2e9219 ]
In the function mmc_alloc_host, the function put_device is called to release allocated resources when mmc_gpio_alloc fails. Finally, the function pointed by host->class_dev.class->dev_release (i.e., mmc_host_classdev_release) is used to release resources including the host structure. However, after put_device, host is used and released again. Resulting in a use-after-free bug.
--- drivers/mmc/core/host.c | 2 -- 1 file changed, 2 deletions(-)
drivers/mmc/core/host.c +0 -2
@@ -376,8 +376,6 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)if (mmc_gpio_alloc (host)) {put_device (&host->class_dev); -ida_simple_remove (&mmc_host_ida, host->index); -kfree (host);return NULL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 188/371 lightnvm: pblk: fix lock order in pblk_rb_tear_down_check
In reply to Sasha LevinFrom: Igor Konopko <[email protected]>
[ Upstream commit 486b5aac85f6ec0b2df3e82a6a629d5eb7804db5 ]
In pblk_rb_tear_down_check() the spinlock functions are not called in proper order.
--- drivers/lightnvm/pblk-rb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/lightnvm/pblk-rb.c +1 -1
@@ -825,8 +825,8 @@ int pblk_rb_tear_down_check(struct pblk_rb *rb) } out: -spin_unlock (&rb->w_lock);spin_unlock_irq (&rb->s_lock); +spin_unlock (&rb->w_lock);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 189/371 afs: Fix the afs.cell and afs.volume xattr handlers
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit c73aa4102f5b9f261a907c3b3df94cd2c478504d ]
Fix the ->get handlers for the afs.cell and afs.volume xattrs to pass the source data size to memcpy() rather than target buffer size.
Overcopying the source data occasionally causes the kernel to oops.
--- fs/afs/xattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/afs/xattr.c +2 -2
@@ -50,7 +50,7 @@ static int afs_xattr_get_cell(const struct xattr_handler *handler,return namelen;if (namelen > size)return -ERANGE ; -memcpy (buffer, cell->name, size); +memcpy (buffer, cell->name, namelen);return namelen; }
@@ -104,7 +104,7 @@ static int afs_xattr_get_volume(const struct xattr_handler *handler,return namelen;if (namelen > size)return -ERANGE ; -memcpy (buffer, volname, size); +memcpy (buffer, volname, namelen);return namelen; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 190/371 vfio/mdev: Avoid release parent reference during error path
In reply to Sasha LevinFrom: Parav Pandit <[email protected]>
[ Upstream commit 60e7f2c3fe9919cee9534b422865eed49f4efb15 ]
During mdev parent registration in mdev_register_device(), if parent device is duplicate, it releases the reference of existing parent device.
This is incorrect. Existing parent device should not be touched.
--- drivers/vfio/mdev/mdev_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/vfio/mdev/mdev_core.c +1 -0
@@ -182,6 +182,7 @@ int mdev_register_device(struct device *dev, const struct mdev_parent_ops *ops)/* Check for duplicate */ parent =__find_parent_device (dev);if (parent) { + parent =NULL ; ret = -EEXIST ; goto add_dev_err; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 191/371 vfio/mdev: Fix aborting mdev child device removal if one fails
In reply to Sasha LevinFrom: Parav Pandit <[email protected]>
[ Upstream commit 6093e348a5e2475c5bb2e571346460f939998670 ]
device_for_each_child() stops executing callback function for remaining child devices, if callback hits an error.
Each child mdev device is independent of each other.
While unregistering parent device, mdev core must remove all child mdev devices.
Therefore, mdev_device_remove_cb() always returns success so that device_for_each_child doesn't abort if one child removal hits error.
While at it, improve remove and unregister functions for below simplicity.
There isn't need to pass forced flag pointer during mdev parent removal which invokes mdev_device_remove(). So simplify the flow.
mdev_device_remove() is called from two paths.
1. mdev_unregister_driver()
mdev_device_remove_cb()
mdev_device_remove()
2. remove_store()
mdev_device_remove()
--- drivers/vfio/mdev/mdev_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/vfio/mdev/mdev_core.c +4 -6
@@ -150,10 +150,10 @@ static int mdev_device_remove_ops(struct mdev_device *mdev, bool force_remove)static int mdev_device_remove_cb (struct device *dev,void *data) { -if (!dev_is_mdev (dev)) -return 0 ; +if (dev_is_mdev (dev)) +mdev_device_remove (dev, true); -return mdev_device_remove (dev, data ? *(bool *)data : true); +return 0 ; }/*
@@ -241,7 +241,6 @@ EXPORT_SYMBOL(mdev_register_device);void mdev_unregister_device (struct device *dev) {struct mdev_parent *parent; -bool force_remove = true;mutex_lock (&parent_list_lock); parent =__find_parent_device (dev);
@@ -255,8 +254,7 @@ void mdev_unregister_device(struct device *dev)list_del (&parent->next);class_compat_remove_link (mdev_bus_compat_class, dev,NULL ); -device_for_each_child (dev, (void *)&force_remove, - mdev_device_remove_cb); +device_for_each_child (dev,NULL , mdev_device_remove_cb);parent_remove_sysfs_files (parent);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 192/371 l2tp: Fix possible NULL pointer dereference
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 638a3a1e349ddf5b82f222ff5cb3b4f266e7c278 ]
BUG: unable to handle kernel NULL pointer dereference at 0000000000000128 PGD 0 P4D 0 Oops: 0000 [#1 CPU: 0 PID: 5697 Comm: modprobe Tainted: G W 5.1.0-rc7+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.3-0-ge2fc41e-prebuilt.qemu-project.org 04/01/2014 RIP: 0010:__lock_acquire+0x53/0x10b0 Code: 8b 1c 25 40 5e 01 00 4c 8b 6d 10 45 85 e4 0f 84 bd 06 00 00 44 8b 1d 7c d2 09 02 49 89 fe 41 89 d2 45 85 db 0f 84 47 02 00 00 <48> 81 3f a0 05 70 83 b8 00 00 00 00 44 0f 44 c0 83 fe 01 0f 86 3a RSP: 0018:ffffc90001c07a28 EFLAGS: 00010002 RAX: 0000000000000000 RBX: ffff88822f038440 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000128 RBP: ffffc90001c07a88 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000001 R13: 0000000000000000 R14: 0000000000000128 R15: 0000000000000000 FS: 00007fead0811540(0000) GS:ffff888237a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000128 CR3: 00000002310da000 CR4: 00000000000006f0 Call Trace: ? __lock_acquire+0x24e/0x10b0 lock_acquire+0xdf/0x230 ? flush_workqueue+0x71/0x530 flush_workqueue+0x97/0x530 ? flush_workqueue+0x71/0x530 l2tp_exit_net+0x170/0x2b0 [l2tp_core ? l2tp_exit_net+0x93/0x2b0 [l2tp_core ops_exit_list.isra.6+0x36/0x60 unregister_pernet_operations+0xb8/0x110 unregister_pernet_device+0x25/0x40 l2tp_init+0x55/0x1000 [l2tp_core ? 0xffffffffa018d000 do_one_initcall+0x6c/0x3cc ? do_init_module+0x22/0x1f1 ? rcu_read_lock_sched_held+0x97/0xb0 ? kmem_cache_alloc_trace+0x325/0x3b0 do_init_module+0x5b/0x1f1 load_module+0x1db1/0x2690 ? m_show+0x1d0/0x1d0 __do_sys_finit_module+0xc5/0xd0 __x64_sys_finit_module+0x15/0x20 do_syscall_64+0x6b/0x1d0 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7fead031a839 Code: 00 f3 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 1f f6 2c 00 f7 d8 64 89 01 48 RSP: 002b:00007ffe8d9acca8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 RAX: ffffffffffffffda RBX: 0000560078398b80 RCX: 00007fead031a839 RDX: 0000000000000000 RSI: 000056007659dc2e RDI: 0000000000000003 RBP: 000056007659dc2e R08: 0000000000000000 R09: 0000560078398b80 R10: 0000000000000003 R11: 0000000000000246 R12: 0000000000000000 R13: 00005600783a04a0 R14: 0000000000040000 R15: 0000560078398b80 Modules linked in: l2tp_core(+) e1000 ip_tables ipv6 [last unloaded: l2tp_core CR2: 0000000000000128 ---[ end trace 8322b2b8bf83f8e1
If alloc_workqueue fails in l2tp_init, l2tp_net_ops is unregistered on failure path. Then l2tp_exit_net is called which will flush NULL workqueue, this patch add a NULL check to fix it.
--- net/l2tp/l2tp_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/l2tp/l2tp_core.c +2 -1
@@ -1892,7 +1892,8 @@ static __net_exit void l2tp_exit_net(struct net *net) }rcu_read_unlock_bh (); -flush_workqueue (l2tp_wq); +if (l2tp_wq) +flush_workqueue (l2tp_wq);rcu_barrier (); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 193/371 media: omap_vout: potential buffer overflow in vidioc_dqbuf()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit dd6e2a981bfe83aa4a493143fd8cf1edcda6c091 ]
The "b->index" is a u32 the comes from the user in the ioctl. It hasn't been checked. We aren't supposed to use it but we're instead supposed to use the value that gets written to it when we call videobuf_dqbuf().
The videobuf_dqbuf() first memsets it to zero and then re-initializes it inside the videobuf_status() function. It's this final value which we want.
Hans Verkuil pointed out that we need to check the return from videobuf_dqbuf(). I ended up doing a little cleanup related to that as well.
--- drivers/media/platform/omap/omap_vout.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/media/platform/omap/omap_vout.c +6 -9
@@ -1527,23 +1527,20 @@ static int vidioc_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b)unsigned long size;struct videobuf_buffer *vb; - vb = q->bufs[b->index]; -if (!vout->streaming)return -EINVAL ; -if (file->f_flags &O_NONBLOCK ) -/* Call videobuf_dqbuf for non blocking mode */ - ret =videobuf_dqbuf (q, (struct v4l2_buffer *)b,1 ); -else -/* Call videobuf_dqbuf for blocking mode */ - ret =videobuf_dqbuf (q, (struct v4l2_buffer *)b,0 ); + ret =videobuf_dqbuf (q, b, !!(file->f_flags &O_NONBLOCK )); +if (ret) +return ret; + + vb = q->bufs[b->index]; addr = (unsigned long ) vout->buf_phy_addr[vb->i]; size = (unsigned long ) vb->size;dma_unmap_single (vout->vid_dev->v4l2_dev.dev, addr, size,DMA_TO_DEVICE ); -return ret; +return 0 ; }static int vidioc_streamon (struct file *file,void *fh,enum v4l2_buf_type i)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 194/371 media: davinci/vpbe: array underflow in vpbe_enum_outputs()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit b72845ee5577b227131b1fef23f9d9a296621d7b ]
In vpbe_enum_outputs() we check if (temp_index >= cfg->num_outputs) but the problem is that "temp_index" can be negative. This patch changes the types to unsigned to address this array underflow bug.
--- drivers/media/platform/davinci/vpbe.c | 2 +- include/media/davinci/vpbe.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +1 -1
@@ -126,7 +126,7 @@ static int vpbe_enum_outputs(struct vpbe_device *vpbe_dev, struct v4l2_output *output) {struct vpbe_config *cfg = vpbe_dev->cfg; -int temp_index = output->index; +unsigned int temp_index = output->index;if (temp_index >= cfg->num_outputs)return -EINVAL ;
include/media/davinci/vpbe.h +1 -1
@@ -92,7 +92,7 @@ struct vpbe_config {struct encoder_config_info *ext_encoders;/* amplifier information goes here */ struct amp_config_info *amp; -int num_outputs; +unsigned int num_outputs;/* Order is venc outputs followed by LCD and then external encoders */ struct vpbe_output *outputs; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 195/371 platform/x86: alienware-wmi: printing the wrong error code
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 6d1f8b3d75419a8659ac916a1e9543bb3513a882 ]
The "out_data" variable is uninitialized at the point. Originally, this used to print "status" instead and that seems like the correct thing to print.
--- drivers/platform/x86/alienware-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/alienware-wmi.c +1 -1
@@ -570,7 +570,7 @@ static ssize_t show_hdmi_source(struct device *dev,return scnprintf (buf,PAGE_SIZE ,"input [gpu] unknown\n" ); } -pr_err ("alienware-wmi: unknown HDMI source status: %d\n" , out_data); +pr_err ("alienware-wmi: unknown HDMI source status: %u\n" , status);return scnprintf (buf,PAGE_SIZE ,"input gpu [unknown]\n" ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 196/371 crypto: caam - fix caam_dump_sg that iterates through scatterlist
In reply to Sasha LevinFrom: Iuliana Prodan <[email protected]>
[ Upstream commit 8c65d35435e8cbfdf953cafe5ebe3648ee9276a2 ]
Fix caam_dump_sg by correctly determining the next scatterlist entry in the list.
--- drivers/crypto/caam/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/caam/error.c +1 -1
@@ -22,7 +22,7 @@ void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type,size_t len;void *buf; -for (it = sg; it && tlen >0 ; it =sg_next (sg)) { +for (it = sg; it && tlen >0 ; it =sg_next (it)) {/* * make sure the scatterlist's page * has a valid virtual memory mapping
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 197/371 netfilter: ebtables: CONFIG_COMPAT: reject trailing data after last rule
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit 680f6af5337c98d116e4f127cea7845339dba8da ]
If userspace provides a rule blob with trailing data after last target, we trigger a splat, then convert ruleset to 64bit format (with trailing data), then pass that to do_replace_finish() which then returns -EINVAL.
Erroring out right away avoids the splat plus unneeded translation and error unwind.
--- net/bridge/netfilter/ebtables.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bridge/netfilter/ebtables.c +3 -1
@@ -2164,7 +2164,9 @@ static int compat_copy_entries(unsigned char *data, unsigned int size_user,if (ret <0 )return ret; -WARN_ON (size_remaining); +if (size_remaining) +return -EINVAL ; +return state->buf_kern_offset; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 198/371 pwm: meson: Consider 128 a valid pre-divider
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 51496e4446875726d50a5617a6e0e0dabbc2e6da ]
The pre-divider allows configuring longer PWM periods compared to using the input clock directly. The pre-divider is 7 bit wide, meaning it's maximum value is 128 (the register value is off-by-one: 0x7f or 127).
Change the loop to also allow for the maximum possible value to be considered valid.
--- drivers/pwm/pwm-meson.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pwm/pwm-meson.c +2 -2
@@ -188,7 +188,7 @@ static int meson_pwm_calc(struct meson_pwm *meson,do_div (fin_ps, fin_freq);/* Calc pre_div with the period */ -for (pre_div =0 ; pre_div <MISC_CLK_DIV_MASK ; pre_div++) { +for (pre_div =0 ; pre_div <=MISC_CLK_DIV_MASK ; pre_div++) { cnt =DIV_ROUND_CLOSEST_ULL ((u64 )period *1000 , fin_ps * (pre_div +1 )); dev_dbg(meson->chip.dev, "fin_ps=%llu pre_div=%u cnt=%u\n",
@@ -197,7 +197,7 @@ static int meson_pwm_calc(struct meson_pwm *meson,break ; } -if (pre_div ==MISC_CLK_DIV_MASK ) { +if (pre_div >MISC_CLK_DIV_MASK ) {dev_err (meson->chip.dev,"unable to get period pre_div\n" );return -EINVAL ; }
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 199/371 pwm: meson: Don't disable PWM when setting duty repeatedly
In reply to Sasha LevinFrom: Bichao Zheng <[email protected]>
[ Upstream commit a279345807e1e0ae79567a52cfdd9d30c9174a3c ]
There is an abnormally low about 20ms,when setting duty repeatedly. Because setting the duty will disable PWM and then enable. Delete this operation now.
--- drivers/pwm/pwm-meson.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/pwm/pwm-meson.c +0 -5
@@ -325,11 +325,6 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,if (state->period != channel->state.period || state->duty_cycle != channel->state.duty_cycle || state->polarity != channel->state.polarity) { -if (channel->state.enabled) { -meson_pwm_disable (meson, pwm->hwpwm); - channel->state.enabled = false; - } -if (state->polarity != channel->state.polarity) {if (state->polarity ==PWM_POLARITY_NORMAL ) meson->inverter_mask |=BIT (pwm->hwpwm);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 200/371 ARM: riscpc: fix lack of keyboard interrupts after irq conversion
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit 63a0666bca9311f35017be454587f3ba903644b8 ]
Fix lack of keyboard interrupts for RiscPC due to incorrect conversion.
--- arch/arm/mach-rpc/irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-rpc/irq.c +2 -1
@@ -118,7 +118,7 @@ extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end;void __init rpc_init_irq (void ) { -unsigned int irq, clr, set =0 ; +unsigned int irq, clr, set;iomd_writeb (0 ,IOMD_IRQMASKA );iomd_writeb (0 ,IOMD_IRQMASKB );
@@ -130,6 +130,7 @@ void __init rpc_init_irq(void)for (irq =0 ; irq <NR_IRQS ; irq++) { clr =IRQ_NOREQUEST ; + set =0 ;if (irq <=6 || (irq >=9 && irq <=15 )) clr |=IRQ_NOPROBE ;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 201/371 kdb: do a sanity check on the cpu in kdb_per_cpu()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit b586627e10f57ee3aa8f0cfab0d6f7dc4ae63760 ]
The "whichcpu" comes from argv[3]. The cpu_online() macro looks up the cpu in a bitmap of online cpus, but if the value is too high then it could read beyond the end of the bitmap and possibly Oops.
--- kernel/debug/kdb/kdb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/debug/kdb/kdb_main.c +1 -1
@@ -2634,7 +2634,7 @@ static int kdb_per_cpu(int argc, const char **argv) diag =kdbgetularg (argv[3 ], &whichcpu);if (diag)return diag; -if (!cpu_online (whichcpu)) { +if (whichcpu >= nr_cpu_ids || !cpu_online (whichcpu)) {kdb_printf ("cpu %ld is not online\n" , whichcpu);return KDB_BADCPUNUM ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 202/371 backlight: lm3630a: Return 0 on success in update_status functions
In reply to Sasha LevinFrom: Brian Masney <[email protected]>
[ Upstream commit d3f48ec0954c6aac736ab21c34a35d7554409112 ]
lm3630a_bank_a_update_status() and lm3630a_bank_b_update_status() both return the brightness value if the brightness was successfully updated. Writing to these attributes via sysfs would cause a 'Bad address' error to be returned. These functions should return 0 on success, so let's change it to correct that error.
--- drivers/video/backlight/lm3630a_bl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/lm3630a_bl.c +2 -2
@@ -201,7 +201,7 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl) LM3630A_LEDA_ENABLE, LM3630A_LEDA_ENABLE);if (ret <0 ) goto out_i2c_err; -return bl->props.brightness; +return 0 ; out_i2c_err:dev_err (pchip->dev,"i2c failed to access\n" );
@@ -278,7 +278,7 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl) LM3630A_LEDB_ENABLE, LM3630A_LEDB_ENABLE);if (ret <0 ) goto out_i2c_err; -return bl->props.brightness; +return 0 ; out_i2c_err:dev_err (pchip->dev,"i2c failed to access REG_CTRL\n" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 203/371 thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power
In reply to Sasha LevinFrom: Matthias Kaehlcke <[email protected]>
[ Upstream commit bf45ac18b78038e43af3c1a273cae4ab5704d2ce ]
The CPU load values passed to the thermal_power_cpu_get_power tracepoint are zero for all CPUs, unless, unless the thermal_power_cpu_limit tracepoint is enabled too:
irq/41-rockchip-98 [000] .... 290.972410: thermal_power_cpu_get_power:
cpus=0000000f freq=1800000 load={{0x0,0x0,0x0,0x0}} dynamic_power=4815
vs
irq/41-rockchip-96 [000] .... 95.773585: thermal_power_cpu_get_power:
cpus=0000000f freq=1800000 load={{0x56,0x64,0x64,0x5e}} dynamic_power=4959
irq/41-rockchip-96 [000] .... 95.773596: thermal_power_cpu_limit:
cpus=0000000f freq=408000 cdev_state=10 power=416
There seems to be no good reason for omitting the CPU load information depending on another tracepoint. My guess is that the intention was to check whether thermal_power_cpu_get_power is (still) enabled, however 'load_cpu != NULL' already indicates that it was at least enabled when cpufreq_get_requested_power() was entered, there seems little gain from omitting the assignment if the tracepoint was just disabled, so just remove the check.
--- drivers/thermal/cpu_cooling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/cpu_cooling.c +1 -1
@@ -514,7 +514,7 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, load =0 ; total_load += load; -if (trace_thermal_power_cpu_limit_enabled () && load_cpu) +if (load_cpu) load_cpu[i] = load; i++;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 204/371 EDAC/mc: Fix edac_mc_find() in case no device is found
In reply to Sasha LevinFrom: Robert Richter <[email protected]>
[ Upstream commit 29a0c843973bc385918158c6976e4dbe891df969 ]
The function should return NULL in case no device is found, but it always returns the last checked mc device from the list even if the index did not match. Fix that.
I did some analysis why this did not raise any issues for about 3 years and the reason is that edac_mc_find() is mostly used to search for existing devices. Thus, the bug is not triggered.
[ bp: Drop the if (mci->mc_idx > idx) test in favor of readability. ]
--- drivers/edac/edac_mc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/edac/edac_mc.c +4 -8
@@ -680,22 +680,18 @@ static int del_mc_from_global_list(struct mem_ctl_info *mci)struct mem_ctl_info *edac_mc_find (int idx) { -struct mem_ctl_info *mci =NULL ; +struct mem_ctl_info *mci;struct list_head *item;mutex_lock (&mem_ctls_mutex);list_for_each (item, &mc_devices) { mci = list_entry(item, struct mem_ctl_info, link); - -if (mci->mc_idx >= idx) { -if (mci->mc_idx == idx) { - goto unlock; - } -break ; - } +if (mci->mc_idx == idx) + goto unlock; } + mci =NULL ; unlock:mutex_unlock (&mem_ctls_mutex);return mci;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 205/371 ARM: dts: sun8i-h3: Fix wifi in Beelink X2 DT
In reply to Sasha LevinFrom: Jernej Skrabec <[email protected]>
[ Upstream commit ca0961011db57e39880df0b5708df8aa3339dc6f ]
mmc1 node where wifi module is connected doesn't have properly defined power supplies so wifi module is never powered up. Fix that by specifying additional power supplies.
Additionally, this STB may have either Realtek or Broadcom based wifi module. One based on Broadcom module also needs external clock to work properly. Fix that by adding clock property to wifi_pwrseq node.
--- arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +4 -0
@@ -79,6 +79,8 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ + clocks = <&rtc 1>; + clock-names = "ext_clock"; }; sound_spdif {
@@ -128,6 +130,8 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins_a>; vmmc-supply = <®_vcc3v3>; + vqmmc-supply = <®_vcc3v3>; + mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; non-removable; status = "okay";
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 206/371 dmaengine: tegra210-adma: Fix crash during probe
In reply to Sasha LevinFrom: Jon Hunter <[email protected]>
[ Upstream commit b53611fb1ce9b1786bd18205473e0c1d6bfa8934 ]
Commit f33e7bb3eb92 ("dmaengine: tegra210-adma: restore channel status") added support to save and restore the DMA channel registers when runtime suspending the ADMA. This change is causing the kernel to crash when probing the ADMA, if the device is probed deferred when looking up the channel interrupts. The crash occurs because not all of the channel base addresses have been setup at this point and in the clean-up path of the probe, pm_runtime_suspend() is called invoking its callback which expects all the channel base addresses to be initialised.
Although this could be fixed by simply checking for a NULL address, on further review of the driver it seems more appropriate that we only call pm_runtime_get_sync() after all the channel interrupts and base addresses have been configured. Therefore, fix this crash by moving the calls to pm_runtime_enable(), pm_runtime_get_sync() and tegra_adma_init() after the DMA channels have been initialised.
--- drivers/dma/tegra210-adma.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/dma/tegra210-adma.c +13 -13
@@ -744,16 +744,6 @@ static int tegra_adma_probe(struct platform_device *pdev)return PTR_ERR (tdma->ahub_clk); } -pm_runtime_enable (&pdev->dev); - - ret =pm_runtime_get_sync (&pdev->dev); -if (ret <0 ) - goto rpm_disable; - - ret =tegra_adma_init (tdma); -if (ret) - goto rpm_put; -INIT_LIST_HEAD (&tdma->dma_dev.channels);for (i =0 ; i < tdma->nr_channels; i++) {struct tegra_adma_chan *tdc = &tdma->channels[i];
@@ -771,6 +761,16 @@ static int tegra_adma_probe(struct platform_device *pdev) tdc->tdma = tdma; } +pm_runtime_enable (&pdev->dev); + + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) + goto rpm_disable; + + ret =tegra_adma_init (tdma); +if (ret) + goto rpm_put; +dma_cap_set (DMA_SLAVE , tdma->dma_dev.cap_mask);dma_cap_set (DMA_PRIVATE , tdma->dma_dev.cap_mask);dma_cap_set (DMA_CYCLIC , tdma->dma_dev.cap_mask);
@@ -812,13 +812,13 @@ static int tegra_adma_probe(struct platform_device *pdev) dma_remove:dma_async_device_unregister (&tdma->dma_dev); -irq_dispose: -while (--i >=0 ) -irq_dispose_mapping (tdma->channels[i].irq); rpm_put:pm_runtime_put_sync (&pdev->dev); rpm_disable:pm_runtime_disable (&pdev->dev); +irq_dispose: +while (--i >=0 ) +irq_dispose_mapping (tdma->channels[i].irq);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 207/371 arm64: dts: meson: libretech-cc: set eMMC as removable
In reply to Sasha LevinFrom: Jerome Brunet <[email protected]>
[ Upstream commit 9f72e321d5506fe3e162a6308a4a295d7f10bb5d ]
The eMMC on this board is add-on module which is not mandatory. Removing 'non-removable' property should prevent some errors when booting a board w/o an eMMC module present.
--- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +0 -1
@@ -226,7 +226,6 @@ cap-mmc-highspeed; mmc-ddr-3_3v; max-frequency = <50000000>; - non-removable; disable-wp; mmc-pwrseq = <&emmc_pwrseq>;
Signature · 7 lines
2.20.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 208/371 RDMA/qedr: Fix incorrect device rate.
In reply to Sasha LevinFrom: Sagiv Ozeri <[email protected]>
[ Upstream commit 69054666df0a9b4e8331319f98b6b9a88bc3fcc4 ]
Use the correct enum value introduced in commit 12113a35ada6 ("IB/core:
Add HDR speed enum") Prior to this change a 50Gbps port would show 40Gbps.
This patch also cleaned up the redundant redefiniton of ib speeds for qedr.
--- drivers/infiniband/hw/qedr/verbs.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +9 -16
@@ -178,54 +178,47 @@ int qedr_query_device(struct ib_device *ibdev,return 0 ; } -#define QEDR_SPEED_SDR (1) -#define QEDR_SPEED_DDR (2) -#define QEDR_SPEED_QDR (4) -#define QEDR_SPEED_FDR10 (8) -#define QEDR_SPEED_FDR (16) -#define QEDR_SPEED_EDR (32) -static inline void get_link_speed_and_width (int speed,u8 *ib_speed,u8 *ib_width) {switch (speed) {case 1000 : - *ib_speed =QEDR_SPEED_SDR ; + *ib_speed =IB_SPEED_SDR ; *ib_width =IB_WIDTH_1X ;break ;case 10000 : - *ib_speed =QEDR_SPEED_QDR ; + *ib_speed =IB_SPEED_QDR ; *ib_width =IB_WIDTH_1X ;break ;case 20000 : - *ib_speed =QEDR_SPEED_DDR ; + *ib_speed =IB_SPEED_DDR ; *ib_width =IB_WIDTH_4X ;break ;case 25000 : - *ib_speed =QEDR_SPEED_EDR ; + *ib_speed =IB_SPEED_EDR ; *ib_width =IB_WIDTH_1X ;break ;case 40000 : - *ib_speed =QEDR_SPEED_QDR ; + *ib_speed =IB_SPEED_QDR ; *ib_width =IB_WIDTH_4X ;break ;case 50000 : - *ib_speed =QEDR_SPEED_QDR ; - *ib_width =IB_WIDTH_4X ; + *ib_speed =IB_SPEED_HDR ; + *ib_width =IB_WIDTH_1X ;break ;case 100000 : - *ib_speed =QEDR_SPEED_EDR ; + *ib_speed =IB_SPEED_EDR ; *ib_width =IB_WIDTH_4X ;break ;default :/* Unsupported */ - *ib_speed =QEDR_SPEED_SDR ; + *ib_speed =IB_SPEED_SDR ; *ib_width =IB_WIDTH_1X ; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 209/371 spi: spi-fsl-spi: call spi_finalize_current_message() at the end
In reply to Sasha LevinFrom: Christophe Leroy <[email protected]>
[ Upstream commit 44a042182cb1e9f7916e015c836967bf638b33c4 ]
spi_finalize_current_message() shall be called once all actions are finished, otherwise the last actions might step over a newly started transfer.
--- drivers/spi/spi-fsl-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-fsl-spi.c +1 -1
@@ -407,7 +407,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master, } m->status = status; -spi_finalize_current_message (master);if (status || !cs_change) {ndelay (nsecs);
@@ -415,6 +414,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master, }fsl_spi_setup_transfer (spi,NULL ); +spi_finalize_current_message (master);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 210/371 crypto: ccp - fix AES CFB error exposed by new test vectors
In reply to Sasha LevinFrom: "Hook, Gary" <[email protected]>
[ Upstream commit c3b359d6567c0b8f413e924feb37cf025067d55a ]
Updated testmgr will exhibit this error message when loading the ccp-crypto module:
alg: skcipher: cfb-aes-ccp encryption failed with err -22 on test vector 3, cfg="in-place"
Update the CCP crypto driver to correctly treat CFB as a streaming mode cipher (instead of block mode). Update the configuration for CFB to specify the block size as a single byte;
--- drivers/crypto/ccp/ccp-crypto-aes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/ccp/ccp-crypto-aes.c +4 -4
@@ -1,7 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * AMD Cryptographic Coprocessor (CCP) AES crypto API support * -* Copyright (C) 2013,2016 Advanced Micro Devices, Inc. +* Copyright (C) 2013-2019 Advanced Micro Devices, Inc. * * Author: Tom Lendacky <[email protected]> *
@@ -79,8 +80,7 @@ static int ccp_aes_crypt(struct ablkcipher_request *req, bool encrypt)return -EINVAL ;if (((ctx->u.aes.mode ==CCP_AES_MODE_ECB ) || - (ctx->u.aes.mode ==CCP_AES_MODE_CBC ) || - (ctx->u.aes.mode ==CCP_AES_MODE_CFB )) && + (ctx->u.aes.mode ==CCP_AES_MODE_CBC )) && (req->nbytes & (AES_BLOCK_SIZE -1 )))return -EINVAL ;
@@ -291,7 +291,7 @@ static struct ccp_aes_def aes_algs[] = { .version = CCP_VERSION(3, 0), .name = "cfb(aes)", .driver_name = "cfb-aes-ccp", - .blocksize = AES_BLOCK_SIZE, + .blocksize = 1, .ivsize = AES_BLOCK_SIZE, .alg_defaults = &ccp_aes_defaults, },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 211/371 crypto: ccp - Fix 3DES complaint from ccp-crypto module
In reply to Sasha LevinFrom: "Hook, Gary" <[email protected]>
[ Upstream commit 89646fdda4cae203185444ac7988835f36a21ee1 ]
Crypto self-tests reveal an error:
alg: skcipher: cbc-des3-ccp encryption test failed (wrong output IV) on test vector 0, cfg="in-place"
The offset value should not be recomputed when retrieving the context. Also, a code path exists which makes decisions based on older (version 3) hardware; a v3 device deosn't support 3DES so remove this check.
--- drivers/crypto/ccp/ccp-ops.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/crypto/ccp/ccp-ops.c +4 -11
@@ -1293,6 +1293,9 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)int ret;/* Error checks */ +if (cmd_q->ccp->vdata->version <CCP_VERSION (5 ,0 )) +return -EINVAL ; +if (!cmd_q->ccp->vdata->perform->des3)return -EINVAL ;
@@ -1375,8 +1378,6 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)* passthru option to convert from big endian to little endian. */ if (des3->mode !=CCP_DES3_MODE_ECB ) { -u32 load_mode; - op.sb_ctx = cmd_q->sb_ctx; ret = ccp_init_dm_workarea(&ctx, cmd_q,
@@ -1392,12 +1393,8 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)if (ret) goto e_ctx; -if (cmd_q->ccp->vdata->version ==CCP_VERSION (3 ,0 )) - load_mode =CCP_PASSTHRU_BYTESWAP_NOOP ; -else - load_mode =CCP_PASSTHRU_BYTESWAP_256BIT ; ret =ccp_copy_to_sb (cmd_q, &ctx, op.jobid, op.sb_ctx, - load_mode); +CCP_PASSTHRU_BYTESWAP_256BIT );if (ret) { cmd->engine_error = cmd_q->cmd_error; goto e_ctx;
@@ -1459,10 +1456,6 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) }/* ...but we only need the last DES3_EDE_BLOCK_SIZE bytes */ -if (cmd_q->ccp->vdata->version ==CCP_VERSION (3 ,0 )) - dm_offset =CCP_SB_BYTES - des3->iv_len; -else - dm_offset =0 ;ccp_get_dm_area (&ctx, dm_offset, des3->iv,0 ,DES3_EDE_BLOCK_SIZE ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 212/371 serial: stm32: fix rx error handling
In reply to Sasha LevinFrom: Erwan Le Ray <[email protected]>
[ Upstream commit 4f01d833fdcdd6f9b85d9e5d5d7568eb683626a7 ]
- Fixes parity and framing error bit by clearing parity and framing error flag. The current implementation doesn't clear the error bits when an error is detected.
- Fixes the incorrect name of framing error clearing flag in header file.
- Fixes misalignement between data frame and errors status. The status read for "n" frame was the status of "n+1" frame".
- Fixes break detection was not triggered by the expected register.
--- drivers/tty/serial/stm32-usart.c | 54 +++++++++++++++++++++----------- drivers/tty/serial/stm32-usart.h | 10 ++---- 2 files changed, 37 insertions(+), 27 deletions(-)
drivers/tty/serial/stm32-usart.c +35 -19
@@ -118,35 +118,51 @@ static void stm32_receive_chars(struct uart_port *port, bool threaded)while (stm32_pending_rx (port, &sr, &stm32_port->last_res, threaded)) { sr |=USART_SR_DUMMY_RX ; - c =stm32_get_char (port, &sr, &stm32_port->last_res); flag =TTY_NORMAL ; - port->icount.rx++; +/* +* Status bits has to be cleared before reading the RDR: +* In FIFO mode, reading the RDR will pop the next data +* (if any) along with its status bits into the SR. +* Not doing so leads to misalignement between RDR and SR, +* and clear status bits of the next rx data. +* +* Clear errors flags for stm32f7 and stm32h7 compatible +* devices. On stm32f4 compatible devices, the error bit is +* cleared by the sequence [read SR - read DR]. +*/ +if ((sr &USART_SR_ERR_MASK ) && ofs->icr !=UNDEF_REG ) +stm32_clr_bits (port, ofs->icr,USART_ICR_ORECF | +USART_ICR_PECF |USART_ICR_FECF ); + + c =stm32_get_char (port, &sr, &stm32_port->last_res); + port->icount.rx++;if (sr &USART_SR_ERR_MASK ) { -if (sr &USART_SR_LBD ) { - port->icount.brk++; -if (uart_handle_break (port)) -continue ; - }else if (sr &USART_SR_ORE ) { -if (ofs->icr !=UNDEF_REG ) -writel_relaxed (USART_ICR_ORECF , - port->membase + - ofs->icr); +if (sr &USART_SR_ORE ) { port->icount.overrun++; }else if (sr &USART_SR_PE ) { port->icount.parity++; }else if (sr &USART_SR_FE ) { - port->icount.frame++; +/* Break detection if character is null */ +if (!c) { + port->icount.brk++; +if (uart_handle_break (port)) +continue ; + }else { + port->icount.frame++; + } } sr &= port->read_status_mask; -if (sr &USART_SR_LBD ) - flag =TTY_BREAK ; -else if (sr &USART_SR_PE ) +if (sr &USART_SR_PE ) { flag =TTY_PARITY ; -else if (sr &USART_SR_FE ) - flag =TTY_FRAME ; + }else if (sr &USART_SR_FE ) { +if (!c) + flag =TTY_BREAK ; +else + flag =TTY_FRAME ; + } }if (uart_handle_sysrq_char (port, c))
@@ -569,14 +585,14 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios,if (termios->c_iflag &INPCK ) port->read_status_mask |=USART_SR_PE |USART_SR_FE ;if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) - port->read_status_mask |=USART_SR_LBD ; + port->read_status_mask |=USART_SR_FE ;/* Characters to ignore */ port->ignore_status_mask =0 ;if (termios->c_iflag &IGNPAR ) port->ignore_status_mask =USART_SR_PE |USART_SR_FE ;if (termios->c_iflag &IGNBRK ) { - port->ignore_status_mask |=USART_SR_LBD ; + port->ignore_status_mask |=USART_SR_FE ;/* * If we're ignoring parity and break indicators, * ignore overruns too (for real raw support).
drivers/tty/serial/stm32-usart.h +2 -8
@@ -108,7 +108,6 @@ struct stm32_usart_info stm32h7_info = {#define USART_SR_RXNE BIT(5)#define USART_SR_TC BIT(6)#define USART_SR_TXE BIT(7) -#define USART_SR_LBD BIT(8)#define USART_SR_CTSIF BIT(9)#define USART_SR_CTS BIT(10)/* F7 */ #define USART_SR_RTOF BIT(11)/* F7 */
@@ -120,8 +119,7 @@ struct stm32_usart_info stm32h7_info = {#define USART_SR_SBKF BIT(18)/* F7 */ #define USART_SR_WUF BIT(20)/* H7 */ #define USART_SR_TEACK BIT(21)/* F7 */ -#define USART_SR_ERR_MASK (USART_SR_LBD | USART_SR_ORE | \ - USART_SR_FE | USART_SR_PE) +#define USART_SR_ERR_MASK (USART_SR_ORE | USART_SR_FE | USART_SR_PE)/* Dummy bits */ #define USART_SR_DUMMY_RX BIT(16)
@@ -166,8 +164,6 @@ struct stm32_usart_info stm32h7_info = {/* USART_CR2 */ #define USART_CR2_ADD_MASK GENMASK(3, 0)/* F4 */ #define USART_CR2_ADDM7 BIT(4)/* F7 */ -#define USART_CR2_LBDL BIT(5) -#define USART_CR2_LBDIE BIT(6)#define USART_CR2_LBCL BIT(8)#define USART_CR2_CPHA BIT(9)#define USART_CR2_CPOL BIT(10)
@@ -224,12 +220,10 @@ struct stm32_usart_info stm32h7_info = {/* USART_ICR */ #define USART_ICR_PECF BIT(0)/* F7 */ -#define USART_ICR_FFECF BIT(1)/* F7 */ -#define USART_ICR_NCF BIT(2)/* F7 */ +#define USART_ICR_FECF BIT(1)/* F7 */ #define USART_ICR_ORECF BIT(3)/* F7 */ #define USART_ICR_IDLECF BIT(4)/* F7 */ #define USART_ICR_TCCF BIT(6)/* F7 */ -#define USART_ICR_LBDCF BIT(8)/* F7 */ #define USART_ICR_CTSCF BIT(9)/* F7 */ #define USART_ICR_RTOCF BIT(11)/* F7 */ #define USART_ICR_EOBCF BIT(12)/* F7 */
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 213/371 serial: stm32: fix transmit_chars when tx is stopped
In reply to Sasha LevinFrom: Erwan Le Ray <[email protected]>
[ Upstream commit b83b957c91f68e53f0dc596e129e8305761f2a32 ]
Disables the tx irq when the transmission is ended and updates stop_tx conditions for code cleanup.
--- drivers/tty/serial/stm32-usart.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/tty/serial/stm32-usart.c +3 -8
@@ -310,13 +310,8 @@ static void stm32_transmit_chars(struct uart_port *port)return ; } -if (uart_tx_stopped (port)) { -stm32_stop_tx (port); -return ; - } - -if (uart_circ_empty (xmit)) { -stm32_stop_tx (port); +if (uart_circ_empty (xmit) ||uart_tx_stopped (port)) { +stm32_clr_bits (port, ofs->cr1,USART_CR1_TXEIE );return ; }
@@ -329,7 +324,7 @@ static void stm32_transmit_chars(struct uart_port *port)uart_write_wakeup (port);if (uart_circ_empty (xmit)) -stm32_stop_tx (port); +stm32_clr_bits (port, ofs->cr1,USART_CR1_TXEIE ); }static irqreturn_t stm32_interrupt (int irq,void *ptr)
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 214/371 serial: stm32: Add support of TC bit status check
In reply to Sasha LevinFrom: Erwan Le Ray <[email protected]>
[ Upstream commit 64c32eab660386f9904bb295a104c9c425e9f8b2 ]
Adds a check on the Transmission Complete bit status before closing the com port. Prevents the port closure before the end of the transmission. TC poll loop is moved from stm32_tx_dma_complete to stm32_shutdown routine, in order to check TC before shutdown in both dma and PIO tx modes.
TC clear is added in stm32_transmit_char routine, in order to be cleared before transmitting in both dma and PIO tx modes.
--- drivers/tty/serial/stm32-usart.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)
drivers/tty/serial/stm32-usart.c +15 -17
@@ -180,21 +180,6 @@ static void stm32_tx_dma_complete(void *arg)struct uart_port *port = arg;struct stm32_port *stm32port =to_stm32_port (port);struct stm32_usart_offsets *ofs = &stm32port->info->ofs; -unsigned int isr; -int ret; - - ret =readl_relaxed_poll_timeout_atomic (port->membase + ofs->isr, - isr, - (isr &USART_SR_TC ), -10 ,100000 ); - -if (ret) -dev_err (port->dev,"terminal count not set\n" ); - -if (ofs->icr ==UNDEF_REG ) -stm32_clr_bits (port, ofs->isr,USART_SR_TC ); -else -stm32_set_bits (port, ofs->icr,USART_CR_TC );stm32_clr_bits (port, ofs->cr3,USART_CR3_DMAT ); stm32port->tx_dma_busy = false;
@@ -286,7 +271,6 @@ static void stm32_transmit_chars_dma(struct uart_port *port)/* Issue pending DMA TX requests */ dma_async_issue_pending (stm32port->tx_ch); -stm32_clr_bits (port, ofs->isr,USART_SR_TC );stm32_set_bits (port, ofs->cr3,USART_CR3_DMAT ); xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE -1 );
@@ -315,6 +299,11 @@ static void stm32_transmit_chars(struct uart_port *port)return ; } +if (ofs->icr ==UNDEF_REG ) +stm32_clr_bits (port, ofs->isr,USART_SR_TC ); +else +stm32_set_bits (port, ofs->icr,USART_ICR_TCCF ); +if (stm32_port->tx_ch)stm32_transmit_chars_dma (port);else
@@ -491,12 +480,21 @@ static void stm32_shutdown(struct uart_port *port)struct stm32_port *stm32_port =to_stm32_port (port);struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;struct stm32_usart_config *cfg = &stm32_port->info->cfg; -u32 val; +u32 val, isr; +int ret; val =USART_CR1_TXEIE |USART_CR1_RXNEIE |USART_CR1_TE |USART_CR1_RE ; val |=BIT (cfg->uart_enable_bit);if (stm32_port->fifoen) val |=USART_CR1_FIFOEN ; + + ret =readl_relaxed_poll_timeout (port->membase + ofs->isr, + isr, (isr &USART_SR_TC ), +10 ,100000 ); + +if (ret) +dev_err (port->dev,"transmission complete not set\n" ); +stm32_clr_bits (port, ofs->cr1, val);dev_pm_clear_wake_irq (port->dev);
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 215/371 serial: stm32: fix wakeup source initialization
In reply to Sasha LevinFrom: Erwan Le Ray <[email protected]>
[ Upstream commit 5297f274e8b61ceb9676cba6649d3de9d03387ad ]
Fixes dedicated_irq_wakeup issue and deactivated uart as wakeup source by default.
--- drivers/tty/serial/stm32-usart.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/tty/serial/stm32-usart.c +15 -13
@@ -447,7 +447,6 @@ static int stm32_startup(struct uart_port *port) {struct stm32_port *stm32_port =to_stm32_port (port);struct stm32_usart_offsets *ofs = &stm32_port->info->ofs; -struct stm32_usart_config *cfg = &stm32_port->info->cfg;const char *name =to_platform_device (port->dev)->name;u32 val;int ret;
@@ -458,15 +457,6 @@ static int stm32_startup(struct uart_port *port)if (ret)return ret; -if (cfg->has_wakeup && stm32_port->wakeirq >=0 ) { - ret =dev_pm_set_dedicated_wake_irq (port->dev, - stm32_port->wakeirq); -if (ret) { -free_irq (port->irq, port); -return ret; - } - } - val =USART_CR1_RXNEIE |USART_CR1_TE |USART_CR1_RE ;if (stm32_port->fifoen) val |=USART_CR1_FIFOEN ;
@@ -497,7 +487,6 @@ static void stm32_shutdown(struct uart_port *port)stm32_clr_bits (port, ofs->cr1, val); -dev_pm_clear_wake_irq (port->dev);free_irq (port->irq, port); }
@@ -904,11 +893,18 @@ static int stm32_serial_probe(struct platform_device *pdev) ret =device_init_wakeup (&pdev->dev, true);if (ret) goto err_uninit; + + ret =dev_pm_set_dedicated_wake_irq (&pdev->dev, + stm32port->wakeirq); +if (ret) + goto err_nowup; + +device_set_wakeup_enable (&pdev->dev, false); } ret =uart_add_one_port (&stm32_usart_driver, &stm32port->port);if (ret) - goto err_nowup; + goto err_wirq; ret =stm32_of_dma_rx_probe (stm32port, pdev);if (ret)
@@ -922,6 +918,10 @@ static int stm32_serial_probe(struct platform_device *pdev)return 0 ; +err_wirq: +if (stm32port->info->cfg.has_wakeup && stm32port->wakeirq >=0 ) +dev_pm_clear_wake_irq (&pdev->dev); + err_nowup:if (stm32port->info->cfg.has_wakeup && stm32port->wakeirq >=0 )device_init_wakeup (&pdev->dev, false);
@@ -959,8 +959,10 @@ static int stm32_serial_remove(struct platform_device *pdev)TX_BUF_L , stm32_port->tx_buf, stm32_port->tx_dma_buf); -if (cfg->has_wakeup && stm32_port->wakeirq >=0 ) +if (cfg->has_wakeup && stm32_port->wakeirq >=0 ) { +dev_pm_clear_wake_irq (&pdev->dev);device_init_wakeup (&pdev->dev, false); + }clk_disable_unprepare (stm32_port->clk);
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 216/371 misc: sgi-xp: Properly initialize buf in xpc_get_rsvd_page_pa
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit b0576f9ecb5c51e9932531d23c447b2739261841 ]
Clang warns:
drivers/misc/sgi-xp/xpc_partition.c:73:14: warning: variable 'buf' is uninitialized when used within its own initialization [-Wuninitialized]
void *buf = buf;
~~~ ^~~1 warning generated.
Arnd's explanation during review:
/*
* Returns the physical address of the partition's reserved page through
* an iterative number of calls.
*
* On first call, 'cookie' and 'len' should be set to 0, and 'addr'
* set to the nasid of the partition whose reserved page's address is
* being sought.
* On subsequent calls, pass the values, that were passed back on the
* previous call.
*
* While the return status equals SALRET_MORE_PASSES, keep calling
* this function after first copying 'len' bytes starting at 'addr'
* into 'buf'. Once the return status equals SALRET_OK, 'addr' will
* be the physical address of the partition's reserved page. If the
* return status equals neither of these, an error as occurred. */
static inline s64
sn_partition_reserved_page_pa(u64 buf, u64 *cookie, u64 *addr, u64 *len)
so *len is set to zero on the first call and tells the bios how many bytes are accessible at 'buf', and it does get updated by the BIOS to tell us how many bytes it needs, and then we allocate that and try again.
--- drivers/misc/sgi-xp/xpc_partition.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/sgi-xp/xpc_partition.c +1 -1
@@ -70,7 +70,7 @@ xpc_get_rsvd_page_pa(int nasid)unsigned long rp_pa = nasid;/* seed with nasid */ size_t len =0 ;size_t buf_len =0 ; -void *buf = buf; +void *buf =NULL ;void *buf_base =NULL ;enum xp_retval (*get_partition_rsvd_page_pa) (void *, u64 *, unsigned long *, size_t *) =
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 217/371 PCI: PM: Avoid possible suspend-to-idle issue
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit d491f2b75237ef37d8867830ab7fad8d9659e853 ]
If a PCI driver leaves the device handled by it in D0 and calls pci_save_state() on the device in its ->suspend() or ->suspend_late() callback, it can expect the device to stay in D0 over the whole s2idle cycle. However, that may not be the case if there is a spurious wakeup while the system is suspended, because in that case pci_pm_suspend_noirq() will run again after pci_pm_resume_noirq() which calls pci_restore_state(), via pci_pm_default_resume_early(), so state_saved is cleared and the second iteration of pci_pm_suspend_noirq() will invoke pci_prepare_to_sleep() which may change the power state of the device.
To avoid that, add a new internal flag, skip_bus_pm, that will be set by pci_pm_suspend_noirq() when it runs for the first time during the given system suspend-resume cycle if the state of the device has been saved already and the device is still in D0. Setting that flag will cause the next iterations of pci_pm_suspend_noirq() to set state_saved for pci_pm_resume_noirq(), so that it always restores the device state from the originally saved data, and avoid calling pci_prepare_to_sleep() for the device.
--- drivers/pci/pci-driver.c | 17 ++++++++++++++++- include/linux/pci.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/pci/pci-driver.c +16 -1
@@ -728,6 +728,8 @@ static int pci_pm_suspend(struct device *dev)struct pci_dev *pci_dev =to_pci_dev (dev);const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm :NULL ; + pci_dev->skip_bus_pm = false; +if (pci_has_legacy_pm_support (pci_dev))return pci_legacy_suspend (dev,PMSG_SUSPEND );
@@ -801,7 +803,20 @@ static int pci_pm_suspend_noirq(struct device *dev) } } -if (!pci_dev->state_saved) { +if (pci_dev->skip_bus_pm) { +/* +* The function is running for the second time in a row without +* going through full resume, which is possible only during +* suspend-to-idle in a spurious wakeup case. Moreover, the +* device was originally left in D0, so its power state should +* not be changed here and the device register values saved +* originally should be restored on resume again. +*/ + pci_dev->state_saved = true; + }else if (pci_dev->state_saved) { +if (pci_dev->current_state ==PCI_D0 ) + pci_dev->skip_bus_pm = true; + }else {pci_save_state (pci_dev);if (pci_power_manageable (pci_dev))pci_prepare_to_sleep (pci_dev);
include/linux/pci.h +1 -0
@@ -346,6 +346,7 @@ struct pci_dev {D3cold, not set for devices powered on/off by the corresponding bridge */ + unsigned int skip_bus_pm:1; /* Internal: Skip bus-level PM */ unsigned int ignore_hotplug:1; /* Ignore hotplug events */ unsigned int hotplug_user_indicators:1; /* SlotCtl indicatorscontrolled exclusively by
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 218/371 iommu: Use right function to get group for device
In reply to Sasha LevinFrom: Lu Baolu <[email protected]>
[ Upstream commit 57274ea25736496ee019a5c40479855b21888839 ]
The iommu_group_get_for_dev() will allocate a group for a device if it isn't in any group. This isn't the use case in iommu_request_dm_for_dev(). Let's use iommu_group_get() instead.
--- drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/iommu.c +3 -3
@@ -1855,9 +1855,9 @@ int iommu_request_dm_for_dev(struct device *dev)int ret;/* Device must already be in a group before calling this function */ - group =iommu_group_get_for_dev (dev); -if (IS_ERR (group)) -return PTR_ERR (group); + group =iommu_group_get (dev); +if (!group) +return -EINVAL ;mutex_lock (&group->mutex);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 219/371 signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig
In reply to Sasha LevinFrom: "Eric W. Biederman" <[email protected]>
[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ]
The locking in force_sig_info is not prepared to deal with a task that exits or execs (as sighand may change). The is not a locking problem in force_sig as force_sig is only built to handle synchronous exceptions.
Further the function force_sig_info changes the signal state if the signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the delivery of the signal. The signal SIGKILL can not be ignored and can not be blocked and SIGNAL_UNKILLABLE won't prevent it from being delivered.
So using force_sig rather than send_sig for SIGKILL is confusing and pointless.
Because it won't impact the sending of the signal and and because using force_sig is wrong, replace force_sig with send_sig.
--- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/connect.c +1 -1
@@ -2320,7 +2320,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) task =xchg (&server->tsk,NULL );if (task) -force_sig (SIGKILL , task); +send_sig (SIGKILL , task,1 ); } static struct TCP_Server_Info *
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 220/371 inet: frags: call inet_frags_fini() after unregister_pernet_subsys()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit ae7352d384a552d8c799c242e74a934809990a71 ]
Both IPv6 and 6lowpan are calling inet_frags_fini() too soon.
inet_frags_fini() is dismantling a kmem_cache, that might be needed later when unregister_pernet_subsys() eventually has to remove frags queues from hash tables and free them.
This fixes potential use-after-free, and is a prereq for the following patch.
--- net/ieee802154/6lowpan/reassembly.c | 2 +- net/ipv6/reassembly.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/ieee802154/6lowpan/reassembly.c +1 -1
@@ -634,7 +634,7 @@ int __init lowpan_net_frag_init(void)void lowpan_net_frag_exit (void ) { -inet_frags_fini (&lowpan_frags);lowpan_frags_sysctl_unregister ();unregister_pernet_subsys (&lowpan_frags_ops); +inet_frags_fini (&lowpan_frags); }
net/ipv6/reassembly.c +1 -1
@@ -593,8 +593,8 @@ int __init ipv6_frag_init(void)void ipv6_frag_exit (void ) { -inet_frags_fini (&ip6_frags);ip6_frags_sysctl_unregister ();unregister_pernet_subsys (&ip6_frags_ops);inet6_del_protocol (&frag_protocol,IPPROTO_FRAGMENT ); +inet_frags_fini (&ip6_frags); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 221/371 netvsc: unshare skb in VF rx handler
In reply to Sasha LevinFrom: Stephen Hemminger <[email protected]>
[ Upstream commit 996ed04741467f6d1552440c92988b132a9487ec ]
The netvsc VF skb handler should make sure that skb is not shared. Similar logic already exists in bonding and team device drivers.
This is not an issue in practice because the VF devicex does not send up shared skb's. But the netvsc driver should do the right thing if it did.
--- drivers/net/hyperv/netvsc_drv.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/hyperv/netvsc_drv.c +6 -0
@@ -1840,6 +1840,12 @@ static rx_handler_result_t netvsc_vf_handle_frame(struct sk_buff **pskb)struct netvsc_vf_pcpu_stats *pcpu_stats =this_cpu_ptr (ndev_ctx->vf_stats); + skb =skb_share_check (skb,GFP_ATOMIC ); +if (unlikely (!skb)) +return RX_HANDLER_CONSUMED ; + + *pskb = skb; + skb->dev = ndev;u64_stats_update_begin (&pcpu_stats->syncp);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 222/371 cpufreq: brcmstb-avs-cpufreq: Fix initial command check
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8 ]
There is a logical error in brcm_avs_is_firmware_loaded() whereby if the firmware returns -EINVAL, we will be reporting this as an error. The comment is correct, the code was not.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +2 -2
@@ -762,8 +762,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv) rc =brcm_avs_get_pmap (priv,NULL ); magic =readl (priv->base +AVS_MBOX_MAGIC ); -return (magic ==AVS_FIRMWARE_MAGIC ) && (rc != -ENOTSUPP ) && - (rc != -EINVAL ); +return (magic ==AVS_FIRMWARE_MAGIC ) && ((rc != -ENOTSUPP ) || + (rc != -EINVAL )); }static unsigned int brcm_avs_cpufreq_get (unsigned int cpu)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 223/371 cpufreq: brcmstb-avs-cpufreq: Fix types for voltage/frequency
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit 4c5681fcc684c762b09435de3e82ffeee7769d21 ]
What we read back from the register is going to be capped at 32-bits, and cpufreq_freq_table.frequency is an unsigned int. Avoid any possible value truncation by using the appropriate return value.
--- drivers/cpufreq/brcmstb-avs-cpufreq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/cpufreq/brcmstb-avs-cpufreq.c +4 -4
@@ -468,12 +468,12 @@ static int brcm_avs_set_pstate(struct private_data *priv, unsigned int pstate)return __issue_avs_command (priv,AVS_CMD_SET_PSTATE , true, args); } -static unsigned long brcm_avs_get_voltage (void __iomem *base) +static u32 brcm_avs_get_voltage (void __iomem *base) {return readl (base +AVS_MBOX_VOLTAGE1 ); } -static unsigned long brcm_avs_get_frequency (void __iomem *base) +static u32 brcm_avs_get_frequency (void __iomem *base) {return readl (base +AVS_MBOX_FREQUENCY ) *1000 ;/* in kHz */ }
@@ -973,14 +973,14 @@ static ssize_t show_brcm_avs_voltage(struct cpufreq_policy *policy, char *buf) {struct private_data *priv = policy->driver_data; -return sprintf (buf,"0x%08lx\n" ,brcm_avs_get_voltage (priv->base)); +return sprintf (buf,"0x%08x\n" ,brcm_avs_get_voltage (priv->base)); }static ssize_t show_brcm_avs_frequency (struct cpufreq_policy *policy,char *buf) {struct private_data *priv = policy->driver_data; -return sprintf (buf,"0x%08lx\n" ,brcm_avs_get_frequency (priv->base)); +return sprintf (buf,"0x%08x\n" ,brcm_avs_get_frequency (priv->base)); }cpufreq_freq_attr_ro (brcm_avs_pstate);
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 224/371 media: vivid: fix incorrect assignment operation when setting video mode
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit d4ec9550e4b2d2e357a46fdc65d8ef3d4d15984c ]
The assigment of FB_VMODE_NONINTERLACE to var->vmode should be a bit-wise or of FB_VMODE_NONINTERLACE instead of an assignment, otherwise the previous clearing of the FB_VMODE_MASK bits of var->vmode makes no sense and is redundant.
Addresses-Coverity: ("Unused value")
--- drivers/media/platform/vivid/vivid-osd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/vivid/vivid-osd.c +1 -1
@@ -167,7 +167,7 @@ static int _vivid_fb_check_var(struct fb_var_screeninfo *var, struct vivid_dev * var->nonstd =0 ; var->vmode &= ~FB_VMODE_MASK ; - var->vmode =FB_VMODE_NONINTERLACED ; + var->vmode |=FB_VMODE_NONINTERLACED ;/* Dummy values */ var->hsync_len =24 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 225/371 mpls: fix warning with multi-label encap
In reply to Sasha LevinFrom: George Wilkie <[email protected]>
[ Upstream commit 2f3f7d1fa0d1039b24a55d127ed190f196fc3e79 ]
If you configure a route with multiple labels, e.g.
ip route add 10.10.3.0/24 encap mpls 16/100 via 10.10.2.2 dev ens4
A warning is logged:
kernel: [ 130.561819] netlink: 'ip': attribute type 1 has an invalid length.
This happens because mpls_iptunnel_policy has set the type of MPLS_IPTUNNEL_DST to fixed size NLA_U32.
Change it to a minimum size.nla_get_labels() does the remaining validation.
--- net/mpls/mpls_iptunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mpls/mpls_iptunnel.c +1 -1
@@ -28,7 +28,7 @@#include "internal.h" static const struct nla_policy mpls_iptunnel_policy[MPLS_IPTUNNEL_MAX +1 ] = { - [MPLS_IPTUNNEL_DST ] = { .type =NLA_U32 }, + [MPLS_IPTUNNEL_DST ] = { .len =sizeof (u32) }, [MPLS_IPTUNNEL_TTL ] = { .type =NLA_U8 }, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 226/371 iommu/vt-d: Duplicate iommu_resv_region objects per device list
In reply to Sasha LevinFrom: Eric Auger <[email protected]>
[ Upstream commit 5f64ce5411b467f1cfea6c63e2494c22b773582b ]
intel_iommu_get_resv_regions() aims to return the list of reserved regions accessible by a given @device. However several devices can access the same reserved memory region and when building the list it is not safe to use a single iommu_resv_region object, whose container is the RMRR. This iommu_resv_region must be duplicated per device reserved region list.
Let's remove the struct iommu_resv_region from the RMRR unit and allocate the iommu_resv_region directly in intel_iommu_get_resv_regions(). We hold the dmar_global_lock instead of the rcu-lock to allow sleeping.
--- drivers/iommu/intel-iommu.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/iommu/intel-iommu.c +17 -17
@@ -442,7 +442,6 @@ struct dmar_rmrr_unit {u64 end_address;/* reserved end address */ struct dmar_dev_scope *devices;/* target devices */ int devices_cnt;/* target device count */ -struct iommu_resv_region *resv;/* reserved region handle */ };struct dmar_atsr_unit {
@@ -4171,7 +4170,6 @@ static inline void init_iommu_pm_ops(void) {}int __init dmar_parse_one_rmrr (struct acpi_dmar_header *header,void *arg) {struct acpi_dmar_reserved_memory *rmrr; -int prot =DMA_PTE_READ |DMA_PTE_WRITE ;struct dmar_rmrr_unit *rmrru;size_t length;
@@ -4185,22 +4183,16 @@ int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg) rmrru->end_address = rmrr->end_address; length = rmrr->end_address - rmrr->base_address +1 ; - rmrru->resv =iommu_alloc_resv_region (rmrr->base_address, length, prot, -IOMMU_RESV_DIRECT ); -if (!rmrru->resv) - goto free_rmrru; rmrru->devices =dmar_alloc_dev_scope ((void *)(rmrr +1 ), ((void *)rmrr) + rmrr->header.length, &rmrru->devices_cnt);if (rmrru->devices_cnt && rmrru->devices ==NULL ) - goto free_all; + goto free_rmrru;list_add (&rmrru->list, &dmar_rmrr_units);return 0 ; -free_all: -kfree (rmrru->resv); free_rmrru:kfree (rmrru); out:
@@ -4418,7 +4410,6 @@ static void intel_iommu_free_dmars(void)list_for_each_entry_safe (rmrru, rmrr_n, &dmar_rmrr_units, list) {list_del (&rmrru->list);dmar_free_dev_scope (&rmrru->devices, &rmrru->devices_cnt); -kfree (rmrru->resv);kfree (rmrru); }
@@ -5186,22 +5177,33 @@ static void intel_iommu_remove_device(struct device *dev)static void intel_iommu_get_resv_regions (struct device *device,struct list_head *head) { +int prot =DMA_PTE_READ |DMA_PTE_WRITE ;struct iommu_resv_region *reg;struct dmar_rmrr_unit *rmrr;struct device *i_dev;int i; -rcu_read_lock (); +down_read (&dmar_global_lock);for_each_rmrr_units (rmrr) {for_each_active_dev_scope (rmrr->devices, rmrr->devices_cnt, i, i_dev) { +struct iommu_resv_region *resv; +size_t length; +if (i_dev != device)continue ; -list_add_tail (&rmrr->resv->list, head); + length = rmrr->end_address - rmrr->base_address +1 ; + resv =iommu_alloc_resv_region (rmrr->base_address, + length, prot, +IOMMU_RESV_DIRECT ); +if (!resv) +break ; + +list_add_tail (&resv->list, head); } } -rcu_read_unlock (); +up_read (&dmar_global_lock); reg = iommu_alloc_resv_region(IOAPIC_RANGE_START, IOAPIC_RANGE_END - IOAPIC_RANGE_START + 1,
@@ -5216,10 +5218,8 @@ static void intel_iommu_put_resv_regions(struct device *dev, {struct iommu_resv_region *entry, *next; -list_for_each_entry_safe (entry, next, head, list) { -if (entry->type ==IOMMU_RESV_MSI ) -kfree (entry); - } +list_for_each_entry_safe (entry, next, head, list) +kfree (entry); }#ifdef CONFIG_INTEL_IOMMU_SVM
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 227/371 qed: iWARP - Use READ_ONCE and smp_store_release to access ep->state
In reply to Sasha LevinFrom: Michal Kalderon <[email protected]>
[ Upstream commit 6117561e1bb30b2fe7f51e1961f34dbedd0bec8a ]
Destroy QP waits for it's ep object state to be set to CLOSED before proceeding. ep->state can be updated from a different context. Add smp_store_release/READ_ONCE to synchronize.
--- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_iwarp.c +11 -5
@@ -509,7 +509,8 @@ int qed_iwarp_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)/* Make sure ep is closed before returning and freeing memory. */ if (ep) { -while (ep->state !=QED_IWARP_EP_CLOSED && wait_count++ <200 ) +while (READ_ONCE (ep->state) !=QED_IWARP_EP_CLOSED && + wait_count++ <200 )msleep (100 );if (ep->state !=QED_IWARP_EP_CLOSED )
@@ -991,8 +992,6 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn, params.ep_context = ep; - ep->state =QED_IWARP_EP_CLOSED ; -switch (fw_return_code) {case RDMA_RETURN_OK : ep->qp->max_rd_atomic_req = ep->cm_info.ord;
@@ -1052,6 +1051,10 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn,break ; } +if (fw_return_code !=RDMA_RETURN_OK ) +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED ); + ep->event_cb (ep->cb_context, ¶ms);/* on passive side, if there is no associated QP (REJECT) we need to
@@ -2069,7 +2072,9 @@ void qed_iwarp_qp_in_error(struct qed_hwfn *p_hwfn, params.status = (fw_return_code ==IWARP_QP_IN_ERROR_GOOD_CLOSE ) ?0 : -ECONNRESET ; - ep->state =QED_IWARP_EP_CLOSED ; +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED ); +spin_lock_bh (&p_hwfn->p_rdma_info->iwarp.iw_lock);list_del (&ep->list_entry);spin_unlock_bh (&p_hwfn->p_rdma_info->iwarp.iw_lock);
@@ -2157,7 +2162,8 @@ qed_iwarp_tcp_connect_unsuccessful(struct qed_hwfn *p_hwfn, params.event =QED_IWARP_EVENT_ACTIVE_COMPLETE ; params.ep_context = ep; params.cm_info = &ep->cm_info; - ep->state =QED_IWARP_EP_CLOSED ; +/* paired with READ_ONCE in destroy_qp */ +smp_store_release (&ep->state,QED_IWARP_EP_CLOSED );switch (fw_return_code) {case IWARP_CONN_ERROR_TCP_CONNECT_INVALID_PACKET :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 228/371 powerpc/cacheinfo: add cacheinfo_teardown, cacheinfo_rebuild
In reply to Sasha LevinFrom: Nathan Lynch <[email protected]>
[ Upstream commit d4aa219a074a5abaf95a756b9f0d190b5c03a945 ]
Allow external callers to force the cacheinfo code to release all its references to cache nodes, e.g. before processing device tree updates post-migration, and to rebuild the hierarchy afterward.
CPU online/offline must be blocked by callers; enforce this.
--- arch/powerpc/kernel/cacheinfo.c | 21 +++++++++++++++++++++ arch/powerpc/kernel/cacheinfo.h | 4 ++++ 2 files changed, 25 insertions(+)
arch/powerpc/kernel/cacheinfo.c +21 -0
@@ -865,4 +865,25 @@ void cacheinfo_cpu_offline(unsigned int cpu_id)if (cache) cache_cpu_clear(cache, cpu_id); } + +void cacheinfo_teardown (void ) +{ +unsigned int cpu; + +lockdep_assert_cpus_held (); + +for_each_online_cpu (cpu) +cacheinfo_cpu_offline (cpu); +} + +void cacheinfo_rebuild (void ) +{ +unsigned int cpu; + +lockdep_assert_cpus_held (); + +for_each_online_cpu (cpu) +cacheinfo_cpu_online (cpu); +} +#endif /* (CONFIG_PPC_PSERIES && CONFIG_SUSPEND) || CONFIG_HOTPLUG_CPU */
arch/powerpc/kernel/cacheinfo.h +4 -0
@@ -6,4 +6,8 @@extern void cacheinfo_cpu_online (unsigned int cpu_id);extern void cacheinfo_cpu_offline (unsigned int cpu_id); +/* Allow migration/suspend to tear down and rebuild the hierarchy. */ +extern void cacheinfo_teardown (void ); +extern void cacheinfo_rebuild (void ); +#endif /* _PPC_CACHEINFO_H */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 229/371 powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration
In reply to Sasha LevinFrom: Nathan Lynch <[email protected]>
[ Upstream commit e610a466d16a086e321f0bd421e2fc75cff28605 ]
It's common for the platform to replace the cache device nodes after a migration. Since the cacheinfo code is never informed about this, it never drops its references to the source system's cache nodes, causing it to wind up in an inconsistent state resulting in warnings and oopses as soon as CPU online/offline occurs after the migration, e.g.
cache for /cpus/l3-cache@3113(Unified) refers to cache for /cpus/l2-cache@200d(Unified)
WARNING: CPU: 15 PID: 86 at arch/powerpc/kernel/cacheinfo.c:176 release_cache+0x1bc/0x1d0
[...]
NIP release_cache+0x1bc/0x1d0
LR release_cache+0x1b8/0x1d0
Call Trace:
release_cache+0x1b8/0x1d0 (unreliable)
cacheinfo_cpu_offline+0x1c4/0x2c0
unregister_cpu_online+0x1b8/0x260
cpuhp_invoke_callback+0x114/0xf40
cpuhp_thread_fun+0x270/0x310
smpboot_thread_fn+0x2c8/0x390
kthread+0x1b8/0x1c0
ret_from_kernel_thread+0x5c/0x68Using device tree notifiers won't work since we want to rebuild the hierarchy only after all the removals and additions have occurred and the device tree is in a consistent state. Call cacheinfo_teardown() before processing device tree updates, and rebuild the hierarchy afterward.
--- arch/powerpc/platforms/pseries/mobility.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/powerpc/platforms/pseries/mobility.c +10 -0
@@ -23,6 +23,7 @@#include <asm/machdep.h> #include <asm/rtas.h> #include "pseries.h" +#include "../../kernel/cacheinfo.h" static struct kobject *mobility_kobj;
@@ -359,11 +360,20 @@ void post_mobility_fixup(void)*/ cpus_read_lock (); +/* +* It's common for the destination firmware to replace cache +* nodes. Release all of the cacheinfo hierarchy's references +* before updating the device tree. +*/ +cacheinfo_teardown (); + rc =pseries_devicetree_update (MIGRATION_SCOPE );if (rc)printk (KERN_ERR "Post-mobility device tree update " "failed: %d\n" , rc); +cacheinfo_rebuild (); +cpus_read_unlock ();/* Possibly switch to a new RFI flush type */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 230/371 drm/msm/mdp5: Fix mdp5_cfg_init error return
In reply to Sasha LevinFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit fc19cbb785d7bbd1a1af26229b5240a3ab332744 ]
If mdp5_cfg_init fails because of an unknown major version, a null pointer dereference occurs. This is because the caller of init expects error pointers, but init returns NULL on error. Fix this by returning the expected values on error.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c +1 -1
@@ -635,7 +635,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms,if (cfg_handler)mdp5_cfg_destroy (cfg_handler); -return NULL ; +return ERR_PTR (ret); }static struct mdp5_cfg_platform *mdp5_get_config (struct platform_device *dev)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 231/371 net: netem: fix backlog accounting for corrupted GSO frames
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 177b8007463c4f36c9a2c7ce7aa9875a4cad9bd5 ]
When GSO frame has to be corrupted netem uses skb_gso_segment() to produce the list of frames, and re-enqueues the segments one by one. The backlog length has to be adjusted to account for new frames.
The current calculation is incorrect, leading to wrong backlog lengths in the parent qdisc (both bytes and packets), and incorrect packet backlog count in netem itself.
Parent backlog goes negative, netem's packet backlog counts all non-first segments twice (thus remaining non-zero even after qdisc is emptied).
Move the variables used to count the adjustment into local scope to make 100% sure they aren't used at any stage in backports.
--- net/sched/sch_netem.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/sched/sch_netem.c +8 -5
@@ -431,8 +431,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,struct netem_skb_cb *cb;struct sk_buff *skb2;struct sk_buff *segs =NULL ; -unsigned int len =0 , last_len, prev_len =qdisc_pkt_len (skb); -int nb =0 ; +unsigned int prev_len =qdisc_pkt_len (skb);int count =1 ;int rc =NET_XMIT_SUCCESS ;int rc_drop =NET_XMIT_DROP ;
@@ -489,6 +488,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, segs =netem_segment (skb, sch, to_free);if (!segs)return rc_drop; +qdisc_skb_cb (segs)->pkt_len = segs->len; }else { segs = skb; }
@@ -579,6 +579,11 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, finish_segs:if (segs) { +unsigned int len, last_len; +int nb =0 ; + + len = skb->len; +while (segs) { skb2 = segs->next; segs->next =NULL ;
@@ -594,9 +599,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, } segs = skb2; } - sch->q.qlen += nb; -if (nb >1 ) -qdisc_tree_reduce_backlog (sch,1 - nb, prev_len - len); +qdisc_tree_reduce_backlog (sch, -nb, prev_len - len); }return NET_XMIT_SUCCESS ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 232/371 net/af_iucv: always register net_device notifier
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 06996c1d4088a0d5f3e7789d7f96b4653cc947cc ]
Even when running as VM guest (ie pr_iucv != NULL), af_iucv can still open HiperTransport-based connections. For robust operation these connections require the af_iucv_netdev_notifier, so register it unconditionally.
Also handle any error that register_netdevice_notifier() returns.
--- net/iucv/af_iucv.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
net/iucv/af_iucv.c +20 -7
@@ -2446,6 +2446,13 @@ static int afiucv_iucv_init(void)return err; } +static void afiucv_iucv_exit (void ) +{ +device_unregister (af_iucv_dev); +driver_unregister (&af_iucv_driver); + pr_iucv->iucv_unregister (&af_iucv_handler,0 ); +} +static int __init afiucv_init (void ) {int err;
@@ -2479,11 +2486,18 @@ static int __init afiucv_init(void) err =afiucv_iucv_init ();if (err) goto out_sock; - }else -register_netdevice_notifier (&afiucv_netdev_notifier); + } + + err =register_netdevice_notifier (&afiucv_netdev_notifier); +if (err) + goto out_notifier; +dev_add_pack (&iucv_packet_type);return 0 ; +out_notifier: +if (pr_iucv) +afiucv_iucv_exit (); out_sock:sock_unregister (PF_IUCV ); out_proto:
@@ -2497,12 +2511,11 @@ static int __init afiucv_init(void) static void __exit afiucv_exit(void) {if (pr_iucv) { -device_unregister (af_iucv_dev); -driver_unregister (&af_iucv_driver); - pr_iucv->iucv_unregister (&af_iucv_handler,0 ); +afiucv_iucv_exit ();symbol_put (iucv_if); - }else -unregister_netdevice_notifier (&afiucv_netdev_notifier); + } + +unregister_netdevice_notifier (&afiucv_netdev_notifier);dev_remove_pack (&iucv_packet_type);sock_unregister (PF_IUCV );proto_unregister (&iucv_proto);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 233/371 ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs
In reply to Sasha LevinFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit fd14f4436fd47d5418023c90e933e66d3645552e ]
If multiple serializers are connected in the system and the number of channels will need to use more than one serializer the mask to enable the serializers were left to 0 if tdm_mask is provided
--- sound/soc/davinci/davinci-mcasp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
sound/soc/davinci/davinci-mcasp.c +6 -7
@@ -882,14 +882,13 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream, active_slots =hweight32 (mcasp->tdm_mask[stream]); active_serializers = (channels + active_slots -1 ) / active_slots; -if (active_serializers ==1 ) { +if (active_serializers ==1 ) active_slots = channels; -for (i =0 ; i < total_slots; i++) { -if ((1 << i) & mcasp->tdm_mask[stream]) { - mask |= (1 << i); -if (--active_slots <=0 ) -break ; - } +for (i =0 ; i < total_slots; i++) { +if ((1 << i) & mcasp->tdm_mask[stream]) { + mask |= (1 << i); +if (--active_slots <=0 ) +break ; } } }else {
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 234/371 rtc: pcf8563: Fix interrupt trigger method
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 65f662cbf829834fa4d94190eb7691e5a9cb92d8 ]
The PCF8563 datasheet says the interrupt line is active low and stays active until the events are cleared, i.e. a level trigger interrupt.
Fix the flags used to request the interrupt.
--- drivers/rtc/rtc-pcf8563.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-pcf8563.c +1 -1
@@ -605,7 +605,7 @@ static int pcf8563_probe(struct i2c_client *client,if (client->irq >0 ) { err =devm_request_threaded_irq (&client->dev, client->irq,NULL , pcf8563_irq, -IRQF_SHARED |IRQF_ONESHOT |IRQF_TRIGGER_FALLING , +IRQF_SHARED |IRQF_ONESHOT |IRQF_TRIGGER_LOW , pcf8563_driver.driver.name, client);if (err) { dev_err(&client->dev, "unable to request IRQ %d\n",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 235/371 rtc: pcf8563: Clear event flags and disable interrupts before requesting irq
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 3572e8aea3bf925dac1dbf86127657c39fe5c254 ]
Besides the alarm, the PCF8563 also has a timer triggered interrupt. In cases where the previous system left the timer and interrupts on, or somehow the bits got enabled, the interrupt would keep triggering as the kernel doesn't know about it.
Clear both the alarm and timer event flags, and disable the interrupts, before requesting the interrupt line.
--- drivers/rtc/rtc-pcf8563.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/rtc/rtc-pcf8563.c +5 -6
@@ -563,7 +563,6 @@ static int pcf8563_probe(struct i2c_client *client,struct pcf8563 *pcf8563;int err;unsigned char buf; -unsigned char alm_pending;dev_dbg (&client->dev,"%s\n" , __func__);
@@ -587,13 +586,13 @@ static int pcf8563_probe(struct i2c_client *client,return err; } - err =pcf8563_get_alarm_mode (client,NULL , &alm_pending); -if (err) { -dev_err (&client->dev,"%s: read error\n" , __func__); +/* Clear flags and disable interrupts */ + buf =0 ; + err =pcf8563_write_block_data (client,PCF8563_REG_ST2 ,1 , &buf); +if (err <0 ) { +dev_err (&client->dev,"%s: write error\n" , __func__);return err; } -if (alm_pending) -pcf8563_set_alarm_mode (client,0 ); pcf8563->rtc = devm_rtc_device_register(&client->dev, pcf8563_driver.driver.name,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 236/371 drm/msm/a3xx: remove TPL1 regs from snapshot
In reply to Sasha LevinFrom: Rob Clark <[email protected]>
[ Upstream commit f47bee2ba447bebc304111c16ef1e1a73a9744dd ]
These regs are write-only, and the hw throws a hissy-fit (ie. reboots) when we try to read them for GPU state snapshot, in response to a GPU hang. It is rather impolite when GPU recovery triggers an insta- reboot, so lets remove the TPL1 registers from the snapshot.
--- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +11 -13
@@ -394,19 +394,17 @@ static const unsigned int a3xx_registers[] = {0x2200 ,0x2212 ,0x2214 ,0x2217 ,0x221a ,0x221a ,0x2240 ,0x227e ,0x2280 ,0x228b ,0x22c0 ,0x22c0 ,0x22c4 ,0x22ce ,0x22d0 ,0x22d8 ,0x22df ,0x22e6 ,0x22e8 ,0x22e9 ,0x22ec ,0x22ec ,0x22f0 ,0x22f7 , -0x22ff ,0x22ff ,0x2340 ,0x2343 ,0x2348 ,0x2349 ,0x2350 ,0x2356 , -0x2360 ,0x2360 ,0x2440 ,0x2440 ,0x2444 ,0x2444 ,0x2448 ,0x244d , -0x2468 ,0x2469 ,0x246c ,0x246d ,0x2470 ,0x2470 ,0x2472 ,0x2472 , -0x2474 ,0x2475 ,0x2479 ,0x247a ,0x24c0 ,0x24d3 ,0x24e4 ,0x24ef , -0x2500 ,0x2509 ,0x250c ,0x250c ,0x250e ,0x250e ,0x2510 ,0x2511 , -0x2514 ,0x2515 ,0x25e4 ,0x25e4 ,0x25ea ,0x25ea ,0x25ec ,0x25ed , -0x25f0 ,0x25f0 ,0x2600 ,0x2612 ,0x2614 ,0x2617 ,0x261a ,0x261a , -0x2640 ,0x267e ,0x2680 ,0x268b ,0x26c0 ,0x26c0 ,0x26c4 ,0x26ce , -0x26d0 ,0x26d8 ,0x26df ,0x26e6 ,0x26e8 ,0x26e9 ,0x26ec ,0x26ec , -0x26f0 ,0x26f7 ,0x26ff ,0x26ff ,0x2740 ,0x2743 ,0x2748 ,0x2749 , -0x2750 ,0x2756 ,0x2760 ,0x2760 ,0x300c ,0x300e ,0x301c ,0x301d , -0x302a ,0x302a ,0x302c ,0x302d ,0x3030 ,0x3031 ,0x3034 ,0x3036 , -0x303c ,0x303c ,0x305e ,0x305f , +0x22ff ,0x22ff ,0x2340 ,0x2343 ,0x2440 ,0x2440 ,0x2444 ,0x2444 , +0x2448 ,0x244d ,0x2468 ,0x2469 ,0x246c ,0x246d ,0x2470 ,0x2470 , +0x2472 ,0x2472 ,0x2474 ,0x2475 ,0x2479 ,0x247a ,0x24c0 ,0x24d3 , +0x24e4 ,0x24ef ,0x2500 ,0x2509 ,0x250c ,0x250c ,0x250e ,0x250e , +0x2510 ,0x2511 ,0x2514 ,0x2515 ,0x25e4 ,0x25e4 ,0x25ea ,0x25ea , +0x25ec ,0x25ed ,0x25f0 ,0x25f0 ,0x2600 ,0x2612 ,0x2614 ,0x2617 , +0x261a ,0x261a ,0x2640 ,0x267e ,0x2680 ,0x268b ,0x26c0 ,0x26c0 , +0x26c4 ,0x26ce ,0x26d0 ,0x26d8 ,0x26df ,0x26e6 ,0x26e8 ,0x26e9 , +0x26ec ,0x26ec ,0x26f0 ,0x26f7 ,0x26ff ,0x26ff ,0x2740 ,0x2743 , +0x300c ,0x300e ,0x301c ,0x301d ,0x302a ,0x302a ,0x302c ,0x302d , +0x3030 ,0x3031 ,0x3034 ,0x3036 ,0x303c ,0x303c ,0x305e ,0x305f , ~0 /* sentinel */ };
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 237/371 perf/ioctl: Add check for the sample_period value
In reply to Sasha LevinFrom: Ravi Bangoria <[email protected]>
[ Upstream commit 913a90bc5a3a06b1f04c337320e9aeee2328dd77 ]
perf_event_open() limits the sample_period to 63 bits. See:
0819b2e30ccb ("perf: Limit perf_event_attr::sample_period to 63 bits")
Make ioctl() consistent with it.
Also on PowerPC, negative sample_period could cause a recursive PMIs leading to a hang (reported when running perf-fuzzer).
--- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/core.c +3 -0
@@ -4762,6 +4762,9 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)if (perf_event_check_period (event, value))return -EINVAL ; +if (!event->attr.freq && (value & (1ULL <<63 ))) +return -EINVAL ; +event_function_call (event, __perf_event_period, &value);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 238/371 dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit c24a5c735f87d0549060de31367c095e8810b895 ]
The commit
080edf75d337 ("dmaengine: hsu: set HSU_CH_MTSR to memory width")
has been mistakenly submitted. The further investigations show that the original code does better job since the memory side transfer size has never been configured by DMA users.
As per latest revision of documentation: "Channel minimum transfer size (CHnMTSR)... For IOSF UART, maximum value that can be programmed is 64 and minimum value that can be programmed is 1."
This reverts commit 080edf75d337d35faa6fc3df99342b10d2848d16.
--- drivers/dma/hsu/hsu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/hsu/hsu.c +2 -2
@@ -64,10 +64,10 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)if (hsuc->direction ==DMA_MEM_TO_DEV ) { bsr = config->dst_maxburst; - mtsr = config->src_addr_width; + mtsr = config->dst_addr_width; }else if (hsuc->direction ==DMA_DEV_TO_MEM ) { bsr = config->src_maxburst; - mtsr = config->dst_addr_width; + mtsr = config->src_addr_width; }hsu_chan_disable (hsuc);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 239/371 clk: qcom: Fix -Wunused-const-variable
In reply to Sasha LevinFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit da642427bd7710ec4f4140f693f59aa8521a358c ]
Clang produces the following warning
drivers/clk/qcom/gcc-msm8996.c:133:32: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map' [-Wunused-const-variable] static const structparent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] =
{ ^drivers/clk/qcom/gcc-msm8996.c:141:27: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div' [-Wunused-const-variable] static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { ^ drivers/clk/qcom/gcc-msm8996.c:187:32: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map' [-Wunused-const-variable] static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { ^ drivers/clk/qcom/gcc-msm8996.c:197:27: warning: unused variable 'gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div' [-Wunused-const-variable] static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = {
It looks like these were never used.
--- drivers/clk/qcom/gcc-msm8996.c | 36 ---------------------------------- 1 file changed, 36 deletions(-)
drivers/clk/qcom/gcc-msm8996.c +0 -36
@@ -140,22 +140,6 @@ static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = {"gpll0_early_div" }; -static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div_map[] = { - {P_XO ,0 }, - {P_GPLL0 ,1 }, - {P_GPLL2 ,2 }, - {P_GPLL3 ,3 }, - {P_GPLL0_EARLY_DIV ,6 } -}; - -static const char *const gcc_xo_gpll0_gpll2_gpll3_gpll0_early_div[] = { -"xo" , -"gpll0" , -"gpll2" , -"gpll3" , -"gpll0_early_div" -}; -static const struct parent_map gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div_map[] = { {P_XO ,0 }, {P_GPLL0 ,1 },
@@ -194,26 +178,6 @@ static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early"gpll0_early_div" }; -static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div_map[] = { - {P_XO ,0 }, - {P_GPLL0 ,1 }, - {P_GPLL2 ,2 }, - {P_GPLL3 ,3 }, - {P_GPLL1 ,4 }, - {P_GPLL4 ,5 }, - {P_GPLL0_EARLY_DIV ,6 } -}; - -static const char *const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll4_gpll0_early_div[] = { -"xo" , -"gpll0" , -"gpll2" , -"gpll3" , -"gpll1" , -"gpll4" , -"gpll0_early_div" -}; -static struct clk_fixed_factor xo = { .mult =1 , .div =1 ,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 240/371 nvmem: imx-ocotp: Ensure WAIT bits are preserved when setting timing
In reply to Sasha LevinFrom: Bryan O'Donoghue <[email protected]>
[ Upstream commit 0493c4792b4eb260441e57f52cc11a9ded48b5a7 ]
The i.MX6 and i.MX8 both have a bit-field spanning bits 27:22 called the WAIT field.
The WAIT field according to the documentation for both parts "specifies time interval between auto read and write access in one time program. It is given in number of ipg_clk periods."
This patch ensures that the relevant field is read and written back to the timing register.
--- drivers/nvmem/imx-ocotp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvmem/imx-ocotp.c +2 -1
@@ -199,7 +199,8 @@ static int imx_ocotp_write(void *context, unsigned int offset, void *val, strobe_prog = clk_rate / (1000000000 /10000 ) +2 * (DEF_RELAX +1 ) -1 ; strobe_read = clk_rate / (1000000000 /40 ) +2 * (DEF_RELAX +1 ) -1 ; - timing = strobe_prog &0x00000FFF ; + timing =readl (priv->base +IMX_OCOTP_ADDR_TIMING ) &0x0FC00000 ; + timing |= strobe_prog &0x00000FFF ; timing |= (relax <<12 ) &0x0000F000 ; timing |= (strobe_read <<16 ) &0x003F0000 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 241/371 bnxt_en: Fix ethtool selftest crash under error conditions.
In reply to Sasha LevinFrom: Michael Chan <[email protected]>
[ Upstream commit d27e2ca1166aefd54d9c48fb6647dee8115a5dfc ]
After ethtool loopback packet tests, we re-open the nic for the next IRQ test. If the open fails, we must not proceed with the IRQ test or we will crash with NULL pointer dereference. Fix it by checking the bnxt_open_nic() return code before proceeding.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +3 -3
@@ -2463,7 +2463,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,bool offline = false;u8 test_results =0 ;u8 test_mask =0 ; -int rc, i; +int rc =0 , i;if (!bp->num_tests || !BNXT_SINGLE_PF (bp))return ;
@@ -2521,9 +2521,9 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, }bnxt_hwrm_phy_loopback (bp, false);bnxt_half_close_nic (bp); -bnxt_open_nic (bp, false, true); + rc =bnxt_open_nic (bp, false, true); } -if (bnxt_test_irq (bp)) { +if (rc ||bnxt_test_irq (bp)) { buf[BNXT_IRQ_TEST_IDX ] =1 ; etest->flags |=ETH_TEST_FL_FAILED ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 242/371 iommu/amd: Make iommu_disable safer
In reply to Sasha LevinFrom: Kevin Mitchell <[email protected]>
[ Upstream commit 3ddbe913e55516d3e2165d43d4d5570761769878 ]
Make it safe to call iommu_disable during early init error conditions before mmio_base is set, but after the struct amd_iommu has been added to the amd_iommu_list. For example, this happens if firmware fails to fill in mmio_phys in the ACPI table leading to a NULL pointer dereference in iommu_feature_disable.
--- drivers/iommu/amd_iommu_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/amd_iommu_init.c +3 -0
@@ -420,6 +420,9 @@ static void iommu_enable(struct amd_iommu *iommu)static void iommu_disable (struct amd_iommu *iommu) { +if (!iommu->mmio_base) +return ; +/* Disable command buffer */ iommu_feature_disable (iommu,CONTROL_CMDBUF_EN );
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 243/371 mfd: intel-lpss: Release IDA resources
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 02f36911c1b41fcd8779fa0c135aab0554333fa5 ]
ida instances allocate some internal memory for ->free_bitmap in addition to the base 'struct ida'. Use ida_destroy() to release that memory at module_exit().
--- drivers/mfd/intel-lpss.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/intel-lpss.c +1 -0
@@ -541,6 +541,7 @@ module_init(intel_lpss_init); static void __exit intel_lpss_exit(void) { +ida_destroy (&intel_lpss_devid_ida);debugfs_remove (intel_lpss_debugfs); }module_exit (intel_lpss_exit);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 244/371 rxrpc: Fix uninitialized error code in rxrpc_send_data_packet()
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 3427beb6375d04e9627c67343872e79341a684ea ]
With gcc 4.1:
net/rxrpc/output.c: In function ‘rxrpc_send_data_packet’:
net/rxrpc/output.c:338: warning: ‘ret’ may be used uninitialized in this function
Indeed, if the first jump to the send_fragmentable label is made, and the address family is not handled in the switch() statement, ret will be used uninitialized.
Fix this by BUG()'ing as is done in other places in rxrpc where internal support for future address families will need adding. It should not be possible to reach this normally as the address families are checked up-front.
--- net/rxrpc/output.c | 3 +++ 1 file changed, 3 insertions(+)
net/rxrpc/output.c +3 -0
@@ -404,6 +404,9 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb, }break ;#endif + +default : +BUG (); }up_write (&conn->params.local->defrag_sem);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 245/371 devres: allow const resource arguments
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 9dea44c91469512d346e638694c22c30a5273992 ]
devm_ioremap_resource() does not currently take 'const' arguments, which results in a warning from the first driver trying to do it anyway:
drivers/gpio/gpio-amd-fch.c: In function 'amd_fch_gpio_probe':drivers/gpio/gpio-amd-fch.c:171:49: error: passing argument 2 of 'devm_ioremap_resource' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
priv->base = devm_ioremap_resource(&pdev->dev, &amd_fch_gpio_iores);
^~~~~~~~~~~~~~~~~~~Change the prototype to allow it, as there is no real reason not to.
--- include/linux/device.h | 3 ++- lib/devres.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
include/linux/device.h +2 -1
@@ -682,7 +682,8 @@ extern unsigned long devm_get_free_pages(struct device *dev, gfp_t gfp_mask, unsigned int order);extern void devm_free_pages (struct device *dev,unsigned long addr); -void __iomem *devm_ioremap_resource (struct device *dev,struct resource *res); +void __iomem *devm_ioremap_resource (struct device *dev, +const struct resource *res);/* allows to add/remove a custom action to devres stack */ int devm_add_action (struct device *dev,void (*action)(void *),void *data);
lib/devres.c +2 -1
@@ -132,7 +132,8 @@ EXPORT_SYMBOL(devm_iounmap);* if (IS_ERR(base)) * return PTR_ERR(base); */ -void __iomem *devm_ioremap_resource (struct device *dev,struct resource *res) +void __iomem *devm_ioremap_resource (struct device *dev, +const struct resource *res) {resource_size_t size;const char *name;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 246/371 RDMA/hns: Fixs hw access invalid dma memory error
In reply to Sasha LevinFrom: Xi Wang <[email protected]>
[ Upstream commit ec5bc2cc69b4fc494e04d10fc5226f6f9cf67c56 ]
When smmu is enable, if execute the perftest command and then use 'kill -9' to exit, follow this operation repeatedly, the kernel will have a high probability to print the following smmu event:
arm-smmu-v3 arm-smmu-v3.1.auto: event 0x10 received:
arm-smmu-v3 arm-smmu-v3.1.auto: 0x00007d0000000010 arm-smmu-v3 arm-smmu-v3.1.auto: 0x0000020900000080 arm-smmu-v3 arm-smmu-v3.1.auto: 0x00000000f47cf000 arm-smmu-v3 arm-smmu-v3.1.auto: 0x00000000f47cf000
This is because the hw will periodically refresh the qpc cache until the next reset.
This patch fixed it by removing the action that release qpc memory in the 'hns_roce_qp_free' function.
--- drivers/infiniband/hw/hns/hns_roce_qp.c | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_qp.c +0 -1
@@ -241,7 +241,6 @@ void hns_roce_qp_free(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)if ((hr_qp->ibqp.qp_type) !=IB_QPT_GSI ) {hns_roce_table_put (hr_dev, &qp_table->irrl_table, hr_qp->qpn); -hns_roce_table_put (hr_dev, &qp_table->qp_table, hr_qp->qpn); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 247/371 net: pasemi: fix an use-after-free in pasemi_mac_phy_init()
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit faf5577f2498cea23011b5c785ef853ded22700b ]
The phy_dn variable is still being used in of_phy_connect() after the of_node_put() call, which may result in use-after-free.
--- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/pasemi/pasemi_mac.c +1 -1
@@ -1053,7 +1053,6 @@ static int pasemi_mac_phy_init(struct net_device *dev) dn =pci_device_to_OF_node (mac->pdev); phy_dn =of_parse_phandle (dn,"phy-handle" ,0 ); -of_node_put (phy_dn); mac->link =0 ; mac->speed =0 ;
@@ -1062,6 +1061,7 @@ static int pasemi_mac_phy_init(struct net_device *dev) phydev =of_phy_connect (dev, phy_dn, &pasemi_adjust_link,0 ,PHY_INTERFACE_MODE_SGMII ); +of_node_put (phy_dn);if (!phydev) {printk (KERN_ERR "%s: Could not attach to phy\n" , dev->name);return -ENODEV ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 248/371 scsi: libfc: fix null pointer dereference on a null lport
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 41a6bf6529edd10a6def42e3b2c34a7474bcc2f5 ]
Currently if lport is null then the null lport pointer is dereference when printing out debug via the FC_LPORT_DB macro. Fix this by using the more generic FC_LIBFC_DBG debug macro instead that does not use lport.
Addresses-Coverity: ("Dereference after null check")
--- drivers/scsi/libfc/fc_exch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/libfc/fc_exch.c +1 -1
@@ -2603,7 +2603,7 @@ void fc_exch_recv(struct fc_lport *lport, struct fc_frame *fp)/* lport lock ? */ if (!lport || lport->state ==LPORT_ST_DISABLED ) { -FC_LPORT_DBG (lport,"Receiving frames for an lport that " +FC_LIBFC_DBG ("Receiving frames for an lport that " "has not been initialized correctly\n" );fc_frame_free (fp);return ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 249/371 clk: sunxi-ng: v3s: add the missing PLL_DDR1
In reply to Sasha LevinFrom: Icenowy Zheng <[email protected]>
[ Upstream commit c5ed9475c22c89d5409402055142372e35d26a3f ]
The user manual of V3/V3s/S3 declares a PLL_DDR1, however it's forgot when developing the V3s CCU driver.
Add back the missing PLL_DDR1.
--- drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 19 +++++++++++++++---- drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 6 ++++-- 2 files changed, 19 insertions(+), 6 deletions(-)
drivers/clk/sunxi-ng/ccu-sun8i-v3s.c +15 -4
@@ -84,7 +84,7 @@ static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_ve_clk, "pll-ve",BIT (28 ),/* lock */ 0); -static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr_clk, "pll-ddr", +static SUNXI_CCU_NKM_WITH_GATE_LOCK(pll_ddr0_clk, "pll-ddr0","osc24M" ,0x020 ,8 ,5 ,/* N */ 4, 2, /* K */
@@ -123,6 +123,14 @@ static SUNXI_CCU_NK_WITH_GATE_LOCK_POSTDIV(pll_periph1_clk, "pll-periph1",2 ,/* post-div */ 0); +static SUNXI_CCU_NM_WITH_GATE_LOCK(pll_ddr1_clk, "pll-ddr1", +"osc24M" ,0x04c , +8 ,7 ,/* N */ +0 ,2 ,/* M */ +BIT (31 ),/* gate */ +BIT (28 ),/* lock */ + 0); +static const char *const cpu_parents[] = {"osc32k" ,"osc24M" ,"pll-cpu" ,"pll-cpu" }; static SUNXI_CCU_MUX(cpu_clk, "cpu", cpu_parents,
@@ -310,7 +318,8 @@ static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc24M", 0x0cc, BIT(16), 0); -static const char *const dram_parents[] = {"pll-ddr" ,"pll-periph0-2x" }; +static const char *const dram_parents[] = {"pll-ddr0" ,"pll-ddr1" , +"pll-periph0-2x" }; static SUNXI_CCU_M_WITH_MUX(dram_clk, "dram", dram_parents, 0x0f4, 0, 4, 20, 2, CLK_IS_CRITICAL);
@@ -369,10 +378,11 @@ static struct ccu_common *sun8i_v3s_ccu_clks[] = { &pll_audio_base_clk.common, &pll_video_clk.common, &pll_ve_clk.common, - &pll_ddr_clk.common, + &pll_ddr0_clk.common, &pll_periph0_clk.common, &pll_isp_clk.common, &pll_periph1_clk.common, + &pll_ddr1_clk.common, &cpu_clk.common, &axi_clk.common, &ahb1_clk.common,
@@ -457,11 +467,12 @@ static struct clk_hw_onecell_data sun8i_v3s_hw_clks = { [CLK_PLL_AUDIO_8X] = &pll_audio_8x_clk.hw, [CLK_PLL_VIDEO] = &pll_video_clk.common.hw, [CLK_PLL_VE] = &pll_ve_clk.common.hw, - [CLK_PLL_DDR] = &pll_ddr_clk.common.hw, + [CLK_PLL_DDR0] = &pll_ddr0_clk.common.hw, [CLK_PLL_PERIPH0] = &pll_periph0_clk.common.hw, [CLK_PLL_PERIPH0_2X] = &pll_periph0_2x_clk.hw, [CLK_PLL_ISP] = &pll_isp_clk.common.hw, [CLK_PLL_PERIPH1] = &pll_periph1_clk.common.hw, + [CLK_PLL_DDR1] = &pll_ddr1_clk.common.hw, [CLK_CPU] = &cpu_clk.common.hw, [CLK_AXI] = &axi_clk.common.hw, [CLK_AHB1] = &ahb1_clk.common.hw,
drivers/clk/sunxi-ng/ccu-sun8i-v3s.h +4 -2
@@ -29,7 +29,7 @@#define CLK_PLL_AUDIO_8X 5#define CLK_PLL_VIDEO 6#define CLK_PLL_VE 7 -#define CLK_PLL_DDR 8 +#define CLK_PLL_DDR0 8#define CLK_PLL_PERIPH0 9#define CLK_PLL_PERIPH0_2X 10#define CLK_PLL_ISP 11
@@ -58,6 +58,8 @@/* And the GPU module clock is exported */ -#define CLK_NUMBER (CLK_MIPI_CSI + 1) +#define CLK_PLL_DDR1 74 + +#define CLK_NUMBER (CLK_PLL_DDR1 + 1)#endif /* _CCU_SUN8I_H3_H_ */
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 250/371 PM: sleep: Fix possible overflow in pm_system_cancel_wakeup()
In reply to Sasha LevinFrom: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 2933954b71f10d392764f95eec0f0aa2d103054b ]
It is not actually guaranteed that pm_abort_suspend will be nonzero when pm_system_cancel_wakeup() is called which may lead to subtle issues, so make it use atomic_dec_if_positive() instead of atomic_dec() for the safety sake.
--- drivers/base/power/wakeup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/power/wakeup.c +1 -1
@@ -877,7 +877,7 @@ EXPORT_SYMBOL_GPL(pm_system_wakeup);void pm_system_cancel_wakeup (void ) { -atomic_dec (&pm_abort_suspend); +atomic_dec_if_positive (&pm_abort_suspend); }void pm_wakeup_clear (bool reset)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 251/371 libertas_tf: Use correct channel range in lbtf_geo_init
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 2ec4ad49b98e4a14147d04f914717135eca7c8b1 ]
It seems we should use 'range' instead of 'priv->range' in lbtf_geo_init(), because 'range' is the corret one related to current regioncode.
--- drivers/net/wireless/marvell/libertas_tf/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/libertas_tf/cmd.c +1 -1
@@ -69,7 +69,7 @@ static void lbtf_geo_init(struct lbtf_private *priv)break ; } -for (ch = priv->range.start; ch < priv->range.end; ch++) +for (ch = range->start; ch < range->end; ch++) priv->channels[CHAN_TO_IDX (ch)].flags =0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 252/371 qed: reduce maximum stack frame size
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 7c116e02a4a7575c8c62bfd2106e3e3ec8fb99dc ]
clang warns about an overly large stack frame in one function when it decides to inline all __qed_get_vport_*() functions into __qed_get_vport_stats():
drivers/net/ethernet/qlogic/qed/qed_l2.c:1889:13: error: stack frame size of 1128 bytes in function '_qed_get_vport_stats' [-Werror,-Wframe-larger-than=]
Use a noinline_for_stack annotation to prevent clang from inlining these, which keeps the maximum stack usage at around half of that in the worst case, similar to what we get with gcc.
--- drivers/net/ethernet/qlogic/qed/qed_l2.c | 34 +++++++++++------------- 1 file changed, 15 insertions(+), 19 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_l2.c +15 -19
@@ -1629,10 +1629,9 @@ static void __qed_get_vport_pstats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_pstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_pstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_pstorm_per_queue_stat pstats;u32 pstats_addr =0 , pstats_len =0 ;
@@ -1659,10 +1658,9 @@ static void __qed_get_vport_pstats(struct qed_hwfn *p_hwfn,HILO_64_REGPAIR (pstats.error_drop_pkts); } -static void __qed_get_vport_tstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_tstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct tstorm_per_port_stat tstats;u32 tstats_addr, tstats_len;
@@ -1705,10 +1703,9 @@ static void __qed_get_vport_ustats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_ustats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack +void __qed_get_vport_ustats(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_ustorm_per_queue_stat ustats;u32 ustats_addr =0 , ustats_len =0 ;
@@ -1747,10 +1744,9 @@ static void __qed_get_vport_mstats_addrlen(struct qed_hwfn *p_hwfn, } } -static void __qed_get_vport_mstats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats, -u16 statistics_bin) +static noinline_for_stack void +__qed_get_vport_mstats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats,u16 statistics_bin) {struct eth_mstorm_per_queue_stat mstats;u32 mstats_addr =0 , mstats_len =0 ;
@@ -1776,9 +1772,9 @@ static void __qed_get_vport_mstats(struct qed_hwfn *p_hwfn,HILO_64_REGPAIR (mstats.tpa_coalesced_bytes); } -static void __qed_get_vport_port_stats (struct qed_hwfn *p_hwfn, -struct qed_ptt *p_ptt, -struct qed_eth_stats *p_stats) +static noinline_for_stack void +__qed_get_vport_port_stats (struct qed_hwfn *p_hwfn,struct qed_ptt *p_ptt, +struct qed_eth_stats *p_stats) {struct qed_eth_stats_common *p_common = &p_stats->common;struct port_stats port_stats;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 253/371 usb: host: xhci-hub: fix extra endianness conversion
In reply to Sasha LevinFrom: Ruslan Bilovol <[email protected]>
[ Upstream commit 6269e4c76eacabaea0d0099200ae1a455768d208 ]
Don't do extra cpu_to_le32 conversion for put_unaligned_le32 because it is already implemented in this function.
Fixes sparse error:
xhci-hub.c:1152:44: warning: incorrect type in argument 1 (different base types)
xhci-hub.c:1152:44: expected unsigned int [usertype] val
xhci-hub.c:1152:44: got restricted __le32 [usertype]
--- drivers/usb/host/xhci-hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -1118,7 +1118,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, } port_li =readl (port_array[wIndex] +PORTLI ); status =xhci_get_ext_port_status (temp, port_li); -put_unaligned_le32 (cpu_to_le32 (status), &buf[4 ]); +put_unaligned_le32 (status, &buf[4 ]); }break ;case SetPortFeature:
Signature · 1 line
2.20.1