5.10.188-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 134/509 IB/hfi1: Fix sdma.h tx->num_descs off-by-one errors
In reply to Greg Kroah-HartmanFrom: Patrick Kelsey <[email protected]>
[ Upstream commit fd8958efe8779d3db19c9124fce593ce681ac709 ]
Fix three sources of error involving struct sdma_txreq.num_descs.
When _extend_sdma_tx_descs() extends the descriptor array, it uses the value of tx->num_descs to determine how many existing entries from the tx's original, internal descriptor array to copy to the newly allocated one. As this value was incremented before the call, the copy loop will access one entry past the internal descriptor array, copying its contents into the corresponding slot in the new array.
If the call to _extend_sdma_tx_descs() fails, _pad_smda_tx_descs() then invokes __sdma_tx_clean() which uses the value of tx->num_desc to drive a loop that unmaps all descriptor entries in use. As this value was incremented before the call, the unmap loop will invoke sdma_unmap_desc() on a descriptor entry whose contents consist of whatever random data was copied into it during (1), leading to cascading further calls into the kernel and driver using arbitrary data.
_sdma_close_tx() was using tx->num_descs instead of tx->num_descs - 1.
Fix all of the above by:
- Only increment .num_descs after .descp is extended.
- Use .num_descs - 1 instead of .num_descs for last .descp entry.
Stable-dep-of: c9358de193ec ("IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate")
--- drivers/infiniband/hw/hfi1/sdma.c | 4 ++-- drivers/infiniband/hw/hfi1/sdma.h | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-)
drivers/infiniband/hw/hfi1/sdma.c +2 -2
@@ -3187,8 +3187,7 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx) {int rval =0 ; - tx->num_desc++; -if ((unlikely (tx->num_desc == tx->desc_limit))) { +if ((unlikely (tx->num_desc +1 == tx->desc_limit))) { rval =_extend_sdma_tx_descs (dd, tx);if (rval) {__sdma_txclean (dd, tx);
@@ -3203,6 +3202,7 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)NULL , dd->sdma_pad_phys, sizeof(u32) - (tx->packet_len & (sizeof(u32) - 1))); + tx->num_desc++;_sdma_close_tx (dd, tx);return rval; }
drivers/infiniband/hw/hfi1/sdma.h +7 -8
@@ -674,14 +674,13 @@ static inline void sdma_txclean(struct hfi1_devdata *dd, struct sdma_txreq *tx)static inline void _sdma_close_tx (struct hfi1_devdata *dd,struct sdma_txreq *tx) { - tx->descp[tx->num_desc].qw[0 ] |= -SDMA_DESC0_LAST_DESC_FLAG ; - tx->descp[tx->num_desc].qw[1 ] |= - dd->default_desc1; +u16 last_desc = tx->num_desc -1 ; + + tx->descp[last_desc].qw[0 ] |=SDMA_DESC0_LAST_DESC_FLAG ; + tx->descp[last_desc].qw[1 ] |= dd->default_desc1;if (tx->flags &SDMA_TXREQ_F_URGENT ) - tx->descp[tx->num_desc].qw[1 ] |= - (SDMA_DESC1_HEAD_TO_HOST_FLAG | -SDMA_DESC1_INT_REQ_FLAG ); + tx->descp[last_desc].qw[1 ] |= (SDMA_DESC1_HEAD_TO_HOST_FLAG | +SDMA_DESC1_INT_REQ_FLAG ); } static inline int _sdma_txadd_daddr(
@@ -700,6 +699,7 @@ static inline int _sdma_txadd_daddr( pinning_ctx, addr, len);WARN_ON (len > tx->tlen); + tx->num_desc++; tx->tlen -= len;/* special cases for last */ if (!tx->tlen) {
@@ -711,7 +711,6 @@ static inline int _sdma_txadd_daddr(_sdma_close_tx (dd, tx); } } - tx->num_desc++;return rval; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 135/509 IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate
In reply to Greg Kroah-HartmanFrom: Brendan Cunningham <[email protected]>
[ Upstream commit c9358de193ecfb360c3ce75f27ce839ca0b0bc8c ]
The hfi1 user SDMA pinned-page cache will leave a stale cache entry when the cache-entry's virtual address range is invalidated but that cache entry is in-use by an outstanding SDMA request.
Subsequent user SDMA requests with buffers in or spanning the virtual address range of the stale cache entry will result in packets constructed from the wrong memory, the physical pages pointed to by the stale cache entry.
To fix this, remove mmu_rb_node cache entries from the mmu_rb_handler cache independent of the cache entry's refcount. Add 'struct kref refcount' to struct mmu_rb_node and manage mmu_rb_node lifetime with kref_get() and kref_put().
mmu_rb_node.refcount makes sdma_mmu_node.refcount redundant. Remove 'atomic_t refcount' from struct sdma_mmu_node and change sdma_mmu_node code to use mmu_rb_node.refcount.
Move the mmu_rb_handler destructor call after a wait-for-SDMA-request-completion call so mmu_rb_nodes that need mmu_rb_handler's workqueue to queue themselves up for destruction from an interrupt context may do so.
--- drivers/infiniband/hw/hfi1/ipoib_tx.c | 4 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 101 ++++++++++------- drivers/infiniband/hw/hfi1/mmu_rb.h | 3 + drivers/infiniband/hw/hfi1/sdma.c | 23 +++- drivers/infiniband/hw/hfi1/sdma.h | 47 +++++--- drivers/infiniband/hw/hfi1/sdma_txreq.h | 2 + drivers/infiniband/hw/hfi1/user_sdma.c | 137 ++++++++++-------------- drivers/infiniband/hw/hfi1/user_sdma.h | 1 - drivers/infiniband/hw/hfi1/vnic_sdma.c | 4 +- 9 files changed, 177 insertions(+), 145 deletions(-)
drivers/infiniband/hw/hfi1/ipoib_tx.c +2 -2
@@ -251,11 +251,11 @@ static int hfi1_ipoib_build_ulp_payload(struct ipoib_txreq *tx,const skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; ret =sdma_txadd_page (dd, -NULL , txreq,skb_frag_page (frag), frag->bv_offset, -skb_frag_size (frag)); +skb_frag_size (frag), +NULL ,NULL ,NULL );if (unlikely (ret))break ; }
drivers/infiniband/hw/hfi1/mmu_rb.c +63 -38
165 lines not on this page · raw message
drivers/infiniband/hw/hfi1/mmu_rb.h +3 -0
@@ -57,6 +57,7 @@ struct mmu_rb_node {struct rb_node node;struct mmu_rb_handler *handler;struct list_head list; +struct kref refcount; };/*
@@ -92,6 +93,8 @@ int hfi1_mmu_rb_register(void *ops_arg,void hfi1_mmu_rb_unregister (struct mmu_rb_handler *handler);int hfi1_mmu_rb_insert (struct mmu_rb_handler *handler,struct mmu_rb_node *mnode); +void hfi1_mmu_rb_release (struct kref *refcount); +void hfi1_mmu_rb_evict (struct mmu_rb_handler *handler,void *evict_arg); struct mmu_rb_node *hfi1_mmu_rb_get_first(struct mmu_rb_handler *handler, unsigned long addr,
drivers/infiniband/hw/hfi1/sdma.c +18 -5
@@ -1635,7 +1635,20 @@ static inline void sdma_unmap_desc(struct hfi1_devdata *dd, struct sdma_desc *descp) { -system_descriptor_complete (dd ,descp ); + switch (sdma_mapping_type(descp)) { + case SDMA_MAP_SINGLE: + dma_unmap_single(&dd->pcidev->dev, sdma_mapping_addr(descp), +sdma_mapping_len (descp ),DMA_TO_DEVICE ); +break ; +case SDMA_MAP_PAGE : +dma_unmap_page (&dd->pcidev->dev,sdma_mapping_addr (descp), +sdma_mapping_len (descp),DMA_TO_DEVICE ); +break ; + } + +if (descp->pinning_ctx && descp->ctx_put) + descp->ctx_put (descp->pinning_ctx); + descp->pinning_ctx =NULL ; }/*
@@ -3155,8 +3168,8 @@ int ext_coal_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx,/* Add descriptor for coalesce buffer */ tx->desc_limit =MAX_DESC ; -return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE ,NULL , tx, - addr, tx->tlen); +return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE , tx, + addr, tx->tlen,NULL ,NULL ,NULL ); }return 1 ;
@@ -3199,9 +3212,9 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)make_tx_sdma_desc ( tx,SDMA_MAP_NONE , -NULL , dd->sdma_pad_phys, -sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 ))); +sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 )), +NULL ,NULL ,NULL ); tx->num_desc++;_sdma_close_tx (dd, tx);return rval;
drivers/infiniband/hw/hfi1/sdma.h +32 -15
116 lines not on this page · raw message
drivers/infiniband/hw/hfi1/sdma_txreq.h +2 -0
@@ -62,6 +62,8 @@ struct sdma_desc {/* private: don't use directly */ u64 qw[2 ];void *pinning_ctx; +/* Release reference to @pinning_ctx. May be called in interrupt context. Must not sleep. */ +void (*ctx_put)(void *ctx); };/**
drivers/infiniband/hw/hfi1/user_sdma.c +55 -82
253 lines not on this page · raw message
drivers/infiniband/hw/hfi1/user_sdma.h +0 -1
@@ -145,7 +145,6 @@ struct hfi1_user_sdma_comp_q {struct sdma_mmu_node {struct mmu_rb_node rb;struct hfi1_user_sdma_pkt_q *pq; -atomic_t refcount;struct page **pages;unsigned int npages; };
drivers/infiniband/hw/hfi1/vnic_sdma.c +2 -2
@@ -106,11 +106,11 @@ static noinline int build_vnic_ulp_payload(struct sdma_engine *sde,/* combine physically continuous fragments later? */ ret =sdma_txadd_page (sde->dd, -NULL , &tx->txreq,skb_frag_page (frag),skb_frag_off (frag), -skb_frag_size (frag)); +skb_frag_size (frag), +NULL ,NULL ,NULL );if (unlikely (ret)) goto bail_txadd; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 136/509 RDMA: Remove uverbs_ex_cmd_mask values that are linked to functions
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit b8e3130dd96b7b2d6d92e62dcd1515af30212fe2 ]
Since a while now the uverbs layer checks if the driver implements a function before allowing the ucmd to proceed. This largely obsoletes the cmd_mask stuff, but there is some tricky bits in drivers preventing it from being removed.
Remove the easy elements of uverbs_ex_cmd_mask by pre-setting them in the core code. These are triggered soley based on the related ops function pointer.
query_device_ex is not triggered based on an op, but all drivers already implement something compatible with the extension, so enable it globally too.
Stable-dep-of: cf5b608fb0e3 ("RDMA/hns: Fix hns_roce_table_get return value")
--- drivers/infiniband/core/device.c | 11 +++++++++++ drivers/infiniband/core/uverbs_cmd.c | 2 +- drivers/infiniband/hw/efa/efa_main.c | 3 --- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 7 ------- drivers/infiniband/hw/hns/hns_roce_main.c | 2 -- drivers/infiniband/hw/mlx4/main.c | 14 +------------- drivers/infiniband/hw/mlx5/main.c | 14 ++------------ 7 files changed, 15 insertions(+), 38 deletions(-)
drivers/infiniband/core/device.c +11 -0
@@ -600,6 +600,17 @@ struct ib_device *_ib_alloc_device(size_t size)init_completion (&device->unreg_completion);INIT_WORK (&device->unregistration_work, ib_unregister_work); + device->uverbs_ex_cmd_mask = +BIT_ULL (IB_USER_VERBS_EX_CMD_CREATE_FLOW ) | +BIT_ULL (IB_USER_VERBS_EX_CMD_CREATE_RWQ_IND_TBL ) | +BIT_ULL (IB_USER_VERBS_EX_CMD_CREATE_WQ ) | +BIT_ULL (IB_USER_VERBS_EX_CMD_DESTROY_FLOW ) | +BIT_ULL (IB_USER_VERBS_EX_CMD_DESTROY_RWQ_IND_TBL ) | +BIT_ULL (IB_USER_VERBS_EX_CMD_DESTROY_WQ ) | +BIT_ULL (IB_USER_VERBS_EX_CMD_MODIFY_CQ ) | +BIT_ULL (IB_USER_VERBS_EX_CMD_MODIFY_WQ ) | +BIT_ULL (IB_USER_VERBS_EX_CMD_QUERY_DEVICE ); +return device; }EXPORT_SYMBOL (_ib_alloc_device);
drivers/infiniband/core/uverbs_cmd.c +1 -1
@@ -3778,7 +3778,7 @@ const struct uapi_definition uverbs_def_write_intf[] = { IB_USER_VERBS_EX_CMD_MODIFY_CQ, ib_uverbs_ex_modify_cq,UAPI_DEF_WRITE_I (struct ib_uverbs_ex_modify_cq ), - UAPI_DEF_METHOD_NEEDS_FN(create_cq))), + UAPI_DEF_METHOD_NEEDS_FN(modify_cq))), DECLARE_UVERBS_OBJECT( UVERBS_OBJECT_DEVICE,
drivers/infiniband/hw/efa/efa_main.c +0 -3
@@ -326,9 +326,6 @@ static int efa_ib_device_add(struct efa_dev *dev) (1ull <<IB_USER_VERBS_CMD_CREATE_AH ) | (1ull <<IB_USER_VERBS_CMD_DESTROY_AH ); - dev->ibdev.uverbs_ex_cmd_mask = - (1ull <<IB_USER_VERBS_EX_CMD_QUERY_DEVICE ); -ib_set_device_ops (&dev->ibdev, &efa_dev_ops); err =ib_register_device (&dev->ibdev,"efa_%d" , &pdev->dev);
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +0 -7
@@ -2062,11 +2062,6 @@ static void hns_roce_v1_write_cqc(struct hns_roce_dev *hr_dev, CQ_CONTEXT_CQC_BYTE_32_CQ_CONS_IDX_S, 0); } -static int hns_roce_v1_modify_cq (struct ib_cq *cq,u16 cq_count,u16 cq_period) -{ -return -EOPNOTSUPP ; -} -static int hns_roce_v1_req_notify_cq (struct ib_cq *ibcq,enum ib_cq_notify_flags flags) {
@@ -4347,7 +4342,6 @@ static void hns_roce_v1_cleanup_eq_table(struct hns_roce_dev *hr_dev)static const struct ib_device_ops hns_roce_v1_dev_ops = { .destroy_qp = hns_roce_v1_destroy_qp, - .modify_cq = hns_roce_v1_modify_cq, .poll_cq = hns_roce_v1_poll_cq, .post_recv = hns_roce_v1_post_recv, .post_send = hns_roce_v1_post_send,
@@ -4367,7 +4361,6 @@ static const struct hns_roce_hw hns_roce_hw_v1 = { .set_mtu = hns_roce_v1_set_mtu, .write_mtpt = hns_roce_v1_write_mtpt, .write_cqc = hns_roce_v1_write_cqc, - .modify_cq = hns_roce_v1_modify_cq, .clear_hem = hns_roce_v1_clear_hem, .modify_qp = hns_roce_v1_modify_qp, .query_qp = hns_roce_v1_query_qp,
drivers/infiniband/hw/hns/hns_roce_main.c +0 -2
@@ -511,8 +511,6 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev) (1ULL <<IB_USER_VERBS_CMD_QUERY_QP ) | (1ULL <<IB_USER_VERBS_CMD_DESTROY_QP ); - ib_dev->uverbs_ex_cmd_mask |= (1ULL <<IB_USER_VERBS_EX_CMD_MODIFY_CQ ); -if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_REREG_MR ) { ib_dev->uverbs_cmd_mask |= (1ULL <<IB_USER_VERBS_CMD_REREG_MR );ib_set_device_ops (ib_dev, &hns_roce_dev_mr_ops);
drivers/infiniband/hw/mlx4/main.c +1 -13
@@ -2682,8 +2682,6 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)ib_set_device_ops (&ibdev->ib_dev, &mlx4_ib_dev_ops); ibdev->ib_dev.uverbs_ex_cmd_mask |= - (1ull <<IB_USER_VERBS_EX_CMD_MODIFY_CQ ) | - (1ull <<IB_USER_VERBS_EX_CMD_QUERY_DEVICE ) | (1ull <<IB_USER_VERBS_EX_CMD_CREATE_CQ ) | (1ull <<IB_USER_VERBS_EX_CMD_CREATE_QP );
@@ -2691,15 +2689,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) ((mlx4_ib_port_link_layer(&ibdev->ib_dev, 1) == IB_LINK_LAYER_ETHERNET) || (mlx4_ib_port_link_layer(&ibdev->ib_dev, 2) == - IB_LINK_LAYER_ETHERNET))) { - ibdev->ib_dev.uverbs_ex_cmd_mask |= - (1ull <<IB_USER_VERBS_EX_CMD_CREATE_WQ ) | - (1ull <<IB_USER_VERBS_EX_CMD_MODIFY_WQ ) | - (1ull <<IB_USER_VERBS_EX_CMD_DESTROY_WQ ) | - (1ull <<IB_USER_VERBS_EX_CMD_CREATE_RWQ_IND_TBL ) | - (1ull <<IB_USER_VERBS_EX_CMD_DESTROY_RWQ_IND_TBL ); + IB_LINK_LAYER_ETHERNET)))ib_set_device_ops (&ibdev->ib_dev, &mlx4_ib_dev_wq_ops); - }if (dev->caps.flags &MLX4_DEV_CAP_FLAG_MEM_WINDOW || dev->caps.bmme_flags &MLX4_BMME_FLAG_TYPE_2_WIN ) {
@@ -2718,9 +2709,6 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)if (check_flow_steering_support (dev)) { ibdev->steering_support =MLX4_STEERING_MODE_DEVICE_MANAGED ; - ibdev->ib_dev.uverbs_ex_cmd_mask |= - (1ull <<IB_USER_VERBS_EX_CMD_CREATE_FLOW ) | - (1ull <<IB_USER_VERBS_EX_CMD_DESTROY_FLOW );ib_set_device_ops (&ibdev->ib_dev, &mlx4_ib_dev_fs_ops); }
drivers/infiniband/hw/mlx5/main.c +2 -12
@@ -4180,14 +4180,10 @@ static int mlx5_ib_stage_caps_init(struct mlx5_ib_dev *dev) (1ull <<IB_USER_VERBS_CMD_DESTROY_SRQ ) | (1ull <<IB_USER_VERBS_CMD_CREATE_XSRQ ) | (1ull <<IB_USER_VERBS_CMD_OPEN_QP ); - dev->ib_dev.uverbs_ex_cmd_mask = - (1ull <<IB_USER_VERBS_EX_CMD_QUERY_DEVICE ) | + dev->ib_dev.uverbs_ex_cmd_mask |= (1ull <<IB_USER_VERBS_EX_CMD_CREATE_CQ ) | (1ull <<IB_USER_VERBS_EX_CMD_CREATE_QP ) | - (1ull <<IB_USER_VERBS_EX_CMD_MODIFY_QP ) | - (1ull <<IB_USER_VERBS_EX_CMD_MODIFY_CQ ) | - (1ull <<IB_USER_VERBS_EX_CMD_CREATE_FLOW ) | - (1ull <<IB_USER_VERBS_EX_CMD_DESTROY_FLOW ); + (1ull <<IB_USER_VERBS_EX_CMD_MODIFY_QP );if (MLX5_CAP_GEN (mdev, ipoib_enhanced_offloads) &&IS_ENABLED (CONFIG_MLX5_CORE_IPOIB ))
@@ -4290,12 +4286,6 @@ static int mlx5_ib_roce_init(struct mlx5_ib_dev *dev) ll =mlx5_port_type_cap_to_rdma_ll (port_type_cap);if (ll ==IB_LINK_LAYER_ETHERNET ) { - dev->ib_dev.uverbs_ex_cmd_mask |= - (1ull <<IB_USER_VERBS_EX_CMD_CREATE_WQ ) | - (1ull <<IB_USER_VERBS_EX_CMD_MODIFY_WQ ) | - (1ull <<IB_USER_VERBS_EX_CMD_DESTROY_WQ ) | - (1ull <<IB_USER_VERBS_EX_CMD_CREATE_RWQ_IND_TBL ) | - (1ull <<IB_USER_VERBS_EX_CMD_DESTROY_RWQ_IND_TBL );ib_set_device_ops (&dev->ib_dev, &mlx5_ib_dev_common_roce_ops); port_num =mlx5_core_native_port_num (dev->mdev) -1 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 137/509 RDMA/hns: Fix coding style issues
In reply to Greg Kroah-HartmanFrom: Lang Cheng <[email protected]>
[ Upstream commit dc93a0d987fcfe93b132871e72d4ea5aff36dd5c ]
Just format the code without modifying anything, including fixing some redundant and missing blanks and spaces and changing the variable definition order.
Stable-dep-of: cf5b608fb0e3 ("RDMA/hns: Fix hns_roce_table_get return value")
--- drivers/infiniband/hw/hns/hns_roce_cmd.c | 27 +++++++++++----------- drivers/infiniband/hw/hns/hns_roce_cmd.h | 4 ++-- drivers/infiniband/hw/hns/hns_roce_cq.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hem.c | 20 ++++++++-------- drivers/infiniband/hw/hns/hns_roce_hem.h | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 9 +++----- drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +++----- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 6 ++--- drivers/infiniband/hw/hns/hns_roce_main.c | 6 ++--- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 ++-- drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 1 - 13 files changed, 43 insertions(+), 51 deletions(-)
drivers/infiniband/hw/hns/hns_roce_cmd.c +13 -14
@@ -36,9 +36,9 @@#include "hns_roce_device.h" #include "hns_roce_cmd.h" -#define CMD_POLL_TOKEN 0xffff -#define CMD_MAX_NUM 32 -#define CMD_TOKEN_MASK 0x1f +#define CMD_POLL_TOKEN 0xffff +#define CMD_MAX_NUM 32 +#define CMD_TOKEN_MASK 0x1f static int hns_roce_cmd_mbox_post_hw(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, u32 in_modifier,
@@ -93,8 +93,8 @@ static int hns_roce_cmd_mbox_poll(struct hns_roce_dev *hr_dev, u64 in_param,void hns_roce_cmd_event (struct hns_roce_dev *hr_dev,u16 token,u8 status,u64 out_param) { -struct hns_roce_cmd_context - *context = &hr_dev->cmd.context[token & hr_dev->cmd.token_mask]; +struct hns_roce_cmd_context *context = + &hr_dev->cmd.context[token % hr_dev->cmd.max_cmds];if (token != context->token)return ;
@@ -164,8 +164,8 @@ static int hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param,int ret;down (&hr_dev->cmd.event_sem); - ret =__hns_roce_cmd_mbox_wait (hr_dev, in_param, out_param, - in_modifier, op_modifier, op, timeout); + ret =__hns_roce_cmd_mbox_wait (hr_dev, in_param, out_param, in_modifier, + op_modifier, op, timeout);up (&hr_dev->cmd.event_sem);return ret;
@@ -231,9 +231,8 @@ int hns_roce_cmd_use_events(struct hns_roce_dev *hr_dev)struct hns_roce_cmdq *hr_cmd = &hr_dev->cmd;int i; - hr_cmd->context =kmalloc_array (hr_cmd->max_cmds, -sizeof (*hr_cmd->context), -GFP_KERNEL ); + hr_cmd->context = +kcalloc (hr_cmd->max_cmds,sizeof (*hr_cmd->context),GFP_KERNEL );if (!hr_cmd->context)return -ENOMEM ;
@@ -262,8 +261,8 @@ void hns_roce_cmd_use_polling(struct hns_roce_dev *hr_dev) hr_cmd->use_events =0 ; } -struct hns_roce_cmd_mailbox - *hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev) +struct hns_roce_cmd_mailbox * +hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev) {struct hns_roce_cmd_mailbox *mailbox;
@@ -271,8 +270,8 @@ struct hns_roce_cmd_mailboxif (!mailbox)return ERR_PTR (-ENOMEM ); - mailbox->buf =dma_pool_alloc (hr_dev->cmd.pool,GFP_KERNEL , - &mailbox->dma); + mailbox->buf = +dma_pool_alloc (hr_dev->cmd.pool,GFP_KERNEL , &mailbox->dma);if (!mailbox->buf) {kfree (mailbox);return ERR_PTR (-ENOMEM );
drivers/infiniband/hw/hns/hns_roce_cmd.h +2 -2
@@ -143,8 +143,8 @@ int hns_roce_cmd_mbox(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, unsigned long in_modifier, u8 op_modifier, u16 op, unsigned long timeout); -struct hns_roce_cmd_mailbox - *hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev); +struct hns_roce_cmd_mailbox * +hns_roce_alloc_cmd_mailbox (struct hns_roce_dev *hr_dev);void hns_roce_free_cmd_mailbox (struct hns_roce_dev *hr_dev,struct hns_roce_cmd_mailbox *mailbox);
drivers/infiniband/hw/hns/hns_roce_cq.c +1 -1
@@ -41,9 +41,9 @@static int alloc_cqc (struct hns_roce_dev *hr_dev,struct hns_roce_cq *hr_cq) { +struct ib_device *ibdev = &hr_dev->ib_dev;struct hns_roce_cmd_mailbox *mailbox;struct hns_roce_cq_table *cq_table; -struct ib_device *ibdev = &hr_dev->ib_dev;u64 mtts[MTT_MIN_COUNT ] = {0 };dma_addr_t dma_handle;int ret;
drivers/infiniband/hw/hns/hns_roce_hem.c +10 -10
@@ -198,9 +198,9 @@ int hns_roce_calc_hem_mhop(struct hns_roce_dev *hr_dev, {struct device *dev = hr_dev->dev;u32 chunk_ba_num; +u32 chunk_size;u32 table_idx;u32 bt_num; -u32 chunk_size;if (get_hem_table_config (hr_dev, mhop, table->type))return -EINVAL ;
@@ -332,15 +332,15 @@ static int hns_roce_set_hem(struct hns_roce_dev *hr_dev, {spinlock_t *lock = &hr_dev->bt_cmd_lock;struct device *dev = hr_dev->dev; -long end; -unsigned long flags;struct hns_roce_hem_iter iter;void __iomem *bt_cmd;__le32 bt_cmd_val[2 ];__le32 bt_cmd_h =0 ; +unsigned long flags;__le32 bt_cmd_l; -u64 bt_ba;int ret =0 ; +u64 bt_ba; +long end;/* Find the HEM(Hardware Entry Memory) entry */ unsigned long i = (obj & (table->num_obj - 1)) /
@@ -640,8 +640,8 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev, struct hns_roce_hem_table *table, unsigned long obj) {struct device *dev = hr_dev->dev; -int ret =0 ;unsigned long i; +int ret =0 ;if (hns_roce_check_whether_mhop (hr_dev, table->type))return hns_roce_table_mhop_get (hr_dev, table, obj);
@@ -789,14 +789,14 @@ void *hns_roce_table_find(struct hns_roce_dev *hr_dev,struct hns_roce_hem_chunk *chunk;struct hns_roce_hem_mhop mhop;struct hns_roce_hem *hem; -void *addr =NULL ;unsigned long mhop_obj = obj;unsigned long obj_per_chunk;unsigned long idx_offset;int offset, dma_offset; +void *addr =NULL ; +u32 hem_idx =0 ;int length;int i, j; -u32 hem_idx =0 ;if (!table->lowmem)return NULL ;
@@ -966,8 +966,8 @@ static void hns_roce_cleanup_mhop_hem_table(struct hns_roce_dev *hr_dev, {struct hns_roce_hem_mhop mhop;u32 buf_chunk_size; -int i;u64 obj; +int i;if (hns_roce_calc_hem_mhop (hr_dev, table,NULL , &mhop))return ;
@@ -1298,8 +1298,8 @@ static int hem_list_alloc_root_bt(struct hns_roce_dev *hr_dev, const struct hns_roce_buf_region *regions, int region_cnt) { -struct roce_hem_item *hem, *temp_hem, *root_hem;struct list_head temp_list[HNS_ROCE_MAX_BT_REGION ]; +struct roce_hem_item *hem, *temp_hem, *root_hem;const struct hns_roce_buf_region *r;struct list_head temp_root;struct list_head temp_btm;
@@ -1404,8 +1404,8 @@ int hns_roce_hem_list_request(struct hns_roce_dev *hr_dev, {const struct hns_roce_buf_region *r;int ofs, end; -int ret;int unit; +int ret;int i;if (region_cnt >HNS_ROCE_MAX_BT_REGION ) {
drivers/infiniband/hw/hns/hns_roce_hem.h +1 -1
@@ -174,4 +174,4 @@ static inline dma_addr_t hns_roce_hem_addr(struct hns_roce_hem_iter *iter) return sg_dma_address(&iter->chunk->mem[iter->page_idx]); } -#endif /*_HNS_ROCE_HEM_H*/ +#endif /* _HNS_ROCE_HEM_H */
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +3 -6
@@ -239,7 +239,7 @@ static int hns_roce_v1_post_send(struct ib_qp *ibqp,break ; } -/*Ctrl field, ctrl set type: sig, solic, imm, fence */ +/* Ctrl field, ctrl set type: sig, solic, imm, fence */ /* SO wait for conforming application scenarios */ ctrl->flag |= (wr->send_flags &IB_SEND_SIGNALED ? cpu_to_le32(HNS_ROCE_WQE_CQ_NOTIFY) : 0) |
@@ -300,7 +300,7 @@ static int hns_roce_v1_post_send(struct ib_qp *ibqp, } ctrl->flag |=cpu_to_le32 (HNS_ROCE_WQE_INLINE ); }else { -/*sqe num is two */ +/* sqe num is two */ for (i =0 ; i < wr->num_sge; i++)set_data_seg (dseg + i, wr->sg_list + i);
@@ -1165,7 +1165,7 @@ static int hns_roce_raq_init(struct hns_roce_dev *hr_dev) } raq->e_raq_buf->map = addr; -/* Configure raq extended address. 48bit 4K align*/ +/* Configure raq extended address. 48bit 4K align */ roce_write (hr_dev,ROCEE_EXT_RAQ_REG , raq->e_raq_buf->map >>12 );/* Configure raq_shift */
@@ -2760,7 +2760,6 @@ static int hns_roce_v1_m_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr,roce_set_field (context->qpc_bytes_16,QP_CONTEXT_QPC_BYTES_16_QP_NUM_M ,QP_CONTEXT_QPC_BYTES_16_QP_NUM_S , hr_qp->qpn); - }else if (cur_state ==IB_QPS_INIT && new_state ==IB_QPS_INIT ) { roce_set_field(context->qpc_bytes_4, QP_CONTEXT_QPC_BYTES_4_TRANSPORT_SERVICE_TYPE_M,
@@ -3793,7 +3792,6 @@ static int hns_roce_v1_aeq_int(struct hns_roce_dev *hr_dev,int event_type;while ((aeqe =next_aeqe_sw_v1 (eq))) { -/* Make sure we read the AEQ entry after we have checked the * ownership bit */
@@ -3898,7 +3896,6 @@ static int hns_roce_v1_ceq_int(struct hns_roce_dev *hr_dev,u32 cqn;while ((ceqe =next_ceqe_sw_v1 (eq))) { -/* Make sure we read CEQ entry after we have checked the * ownership bit */
drivers/infiniband/hw/hns/hns_roce_hw_v1.h +1 -1
@@ -419,7 +419,7 @@ struct hns_roce_wqe_data_seg {struct hns_roce_wqe_raddr_seg {__le32 rkey; -__le32 len;/* reserved */ +__le32 len;/* reserved */ __le64 raddr; };
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +3 -6
@@ -1028,8 +1028,8 @@ static int hns_roce_v2_rst_process_cmd(struct hns_roce_dev *hr_dev)struct hns_roce_v2_priv *priv = hr_dev->priv;struct hnae3_handle *handle = priv->handle;const struct hnae3_ae_ops *ops = handle->ae_algo->ops; -unsigned long instance_stage;/* the current instance stage */ -unsigned long reset_stage;/* the current reset stage */ +unsigned long instance_stage;/* the current instance stage */ +unsigned long reset_stage;/* the current reset stage */ unsigned long reset_cnt;bool sw_resetting;bool hw_resetting;
@@ -2434,7 +2434,6 @@ static int hns_roce_init_link_table(struct hns_roce_dev *hr_dev,if (i < (pg_num -1 )) entry[i].blk_ba1_nxt_ptr |= (i +1 ) <<HNS_ROCE_LINK_TABLE_NXT_PTR_S ; - } link_tbl->npages = pg_num; link_tbl->pg_sz = buf_chk_sz;
@@ -5540,16 +5539,14 @@ static int hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev,case HNS_ROCE_EVENT_TYPE_CQ_OVERFLOW :hns_roce_cq_event (hr_dev, cqn, event_type);break ; -case HNS_ROCE_EVENT_TYPE_DB_OVERFLOW : -break ;case HNS_ROCE_EVENT_TYPE_MB :hns_roce_cmd_event (hr_dev,le16_to_cpu (aeqe->event.cmd.token), aeqe->event.cmd.status,le64_to_cpu (aeqe->event.cmd.out_param));break ; +case HNS_ROCE_EVENT_TYPE_DB_OVERFLOW :case HNS_ROCE_EVENT_TYPE_CEQ_OVERFLOW : -break ;case HNS_ROCE_EVENT_TYPE_FLR :break ;default :
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +3 -3
@@ -440,7 +440,7 @@ struct hns_roce_srq_context {#define SRQC_BYTE_60_SRQ_DB_RECORD_ADDR_S 1#define SRQC_BYTE_60_SRQ_DB_RECORD_ADDR_M GENMASK(31, 1) -enum { +enum {V2_MPT_ST_VALID =0x1 ,V2_MPT_ST_FREE =0x2 , };
@@ -1076,9 +1076,9 @@ struct hns_roce_v2_ud_send_wqe {__le32 dmac;__le32 byte_48;u8 dgid[GID_LEN_V2 ]; - }; -#define V2_UD_SEND_WQE_BYTE_4_OPCODE_S 0 + +#define V2_UD_SEND_WQE_BYTE_4_OPCODE_S 0#define V2_UD_SEND_WQE_BYTE_4_OPCODE_M GENMASK(4, 0)#define V2_UD_SEND_WQE_BYTE_4_OWNER_S 7
drivers/infiniband/hw/hns/hns_roce_main.c +3 -3
@@ -582,8 +582,8 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev)static int hns_roce_init_hem (struct hns_roce_dev *hr_dev) { -int ret;struct device *dev = hr_dev->dev; +int ret; ret = hns_roce_init_hem_table(hr_dev, &hr_dev->mr_table.mtpt_table, HEM_TYPE_MTPT, hr_dev->caps.mtpt_entry_sz,
@@ -723,8 +723,8 @@ static int hns_roce_init_hem(struct hns_roce_dev *hr_dev)*/ static int hns_roce_setup_hca (struct hns_roce_dev *hr_dev) { -int ret;struct device *dev = hr_dev->dev; +int ret;spin_lock_init (&hr_dev->sm_lock);spin_lock_init (&hr_dev->bt_cmd_lock);
@@ -847,8 +847,8 @@ void hns_roce_handle_device_err(struct hns_roce_dev *hr_dev)int hns_roce_init (struct hns_roce_dev *hr_dev) { -int ret;struct device *dev = hr_dev->dev; +int ret;if (hr_dev->hw->reset) { ret = hr_dev->hw->reset (hr_dev, true);
drivers/infiniband/hw/hns/hns_roce_mr.c +2 -2
@@ -167,10 +167,10 @@ static void hns_roce_mr_free(struct hns_roce_dev *hr_dev,static int hns_roce_mr_enable (struct hns_roce_dev *hr_dev,struct hns_roce_mr *mr) { -int ret;unsigned long mtpt_idx =key_to_hw_index (mr->key); -struct device *dev = hr_dev->dev;struct hns_roce_cmd_mailbox *mailbox; +struct device *dev = hr_dev->dev; +int ret;/* Allocate mailbox memory */ mailbox =hns_roce_alloc_cmd_mailbox (hr_dev);
drivers/infiniband/hw/hns/hns_roce_qp.c +1 -1
@@ -114,8 +114,8 @@ void hns_roce_qp_event(struct hns_roce_dev *hr_dev, u32 qpn, int event_type)static void hns_roce_ib_qp_event (struct hns_roce_qp *hr_qp,enum hns_roce_event type) { -struct ib_event event;struct ib_qp *ibqp = &hr_qp->ibqp; +struct ib_event event;if (ibqp->event_handler) { event.device = ibqp->device;
drivers/infiniband/hw/hns/hns_roce_srq.c +0 -1
@@ -245,7 +245,6 @@ static int alloc_srq_idx(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq, err = -ENOMEM ; goto err_idx_mtr; } - }return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 138/509 RDMA/hns: Use refcount_t APIs for HEM
In reply to Greg Kroah-HartmanFrom: Weihang Li <[email protected]>
[ Upstream commit 82eb481da64586ccd287b2b2c5a086202c65e7eb ]
refcount_t is better than integer for reference counting, it will WARN on overflow/underflow and avoid use-after-free risks.
Stable-dep-of: cf5b608fb0e3 ("RDMA/hns: Fix hns_roce_table_get return value")
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 32 +++++++++++------------- drivers/infiniband/hw/hns/hns_roce_hem.h | 4 +-- 2 files changed, 17 insertions(+), 19 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +15 -17
@@ -260,7 +260,6 @@ static struct hns_roce_hem *hns_roce_alloc_hem(struct hns_roce_dev *hr_dev,if (!hem)return NULL ; - hem->refcount =0 ;INIT_LIST_HEAD (&hem->chunk_list); order =get_order (hem_alloc_size);
@@ -607,7 +606,7 @@ static int hns_roce_table_mhop_get(struct hns_roce_dev *hr_dev,mutex_lock (&table->mutex);if (table->hem[index.buf]) { - ++table->hem[index.buf]->refcount; +refcount_inc (&table->hem[index.buf]->refcount); goto out; }
@@ -626,7 +625,7 @@ static int hns_roce_table_mhop_get(struct hns_roce_dev *hr_dev, } } - ++table->hem[index.buf]->refcount; +refcount_set (&table->hem[index.buf]->refcount,1 ); goto out; err_alloc:
@@ -652,7 +651,7 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev,mutex_lock (&table->mutex);if (table->hem[i]) { - ++table->hem[i]->refcount; +refcount_inc (&table->hem[i]->refcount); goto out; }
@@ -675,7 +674,7 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev, goto out; } - ++table->hem[i]->refcount; +refcount_set (&table->hem[i]->refcount,1 ); out:mutex_unlock (&table->mutex);return ret;
@@ -742,11 +741,11 @@ static void hns_roce_table_mhop_put(struct hns_roce_dev *hr_dev,return ; } -mutex_lock (&table->mutex); -if (check_refcount && (--table->hem[index.buf]->refcount >0 )) { -mutex_unlock (&table->mutex); +if (!check_refcount) +mutex_lock (&table->mutex); +else if (!refcount_dec_and_mutex_lock (&table->hem[index.buf]->refcount, + &table->mutex))return ; - }clear_mhop_hem (hr_dev, table, obj, &mhop, &index);free_mhop_hem (hr_dev, table, &mhop, &index);
@@ -768,16 +767,15 @@ void hns_roce_table_put(struct hns_roce_dev *hr_dev, i = (obj & (table->num_obj -1 )) / (table->table_chunk_size / table->obj_size); -mutex_lock (&table->mutex); +if (!refcount_dec_and_mutex_lock (&table->hem[i]->refcount, + &table->mutex)) +return ; -if (--table->hem[i]->refcount ==0 ) { -/* Clear HEM base address */ -if (hr_dev->hw->clear_hem (hr_dev, table, obj,0 )) -dev_warn (dev,"Clear HEM base address failed.\n" ); +if (hr_dev->hw->clear_hem (hr_dev, table, obj,0 )) +dev_warn (dev,"failed to clear HEM base address.\n" ); -hns_roce_free_hem (hr_dev, table->hem[i]); - table->hem[i] =NULL ; - } +hns_roce_free_hem (hr_dev, table->hem[i]); + table->hem[i] =NULL ;mutex_unlock (&table->mutex); }
drivers/infiniband/hw/hns/hns_roce_hem.h +2 -2
@@ -87,8 +87,8 @@ struct hns_roce_hem_chunk { };struct hns_roce_hem { -struct list_head chunk_list; -int refcount; +struct list_head chunk_list; +refcount_t refcount; };struct hns_roce_hem_iter {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 139/509 RDMA/hns: Clean the hardware related code for HEM
In reply to Greg Kroah-HartmanFrom: Xi Wang <[email protected]>
[ Upstream commit 68e11a6086b10e1a88d2b2c8432299f595db748d ]
Move the HIP06 related code to the hw v1 source file for HEM.
Stable-dep-of: cf5b608fb0e3 ("RDMA/hns: Fix hns_roce_table_get return value")
--- drivers/infiniband/hw/hns/hns_roce_device.h | 2 - drivers/infiniband/hw/hns/hns_roce_hem.c | 82 +-------------------- drivers/infiniband/hw/hns/hns_roce_hem.h | 9 +-- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 77 +++++++++++++++++++ drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 5 ++ 5 files changed, 85 insertions(+), 90 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +0 -2
@@ -46,8 +46,6 @@#define HNS_ROCE_IB_MIN_SQ_STRIDE 6 -#define HNS_ROCE_BA_SIZE (32 * 4096) -#define BA_BYTE_LEN 8/* Hardware specification only for v1 engine */
drivers/infiniband/hw/hns/hns_roce_hem.c +2 -80
106 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_hem.h +1 -8
@@ -34,9 +34,7 @@#ifndef _HNS_ROCE_HEM_H#define _HNS_ROCE_HEM_H -#define HW_SYNC_SLEEP_TIME_INTERVAL 20 -#define HW_SYNC_TIMEOUT_MSECS (25 * HW_SYNC_SLEEP_TIME_INTERVAL) -#define BT_CMD_SYNC_SHIFT 31 +#define HEM_HOP_STEP_DIRECT 0xffenum { /* MAP HEM(Hardware Entry Memory) */
@@ -73,11 +71,6 @@ enum { (type >= HEM_TYPE_MTT && hop_num == 1) || \ (type >= HEM_TYPE_MTT && hop_num == HNS_ROCE_HOP_NUM_0)) -enum { -HNS_ROCE_HEM_PAGE_SHIFT =12 , -HNS_ROCE_HEM_PAGE_SIZE =1 <<HNS_ROCE_HEM_PAGE_SHIFT , -}; - struct hns_roce_hem_chunk { struct list_head list; int npages;
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +77 -0
89 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_hw_v1.h +5 -0
@@ -1042,6 +1042,11 @@ struct hns_roce_db_table {struct hns_roce_ext_db *ext_db; }; +#define HW_SYNC_SLEEP_TIME_INTERVAL 20 +#define HW_SYNC_TIMEOUT_MSECS (25 * HW_SYNC_SLEEP_TIME_INTERVAL) +#define BT_CMD_SYNC_SHIFT 31 +#define HNS_ROCE_BA_SIZE (32 * 4096) +struct hns_roce_bt_table {struct hns_roce_buf_list qpc_buf;struct hns_roce_buf_list mtpt_buf;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 140/509 RDMA/hns: Fix hns_roce_table_get return value
In reply to Greg Kroah-HartmanFrom: Chengchang Tang <[email protected]>
[ Upstream commit cf5b608fb0e369c473a8303cad6ddb386505e5b8 ]
The return value of set_hem has been fixed to ENODEV, which will lead a diagnostic information missing.
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +4 -3
@@ -588,11 +588,12 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev, }/* Set HEM base address(128K/page, pa) to Hardware */ -if (hr_dev->hw->set_hem (hr_dev, table, obj,HEM_HOP_STEP_DIRECT )) { + ret = hr_dev->hw->set_hem (hr_dev, table, obj,HEM_HOP_STEP_DIRECT ); +if (ret) {hns_roce_free_hem (hr_dev, table->hem[i]); table->hem[i] =NULL ; - ret = -ENODEV ; -dev_err (dev,"set HEM base address to HW failed.\n" ); +dev_err (dev,"set HEM base address to HW failed, ret = %d.\n" , + ret); goto out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 141/509 ARM: dts: iwg20d-q7-common: Fix backlight pwm specifier
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0501fdec106a291c43b3c1b525cf22ab4c24b2d8 ]
make dtbs_check:
arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7.dtb: backlight: pwms: [[58, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7-dbcm-ca.dtb: backlight: pwms: [[67, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7-dbcm-ca.dtb: backlight: pwms: [[67, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7.dtb: backlight: pwms: [[58, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
PWM specifiers referring to R-Car PWM Timer Controllers should contain only two cells.
Fix this by dropping the bogus third cell.
--- arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/iwg20d-q7-common.dtsi +1 -1
@@ -49,7 +49,7 @@ audio_clock: audio_clock { lcd_backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm3 0 5000000 0>; + pwms = <&pwm3 0 5000000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <7>; enable-gpios = <&gpio5 14 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 142/509 arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 1a2c4e5635177939a088d22fa35c6a7032725663 ]
The schematics are misleading, the flow control is for HSCIF1. We need SCIF1 for GNSS/GPS which does not use flow control.
--- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +1 -2
@@ -270,7 +270,7 @@ hscif0_pins: hscif0 { }; scif1_pins: scif1 { - groups = "scif1_data_b", "scif1_ctrl"; + groups = "scif1_data_b"; function = "scif1"; };
@@ -330,7 +330,6 @@ rsnd_for_pcm3168a_capture: endpoint { &scif1 { pinctrl-0 = <&scif1_pins>; pinctrl-names = "default"; - uart-has-rtscts; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 143/509 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 79a3908d1ea6c35157a6d907b1a9d8ec06015e7a ]
If 'mipid_detect()' fails, we must free 'md' to avoid a memory leak.
--- drivers/video/fbdev/omap/lcd_mipid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/video/fbdev/omap/lcd_mipid.c +5 -1
@@ -563,11 +563,15 @@ static int mipid_spi_probe(struct spi_device *spi) r =mipid_detect (md);if (r <0 ) -return r; + goto free_md;omapfb_register_panel (&md->panel);return 0 ; + +free_md: +kfree (md); +return r; }static int mipid_spi_remove (struct spi_device *spi)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 144/509 arm64: dts: ti: k3-j7200: Fix physical address of pin
In reply to Greg Kroah-HartmanFrom: Keerthy <[email protected]>
[ Upstream commit 3d011933000ed9054c649952d83162d24f020a93 ]
wkup_pmx splits into multiple regions. Like
wkup_pmx0 -> 13 pins (WKUP_PADCONFIG 0 - 12)
wkup_pmx1 -> 2 pins (WKUP_PADCONFIG 14 - 15)
wkup_pmx2 -> 59 pins (WKUP_PADCONFIG 26 - 84)
wkup_pmx3 -> 8 pins (WKUP_PADCONFIG 93 - 100)With this split, pin offset needs to be adjusted to match with new pmx for all pins above wkup_pmx0.
Example a pin under wkup_pmx1 should start from 0 instead of old offset(0x38 WKUP_PADCONFIG 14 offset)
J7200 Datasheet (Table 6-106, Section 6.4 Pin Multiplexing) :
https://www.ti.com/lit/ds/symlink/dra821u.pdf
--- .../dts/ti/k3-j7200-common-proc-board.dts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +14 -14
@@ -19,25 +19,25 @@ chosen { &wkup_pmx2 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < - J721E_WKUP_IOPAD(0x0068, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */ - J721E_WKUP_IOPAD(0x006c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */ - J721E_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */ - J721E_WKUP_IOPAD(0x0074, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */ - J721E_WKUP_IOPAD(0x0078, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */ - J721E_WKUP_IOPAD(0x007c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */ - J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ - J721E_WKUP_IOPAD(0x008c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ - J721E_WKUP_IOPAD(0x0090, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ - J721E_WKUP_IOPAD(0x0094, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ - J721E_WKUP_IOPAD(0x0080, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ - J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ + J721E_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */ + J721E_WKUP_IOPAD(0x0004, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */ + J721E_WKUP_IOPAD(0x0008, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */ + J721E_WKUP_IOPAD(0x000c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */ + J721E_WKUP_IOPAD(0x0010, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */ + J721E_WKUP_IOPAD(0x0014, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */ + J721E_WKUP_IOPAD(0x0020, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ + J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ + J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ + J721E_WKUP_IOPAD(0x002c, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ + J721E_WKUP_IOPAD(0x0018, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ + J721E_WKUP_IOPAD(0x001c, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ >; }; mcu_mdio_pins_default: mcu-mdio1-pins-default { pinctrl-single,pins = < - J721E_WKUP_IOPAD(0x009c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */ - J721E_WKUP_IOPAD(0x0098, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ + J721E_WKUP_IOPAD(0x0034, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */ + J721E_WKUP_IOPAD(0x0030, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ >; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 145/509 ARM: dts: stm32: Fix audio routing on STM32MP15xx DHCOM PDK2
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e3f2778b1b6ced649bffdc7cbb05b80bb92f2108 ]
The audio routing flow is not correct, the flow should be from source (second element in the pair) to sink (first element in the pair). The flow now is from "HP_OUT" to "Playback", where "Playback" is source and "HP_OUT" is sink, i.e. the direction is swapped and there is no direct link between the two either.
Fill in the correct routing, where "HP_OUT" supplies the "Headphone Jack", "Line In Jack" supplies "LINE_IN" input, "Microphone Jack" supplies "MIC_IN" input and "Mic Bias" supplies "Microphone Jack".
--- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi +7 -4
@@ -120,10 +120,13 @@ lcd_panel_in: endpoint { sound { compatible = "audio-graph-card"; - routing = - "MIC_IN", "Capture", - "Capture", "Mic Bias", - "Playback", "HP_OUT"; + widgets = "Headphone", "Headphone Jack", + "Line", "Line In Jack", + "Microphone", "Microphone Jack"; + routing = "Headphone Jack", "HP_OUT", + "LINE_IN", "Line In Jack", + "MIC_IN", "Microphone Jack", + "Microphone Jack", "Mic Bias"; dais = <&sai2a_port &sai2b_port>; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 146/509 ARM: dts: stm32: fix i2s endpoint format property for stm32mp15xx-dkx
In reply to Greg Kroah-HartmanFrom: Olivier Moysan <[email protected]>
[ Upstream commit 076c74c592cabe4a47537fe5205b5b678bed010d ]
Use "dai-format" to configure DAI audio format as specified in audio-graph-port.yaml bindings.
--- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dkx.dtsi +1 -1
@@ -406,7 +406,7 @@ &i2s2 { i2s2_port: port { i2s2_endpoint: endpoint { remote-endpoint = <&sii9022_tx_endpoint>; - format = "i2s"; + dai-format = "i2s"; mclk-fs = <256>; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 147/509 hwmon: (gsc-hwmon) fix fan pwm temperature scaling
In reply to Greg Kroah-HartmanFrom: Tim Harvey <[email protected]>
[ Upstream commit a6d80df47ee2c69db99e4f2f8871aa4db154620b ]
The GSC fan pwm temperature register is in centidegrees celcius but the Linux hwmon convention is to use milidegrees celcius. Fix the scaling.
--- drivers/hwmon/gsc-hwmon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/gsc-hwmon.c +3 -3
@@ -82,8 +82,8 @@ static ssize_t pwm_auto_point_temp_store(struct device *dev,if (kstrtol (buf,10 , &temp))return -EINVAL ; - temp =clamp_val (temp,0 ,10000 ); - temp =DIV_ROUND_CLOSEST (temp,10 ); + temp =clamp_val (temp,0 ,100000 ); + temp =DIV_ROUND_CLOSEST (temp,100 ); regs[0 ] = temp &0xff ; regs[1 ] = (temp >>8 ) &0xff ;
@@ -100,7 +100,7 @@ static ssize_t pwm_auto_point_pwm_show(struct device *dev, {struct sensor_device_attribute *attr =to_sensor_dev_attr (devattr); -return sprintf (buf,"%d\n" ,255 * (50 + (attr->index *10 )) /100 ); +return sprintf (buf,"%d\n" ,255 * (50 + (attr->index *10 ))); } static SENSOR_DEVICE_ATTR_RO(pwm1_auto_point1_pwm, pwm_auto_point_pwm, 0);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 148/509 hwmon: (adm1275) enable adm1272 temperature reporting
In reply to Greg Kroah-HartmanFrom: Chu Lin <[email protected]>
[ Upstream commit 9da9c2dc57b2fa2e65521894cb66df4bf615214d ]
adm1272 supports temperature reporting but it is disabled by default.
Tested:
ls temp1_*
temp1_crit temp1_highest temp1_max temp1_crit_alarm temp1_input temp1_max_alarm
cat temp1_input
26642
Stable-dep-of: b153a0bb4199 ("hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272")
--- drivers/hwmon/pmbus/adm1275.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/hwmon/pmbus/adm1275.c +6 -8
@@ -611,11 +611,13 @@ static int adm1275_probe(struct i2c_client *client) tindex =8 ; info->func[0 ] |=PMBUS_HAVE_PIN |PMBUS_HAVE_STATUS_INPUT | -PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT ; +PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT | +PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP ; -/* Enable VOUT if not enabled (it is disabled by default) */ -if (!(config &ADM1278_VOUT_EN )) { - config |=ADM1278_VOUT_EN ; +/* Enable VOUT & TEMP1 if not enabled (disabled by default) */ +if ((config & (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) != + (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) { + config |=ADM1278_VOUT_EN |ADM1278_TEMP1_EN ; ret =i2c_smbus_write_byte_data (client,ADM1275_PMON_CONFIG , config);
@@ -625,10 +627,6 @@ static int adm1275_probe(struct i2c_client *client)return -ENODEV ; } } - -if (config &ADM1278_TEMP1_EN ) - info->func[0 ] |= -PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP ;if (config &ADM1278_VIN_EN ) info->func[0 ] |=PMBUS_HAVE_VIN ;break ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 149/509 hwmon: (adm1275) Allow setting sample averaging
In reply to Greg Kroah-HartmanFrom: Potin Lai <[email protected]>
[ Upstream commit a3cd66d7cbadcc0c29884f25b754fd22699c719c ]
Current driver assume PWR_AVG and VI_AVG as 1 by default, and user needs to set sample averaging via sysfs manually.
This patch parses the properties "adi,power-sample-average" and "adi,volt-curr-sample-average" from device tree, and setting sample averaging during probe. Input value must be one of value in the list [1, 2, 4, 8, 16, 32, 64, 128].
Stable-dep-of: b153a0bb4199 ("hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272")
--- drivers/hwmon/pmbus/adm1275.c | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/adm1275.c +39 -1
@@ -475,6 +475,7 @@ static int adm1275_probe(struct i2c_client *client)int vindex =-1 , voindex =-1 , cindex =-1 , pindex =-1 ;int tindex =-1 ;u32 shunt; +u32 avg; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA
@@ -687,7 +688,7 @@ static int adm1275_probe(struct i2c_client *client)if ((config & (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) != (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) { config |=ADM1278_VOUT_EN |ADM1278_TEMP1_EN ; - ret =i2c_smbus_write_byte_data (client, + ret =i2c_smbus_write_word_data (client,ADM1275_PMON_CONFIG , config);if (ret <0 ) {
@@ -756,6 +757,43 @@ static int adm1275_probe(struct i2c_client *client)return -ENODEV ; } +if (data->have_power_sampling && +of_property_read_u32 (client->dev.of_node, +"adi,power-sample-average" , &avg) ==0 ) { +if (!avg || avg >ADM1275_SAMPLES_AVG_MAX || +BIT (__fls (avg)) != avg) { +dev_err (&client->dev, +"Invalid number of power samples" ); +return -EINVAL ; + } + ret =adm1275_write_pmon_config (data, client, true, +ilog2 (avg)); +if (ret <0 ) { +dev_err (&client->dev, +"Setting power sample averaging failed with error %d" , + ret); +return ret; + } + } + +if (of_property_read_u32 (client->dev.of_node, +"adi,volt-curr-sample-average" , &avg) ==0 ) { +if (!avg || avg >ADM1275_SAMPLES_AVG_MAX || +BIT (__fls (avg)) != avg) { +dev_err (&client->dev, +"Invalid number of voltage/current samples" ); +return -EINVAL ; + } + ret =adm1275_write_pmon_config (data, client, false, +ilog2 (avg)); +if (ret <0 ) { +dev_err (&client->dev, +"Setting voltage and current sample averaging failed with error %d" , + ret); +return ret; + } + } +if (voindex <0 ) voindex = vindex;if (vindex >=0 ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 150/509 hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit b153a0bb4199566abd337119207f82b59a8cd1ca ]
The PMON_CONFIG register on ADM1272 is a 16 bit register. Writing a 8 bit value into it clears the upper 8 bits of the register, resulting in unexpected side effects. Fix by writing the 16 bit register value.
Also, it has been reported that temperature readings are sometimes widely inaccurate, to the point where readings may result in device shutdown due to errant overtemperature faults. Improve by enabling temperature sampling.
While at it, move the common code for ADM1272 and ADM1278 into a separate function, and clarify in the error message that an attempt was made to enable both VOUT and temperature monitoring.
Last but not least, return the error code reported by the underlying I2C controller and not -ENODEV if updating the PMON_CONFIG register fails. After all, this does not indicate that the chip is not present, but an error in the communication with the chip.
--- drivers/hwmon/pmbus/adm1275.c | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/hwmon/pmbus/adm1275.c +26 -26
@@ -37,10 +37,13 @@ enum chips { adm1075, adm1272, adm1275, adm1276, adm1278, adm1293, adm1294 };#define ADM1272_IRANGE BIT(0) +#define ADM1278_TSFILT BIT(15)#define ADM1278_TEMP1_EN BIT(3)#define ADM1278_VIN_EN BIT(2)#define ADM1278_VOUT_EN BIT(1) +#define ADM1278_PMON_DEFCONFIG (ADM1278_VOUT_EN | ADM1278_TEMP1_EN | ADM1278_TSFILT) +#define ADM1293_IRANGE_25 0#define ADM1293_IRANGE_50 BIT(6)#define ADM1293_IRANGE_100 BIT(7)
@@ -462,6 +465,22 @@ static const struct i2c_device_id adm1275_id[] = { };MODULE_DEVICE_TABLE (i2c, adm1275_id); +/* Enable VOUT & TEMP1 if not enabled (disabled by default) */ +static int adm1275_enable_vout_temp (struct i2c_client *client,int config) +{ +int ret; + +if ((config &ADM1278_PMON_DEFCONFIG ) !=ADM1278_PMON_DEFCONFIG ) { + config |=ADM1278_PMON_DEFCONFIG ; + ret =i2c_smbus_write_word_data (client,ADM1275_PMON_CONFIG , config); +if (ret <0 ) { +dev_err (&client->dev,"Failed to enable VOUT/TEMP1 monitoring\n" ); +return ret; + } + } +return 0 ; +} +static int adm1275_probe (struct i2c_client *client) {s32 (*config_read_fn)(const struct i2c_client *client,u8 reg);
@@ -615,19 +634,10 @@ static int adm1275_probe(struct i2c_client *client)PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT |PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP ; -/* Enable VOUT & TEMP1 if not enabled (disabled by default) */ -if ((config & (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) != - (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) { - config |=ADM1278_VOUT_EN |ADM1278_TEMP1_EN ; - ret =i2c_smbus_write_byte_data (client, -ADM1275_PMON_CONFIG , - config); -if (ret <0 ) { -dev_err (&client->dev, -"Failed to enable VOUT monitoring\n" ); -return -ENODEV ; - } - } + ret =adm1275_enable_vout_temp (client, config); +if (ret) +return ret; +if (config &ADM1278_VIN_EN ) info->func[0 ] |=PMBUS_HAVE_VIN ;break ;
@@ -684,19 +694,9 @@ static int adm1275_probe(struct i2c_client *client)PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT |PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP ; -/* Enable VOUT & TEMP1 if not enabled (disabled by default) */ -if ((config & (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) != - (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) { - config |=ADM1278_VOUT_EN |ADM1278_TEMP1_EN ; - ret =i2c_smbus_write_word_data (client, -ADM1275_PMON_CONFIG , - config); -if (ret <0 ) { -dev_err (&client->dev, -"Failed to enable VOUT monitoring\n" ); -return -ENODEV ; - } - } + ret =adm1275_enable_vout_temp (client, config); +if (ret) +return ret;if (config &ADM1278_VIN_EN ) info->func[0 ] |=PMBUS_HAVE_VIN ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 151/509 ARM: dts: BCM5301X: fix duplex-full => full-duplex
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
[ Upstream commit fd274b733bfdde3ca72f0fa2a37f032f3a8c402c ]
this typo was found by the dtbs_check
| ports:port@5:fixed-link: 'oneOf' conditional failed,
| {'speed': [[1000]], 'duplex-full': True} is not of type 'array'
| 'duplex-full' does not match any of the regexes: 'pinctrl-[0-]..."this should have been full-duplex;
--- arch/arm/boot/dts/bcm53015-meraki-mr26.dts | 2 +- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/bcm53015-meraki-mr26.dts +1 -1
@@ -128,7 +128,7 @@ port@5 { fixed-link { speed = <1000>; - duplex-full; + full-duplex; }; }; };
arch/arm/boot/dts/bcm53016-meraki-mr32.dts +1 -1
@@ -212,7 +212,7 @@ port@5 { fixed-link { speed = <1000>; - duplex-full; + full-duplex; }; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 152/509 drm/amdkfd: Fix potential deallocation of previously deallocated memory.
In reply to Greg Kroah-HartmanFrom: Daniil Dulov <[email protected]>
[ Upstream commit cabbdea1f1861098991768d7bbf5a49ed1608213 ]
Pointer mqd_mem_obj can be deallocated in kfd_gtt_sa_allocate(). The function then returns non-zero value, which causes the second deallocation.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +7 -6
@@ -113,18 +113,19 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd, &(mqd_mem_obj->gtt_mem), &(mqd_mem_obj->gpu_addr), (void *)&(mqd_mem_obj->cpu_ptr), true); + +if (retval) { +kfree (mqd_mem_obj); +return NULL ; + } }else { retval =kfd_gtt_sa_allocate (kfd,sizeof (struct v9_mqd ), &mqd_mem_obj); - } - -if (retval) { -kfree (mqd_mem_obj); -return NULL ; +if (retval) +return NULL ; }return mqd_mem_obj; - } static void init_mqd(struct mqd_manager *mm, void **mqd,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 153/509 drm/radeon: fix possible division-by-zero errors
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 1becc57cd1a905e2aa0e1eca60d2a37744525c4a ]
Function rv740_get_decoded_reference_divider() may return 0 due to unpredictable reference divider value calculated in radeon_atom_get_clock_dividers(). This will lead to division-by-zero error once that value is used as a divider in calculating 'clk_s'.
While unlikely, this issue should nonetheless be prevented so add a sanity check for such cases by testing 'decoded_ref' value against 0.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
v2: minor coding style fixes (Alex)
In practice this should actually happen as the vbios should be properly populated.
--- drivers/gpu/drm/radeon/cypress_dpm.c | 8 ++++++-- drivers/gpu/drm/radeon/ni_dpm.c | 8 ++++++-- drivers/gpu/drm/radeon/rv740_dpm.c | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/cypress_dpm.c +6 -2
@@ -559,8 +559,12 @@ static int cypress_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v = ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v = ss.percentage * (0x4000 * dividers.whole_fb_div +0x800 * dividers.frac_fb_div) / (clk_s *625 ); mpll_ss1 &= ~CLKV_MASK ;
drivers/gpu/drm/radeon/ni_dpm.c +6 -2
@@ -2240,8 +2240,12 @@ static int ni_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v = ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v = ss.percentage * (0x4000 * dividers.whole_fb_div +0x800 * dividers.frac_fb_div) / (clk_s *625 ); mpll_ss1 &= ~CLKV_MASK ;
drivers/gpu/drm/radeon/rv740_dpm.c +6 -2
@@ -250,8 +250,12 @@ int rv740_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v =0x40000 * ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v =0x40000 * ss.percentage * (dividers.whole_fb_div + (dividers.frac_fb_div /8 )) / (clk_s *10000 ); mpll_ss1 &= ~CLKV_MASK ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 154/509 amdgpu: validate offset_in_bo of drm_amdgpu_gem_va
In reply to Greg Kroah-HartmanFrom: Chia-I Wu <[email protected]>
[ Upstream commit 9f0bcf49e9895cb005d78b33a5eebfa11711b425 ]
This is motivated by OOB access in amdgpu_vm_update_range when offset_in_bo+map_size overflows.
v2: keep the validations in amdgpu_vm_bo_map
v3: add the validations to amdgpu_vm_bo_map/amdgpu_vm_bo_replace_map
rather than to amdgpu_gem_va_ioctl
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +8 -8
@@ -2229,14 +2229,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev,uint64_t eaddr;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;
@@ -2295,14 +2295,14 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,int r;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 155/509 RDMA/bnxt_re: wraparound mbox producer index
In reply to Greg Kroah-HartmanFrom: Kashyap Desai <[email protected]>
[ Upstream commit 0af91306e17ef3d18e5f100aa58aa787869118af ]
Driver is not handling the wraparound of the mbox producer index correctly. Currently the wraparound happens once u32 max is reached.
Bit 31 of the producer index register is special and should be set only once for the first command. Because the producer index overflow setting bit31 after a long time, FW goes to initialization sequence and this causes FW hang.
Fix is to wraparound the mbox producer index once it reaches u16 max.
--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +2 -2
@@ -181,7 +181,7 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw, struct cmdq_base *req, }while (size >0 ); cmdq->seq_num++; - cmdq_prod = hwq->prod; + cmdq_prod = hwq->prod &0xFFFF ;if (test_bit (FIRMWARE_FIRST_FLAG , &cmdq->flags)) {/* The very first doorbell write * is required to set this flag
@@ -595,7 +595,7 @@ int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res, rcfw->cmdq_depth =BNXT_QPLIB_CMDQE_MAX_CNT_8192 ; sginfo.pgsize =bnxt_qplib_cmdqe_page_size (rcfw->cmdq_depth); - hwq_attr.depth = rcfw->cmdq_depth; + hwq_attr.depth = rcfw->cmdq_depth &0x7FFFFFFF ; hwq_attr.stride =BNXT_QPLIB_CMDQE_UNITS ; hwq_attr.type =HWQ_TYPE_CTX ;if (bnxt_qplib_alloc_init_hwq (&cmdq->hwq, &hwq_attr)) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 156/509 RDMA/bnxt_re: Avoid calling wake_up threads from spin_lock context
In reply to Greg Kroah-HartmanFrom: Kashyap Desai <[email protected]>
[ Upstream commit 3099bcdc19b701f732f638ee45679858c08559bb ]
bnxt_qplib_service_creq can be called from interrupt or tasklet or process context. So the function take irq variant of spin_lock. But when wake_up is invoked with the lock held, it is putting the calling context to sleep.
[exception RIP: __wake_up_common+190]
RIP: ffffffffb7539d7e RSP: ffffa73300207ad8 RFLAGS: 00000083 RAX: 0000000000000001 RBX: ffff91fa295f69b8 RCX: dead000000000200 RDX: ffffa733344af940 RSI: ffffa73336527940 RDI: ffffa73336527940 RBP: 000000000000001c R8: 0000000000000002 R9: 00000000000299c0 R10: 0000017230de82c5 R11: 0000000000000002 R12: ffffa73300207b28 R13: 0000000000000000 R14: ffffa733341bf928 R15: 0000000000000000 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
Call the wakeup after releasing the lock.
--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +10 -3
@@ -295,7 +295,8 @@ static int bnxt_qplib_process_func_event(struct bnxt_qplib_rcfw *rcfw, }static int bnxt_qplib_process_qp_event (struct bnxt_qplib_rcfw *rcfw, -struct creq_qp_event *qp_event) +struct creq_qp_event *qp_event, +u32 *num_wait) {struct creq_qp_error_notification *err_event;struct bnxt_qplib_hwq *hwq = &rcfw->cmdq.hwq;
@@ -304,6 +305,7 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,u16 cbit, blocked =0 ;struct pci_dev *pdev;unsigned long flags; +u32 wait_cmds =0 ;__le16 mcookie;u16 cookie;int rc =0 ;
@@ -363,9 +365,10 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw, crsqe->req_size =0 ;if (!blocked) -wake_up (&rcfw->cmdq.waitq); + wait_cmds++;spin_unlock_irqrestore (&hwq->lock, flags); } + *num_wait += wait_cmds;return rc; }
@@ -379,6 +382,7 @@ static void bnxt_qplib_service_creq(struct tasklet_struct *t)struct creq_base *creqe;u32 sw_cons, raw_cons;unsigned long flags; +u32 num_wakeup =0 ;/* Service the CREQ until budget is over */ spin_lock_irqsave (&hwq->lock, flags);
@@ -397,7 +401,8 @@ static void bnxt_qplib_service_creq(struct tasklet_struct *t)switch (type) {case CREQ_BASE_TYPE_QP_EVENT :bnxt_qplib_process_qp_event - (rcfw, (struct creq_qp_event *)creqe); + (rcfw, (struct creq_qp_event *)creqe, + &num_wakeup); creq->stats.creq_qp_event_processed++;break ;case CREQ_BASE_TYPE_FUNC_EVENT :
@@ -425,6 +430,8 @@ static void bnxt_qplib_service_creq(struct tasklet_struct *t) rcfw->res->cctx, true); }spin_unlock_irqrestore (&hwq->lock, flags); +if (num_wakeup) +wake_up_nr (&rcfw->cmdq.waitq, num_wakeup); }static irqreturn_t bnxt_qplib_creq_irq (int irq,void *dev_instance)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 157/509 clk: imx: clk-imx8mn: fix memory leak in imx8mn_clocks_probe
In reply to Greg Kroah-HartmanFrom: Hao Luo <[email protected]>
[ Upstream commit 188d070de9132667956f5aadd98d2bd87d3eac89 ]
Use devm_of_iomap() instead of of_iomap() to automatically handle the unused ioremap region.
If any error occurs, regions allocated by kzalloc() will leak, but using devm_kzalloc() instead will automatically free the memory using devm_kfree().
--- drivers/clk/imx/clk-imx8mn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/imx/clk-imx8mn.c +4 -4
@@ -291,7 +291,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)void __iomem *base;int ret; - clk_hw_data =kzalloc (struct_size (clk_hw_data, hws, + clk_hw_data =devm_kzalloc (dev,struct_size (clk_hw_data, hws,IMX8MN_CLK_END ),GFP_KERNEL );if (WARN_ON (!clk_hw_data))return -ENOMEM ;
@@ -308,10 +308,10 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_CLK_EXT4 ] =imx_obtain_fixed_clk_hw (np,"clk_ext4" ); np =of_find_compatible_node (NULL ,NULL ,"fsl,imx8mn-anatop" ); - base =of_iomap (np,0 ); + base =devm_of_iomap (dev, np,0 ,NULL );of_node_put (np); -if (WARN_ON (!base)) { - ret = -ENOMEM ; +if (WARN_ON (IS_ERR (base))) { + ret =PTR_ERR (base); goto unregister_hws; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 158/509 clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe()
In reply to Greg Kroah-HartmanFrom: Yuxing Liu <[email protected]>
[ Upstream commit 878b02d5f3b56cb090dbe2c70c89273be144087f ]
Replace of_iomap() and kzalloc() with devm_of_iomap() and devm_kzalloc() which can automatically release the related memory when the device or driver is removed or unloaded to avoid potential memory leak.
In this case, iounmap(anatop_base) in line 427,433 are removed as manual release is not required.
Besides, referring to clk-imx8mq.c, check the return code of of_clk_add_hw_provider, if it returns negtive, print error info and unregister hws, which makes the program more robust.
--- drivers/clk/imx/clk-imx8mp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/clk/imx/clk-imx8mp.c +13 -11
@@ -425,25 +425,22 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct device_node *np = dev->of_node;void __iomem *anatop_base, *ccm_base; +int err; np =of_find_compatible_node (NULL ,NULL ,"fsl,imx8mp-anatop" ); - anatop_base =of_iomap (np,0 ); + anatop_base =devm_of_iomap (dev, np,0 ,NULL );of_node_put (np); -if (WARN_ON (!anatop_base)) -return -ENOMEM ; +if (WARN_ON (IS_ERR (anatop_base))) +return PTR_ERR (anatop_base); np = dev->of_node; ccm_base =devm_platform_ioremap_resource (pdev,0 ); -if (WARN_ON (IS_ERR (ccm_base))) { -iounmap (anatop_base); +if (WARN_ON (IS_ERR (ccm_base)))return PTR_ERR (ccm_base); - } - clk_hw_data =kzalloc (struct_size (clk_hw_data, hws,IMX8MP_CLK_END ),GFP_KERNEL ); -if (WARN_ON (!clk_hw_data)) { -iounmap (anatop_base); + clk_hw_data =devm_kzalloc (dev,struct_size (clk_hw_data, hws,IMX8MP_CLK_END ),GFP_KERNEL ); +if (WARN_ON (!clk_hw_data))return -ENOMEM ; - } clk_hw_data->num =IMX8MP_CLK_END ; hws = clk_hw_data->hws;
@@ -743,7 +740,12 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)imx_check_clk_hws (hws,IMX8MP_CLK_END ); -of_clk_add_hw_provider (np, of_clk_hw_onecell_get, clk_hw_data); + err =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, clk_hw_data); +if (err <0 ) { +dev_err (dev,"failed to register hws for i.MX8MP\n" ); +imx_unregister_hw_clocks (hws,IMX8MP_CLK_END ); +return err; + }imx_register_uart_clocks (4 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 159/509 clk: tegra: tegra124-emc: Fix potential memory leak
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 53a06e5924c0d43c11379a08c5a78529c3e61595 ]
The tegra and tegra needs to be freed in the error handling path, otherwise it will be leaked.
--- drivers/clk/tegra/clk-tegra124-emc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/tegra/clk-tegra124-emc.c +2 -0
@@ -455,6 +455,7 @@ static int load_timings_from_dt(struct tegra_clk_emc *tegra, err =load_one_timing_from_dt (tegra, timing, child);if (err) {of_node_put (child); +kfree (tegra->timings);return err; }
@@ -506,6 +507,7 @@ struct clk *tegra_clk_register_emc(void __iomem *base, struct device_node *np, err =load_timings_from_dt (tegra, node, node_ram_code);if (err) {of_node_put (node); +kfree (tegra);return ERR_PTR (err); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 160/509 ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer
In reply to Greg Kroah-HartmanFrom: Su Hui <[email protected]>
[ Upstream commit 79597c8bf64ca99eab385115743131d260339da5 ]
smatch error:sound/pci/ac97/ac97_codec.c:2354 snd_ac97_mixer() error:
we previously assumed 'rac97' could be null (see line 2072)
remove redundant assignment, return error if rac97 is NULL.
--- sound/pci/ac97/ac97_codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/ac97/ac97_codec.c +2 -2
@@ -2007,8 +2007,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, .dev_disconnect = snd_ac97_dev_disconnect, }; -if (rac97) - *rac97 =NULL ; +if (!rac97) +return -EINVAL ;if (snd_BUG_ON (!bus || !template))return -EINVAL ;if (snd_BUG_ON (template->num >=4 ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 161/509 drm/msm/dpu: do not enable color-management if DSPPs are not available
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 3bcfc7b90465efd337d39b91b43972162f0d1908 ]
We can not support color management without DSPP blocks being provided in the HW catalog. Do not enable color management for CRTCs if num_dspps is 0.
Patchwork: https://patchwork.freedesktop.org/patch/542141/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -1
@@ -1262,6 +1262,8 @@ static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = {struct drm_crtc *dpu_crtc_init (struct drm_device *dev,struct drm_plane *plane,struct drm_plane *cursor) { +struct msm_drm_private *priv = dev->dev_private; +struct dpu_kms *dpu_kms =to_dpu_kms (priv->kms);struct drm_crtc *crtc =NULL ;struct dpu_crtc *dpu_crtc =NULL ;int i;
@@ -1293,7 +1295,8 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane,drm_crtc_helper_add (crtc, &dpu_crtc_helper_funcs); -drm_crtc_enable_color_mgmt (crtc,0 , true,0 ); +if (dpu_kms->catalog->dspp_count) +drm_crtc_enable_color_mgmt (crtc,0 , true,0 );/* save user friendly CRTC name for later */ snprintf (dpu_crtc->name,DPU_CRTC_NAME_SIZE ,"crtc%u" , crtc->base.id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 162/509 drm/msm/dp: Free resources after unregistering them
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit fa0048a4b1fa7a50c8b0e514f5b428abdf69a6f8 ]
The DP component's unbind operation walks through the submodules to unregister and clean things up. But if the unbind happens because the DP controller itself is being removed, all the memory for those submodules has just been freed.
Change the order of these operations to avoid the many use-after-free that otherwise happens in this code path.
Patchwork: https://patchwork.freedesktop.org/patch/542166/
--- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/dp/dp_display.c +1 -1
@@ -1267,9 +1267,9 @@ static int dp_display_remove(struct platform_device *pdev) dp =container_of (g_dp_display, struct dp_display_private, dp_display); +component_del (&pdev->dev, &dp_display_comp_ops);dp_display_deinit_sub_modules (dp); -component_del (&pdev->dev, &dp_display_comp_ops);platform_set_drvdata (pdev,NULL );return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 163/509 clk: vc5: check memory returned by kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 144601f6228de5598f03e693822b60a95c367a17 ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/clk/clk-versaclock5.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/clk/clk-versaclock5.c +29 -0
@@ -906,6 +906,11 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id) } init.name =kasprintf (GFP_KERNEL ,"%pOFn.mux" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } + init.ops = &vc5_mux_ops; init.flags =0 ; init.parent_names = parent_names;
@@ -920,6 +925,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.dbl" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_dbl_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -935,6 +944,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)/* Register PFD */ memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.pfd" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_pfd_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -952,6 +965,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)/* Register PLL */ memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.pll" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_pll_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -971,6 +988,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.fod%d" , client->dev.of_node, idx); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_fod_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -989,6 +1010,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.out0_sel_i2cb" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_clk_out_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -1015,6 +1040,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.out%d" , client->dev.of_node, idx +1 ); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_clk_out_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 164/509 clk: cdce925: check return value of kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit bb7d09ddbf361d51eae46f38e7c8a2b85914ea2a ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: e665f029a283 ("clk: Convert to using %pOFn instead of device_node.name")
--- drivers/clk/clk-cdce925.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/clk/clk-cdce925.c +12 -0
@@ -705,6 +705,10 @@ static int cdce925_probe(struct i2c_client *client,for (i =0 ; i < data->chip_info->num_plls; ++i) { pll_clk_name[i] =kasprintf (GFP_KERNEL ,"%pOFn.pll%d" , client->dev.of_node, i); +if (!pll_clk_name[i]) { + err = -ENOMEM ; + goto error; + } init.name = pll_clk_name[i]; data->pll[i].chip = data; data->pll[i].hw.init = &init;
@@ -746,6 +750,10 @@ static int cdce925_probe(struct i2c_client *client, init.num_parents =1 ; init.parent_names = &parent_name;/* Mux Y1 to input */ init.name =kasprintf (GFP_KERNEL ,"%pOFn.Y1" , client->dev.of_node); +if (!init.name) { + err = -ENOMEM ; + goto error; + } data->clk[0 ].chip = data; data->clk[0 ].hw.init = &init; data->clk[0 ].index =0 ;
@@ -764,6 +772,10 @@ static int cdce925_probe(struct i2c_client *client,for (i =1 ; i < data->chip_info->num_outputs; ++i) { init.name =kasprintf (GFP_KERNEL ,"%pOFn.Y%d" , client->dev.of_node, i+1 ); +if (!init.name) { + err = -ENOMEM ; + goto error; + } data->clk[i].chip = data; data->clk[i].hw.init = &init; data->clk[i].index = i;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 165/509 clk: si5341: Allow different output VDD_SEL values
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit b7bbf6ec4940d1a69811ec354edeeb9751fa8e85 ]
The driver was not previously programming the VDD_SEL values for each output to indicate what external VDDO voltage was used for each. Add ability to specify a regulator supplying the VDDO pin for each output of the device. The voltage of the regulator is used to automatically set the VDD_SEL value appropriately. If no regulator is specified and the chip is being reconfigured, assume 2.5V which appears to be the chip default.
Stable-dep-of: 2560114c06d7 ("clk: si5341: return error if one synth clock registration fails")
--- drivers/clk/clk-si5341.c | 136 +++++++++++++++++++++++++++++++-------- 1 file changed, 110 insertions(+), 26 deletions(-)
drivers/clk/clk-si5341.c +110 -26
@@ -19,6 +19,7 @@#include <linux/i2c.h> #include <linux/module.h> #include <linux/regmap.h> +#include <linux/regulator/consumer.h> #include <linux/slab.h> #include <asm/unaligned.h>
@@ -59,6 +60,7 @@ struct clk_si5341_synth {struct clk_si5341_output {struct clk_hw hw;struct clk_si5341 *data; +struct regulator *vddo_reg;u8 index; };#define to_clk_si5341_output (_hw) \
@@ -84,6 +86,7 @@ struct clk_si5341 {struct clk_si5341_output_config {u8 out_format_drv_bits;u8 out_cm_ampl_bits; +u8 vdd_sel_bits;bool synth_master;bool always_on; };
@@ -136,6 +139,8 @@ struct clk_si5341_output_config {#define SI5341_OUT_R_REG (output) \ ((output)->data->reg_rdiv_offset[(output)->index]) +#define SI5341_OUT_MUX_VDD_SEL_MASK 0x38 +/* Synthesize N divider */ #define SI5341_SYNTH_N_NUM (x) (0x0302 + ((x) * 11))#define SI5341_SYNTH_N_DEN (x) (0x0308 + ((x) * 11))
@@ -1250,11 +1255,11 @@ static const struct regmap_config si5341_regmap_config = { .volatile_table = &si5341_regmap_volatile, }; -static int si5341_dt_parse_dt (struct i2c_client *client, -struct clk_si5341_output_config *config) +static int si5341_dt_parse_dt (struct clk_si5341 *data, +struct clk_si5341_output_config *config) {struct device_node *child; -struct device_node *np = client->dev.of_node; +struct device_node *np = data->i2c_client->dev.of_node;u32 num;u32 val;
@@ -1263,13 +1268,13 @@ static int si5341_dt_parse_dt(struct i2c_client *client,for_each_child_of_node (np, child) {if (of_property_read_u32 (child,"reg" , &num)) { -dev_err (&client->dev,"missing reg property of %s\n" , +dev_err (&data->i2c_client->dev,"missing reg property of %s\n" , child->name); goto put_child; }if (num >=SI5341_MAX_NUM_OUTPUTS ) { -dev_err (&client->dev,"invalid clkout %d\n" , num); +dev_err (&data->i2c_client->dev,"invalid clkout %d\n" , num); goto put_child; }
@@ -1288,7 +1293,7 @@ static int si5341_dt_parse_dt(struct i2c_client *client, config[num].out_format_drv_bits |=0xc0 ;break ;default : -dev_err (&client->dev, +dev_err (&data->i2c_client->dev,"invalid silabs,format %u for %u\n" , val, num); goto put_child;
@@ -1301,7 +1306,7 @@ static int si5341_dt_parse_dt(struct i2c_client *client,if (!of_property_read_u32 (child,"silabs,common-mode" , &val)) {if (val >0xf ) { -dev_err (&client->dev, +dev_err (&data->i2c_client->dev,"invalid silabs,common-mode %u\n" , val); goto put_child;
@@ -1312,7 +1317,7 @@ static int si5341_dt_parse_dt(struct i2c_client *client,if (!of_property_read_u32 (child,"silabs,amplitude" , &val)) {if (val >0xf ) { -dev_err (&client->dev, +dev_err (&data->i2c_client->dev,"invalid silabs,amplitude %u\n" , val); goto put_child;
@@ -1329,6 +1334,34 @@ static int si5341_dt_parse_dt(struct i2c_client *client, config[num].always_on =of_property_read_bool (child,"always-on" ); + + config[num].vdd_sel_bits =0x08 ; +if (data->clk[num].vddo_reg) { +int vdd =regulator_get_voltage (data->clk[num].vddo_reg); + +switch (vdd) { +case 3300000 : + config[num].vdd_sel_bits |=0 <<4 ; +break ; +case 1800000 : + config[num].vdd_sel_bits |=1 <<4 ; +break ; +case 2500000 : + config[num].vdd_sel_bits |=2 <<4 ; +break ; +default : +dev_err (&data->i2c_client->dev, +"unsupported vddo voltage %d for %s\n" , + vdd, child->name); + goto put_child; + } + }else { +/* chip seems to default to 2.5V when not set */ +dev_warn (&data->i2c_client->dev, +"no regulator set, defaulting vdd_sel to 2.5V for %s\n" , + child->name); + config[num].vdd_sel_bits |=2 <<4 ; + } }return 0 ;
@@ -1454,9 +1487,33 @@ static int si5341_probe(struct i2c_client *client, } } - err =si5341_dt_parse_dt (client, config); +for (i =0 ; i <SI5341_MAX_NUM_OUTPUTS ; ++i) { +char reg_name[10 ]; + +snprintf (reg_name,sizeof (reg_name),"vddo%d" , i); + data->clk[i].vddo_reg =devm_regulator_get_optional ( + &client->dev, reg_name); +if (IS_ERR (data->clk[i].vddo_reg)) { + err =PTR_ERR (data->clk[i].vddo_reg); + data->clk[i].vddo_reg =NULL ; +if (err == -ENODEV ) +continue ; + goto cleanup; + }else { + err =regulator_enable (data->clk[i].vddo_reg); +if (err) { +dev_err (&client->dev, +"failed to enable %s regulator: %d\n" , + reg_name, err); + data->clk[i].vddo_reg =NULL ; + goto cleanup; + } + } + } + + err =si5341_dt_parse_dt (data, config);if (err) -return err; + goto cleanup;if (of_property_read_string (client->dev.of_node,"clock-output-names" , &init.name))
@@ -1464,21 +1521,23 @@ static int si5341_probe(struct i2c_client *client, root_clock_name = init.name; data->regmap =devm_regmap_init_i2c (client, &si5341_regmap_config); -if (IS_ERR (data->regmap)) -return PTR_ERR (data->regmap); +if (IS_ERR (data->regmap)) { + err =PTR_ERR (data->regmap); + goto cleanup; + }i2c_set_clientdata (client, data); err =si5341_probe_chip_id (data);if (err <0 ) -return err; + goto cleanup;if (of_property_read_bool (client->dev.of_node,"silabs,reprogram" )) { initialization_required = true; }else { err =si5341_is_programmed_already (data);if (err <0 ) -return err; + goto cleanup; initialization_required = !err; }
@@ -1487,11 +1546,11 @@ static int si5341_probe(struct i2c_client *client,/* Populate the regmap cache in preparation for "cache only" */ err =si5341_read_settings (data);if (err <0 ) -return err; + goto cleanup; err =si5341_send_preamble (data);if (err <0 ) -return err; + goto cleanup;/* * We intend to send all 'final' register values in a single
@@ -1504,19 +1563,19 @@ static int si5341_probe(struct i2c_client *client, err =si5341_write_multiple (data, si5341_reg_defaults,ARRAY_SIZE (si5341_reg_defaults));if (err <0 ) -return err; + goto cleanup; }/* Input must be up and running at this point */ err =si5341_clk_select_active_input (data);if (err <0 ) -return err; + goto cleanup;if (initialization_required) {/* PLL configuration is required */ err =si5341_initialize_pll (data);if (err <0 ) -return err; + goto cleanup; }/* Register the PLL */
@@ -1529,7 +1588,7 @@ static int si5341_probe(struct i2c_client *client, err =devm_clk_hw_register (&client->dev, &data->hw);if (err) {dev_err (&client->dev,"clock registration failed\n" ); -return err; + goto cleanup; } init.num_parents =1 ;
@@ -1566,13 +1625,17 @@ static int si5341_probe(struct i2c_client *client,regmap_write (data->regmap,SI5341_OUT_CM (&data->clk[i]), config[i].out_cm_ampl_bits); +regmap_update_bits (data->regmap, +SI5341_OUT_MUX_SEL (&data->clk[i]), +SI5341_OUT_MUX_VDD_SEL_MASK , + config[i].vdd_sel_bits); } err =devm_clk_hw_register (&client->dev, &data->clk[i].hw);kfree (init.name);/* clock framework made a copy of the name */ if (err) {dev_err (&client->dev,"output %u registration failed\n" , i); -return err; + goto cleanup; }if (config[i].always_on)clk_prepare (data->clk[i].hw.clk);
@@ -1582,7 +1645,7 @@ static int si5341_probe(struct i2c_client *client, data);if (err) {dev_err (&client->dev,"unable to add clk provider\n" ); -return err; + goto cleanup; }if (initialization_required) {
@@ -1590,11 +1653,11 @@ static int si5341_probe(struct i2c_client *client,regcache_cache_only (data->regmap, false); err =regcache_sync (data->regmap);if (err <0 ) -return err; + goto cleanup; err =si5341_finalize_defaults (data);if (err <0 ) -return err; + goto cleanup; }/* wait for device to report input clock present and PLL lock */
@@ -1603,14 +1666,14 @@ static int si5341_probe(struct i2c_client *client, 10000, 250000);if (err) {dev_err (&client->dev,"Error waiting for input clock or PLL lock\n" ); -return err; + goto cleanup; }/* clear sticky alarm bits from initialization */ err =regmap_write (data->regmap,SI5341_STATUS_STICKY ,0 );if (err) {dev_err (&client->dev,"unable to clear sticky status\n" ); -return err; + goto cleanup; }/* Free the names, clk framework makes copies */
@@ -1618,6 +1681,26 @@ static int si5341_probe(struct i2c_client *client,devm_kfree (&client->dev, (void *)synth_clock_names[i]);return 0 ; + +cleanup: +for (i =0 ; i <SI5341_MAX_NUM_OUTPUTS ; ++i) { +if (data->clk[i].vddo_reg) +regulator_disable (data->clk[i].vddo_reg); + } +return err; +} + +static int si5341_remove (struct i2c_client *client) +{ +struct clk_si5341 *data =i2c_get_clientdata (client); +int i; + +for (i =0 ; i <SI5341_MAX_NUM_OUTPUTS ; ++i) { +if (data->clk[i].vddo_reg) +regulator_disable (data->clk[i].vddo_reg); + } + +return 0 ; }static const struct i2c_device_id si5341_id[] = {
@@ -1646,6 +1729,7 @@ static struct i2c_driver si5341_driver = { .of_match_table = clk_si5341_of_match, }, .probe = si5341_probe, + .remove = si5341_remove, .id_table = si5341_id, };module_i2c_driver (si5341_driver);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 166/509 clk: si5341: Add sysfs properties to allow checking/resetting device faults
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit 9b13ff4340dff30f361462999a6a122fcc4e473f ]
Add sysfs property files to allow viewing the current and latched states of the input present and PLL lock bits, and allow resetting the latched fault state. This allows manual checks or automated userspace polling for faults occurring after initialization.
Stable-dep-of: 2560114c06d7 ("clk: si5341: return error if one synth clock registration fails")
--- drivers/clk/clk-si5341.c | 96 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+)
drivers/clk/clk-si5341.c +96 -0
@@ -1450,6 +1450,94 @@ static int si5341_clk_select_active_input(struct clk_si5341 *data)return res; } +static ssize_t input_present_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct clk_si5341 *data =dev_get_drvdata (dev); +u32 status; +int res =regmap_read (data->regmap,SI5341_STATUS , &status); + +if (res <0 ) +return res; + res = !(status &SI5341_STATUS_LOSREF ); +return snprintf (buf,PAGE_SIZE ,"%d\n" , res); +} +static DEVICE_ATTR_RO (input_present); + +static ssize_t input_present_sticky_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct clk_si5341 *data =dev_get_drvdata (dev); +u32 status; +int res =regmap_read (data->regmap,SI5341_STATUS_STICKY , &status); + +if (res <0 ) +return res; + res = !(status &SI5341_STATUS_LOSREF ); +return snprintf (buf,PAGE_SIZE ,"%d\n" , res); +} +static DEVICE_ATTR_RO (input_present_sticky); + +static ssize_t pll_locked_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct clk_si5341 *data =dev_get_drvdata (dev); +u32 status; +int res =regmap_read (data->regmap,SI5341_STATUS , &status); + +if (res <0 ) +return res; + res = !(status &SI5341_STATUS_LOL ); +return snprintf (buf,PAGE_SIZE ,"%d\n" , res); +} +static DEVICE_ATTR_RO (pll_locked); + +static ssize_t pll_locked_sticky_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct clk_si5341 *data =dev_get_drvdata (dev); +u32 status; +int res =regmap_read (data->regmap,SI5341_STATUS_STICKY , &status); + +if (res <0 ) +return res; + res = !(status &SI5341_STATUS_LOL ); +return snprintf (buf,PAGE_SIZE ,"%d\n" , res); +} +static DEVICE_ATTR_RO (pll_locked_sticky); + +static ssize_t clear_sticky_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +struct clk_si5341 *data =dev_get_drvdata (dev); +long val; + +if (kstrtol (buf,10 , &val)) +return -EINVAL ; +if (val) { +int res =regmap_write (data->regmap,SI5341_STATUS_STICKY ,0 ); + +if (res <0 ) +return res; + } +return count; +} +static DEVICE_ATTR_WO (clear_sticky); + +static const struct attribute *si5341_attributes[] = { + &dev_attr_input_present.attr, + &dev_attr_input_present_sticky.attr, + &dev_attr_pll_locked.attr, + &dev_attr_pll_locked_sticky.attr, + &dev_attr_clear_sticky.attr, +NULL +}; +static int si5341_probe (struct i2c_client *client,const struct i2c_device_id *id) {
@@ -1676,6 +1764,12 @@ static int si5341_probe(struct i2c_client *client, goto cleanup; } + err =sysfs_create_files (&client->dev.kobj, si5341_attributes); +if (err) { +dev_err (&client->dev,"unable to create sysfs files\n" ); + goto cleanup; + } +/* Free the names, clk framework makes copies */ for (i =0 ; i < data->num_synth; ++i)devm_kfree (&client->dev, (void *)synth_clock_names[i]);
@@ -1695,6 +1789,8 @@ static int si5341_remove(struct i2c_client *client)struct clk_si5341 *data =i2c_get_clientdata (client);int i; +sysfs_remove_files (&client->dev.kobj, si5341_attributes); +for (i =0 ; i <SI5341_MAX_NUM_OUTPUTS ; ++i) {if (data->clk[i].vddo_reg)regulator_disable (data->clk[i].vddo_reg);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 167/509 clk: si5341: return error if one synth clock registration fails
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 2560114c06d7a752b3f4639f28cece58fed11267 ]
In case devm_clk_hw_register() fails for one of synth clocks the probe continues. Later on, when registering output clocks which have as parents all the synth clocks, in case there is registration failure for at least one synth clock the information passed to clk core for registering output clock is not right: init.num_parents is fixed but init.parents may contain an array with less parents.
--- drivers/clk/clk-si5341.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/clk/clk-si5341.c +8 -6
@@ -1545,7 +1545,7 @@ static int si5341_probe(struct i2c_client *client,struct clk_init_data init;struct clk *input;const char *root_clock_name; -const char *synth_clock_names[SI5341_NUM_SYNTH ]; +const char *synth_clock_names[SI5341_NUM_SYNTH ] = {NULL };int err;unsigned int i;struct clk_si5341_output_config config[SI5341_MAX_NUM_OUTPUTS ];
@@ -1693,6 +1693,7 @@ static int si5341_probe(struct i2c_client *client,if (err) {dev_err (&client->dev,"synth N%u registration failed\n" , i); + goto free_clk_names; } }
@@ -1770,16 +1771,17 @@ static int si5341_probe(struct i2c_client *client, goto cleanup; } +free_clk_names:/* Free the names, clk framework makes copies */ for (i =0 ; i < data->num_synth; ++i)devm_kfree (&client->dev, (void *)synth_clock_names[i]); -return 0 ; - cleanup: -for (i =0 ; i <SI5341_MAX_NUM_OUTPUTS ; ++i) { -if (data->clk[i].vddo_reg) -regulator_disable (data->clk[i].vddo_reg); +if (err) { +for (i =0 ; i <SI5341_MAX_NUM_OUTPUTS ; ++i) { +if (data->clk[i].vddo_reg) +regulator_disable (data->clk[i].vddo_reg); + } }return err; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 168/509 clk: si5341: check return value of {devm_}kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 36e4ef82016a2b785cf2317eade77e76699b7bff ]
{devm_}kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/clk/clk-si5341.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clk/clk-si5341.c +8 -0
@@ -1685,6 +1685,10 @@ static int si5341_probe(struct i2c_client *client,for (i =0 ; i < data->num_synth; ++i) { synth_clock_names[i] =devm_kasprintf (&client->dev,GFP_KERNEL ,"%s.N%u" , client->dev.of_node->name, i); +if (!synth_clock_names[i]) { + err = -ENOMEM ; + goto free_clk_names; + } init.name = synth_clock_names[i]; data->synth[i].index = i; data->synth[i].data = data;
@@ -1703,6 +1707,10 @@ static int si5341_probe(struct i2c_client *client,for (i =0 ; i < data->num_outputs; ++i) { init.name =kasprintf (GFP_KERNEL ,"%s.%d" , client->dev.of_node->name, i); +if (!init.name) { + err = -ENOMEM ; + goto free_clk_names; + } init.flags = config[i].synth_master ?CLK_SET_RATE_PARENT :0 ; data->clk[i].index = i; data->clk[i].data = data;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 169/509 clk: si5341: free unused memory on probe failure
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 267ad94b13c53d8c99a336f0841b1fa1595b1d0f ]
Pointers from synth_clock_names[] should be freed at the end of probe either on probe success or failure path.
--- drivers/clk/clk-si5341.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/clk/clk-si5341.c +7 -9
@@ -1732,7 +1732,7 @@ static int si5341_probe(struct i2c_client *client,if (err) {dev_err (&client->dev,"output %u registration failed\n" , i); - goto cleanup; + goto free_clk_names; }if (config[i].always_on)clk_prepare (data->clk[i].hw.clk);
@@ -1742,7 +1742,7 @@ static int si5341_probe(struct i2c_client *client, data);if (err) {dev_err (&client->dev,"unable to add clk provider\n" ); - goto cleanup; + goto free_clk_names; }if (initialization_required) {
@@ -1750,11 +1750,11 @@ static int si5341_probe(struct i2c_client *client,regcache_cache_only (data->regmap, false); err =regcache_sync (data->regmap);if (err <0 ) - goto cleanup; + goto free_clk_names; err =si5341_finalize_defaults (data);if (err <0 ) - goto cleanup; + goto free_clk_names; }/* wait for device to report input clock present and PLL lock */
@@ -1763,21 +1763,19 @@ static int si5341_probe(struct i2c_client *client, 10000, 250000);if (err) {dev_err (&client->dev,"Error waiting for input clock or PLL lock\n" ); - goto cleanup; + goto free_clk_names; }/* clear sticky alarm bits from initialization */ err =regmap_write (data->regmap,SI5341_STATUS_STICKY ,0 );if (err) {dev_err (&client->dev,"unable to clear sticky status\n" ); - goto cleanup; + goto free_clk_names; } err =sysfs_create_files (&client->dev.kobj, si5341_attributes); -if (err) { +if (err)dev_err (&client->dev,"unable to create sysfs files\n" ); - goto cleanup; - } free_clk_names:/* Free the names, clk framework makes copies */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 170/509 clk: keystone: sci-clk: check return value of kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit b73ed981da6d25c921aaefa7ca3df85bbd85b7fc ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: 96488c09b0f4 ("clk: keystone: sci-clk: cut down the clock name length")
--- drivers/clk/keystone/sci-clk.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/keystone/sci-clk.c +2 -0
@@ -302,6 +302,8 @@ static int _sci_clk_build(struct sci_clk_provider *provider, name =kasprintf (GFP_KERNEL ,"clk:%d:%d" , sci_clk->dev_id, sci_clk->clk_id); +if (!name) +return -ENOMEM ; init.name = name;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 171/509 clk: ti: clkctrl: check return value of kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit bd46cd0b802d9c9576ca78007aa084ae3e74907b ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/clk/ti/clkctrl.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/clk/ti/clkctrl.c +7 -0
@@ -267,6 +267,9 @@ static const char * __init clkctrl_get_clock_name(struct device_node *np,if (clkctrl_name && !legacy_naming) { clock_name =kasprintf (GFP_KERNEL ,"%s-clkctrl:%04x:%d" , clkctrl_name, offset, index); +if (!clock_name) +return NULL ; +strreplace (clock_name,'_' ,'-' );return clock_name;
@@ -598,6 +601,10 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)if (clkctrl_name) { provider->clkdm_name =kasprintf (GFP_KERNEL ,"%s_clkdm" , clkctrl_name); +if (!provider->clkdm_name) { +kfree (provider); +return ; + } goto clkdm_found; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 172/509 drivers: meson: secure-pwrc: always enable DMA domain
In reply to Greg Kroah-HartmanFrom: Alexey Romanov <[email protected]>
[ Upstream commit 0bb4644d583789c97e74d3e3047189f0c59c4742 ]
Starting from commit e45f243409db ("firmware: meson_sm:
populate platform devices from sm device tree data") pwrc is probed successfully and disables unused pwr domains. By A1 SoC family design, any TEE requires DMA pwr domain always enabled.
--- drivers/soc/amlogic/meson-secure-pwrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/amlogic/meson-secure-pwrc.c +1 -1
@@ -103,7 +103,7 @@ static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {SEC_PD (ACODEC ,0 ),SEC_PD (AUDIO ,0 ),SEC_PD (OTP ,0 ), -SEC_PD (DMA ,0 ), +SEC_PD (DMA ,GENPD_FLAG_ALWAYS_ON |GENPD_FLAG_IRQ_SAFE ),SEC_PD (SD_EMMC ,0 ), SEC_PD(RAMA, 0),/* SRAMB is used as ATF runtime memory, and should be always on */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 173/509 ovl: update of dentry revalidate flags after copy up
In reply to Greg Kroah-HartmanFrom: Amir Goldstein <[email protected]>
[ Upstream commit b07d5cc93e1b28df47a72c519d09d0a836043613 ]
After copy up, we may need to update d_flags if upper dentry is on a remote fs and lower dentries are not.
Add helpers to allow incremental update of the revalidate flags.
--- fs/overlayfs/copy_up.c | 2 ++ fs/overlayfs/dir.c | 3 +-- fs/overlayfs/export.c | 3 +-- fs/overlayfs/namei.c | 3 +-- fs/overlayfs/overlayfs.h | 6 ++++-- fs/overlayfs/super.c | 2 +- fs/overlayfs/util.c | 24 ++++++++++++++++++++---- 7 files changed, 30 insertions(+), 13 deletions(-)
fs/overlayfs/copy_up.c +2 -0
@@ -475,6 +475,7 @@ static int ovl_link_up(struct ovl_copy_up_ctx *c)/* Restore timestamps on parent (best effort) */ ovl_set_timestamps (upperdir, &c->pstat);ovl_dentry_set_upper_alias (c->dentry); +ovl_dentry_update_reval (c->dentry, upper); } }inode_unlock (udir);
@@ -762,6 +763,7 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c)inode_unlock (udir);ovl_dentry_set_upper_alias (c->dentry); +ovl_dentry_update_reval (c->dentry,ovl_dentry_upper (c->dentry)); } out:
fs/overlayfs/dir.c +1 -2
@@ -266,8 +266,7 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode,ovl_dir_modified (dentry->d_parent, false);ovl_dentry_set_upper_alias (dentry); -ovl_dentry_update_reval (dentry, newdentry, -DCACHE_OP_REVALIDATE |DCACHE_OP_WEAK_REVALIDATE ); +ovl_dentry_init_reval (dentry, newdentry);if (!hardlink) {/*
fs/overlayfs/export.c +1 -2
@@ -324,8 +324,7 @@ static struct dentry *ovl_obtain_alias(struct super_block *sb,if (upper_alias)ovl_dentry_set_upper_alias (dentry); -ovl_dentry_update_reval (dentry, upper, -DCACHE_OP_REVALIDATE |DCACHE_OP_WEAK_REVALIDATE ); +ovl_dentry_init_reval (dentry, upper);return d_instantiate_anon (dentry, inode);
fs/overlayfs/namei.c +1 -2
@@ -1095,8 +1095,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,ovl_set_flag (OVL_UPPERDATA , inode); } -ovl_dentry_update_reval (dentry, upperdentry, -DCACHE_OP_REVALIDATE |DCACHE_OP_WEAK_REVALIDATE ); +ovl_dentry_init_reval (dentry, upperdentry);revert_creds (old_cred);if (origin_path) {
fs/overlayfs/overlayfs.h +4 -2
@@ -257,8 +257,10 @@ bool ovl_index_all(struct super_block *sb);bool ovl_verify_lower (struct super_block *sb);struct ovl_entry *ovl_alloc_entry (unsigned int numlower);bool ovl_dentry_remote (struct dentry *dentry); -void ovl_dentry_update_reval (struct dentry *dentry,struct dentry *upperdentry, -unsigned int mask); +void ovl_dentry_update_reval (struct dentry *dentry,struct dentry *realdentry); +void ovl_dentry_init_reval (struct dentry *dentry,struct dentry *upperdentry); +void ovl_dentry_init_flags (struct dentry *dentry,struct dentry *upperdentry, +unsigned int mask);bool ovl_dentry_weird (struct dentry *dentry);enum ovl_path_type ovl_path_type (struct dentry *dentry);void ovl_path_upper (struct dentry *dentry,struct path *path);
fs/overlayfs/super.c +1 -1
@@ -1868,7 +1868,7 @@ static struct dentry *ovl_get_root(struct super_block *sb,ovl_dentry_set_flag (OVL_E_CONNECTED , root);ovl_set_upperdata (d_inode (root));ovl_inode_init (d_inode (root), &oip, ino, fsid); -ovl_dentry_update_reval (root, upperdentry,DCACHE_OP_WEAK_REVALIDATE ); +ovl_dentry_init_flags (root, upperdentry,DCACHE_OP_WEAK_REVALIDATE );return root; }
fs/overlayfs/util.c +20 -4
@@ -90,14 +90,30 @@ struct ovl_entry *ovl_alloc_entry(unsigned int numlower)return oe; } +#define OVL_D_REVALIDATE (DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE) +bool ovl_dentry_remote (struct dentry *dentry) { -return dentry->d_flags & - (DCACHE_OP_REVALIDATE |DCACHE_OP_WEAK_REVALIDATE ); +return dentry->d_flags &OVL_D_REVALIDATE ; +} + +void ovl_dentry_update_reval (struct dentry *dentry,struct dentry *realdentry) +{ +if (!ovl_dentry_remote (realdentry)) +return ; + +spin_lock (&dentry->d_lock); + dentry->d_flags |= realdentry->d_flags &OVL_D_REVALIDATE ; +spin_unlock (&dentry->d_lock); +} + +void ovl_dentry_init_reval (struct dentry *dentry,struct dentry *upperdentry) +{ +return ovl_dentry_init_flags (dentry, upperdentry,OVL_D_REVALIDATE ); } -void ovl_dentry_update_reval (struct dentry *dentry,struct dentry *upperdentry, -unsigned int mask) +void ovl_dentry_init_flags (struct dentry *dentry,struct dentry *upperdentry, +unsigned int mask) {struct ovl_entry *oe =OVL_E (dentry);unsigned int i, flags =0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 174/509 ASoC: imx-audmix: check return value of devm_kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 2f76e1d6ca524a888d29aafe29f2ad2003857971 ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- sound/soc/fsl/imx-audmix.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/soc/fsl/imx-audmix.c +9 -0
@@ -230,6 +230,8 @@ static int imx_audmix_probe(struct platform_device *pdev) dai_name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s%s" , fe_name_pref, args.np->full_name +1 ); +if (!dai_name) +return -ENOMEM ;dev_info (pdev->dev.parent,"DAI FE name:%s\n" , dai_name);
@@ -238,6 +240,8 @@ static int imx_audmix_probe(struct platform_device *pdev) capture_dai_name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s %s" , dai_name,"CPU-Capture" ); +if (!capture_dai_name) +return -ENOMEM ; } priv->dai[i].cpus = &dlc[0 ];
@@ -268,6 +272,8 @@ static int imx_audmix_probe(struct platform_device *pdev) "AUDMIX-Playback-%d", i); be_cp =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"AUDMIX-Capture-%d" , i); +if (!be_name || !be_pb || !be_cp) +return -ENOMEM ; priv->dai[num_dai + i].cpus = &dlc[3 ]; priv->dai[num_dai + i].codecs = &dlc[4 ];
@@ -295,6 +301,9 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dapm_routes[i].source =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s %s" , dai_name,"CPU-Playback" ); +if (!priv->dapm_routes[i].source) +return -ENOMEM ; + priv->dapm_routes[i].sink = be_pb; priv->dapm_routes[num_dai + i].source = be_pb; priv->dapm_routes[num_dai + i].sink = be_cp;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 175/509 PCI: cadence: Fix Gen2 Link Retraining process
In reply to Greg Kroah-HartmanFrom: Siddharth Vadapalli <[email protected]>
[ Upstream commit 0e12f830236928b6fadf40d917a7527f0a048d2f ]
The Link Retraining process is initiated to account for the Gen2 defect in the Cadence PCIe controller in J721E SoC. The errata corresponding to this is i2085, documented at:
https://www.ti.com/lit/er/sprz455c/sprz455c.pdf
The existing workaround implemented for the errata waits for the Data Link initialization to complete and assumes that the link retraining process at the Physical Layer has completed. However, it is possible that the Physical Layer training might be ongoing as indicated by the PCI_EXP_LNKSTA_LT bit in the PCI_EXP_LNKSTA register.
Fix the existing workaround, to ensure that the Physical Layer training has also completed, in addition to the Data Link initialization.
--- .../controller/cadence/pcie-cadence-host.c | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/pci/controller/cadence/pcie-cadence-host.c +27 -0
@@ -12,6 +12,8 @@#include "pcie-cadence.h" +#define LINK_RETRAIN_TIMEOUT HZ +static u64 bar_max_size[] = { [RP_BAR0 ] =_ULL (128 *SZ_2G ), [RP_BAR1 ] =SZ_2G ,
@@ -77,6 +79,27 @@ static struct pci_ops cdns_pcie_host_ops = { .write = pci_generic_config_write, }; +static int cdns_pcie_host_training_complete (struct cdns_pcie *pcie) +{ +u32 pcie_cap_off =CDNS_PCIE_RP_CAP_OFFSET ; +unsigned long end_jiffies; +u16 lnk_stat; + +/* Wait for link training to complete. Exit after timeout. */ + end_jiffies = jiffies +LINK_RETRAIN_TIMEOUT ; +do { + lnk_stat =cdns_pcie_rp_readw (pcie, pcie_cap_off +PCI_EXP_LNKSTA ); +if (!(lnk_stat &PCI_EXP_LNKSTA_LT )) +break ; +usleep_range (0 ,1000 ); + }while (time_before (jiffies, end_jiffies)); + +if (!(lnk_stat &PCI_EXP_LNKSTA_LT )) +return 0 ; + +return -ETIMEDOUT ; +} +static int cdns_pcie_host_wait_for_link (struct cdns_pcie *pcie) {struct device *dev = pcie->dev;
@@ -118,6 +141,10 @@ static int cdns_pcie_retrain(struct cdns_pcie *pcie)cdns_pcie_rp_writew (pcie, pcie_cap_off +PCI_EXP_LNKCTL , lnk_ctl); + ret =cdns_pcie_host_training_complete (pcie); +if (ret) +return ret; + ret =cdns_pcie_host_wait_for_link (pcie); }return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 176/509 scsi: qedf: Fix NULL dereference in error handling
In reply to Greg Kroah-HartmanFrom: Jinhong Zhu <[email protected]>
[ Upstream commit f025312b089474a54e4859f3453771314d9e3d4f ]
Smatch reported:
drivers/scsi/qedf/qedf_main.c:3056 qedf_alloc_global_queues()
warn: missing unwind goto?
At this point in the function, nothing has been allocated so we can return directly. In particular the "qedf->global_queues" have not been allocated so calling qedf_free_global_queues() will lead to a NULL dereference when we check if (!gl[i]) and "gl" is NULL.
--- drivers/scsi/qedf/qedf_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/qedf/qedf_main.c +1 -2
@@ -3042,9 +3042,8 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)* addresses of our queues */ if (!qedf->p_cpuq) { - status = -EINVAL ;QEDF_ERR (&qedf->dbg_ctx,"p_cpuq is NULL.\n" ); - goto mem_alloc_failure; +return -EINVAL ; } qedf->global_queues = kzalloc((sizeof(struct global_queue *)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 177/509 pinctrl: bcm2835: Handle gpiochip_add_pin_range() errors
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit cdf7e616120065007687fe1df0412154f259daec ]
gpiochip_add_pin_range() can fail, so better return its error code than a hard coded '0'.
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +2 -4
@@ -359,10 +359,8 @@ static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc,if (!pctldev)return 0 ; -gpiochip_add_pin_range (gc,pinctrl_dev_get_devname (pctldev),0 ,0 , - gc->ngpio); - -return 0 ; +return gpiochip_add_pin_range (gc,pinctrl_dev_get_devname (pctldev),0 ,0 , + gc->ngpio); }static const struct gpio_chip bcm2835_gpio_chip = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 178/509 PCI/ASPM: Disable ASPM on MFD function removal to avoid use-after-free
In reply to Greg Kroah-HartmanFrom: Ding Hui <[email protected]>
[ Upstream commit 456d8aa37d0f56fc9e985e812496e861dcd6f2f2 ]
Struct pcie_link_state->downstream is a pointer to the pci_dev of function
0. Previously we retained that pointer when removing function 0, and subsequent ASPM policy changes dereferenced it, resulting in a use-after-free warning from KASAN, e.g.:
# echo 1 > /sys/bus/pci/devices/0000:03:00.0/remove # echo powersave > /sys/module/pcie_aspm/parameters/policy
BUG: KASAN: slab-use-after-free in pcie_config_aspm_link+0x42d/0x500 Call Trace: kasan_report+0xae/0xe0 pcie_config_aspm_link+0x42d/0x500 pcie_aspm_set_policy+0x8e/0x1a0 param_attr_store+0x162/0x2c0 module_attr_store+0x3e/0x80
PCIe spec r6.0, sec 7.5.3.7, recommends that software program the same ASPM Control value in all functions of multi-function devices.
Disable ASPM and free the pcie_link_state when any child function is removed so we can discard the dangling pcie_link_state->downstream pointer and maintain the same ASPM Control configuration for all functions.
--- drivers/pci/pcie/aspm.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/pci/pcie/aspm.c +12 -9
@@ -993,21 +993,24 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)down_read (&pci_bus_sem);mutex_lock (&aspm_lock); -/* -* All PCIe functions are in one slot, remove one function will remove -* the whole slot, so just wait until we are the last function left. -*/ -if (!list_empty (&parent->subordinate->devices)) - goto out; link = parent->link_state; root = link->root; parent_link = link->parent; -/* All functions are removed, so just disable ASPM for the link */ +/* +* link->downstream is a pointer to the pci_dev of function 0. If +* we remove that function, the pci_dev is about to be deallocated, +* so we can't use link->downstream again. Free the link state to +* avoid this. +* +* If we're removing a non-0 function, it's possible we could +* retain the link state, but PCIe r6.0, sec 7.5.3.7, recommends +* programming the same ASPM Control value for all functions of +* multi-function devices, so disable ASPM for all of them. +*/ pcie_config_aspm_link (link,0 );list_del (&link->sibling); -/* Clock PM is for endpoint device */ free_link_state (link);/* Recheck latencies and configure upstream links */
@@ -1015,7 +1018,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)pcie_update_aspm_capable (root);pcie_config_aspm_path (parent_link); } -out: +mutex_unlock (&aspm_lock);up_read (&pci_bus_sem); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 179/509 scsi: 3w-xxxx: Add error handling for initialization failure in tw_probe()
In reply to Greg Kroah-HartmanFrom: Yuchen Yang <[email protected]>
[ Upstream commit 2e2fe5ac695a00ab03cab4db1f4d6be07168ed9d ]
Smatch complains that:
tw_probe() warn: missing error code 'retval'
This patch adds error checking to tw_probe() to handle initialization failure. If tw_reset_sequence() function returns a non-zero value, the function will return -EINVAL to indicate initialization failure.
--- drivers/scsi/3w-xxxx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/3w-xxxx.c +3 -1
@@ -2308,8 +2308,10 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)TW_DISABLE_INTERRUPTS (tw_dev);/* Initialize the card */ -if (tw_reset_sequence (tw_dev)) +if (tw_reset_sequence (tw_dev)) { + retval = -EINVAL ; goto out_release_mem_region; + }/* Set host specific parameters */ host->max_id =TW_MAX_UNITS ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 180/509 PCI: pciehp: Cancel bringup sequence if card is not present
In reply to Greg Kroah-HartmanFrom: Rongguang Wei <[email protected]>
[ Upstream commit e8afd0d9fccc27c8ad263db5cf5952cfcf72d6fe ]
If a PCIe hotplug slot has an Attention Button, the normal hot-add flow is:
- Slot is empty and slot power is off
- User inserts card in slot and presses Attention Button
- OS blinks Power Indicator for 5 seconds
- After 5 seconds, OS turns on Power Indicator, turns on slot power, and enumerates the device
Previously, if a user pressed the Attention Button on an *empty* slot, pciehp logged the following messages and blinked the Power Indicator until a second button press:
[0.000] pciehp: Button press: will power on in 5 sec
[0.001] # Power Indicator starts blinking
[5.001] # 5 second timeout; slot is empty, so we should cancel the
request to power on and turn off Power Indicator[7.000] # Power Indicator still blinking [8.000] # possible card insertion [9.000] pciehp: Button press: canceling request to power on
The first button press incorrectly left the slot in BLINKINGON_STATE, so the second was interpreted as a "cancel power on" event regardless of whether a card was present.
If the slot is empty, turn off the Power Indicator and return from BLINKINGON_STATE to OFF_STATE after 5 seconds, effectively canceling the request to power on. Putting the slot in OFF_STATE also means the second button press will correctly request a slot power on if the slot is occupied.
--- drivers/pci/hotplug/pciehp_ctrl.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pci/hotplug/pciehp_ctrl.c +8 -0
@@ -256,6 +256,14 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events) present =pciehp_card_present (ctrl); link_active =pciehp_check_link_active (ctrl);if (present <=0 && link_active <=0 ) { +if (ctrl->state ==BLINKINGON_STATE ) { + ctrl->state =OFF_STATE ; +cancel_delayed_work (&ctrl->button_work); +pciehp_set_indicators (ctrl,PCI_EXP_SLTCTL_PWR_IND_OFF , +INDICATOR_NOOP ); +ctrl_info (ctrl,"Slot(%s): Card not present\n" , +slot_name (ctrl)); + }mutex_unlock (&ctrl->state_lock);return ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 181/509 PCI: ftpci100: Release the clock resources
In reply to Greg Kroah-HartmanFrom: Junyan Ye <[email protected]>
[ Upstream commit c60738de85f40b0b9f5cb23c21f9246e5a47908c ]
Smatch reported:
1. drivers/pci/controller/pci-ftpci100.c:526 faraday_pci_probe() warn:
'clk' from clk_prepare_enable() not released on lines: 442,451,462,478,512,517.
2. drivers/pci/controller/pci-ftpci100.c:526 faraday_pci_probe() warn:
'p->bus_clk' from clk_prepare_enable() not released on lines: 451,462,478,512,517.
The clock resource is obtained by devm_clk_get(), and then clk_prepare_enable() makes the clock resource ready for use. After that, clk_disable_unprepare() should be called to release the clock resource when it is no longer needed. However, while doing some error handling in faraday_pci_probe(), clk_disable_unprepare() is not called to release clk and p->bus_clk before returning. These return lines are exactly 442, 451, 462, 478, 512, 517.
Fix this warning by replacing devm_clk_get() with devm_clk_get_enabled(), which is equivalent to devm_clk_get() + clk_prepare_enable(). And with devm_clk_get_enabled(), the clock will automatically be disabled, unprepared and freed when the device is unbound from the bus.
--- drivers/pci/controller/pci-ftpci100.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/pci/controller/pci-ftpci100.c +2 -12
@@ -442,22 +442,12 @@ static int faraday_pci_probe(struct platform_device *pdev) p->dev = dev;/* Retrieve and enable optional clocks */ - clk =devm_clk_get (dev,"PCLK" ); + clk =devm_clk_get_enabled (dev,"PCLK" );if (IS_ERR (clk))return PTR_ERR (clk); - ret =clk_prepare_enable (clk); -if (ret) { -dev_err (dev,"could not prepare PCLK\n" ); -return ret; - } - p->bus_clk =devm_clk_get (dev,"PCICLK" ); + p->bus_clk =devm_clk_get_enabled (dev,"PCICLK" );if (IS_ERR (p->bus_clk))return PTR_ERR (p->bus_clk); - ret =clk_prepare_enable (p->bus_clk); -if (ret) { -dev_err (dev,"could not prepare PCICLK\n" ); -return ret; - } p->base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (p->base))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 182/509 PCI: Add pci_clear_master() stub for non-CONFIG_PCI
In reply to Greg Kroah-HartmanFrom: Sui Jingfeng <[email protected]>
[ Upstream commit 2aa5ac633259843f656eb6ecff4cf01e8e810c5e ]
Add a pci_clear_master() stub when CONFIG_PCI is not set so drivers that support both PCI and platform devices don't need #ifdefs or extra Kconfig symbols for the PCI parts.
--- include/linux/pci.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci.h +1 -0
@@ -1719,6 +1719,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class,#define pci_dev_put (dev) do { } while (0)static inline void pci_set_master (struct pci_dev *dev) { } +static inline void pci_clear_master (struct pci_dev *dev) { }static inline int pci_enable_device (struct pci_dev *dev) {return -EIO ; }static inline void pci_disable_device (struct pci_dev *dev) { }static inline int pcim_enable_device (struct pci_dev *pdev) {return -EIO ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 183/509 perf bench: Use unbuffered output when pipe/teeing to a file
In reply to Greg Kroah-HartmanFrom: Sohaib Mohamed <[email protected]>
[ Upstream commit f0a29c9647ff8bbb424641f79bc1894e83dec218 ]
The output of 'perf bench' gets buffered when I pipe it to a file or to tee, in such a way that I can see it only at the end.
E.g.
$ perf bench internals synthesize -t < output comes out fine after each test run >
$ perf bench internals synthesize -t | tee file.txt < output comes out only at the end of all tests >
This patch resolves this issue for 'bench' and 'test' subcommands.
See, also:
$ perf bench mem all | tee file.txt $ perf bench sched all | tee file.txt $ perf bench internals all -t | tee file.txt $ perf bench internals all | tee file.txt
Committer testing:
It really gets staggered, i.e. outputs in bursts, when the buffer fills up and has to be drained to make up space for more output.
Stable-dep-of: 16203e9cd018 ("perf bench: Add missing setlocale() call to allow usage of %'d style formatting")
--- tools/perf/builtin-bench.c | 5 +++-- tools/perf/tests/builtin-test.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-)
tools/perf/builtin-bench.c +3 -2
@@ -225,7 +225,6 @@ static void run_collection(struct collection *coll)if (!bench->fn)break ;printf ("# Running %s/%s benchmark...\n" , coll->name, bench->name); -fflush (stdout); argv[1 ] = bench->name;run_bench (coll->name, bench->name, bench->fn,1 , argv);
@@ -246,6 +245,9 @@ int cmd_bench(int argc, const char **argv)struct collection *coll;int ret =0 ; +/* Unbuffered output */ +setvbuf (stdout,NULL , _IONBF,0 ); +if (argc <2 ) {/* No collection specified. */ print_usage ();
@@ -299,7 +301,6 @@ int cmd_bench(int argc, const char **argv)if (bench_format ==BENCH_FORMAT_DEFAULT )printf ("# Running '%s/%s' benchmark:\n" , coll->name, bench->name); -fflush (stdout); ret =run_bench (coll->name, bench->name, bench->fn, argc-1 , argv+1 ); goto end; }
tools/perf/tests/builtin-test.c +3 -0
@@ -793,6 +793,9 @@ int cmd_test(int argc, const char **argv)if (ret <0 )return ret; +/* Unbuffered output */ +setvbuf (stdout,NULL , _IONBF,0 ); + argc =parse_options_subcommand (argc, argv, test_options, test_subcommands, test_usage,0 );if (argc >=1 && !strcmp (argv[0 ],"list" ))return perf_test__list (argc -1 , argv +1 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 184/509 perf bench: Add missing setlocale() call to allow usage of %d style formatting
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 16203e9cd01896b4244100a8e3fb9f6e612ab2b1 ]
Without this we were not getting the thousands separator for big numbers.
Noticed while developing 'perf bench uprobe', but the use of %' predates that, for instance 'perf bench syscall' uses it.
Before:
# perf bench uprobe all
# Running uprobe/baseline benchmark...
# Executed 1000 usleep(1000) calls
Total time: 1054082243ns1054082.243000 nsecs/op
#
After:
# perf bench uprobe all
# Running uprobe/baseline benchmark...
# Executed 1,000 usleep(1000) calls
Total time: 1,053,715,144ns1,053,715.144000 nsecs/op
#
--- tools/perf/builtin-bench.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/builtin-bench.c +2 -0
@@ -21,6 +21,7 @@#include "builtin.h" #include "bench/bench.h" +#include <locale.h> #include <stdio.h> #include <stdlib.h> #include <string.h>
@@ -247,6 +248,7 @@ int cmd_bench(int argc, const char **argv)/* Unbuffered output */ setvbuf (stdout,NULL , _IONBF,0 ); +setlocale (LC_ALL ,"" );if (argc <2 ) {/* No collection specified. */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 185/509 pinctrl: cherryview: Return correct value if pin in push-pull mode
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 5835196a17be5cfdcad0b617f90cf4abe16951a4 ]
Currently the getter returns ENOTSUPP on pin configured in the push-pull mode. Fix this by adding the missed switch case.
--- drivers/pinctrl/intel/pinctrl-cherryview.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/pinctrl/intel/pinctrl-cherryview.c +10 -5
@@ -945,11 +945,6 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned int pin,break ; -case PIN_CONFIG_DRIVE_OPEN_DRAIN : -if (!(ctrl1 &CHV_PADCTRL1_ODEN )) -return -EINVAL ; -break ; -case PIN_CONFIG_BIAS_HIGH_IMPEDANCE : {u32 cfg;
@@ -959,6 +954,16 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned int pin,return -EINVAL ;break ; + +case PIN_CONFIG_DRIVE_PUSH_PULL : +if (ctrl1 &CHV_PADCTRL1_ODEN ) +return -EINVAL ; +break ; + +case PIN_CONFIG_DRIVE_OPEN_DRAIN : +if (!(ctrl1 &CHV_PADCTRL1_ODEN )) +return -EINVAL ; +break ; }default :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 186/509 kcsan: Dont expect 64 bits atomic builtins from 32 bits architectures
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 353e7300a1db928e427462f2745f9a2cd1625b3d ]
Activating KCSAN on a 32 bits architecture leads to the following link-time failure:
LD .tmp_vmlinux.kallsyms1
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_load':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_load_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_store':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_store_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_exchange':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_exchange_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_add':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_add_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_sub':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_sub_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_and':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_and_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_or':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_or_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_xor':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_xor_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_nand':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_nand_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_strong':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_weak':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_val':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'
32 bits architectures don't have 64 bits atomic builtins. Only include DEFINE_TSAN_ATOMIC_OPS(64) on 64 bits architectures.
--- kernel/kcsan/core.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/kcsan/core.c +2 -0
@@ -1035,7 +1035,9 @@ EXPORT_SYMBOL(__tsan_init);DEFINE_TSAN_ATOMIC_OPS (8 );DEFINE_TSAN_ATOMIC_OPS (16 );DEFINE_TSAN_ATOMIC_OPS (32 ); +#ifdef CONFIG_64BIT DEFINE_TSAN_ATOMIC_OPS (64 ); +#endif void __tsan_atomic_thread_fence (int memorder);void __tsan_atomic_thread_fence (int memorder)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 187/509 perf script: Fixup struct evsel_script method prefix
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 297e69bfa4c7aa27259dd456af1377e868337043 ]
They all operate on 'struct evsel_script' instances, so should be prefixed with evsel_script__, not with perf_evsel_script__.
Stable-dep-of: 36d3e4138e1b ("perf script: Fix allocation of evsel->priv related to per-event dump files")
--- tools/perf/builtin-script.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
tools/perf/builtin-script.c +8 -10
@@ -295,8 +295,7 @@ static inline struct evsel_script *evsel_script(struct evsel *evsel)return (struct evsel_script *)evsel->priv; } -static struct evsel_script *perf_evsel_script__new (struct evsel *evsel, -struct perf_data *data) +static struct evsel_script *evsel_script__new (struct evsel *evsel,struct perf_data *data) {struct evsel_script *es =zalloc (sizeof (*es));
@@ -316,7 +315,7 @@ static struct evsel_script *perf_evsel_script__new(struct evsel *evsel,return NULL ; } -static void perf_evsel_script__delete (struct evsel_script *es) +static void evsel_script__delete (struct evsel_script *es) {zfree (&es->filename);fclose (es->fp);
@@ -324,7 +323,7 @@ static void perf_evsel_script__delete(struct evsel_script *es)free (es); } -static int perf_evsel_script__fprintf (struct evsel_script *es,FILE *fp) +static int evsel_script__fprintf (struct evsel_script *es,FILE *fp) {struct stat st;
@@ -2166,8 +2165,7 @@ static int process_attr(struct perf_tool *tool, union perf_event *event,if (!evsel->priv) {if (scr->per_event_dump) { - evsel->priv =perf_evsel_script__new (evsel, - scr->session->data); + evsel->priv =evsel_script__new (evsel, scr->session->data); }else { es =zalloc (sizeof (*es));if (!es)
@@ -2422,7 +2420,7 @@ static void perf_script__fclose_per_event_dump(struct perf_script *script)evlist__for_each_entry (evlist, evsel) {if (!evsel->priv)break ; -perf_evsel_script__delete (evsel->priv); +evsel_script__delete (evsel->priv); evsel->priv =NULL ; } }
@@ -2442,7 +2440,7 @@ static int perf_script__fopen_per_event_dump(struct perf_script *script)if (evsel->priv !=NULL )continue ; - evsel->priv =perf_evsel_script__new (evsel, script->session->data); + evsel->priv =evsel_script__new (evsel, script->session->data);if (evsel->priv ==NULL ) goto out_err_fclose; }
@@ -2477,8 +2475,8 @@ static void perf_script__exit_per_event_dump_stats(struct perf_script *script)evlist__for_each_entry (script->session->evlist, evsel) {struct evsel_script *es = evsel->priv; -perf_evsel_script__fprintf (es, stdout); -perf_evsel_script__delete (es); +evsel_script__fprintf (es, stdout); +evsel_script__delete (es); evsel->priv =NULL ; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 188/509 perf script: Fix allocation of evsel->priv related to per-event dump files
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 36d3e4138e1b6cc9ab179f3f397b5548f8b1eaae ]
When printing output we may want to generate per event files, where the --per-event-dump option should be used, creating perf.data.EVENT.dump files instead of printing to stdout.
The callback thar processes event thus expects that evsel->priv->fp should point to either the per-event FILE descriptor or to stdout.
The a3af66f51bd0bca7 ("perf script: Fix crash because of missing evsel->priv") changeset fixed a case where evsel->priv wasn't setup, thus set to NULL, causing a segfault when trying to access evsel->priv->fp.
But it did it for the non --per-event-dump case by allocating a 'struct perf_evsel_script' just to set its ->fp to stdout.
Since evsel->priv is only freed when --per-event-dump is used, we ended up with a memory leak, detected using ASAN.
Fix it by using the same method as perf_script__setup_per_event_dump(), and reuse that static 'struct perf_evsel_script'.
Also check if evsel_script__new() failed.
--- tools/perf/builtin-script.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
tools/perf/builtin-script.c +8 -8
@@ -2146,6 +2146,9 @@ static int process_sample_event(struct perf_tool *tool,return 0 ; } +// Used when scr->per_event_dump is not set +static struct evsel_script es_stdout; +static int process_attr (struct perf_tool *tool,union perf_event *event,struct evlist **pevlist) {
@@ -2154,7 +2157,6 @@ static int process_attr(struct perf_tool *tool, union perf_event *event,struct evsel *evsel, *pos;u64 sample_type;int err; -static struct evsel_script *es; err =perf_event__process_attr (tool, event, pevlist);if (err)
@@ -2164,14 +2166,13 @@ static int process_attr(struct perf_tool *tool, union perf_event *event, evsel =evlist__last (*pevlist);if (!evsel->priv) { -if (scr->per_event_dump) { +if (scr->per_event_dump) { evsel->priv =evsel_script__new (evsel, scr->session->data); - }else { - es =zalloc (sizeof (*es)); -if (!es) +if (!evsel->priv)return -ENOMEM ; - es->fp = stdout; - evsel->priv = es; + }else {// Replicate what is done in perf_script__setup_per_event_dump() + es_stdout.fp = stdout; + evsel->priv = &es_stdout; } }
@@ -2455,7 +2456,6 @@ static int perf_script__fopen_per_event_dump(struct perf_script *script)static int perf_script__setup_per_event_dump (struct perf_script *script) {struct evsel *evsel; -static struct evsel_script es_stdout;if (script->per_event_dump)return perf_script__fopen_per_event_dump (script);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 189/509 perf dwarf-aux: Fix off-by-one in die_get_varname()
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit 3abfcfd847717d232e36963f31a361747c388fe7 ]
The die_get_varname() returns "(unknown_type)" string if it failed to find a type for the variable. But it had a space before the opening parenthesis and it made the closing parenthesis cut off due to the off-by-one in the string length (14).
--- tools/perf/util/dwarf-aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +1 -1
@@ -1081,7 +1081,7 @@ int die_get_varname(Dwarf_Die *vr_die, struct strbuf *buf) ret =die_get_typename (vr_die, buf);if (ret <0 ) {pr_debug ("Failed to get type, make it unknown.\n" ); - ret =strbuf_add (buf," (unknown_type)" ,14 ); + ret =strbuf_add (buf,"(unknown_type)" ,14 ); }return ret <0 ? ret :strbuf_addf (buf,"\t%s" ,dwarf_diename (vr_die));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 190/509 pinctrl: at91-pio4: check return value of devm_kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit f6fd5d4ff8ca0b24cee1af4130bcb1fa96b61aa0 ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: 1c4e5c470a56 ("pinctrl: at91: use devm_kasprintf() to avoid potential leaks")
Depends-on: 5a8f9cf269e8 ("pinctrl: at91-pio4: use proper format specifier for unsigned int")
--- drivers/pinctrl/pinctrl-at91-pio4.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-at91-pio4.c +2 -0
@@ -1083,6 +1083,8 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)/* Pin naming convention: P(bank_name)(bank_pin_number). */ pin_desc[i].name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"P%c%d" , bank +'A' , line); +if (!pin_desc[i].name) +return -ENOMEM ; group->name = group_names[i] = pin_desc[i].name; group->pin = pin_desc[i].number;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 191/509 powerpc/powernv/sriov: perform null check on iov before dereferencing iov
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit f4f913c980bc6abe0ccfe88fe3909c125afe4a2d ]
Currently pointer iov is being dereferenced before the null check of iov which can lead to null pointer dereference errors. Fix this by moving the iov null check before the dereferencing.
Detected using cppcheck static analysis:linux/arch/powerpc/platforms/powernv/pci-sriov.c:597:12: warning: Either the condition '!iov' is redundant or there is possible null pointer
dereference: iov. [nullPointerRedundantCheck]
num_vfs = iov->num_vfs;
^--- arch/powerpc/platforms/powernv/pci-sriov.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/platforms/powernv/pci-sriov.c +3 -3
@@ -600,12 +600,12 @@ static void pnv_pci_sriov_disable(struct pci_dev *pdev)struct pnv_iov_data *iov; iov =pnv_iov_get (pdev); - num_vfs = iov->num_vfs; - base_pe = iov->vf_pe_arr[0 ].pe_number; -if (WARN_ON (!iov))return ; + num_vfs = iov->num_vfs; + base_pe = iov->vf_pe_arr[0 ].pe_number; +/* Release VF PEs */ pnv_ioda_release_vf_PE (pdev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 192/509 mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t *
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit 9cf6fa2458443118b84090aa1bf7a3630b5940e8 ]
No functional change in this patch.
Stable-dep-of: 0da90af431ab ("powerpc/book3s64/mm: Fix DirectMap stats in /proc/meminfo")
--- arch/alpha/include/asm/pgtable.h | 8 +++++--- arch/arm/include/asm/pgtable-3level.h | 2 +- arch/arm64/include/asm/pgtable.h | 4 ++-- arch/ia64/include/asm/pgtable.h | 2 +- arch/m68k/include/asm/motorola_pgtable.h | 2 +- arch/mips/include/asm/pgtable-64.h | 4 ++-- arch/parisc/include/asm/pgtable.h | 4 ++-- arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +++++- arch/powerpc/include/asm/nohash/64/pgtable.h | 6 +++++- arch/powerpc/mm/book3s64/radix_pgtable.c | 4 ++-- arch/powerpc/mm/pgtable_64.c | 2 +- arch/riscv/include/asm/pgtable-64.h | 4 ++-- arch/sh/include/asm/pgtable-3level.h | 4 ++-- arch/sparc/include/asm/pgtable_32.h | 6 +++--- arch/sparc/include/asm/pgtable_64.h | 6 +++--- arch/um/include/asm/pgtable-3level.h | 2 +- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/pat/set_memory.c | 4 ++-- arch/x86/mm/pgtable.c | 2 +- include/asm-generic/pgtable-nopmd.h | 2 +- include/asm-generic/pgtable-nopud.h | 2 +- include/linux/pgtable.h | 2 +- 22 files changed, 46 insertions(+), 36 deletions(-)
arch/alpha/include/asm/pgtable.h +5 -3
@@ -241,8 +241,10 @@ pmd_page_vaddr(pmd_t pmd)#define pud_page (pud) (mem_map + ((pud_val(pud) & _PFN_MASK) >> 32))#endif -extern inline unsigned long pud_page_vaddr (pud_t pgd) -{return PAGE_OFFSET + ((pud_val (pgd) & _PFN_MASK) >> (32 -PAGE_SHIFT )); } +extern inline pmd_t *pud_pgtable (pud_t pgd) +{ +return (pmd_t *)(PAGE_OFFSET + ((pud_val (pgd) & _PFN_MASK) >> (32 -PAGE_SHIFT ))); +}extern inline int pte_none (pte_t pte) {return !pte_val (pte); }extern inline int pte_present (pte_t pte) {return pte_val (pte) & _PAGE_VALID; }
@@ -292,7 +294,7 @@ extern inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= __ACCESS_BITS; retu/* Find an entry in the second-level page table.. */ extern inline pmd_t *pmd_offset (pud_t * dir,unsigned long address) { -pmd_t *ret = (pmd_t *)pud_page_vaddr (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PAGE -1 )); +pmd_t *ret =pud_pgtable (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PAGE -1 ));smp_rmb ();/* see above */ return ret; }
arch/arm/include/asm/pgtable-3level.h +1 -1
@@ -130,7 +130,7 @@flush_pmd_entry (pudp); \ }while (0 ) -static inline pmd_t *pud_page_vaddr(pud_t pud) +static inline pmd_t *pud_pgtable(pud_t pud) {return __va (pud_val (pud) &PHYS_MASK & (s32 )PAGE_MASK ); }
arch/arm64/include/asm/pgtable.h +2 -2
@@ -633,9 +633,9 @@ static inline phys_addr_t pud_page_paddr(pud_t pud)return __pud_to_phys (pud); } -static inline unsigned long pud_page_vaddr (pud_t pud) +static inline pmd_t *pud_pgtable (pud_t pud) { -return (unsigned long )__va (pud_page_paddr (pud)); +return (pmd_t *)__va (pud_page_paddr (pud)); }/* Find an entry in the second-level page table. */
arch/ia64/include/asm/pgtable.h +1 -1
@@ -279,7 +279,7 @@ extern unsigned long VMALLOC_END;#define pud_bad (pud) (!ia64_phys_addr_valid(pud_val(pud)))#define pud_present (pud) (pud_val(pud) != 0UL)#define pud_clear (pudp) (pud_val(*(pudp)) = 0UL) -#define pud_page_vaddr (pud) ((unsigned long) __va(pud_val(pud) & _PFN_MASK)) +#define pud_pgtable (pud) ((pmd_t *) __va(pud_val(pud) & _PFN_MASK))#define pud_page (pud) virt_to_page((pud_val(pud) + PAGE_OFFSET))#if CONFIG_PGTABLE_LEVELS ==4
arch/m68k/include/asm/motorola_pgtable.h +1 -1
@@ -129,7 +129,7 @@ static inline void pud_set(pud_t *pudp, pmd_t *pmdp)#define __pte_page (pte) ((unsigned long)__va(pte_val(pte) & PAGE_MASK))#define pmd_page_vaddr (pmd) ((unsigned long)__va(pmd_val(pmd) & _TABLE_MASK)) -#define pud_page_vaddr (pud) ((unsigned long)__va(pud_val(pud) & _TABLE_MASK)) +#define pud_pgtable (pud) ((pmd_t *)__va(pud_val(pud) & _TABLE_MASK))#define pte_none (pte) (!pte_val(pte))
arch/mips/include/asm/pgtable-64.h +2 -2
@@ -314,9 +314,9 @@ static inline void pud_clear(pud_t *pudp)#endif #ifndef __PAGETABLE_PMD_FOLDED -static inline unsigned long pud_page_vaddr (pud_t pud) +static inline pmd_t *pud_pgtable (pud_t pud) { -return pud_val (pud); +return (pmd_t *)pud_val (pud); }#define pud_phys (pud) virt_to_phys((void *)pud_val(pud))#define pud_page (pud) (pfn_to_page(pud_phys(pud) >> PAGE_SHIFT))
arch/parisc/include/asm/pgtable.h +2 -2
@@ -330,8 +330,8 @@ static inline void pmd_clear(pmd_t *pmd) {#if CONFIG_PGTABLE_LEVELS ==3 -#define pud_page_vaddr (pud) ((unsigned long) __va(pud_address(pud))) -#define pud_page (pud) virt_to_page((void *)pud_page_vaddr(pud)) +#define pud_pgtable (pud) ((pmd_t *) __va(pud_address(pud))) +#define pud_page (pud) virt_to_page((void *)pud_pgtable(pud))/* For 64 bit we have three level tables */
arch/powerpc/include/asm/book3s/64/pgtable.h +5 -1
@@ -1030,9 +1030,13 @@ extern struct page *p4d_page(p4d_t p4d);/* Pointers in the page table tree are physical addresses */ #define __pgtable_ptr_val (ptr) __pa(ptr) -#define pud_page_vaddr (pud) __va(pud_val(pud) & ~PUD_MASKED_BITS)#define p4d_page_vaddr (p4d) __va(p4d_val(p4d) & ~P4D_MASKED_BITS) +static inline pmd_t *pud_pgtable (pud_t pud) +{ +return (pmd_t *)__va (pud_val (pud) & ~PUD_MASKED_BITS ); +} +#define pte_ERROR (e) \ pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))#define pmd_ERROR (e) \
arch/powerpc/include/asm/nohash/64/pgtable.h +5 -1
@@ -164,7 +164,11 @@ static inline void pud_clear(pud_t *pudp)#define pud_bad (pud) (!is_kernel_addr(pud_val(pud)) \ || (pud_val(pud) & PUD_BAD_BITS))#define pud_present (pud) (pud_val(pud) != 0) -#define pud_page_vaddr (pud) (pud_val(pud) & ~PUD_MASKED_BITS) + +static inline pmd_t *pud_pgtable (pud_t pud) +{ +return (pmd_t *)(pud_val (pud) & ~PUD_MASKED_BITS ); +}extern struct page *pud_page (pud_t pud);
arch/powerpc/mm/book3s64/radix_pgtable.c +2 -2
@@ -864,7 +864,7 @@ static void __meminit remove_pud_table(pud_t *pud_start, unsigned long addr,continue ; } - pmd_base = (pmd_t *)pud_page_vaddr (*pud); + pmd_base =pud_pgtable (*pud);remove_pmd_table (pmd_base, addr, next);free_pmd_table (pmd_base, pud); }
@@ -1156,7 +1156,7 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr)pmd_t *pmd;int i; - pmd = (pmd_t *)pud_page_vaddr (*pud); + pmd =pud_pgtable (*pud);pud_clear (pud);flush_tlb_kernel_range (addr, addr +PUD_SIZE );
arch/powerpc/mm/pgtable_64.c +1 -1
@@ -117,7 +117,7 @@ struct page *pud_page(pud_t pud)VM_WARN_ON (!pud_huge (pud));return pte_page (pud_pte (pud)); } -return virt_to_page (pud_page_vaddr (pud)); +return virt_to_page (pud_pgtable (pud)); }/*
arch/riscv/include/asm/pgtable-64.h +2 -2
@@ -60,9 +60,9 @@ static inline void pud_clear(pud_t *pudp)set_pud (pudp,__pud (0 )); } -static inline unsigned long pud_page_vaddr (pud_t pud) +static inline pmd_t *pud_pgtable (pud_t pud) { -return (unsigned long )pfn_to_virt (pud_val (pud) >> _PAGE_PFN_SHIFT); +return (pmd_t *)pfn_to_virt (pud_val (pud) >> _PAGE_PFN_SHIFT); }static inline struct page *pud_page (pud_t pud)
arch/sh/include/asm/pgtable-3level.h +2 -2
@@ -32,9 +32,9 @@ typedef struct { unsigned long long pmd; } pmd_t;#define pmd_val (x) ((x).pmd)#define __pmd (x) ((pmd_t) { (x) } ) -static inline unsigned long pud_page_vaddr (pud_t pud) +static inline pmd_t *pud_pgtable (pud_t pud) { -return pud_val (pud); +return (pmd_t *)pud_val (pud); }/* only used by the stubbed out hugetlb gup code, should never be called */
arch/sparc/include/asm/pgtable_32.h +3 -3
@@ -152,13 +152,13 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)return (unsigned long )__nocache_va (v <<4 ); } -static inline unsigned long pud_page_vaddr (pud_t pud) +static inline pmd_t *pud_pgtable (pud_t pud) {if (srmmu_device_memory (pud_val (pud))) { -return ~0 ; +return (pmd_t *)~0 ; }else {unsigned long v =pud_val (pud) &SRMMU_PTD_PMASK ; -return (unsigned long )__nocache_va (v <<4 ); +return (pmd_t *)__nocache_va (v <<4 ); } }
arch/sparc/include/asm/pgtable_64.h +3 -3
@@ -845,18 +845,18 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)return ((unsigned long )__va (pfn <<PAGE_SHIFT )); } -static inline unsigned long pud_page_vaddr (pud_t pud) +static inline pmd_t *pud_pgtable (pud_t pud) {pte_t pte =__pte (pud_val (pud));unsigned long pfn; pfn =pte_pfn (pte); -return ((unsigned long )__va (pfn <<PAGE_SHIFT )); +return ((pmd_t *)__va (pfn <<PAGE_SHIFT )); }#define pmd_page (pmd) virt_to_page((void *)pmd_page_vaddr(pmd)) -#define pud_page (pud) virt_to_page((void *)pud_page_vaddr(pud)) +#define pud_page (pud) virt_to_page((void *)pud_pgtable(pud))#define pmd_clear (pmdp) (pmd_val(*(pmdp)) = 0UL)#define pud_present (pud) (pud_val(pud) != 0U)#define pud_clear (pudp) (pud_val(*(pudp)) = 0UL)
arch/um/include/asm/pgtable-3level.h +1 -1
@@ -84,7 +84,7 @@ static inline void pud_clear (pud_t *pud) }#define pud_page (pud) phys_to_page(pud_val(pud) & PAGE_MASK) -#define pud_page_vaddr (pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK)) +#define pud_pgtable (pud) ((pmd_t *) __va(pud_val(pud) & PAGE_MASK))static inline unsigned long pte_pfn (pte_t pte) {
arch/x86/include/asm/pgtable.h +2 -2
@@ -865,9 +865,9 @@ static inline int pud_present(pud_t pud)return pud_flags (pud) & _PAGE_PRESENT; } -static inline unsigned long pud_page_vaddr (pud_t pud) +static inline pmd_t *pud_pgtable (pud_t pud) { -return (unsigned long )__va (pud_val (pud) &pud_pfn_mask (pud)); +return (pmd_t *)__va (pud_val (pud) &pud_pfn_mask (pud)); }/*
arch/x86/mm/pat/set_memory.c +2 -2
@@ -1126,7 +1126,7 @@ static void __unmap_pmd_range(pud_t *pud, pmd_t *pmd, unsigned long start, unsigned long end) { if (unmap_pte_range(pmd, start, end)) - if (try_to_free_pmd_page((pmd_t *)pud_page_vaddr(*pud))) + if (try_to_free_pmd_page(pud_pgtable(*pud))) pud_clear(pud); }
@@ -1170,7 +1170,7 @@ static void unmap_pmd_range(pud_t *pud, unsigned long start, unsigned long end)* Try again to free the PMD page if haven't succeeded above. */ if (!pud_none (*pud)) -if (try_to_free_pmd_page ((pmd_t *)pud_page_vaddr (*pud))) +if (try_to_free_pmd_page (pud_pgtable (*pud)))pud_clear (pud); }
arch/x86/mm/pgtable.c +1 -1
@@ -805,7 +805,7 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr)pte_t *pte;int i; - pmd = (pmd_t *)pud_page_vaddr (*pud); + pmd =pud_pgtable (*pud); pmd_sv = (pmd_t *)__get_free_page (GFP_KERNEL );if (!pmd_sv)return 0 ;
include/asm-generic/pgtable-nopmd.h +1 -1
@@ -51,7 +51,7 @@ static inline pmd_t * pmd_offset(pud_t * pud, unsigned long address)#define __pmd (x) ((pmd_t) { __pud(x) } )#define pud_page (pud) (pmd_page((pmd_t){ pud })) -#define pud_page_vaddr (pud) (pmd_page_vaddr((pmd_t){ pud })) +#define pud_pgtable (pud) ((pmd_t *)(pmd_page_vaddr((pmd_t){ pud })))/* * allocating and freeing a pmd is trivial: the 1-entry pmd is
include/asm-generic/pgtable-nopud.h +1 -1
@@ -49,7 +49,7 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)#define __pud (x) ((pud_t) { __p4d(x) })#define p4d_page (p4d) (pud_page((pud_t){ p4d })) -#define p4d_page_vaddr (p4d) (pud_page_vaddr((pud_t){ p4d })) +#define p4d_page_vaddr (p4d) (pud_pgtable((pud_t){ p4d }))/* * allocating and freeing a pud is trivial: the 1-entry pud is
include/linux/pgtable.h +1 -1
@@ -89,7 +89,7 @@ static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)#ifndef pmd_offsetstatic inline pmd_t *pmd_offset (pud_t *pud,unsigned long address) { -return (pmd_t *)pud_page_vaddr (*pud) +pmd_index (address); +return pud_pgtable (*pud) +pmd_index (address); }#define pmd_offset pmd_offset#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 193/509 mm: rename p4d_page_vaddr to p4d_pgtable and make it return pud_t *
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit dc4875f0e791de554bdc45aa1dbd6e45e107e50f ]
No functional change in this patch.
Stable-dep-of: 0da90af431ab ("powerpc/book3s64/mm: Fix DirectMap stats in /proc/meminfo")
--- arch/arm64/include/asm/pgtable.h | 4 ++-- arch/ia64/include/asm/pgtable.h | 2 +- arch/mips/include/asm/pgtable-64.h | 4 ++-- arch/powerpc/include/asm/book3s/64/pgtable.h | 5 ++++- arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 6 +++++- arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +- arch/powerpc/mm/pgtable_64.c | 2 +- arch/sparc/include/asm/pgtable_64.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- arch/x86/mm/init_64.c | 4 ++-- include/asm-generic/pgtable-nop4d.h | 2 +- include/asm-generic/pgtable-nopud.h | 2 +- include/linux/pgtable.h | 2 +- 13 files changed, 25 insertions(+), 18 deletions(-)
arch/arm64/include/asm/pgtable.h +2 -2
@@ -694,9 +694,9 @@ static inline phys_addr_t p4d_page_paddr(p4d_t p4d)return __p4d_to_phys (p4d); } -static inline unsigned long p4d_page_vaddr (p4d_t p4d) +static inline pud_t *p4d_pgtable (p4d_t p4d) { -return (unsigned long )__va (p4d_page_paddr (p4d)); +return (pud_t *)__va (p4d_page_paddr (p4d)); }/* Find an entry in the frst-level page table. */
arch/ia64/include/asm/pgtable.h +1 -1
@@ -287,7 +287,7 @@ extern unsigned long VMALLOC_END;#define p4d_bad (p4d) (!ia64_phys_addr_valid(p4d_val(p4d)))#define p4d_present (p4d) (p4d_val(p4d) != 0UL)#define p4d_clear (p4dp) (p4d_val(*(p4dp)) = 0UL) -#define p4d_page_vaddr (p4d) ((unsigned long) __va(p4d_val(p4d) & _PFN_MASK)) +#define p4d_pgtable (p4d) ((pud_t *) __va(p4d_val(p4d) & _PFN_MASK))#define p4d_page (p4d) virt_to_page((p4d_val(p4d) + PAGE_OFFSET))#endif
arch/mips/include/asm/pgtable-64.h +2 -2
@@ -210,9 +210,9 @@ static inline void p4d_clear(p4d_t *p4dp)p4d_val (*p4dp) = (unsigned long )invalid_pud_table; } -static inline unsigned long p4d_page_vaddr (p4d_t p4d) +static inline pud_t *p4d_pgtable (p4d_t p4d) { -return p4d_val (p4d); +return (pud_t *)p4d_val (p4d); }#define p4d_phys (p4d) virt_to_phys((void *)p4d_val(p4d))
arch/powerpc/include/asm/book3s/64/pgtable.h +4 -1
@@ -1030,7 +1030,10 @@ extern struct page *p4d_page(p4d_t p4d);/* Pointers in the page table tree are physical addresses */ #define __pgtable_ptr_val (ptr) __pa(ptr) -#define p4d_page_vaddr (p4d) __va(p4d_val(p4d) & ~P4D_MASKED_BITS) +static inline pud_t *p4d_pgtable (p4d_t p4d) +{ +return (pud_t *)__va (p4d_val (p4d) & ~P4D_MASKED_BITS ); +}static inline pmd_t *pud_pgtable (pud_t pud) {
arch/powerpc/include/asm/nohash/64/pgtable-4k.h +5 -1
@@ -56,10 +56,14 @@#define p4d_none (p4d) (!p4d_val(p4d))#define p4d_bad (p4d) (p4d_val(p4d) == 0)#define p4d_present (p4d) (p4d_val(p4d) != 0) -#define p4d_page_vaddr (p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS)#ifndef __ASSEMBLY__ +static inline pud_t *p4d_pgtable (p4d_t p4d) +{ +return (pud_t *) (p4d_val (p4d) & ~P4D_MASKED_BITS ); +} +static inline void p4d_clear (p4d_t *p4dp) { *p4dp =__p4d (0 );
arch/powerpc/mm/book3s64/radix_pgtable.c +1 -1
@@ -898,7 +898,7 @@ static void __meminit remove_pagetable(unsigned long start, unsigned long end)continue ; } - pud_base = (pud_t *)p4d_page_vaddr (*p4d); + pud_base =p4d_pgtable (*p4d);remove_pud_table (pud_base, addr, next);free_pud_table (pud_base, p4d); }
arch/powerpc/mm/pgtable_64.c +1 -1
@@ -106,7 +106,7 @@ struct page *p4d_page(p4d_t p4d)VM_WARN_ON (!p4d_huge (p4d)); return pte_page(p4d_pte(p4d)); } -return virt_to_page (p4d_page_vaddr (p4d)); +return virt_to_page (p4d_pgtable (p4d)); }#endif
arch/sparc/include/asm/pgtable_64.h +2 -2
@@ -860,8 +860,8 @@ static inline pmd_t *pud_pgtable(pud_t pud)#define pmd_clear (pmdp) (pmd_val(*(pmdp)) = 0UL)#define pud_present (pud) (pud_val(pud) != 0U)#define pud_clear (pudp) (pud_val(*(pudp)) = 0UL) -#define p4d_page_vaddr (p4d) \ - ((unsigned long) __va(p4d_val(p4d))) +#define p4d_pgtable (p4d) \ + ((pud_t *) __va(p4d_val(p4d)))#define p4d_present (p4d) (p4d_val(p4d) != 0U)#define p4d_clear (p4dp) (p4d_val(*(p4dp)) = 0UL)
arch/x86/include/asm/pgtable.h +2 -2
@@ -906,9 +906,9 @@ static inline int p4d_present(p4d_t p4d)return p4d_flags (p4d) & _PAGE_PRESENT; } -static inline unsigned long p4d_page_vaddr (p4d_t p4d) +static inline pud_t *p4d_pgtable (p4d_t p4d) { -return (unsigned long )__va (p4d_val (p4d) &p4d_pfn_mask (p4d)); +return (pud_t *)__va (p4d_val (p4d) &p4d_pfn_mask (p4d)); }/*
arch/x86/mm/init_64.c +2 -2
@@ -193,8 +193,8 @@ static void sync_global_pgds_l4(unsigned long start, unsigned long end)spin_lock (pgt_lock);if (!p4d_none (*p4d_ref) && !p4d_none (*p4d)) -BUG_ON (p4d_page_vaddr (*p4d) - !=p4d_page_vaddr (*p4d_ref)); +BUG_ON (p4d_pgtable (*p4d) + !=p4d_pgtable (*p4d_ref));if (p4d_none (*p4d))set_p4d (p4d, *p4d_ref);
include/asm-generic/pgtable-nop4d.h +1 -1
@@ -42,7 +42,7 @@ static inline p4d_t *p4d_offset(pgd_t *pgd, unsigned long address)#define __p4d (x) ((p4d_t) { __pgd(x) })#define pgd_page (pgd) (p4d_page((p4d_t){ pgd })) -#define pgd_page_vaddr (pgd) (p4d_page_vaddr((p4d_t){ pgd })) +#define pgd_page_vaddr (pgd) ((unsigned long)(p4d_pgtable((p4d_t){ pgd })))/* * allocating and freeing a p4d is trivial: the 1-entry p4d is
include/asm-generic/pgtable-nopud.h +1 -1
@@ -49,7 +49,7 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)#define __pud (x) ((pud_t) { __p4d(x) })#define p4d_page (p4d) (pud_page((pud_t){ p4d })) -#define p4d_page_vaddr (p4d) (pud_pgtable((pud_t){ p4d })) +#define p4d_pgtable (p4d) ((pud_t *)(pud_pgtable((pud_t){ p4d })))/* * allocating and freeing a pud is trivial: the 1-entry pud is
include/linux/pgtable.h +1 -1
@@ -97,7 +97,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)#ifndef pud_offsetstatic inline pud_t *pud_offset (p4d_t *p4d,unsigned long address) { -return (pud_t *)p4d_page_vaddr (*p4d) +pud_index (address); +return p4d_pgtable (*p4d) +pud_index (address); }#define pud_offset pud_offset#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 194/509 powerpc/book3s64/mm: Fix DirectMap stats in /proc/meminfo
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit 0da90af431abc3f497a38ec9ef6e43b0d0dabe80 ]
On memory unplug reduce DirectMap page count correctly.
root@ubuntu-guest:# grep Direct /proc/meminfo DirectMap4k: 0 kB DirectMap64k: 0 kB DirectMap2M: 115343360 kB DirectMap1G: 0 kB
Before fix:
root@ubuntu-guest:# ndctl disable-namespace all disabled 1 namespace root@ubuntu-guest:# grep Direct /proc/meminfo DirectMap4k: 0 kB DirectMap64k: 0 kB DirectMap2M: 115343360 kB DirectMap1G: 0 kB
After fix:
root@ubuntu-guest:# ndctl disable-namespace all disabled 1 namespace root@ubuntu-guest:# grep Direct /proc/meminfo DirectMap4k: 0 kB DirectMap64k: 0 kB DirectMap2M: 104857600 kB DirectMap1G: 0 kB
--- arch/powerpc/mm/book3s64/radix_pgtable.c | 34 +++++++++++++++--------- 1 file changed, 22 insertions(+), 12 deletions(-)
arch/powerpc/mm/book3s64/radix_pgtable.c +22 -12
@@ -783,9 +783,9 @@ static void free_pud_table(pud_t *pud_start, p4d_t *p4d) }static void remove_pte_table (pte_t *pte_start,unsigned long addr, -unsigned long end) +unsigned long end,bool direct) { -unsigned long next; +unsigned long next, pages =0 ;pte_t *pte; pte = pte_start +pte_index (addr);
@@ -807,13 +807,16 @@ static void remove_pte_table(pte_t *pte_start, unsigned long addr, }pte_clear (&init_mm, addr, pte); + pages++; } +if (direct) +update_page_count (mmu_virtual_psize, -pages); }static void __meminit remove_pmd_table (pmd_t *pmd_start,unsigned long addr, -unsigned long end) +unsigned long end,bool direct) { -unsigned long next; +unsigned long next, pages =0 ;pte_t *pte_base;pmd_t *pmd;
@@ -831,19 +834,22 @@ static void __meminit remove_pmd_table(pmd_t *pmd_start, unsigned long addr,continue ; }pte_clear (&init_mm, addr, (pte_t *)pmd); + pages++;continue ; } pte_base = (pte_t *)pmd_page_vaddr (*pmd); -remove_pte_table (pte_base, addr, next); +remove_pte_table (pte_base, addr, next, direct);free_pte_table (pte_base, pmd); } +if (direct) +update_page_count (MMU_PAGE_2M , -pages); }static void __meminit remove_pud_table (pud_t *pud_start,unsigned long addr, -unsigned long end) +unsigned long end,bool direct) { -unsigned long next; +unsigned long next, pages =0 ;pmd_t *pmd_base;pud_t *pud;
@@ -861,16 +867,20 @@ static void __meminit remove_pud_table(pud_t *pud_start, unsigned long addr,continue ; }pte_clear (&init_mm, addr, (pte_t *)pud); + pages++;continue ; } pmd_base =pud_pgtable (*pud); -remove_pmd_table (pmd_base, addr, next); +remove_pmd_table (pmd_base, addr, next, direct);free_pmd_table (pmd_base, pud); } +if (direct) +update_page_count (MMU_PAGE_1G , -pages); } -static void __meminit remove_pagetable (unsigned long start,unsigned long end) +static void __meminit remove_pagetable (unsigned long start,unsigned long end, +bool direct) {unsigned long addr, next;pud_t *pud_base;
@@ -899,7 +909,7 @@ static void __meminit remove_pagetable(unsigned long start, unsigned long end) } pud_base =p4d_pgtable (*p4d); -remove_pud_table (pud_base, addr, next); +remove_pud_table (pud_base, addr, next, direct);free_pud_table (pud_base, p4d); }
@@ -922,7 +932,7 @@ int __meminit radix__create_section_mapping(unsigned long start,int __meminit radix__remove_section_mapping (unsigned long start,unsigned long end) { -remove_pagetable (start, end); +remove_pagetable (start, end, true);return 0 ; }#endif /* CONFIG_MEMORY_HOTPLUG */
@@ -958,7 +968,7 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,#ifdef CONFIG_MEMORY_HOTPLUG void __meminit radix__vmemmap_remove_mapping (unsigned long start,unsigned long page_size) { -remove_pagetable (start, start + page_size); +remove_pagetable (start, start + page_size, false); }#endif #endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 195/509 powerpc/mm/dax: Fix the condition when checking if altmap vmemap can cross-boundary
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit c8eebc4a99f15280654f23e914e746c40a516e50 ]
Without this fix, the last subsection vmemmap can end up in memory even if the namespace is created with -M mem and has sufficient space in the altmap area.
--- arch/powerpc/mm/init_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/init_64.c +1 -1
@@ -188,7 +188,7 @@ static bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long starunsigned long nr_pfn = page_size /sizeof (struct page );unsigned long start_pfn =page_to_pfn ((struct page *)start); -if ((start_pfn + nr_pfn) > altmap->end_pfn) +if ((start_pfn + nr_pfn -1 ) > altmap->end_pfn)return true;if (start_pfn < altmap->base_pfn)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 196/509 hwrng: virtio - add an internal buffer
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit bf3175bc50a3754dc427e2f5046e17a9fafc8be7 ]
hwrng core uses two buffers that can be mixed in the virtio-rng queue.
If the buffer is provided with wait=0 it is enqueued in the virtio-rng queue but unused by the caller.
On the next call, core provides another buffer but the first one is filled instead and the new one queued. And the caller reads the data from the new one that is not updated, and the data in the first one are lost.
To avoid this mix, virtio-rng needs to use its own unique internal buffer at a cost of a data copy to the caller buffer.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 43 ++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 10 deletions(-)
drivers/char/hw_random/virtio-rng.c +33 -10
@@ -18,13 +18,20 @@ static DEFINE_IDA(rng_index_ida);struct virtrng_info {struct hwrng hwrng;struct virtqueue *vq; -struct completion have_data;char name[25 ]; -unsigned int data_avail;int index;bool busy;bool hwrng_register_done;bool hwrng_removed; +/* data transfer */ +struct completion have_data; +unsigned int data_avail; +/* minimal size returned by rng_buffer_size() */ +#if SMP_CACHE_BYTES <32 +u8 data[32 ]; +#else +u8 data[SMP_CACHE_BYTES ]; +#endif };static void random_recv_done (struct virtqueue *vq)
@@ -39,14 +46,14 @@ static void random_recv_done(struct virtqueue *vq) }/* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer (struct virtrng_info *vi,u8 *buf,size_t size) +static void register_buffer (struct virtrng_info *vi) {struct scatterlist sg; -sg_init_one (&sg, buf, size); +sg_init_one (&sg, vi->data,sizeof (vi->data));/* There should always be room for one buffer. */ -virtqueue_add_inbuf (vi->vq, &sg,1 , buf,GFP_KERNEL ); +virtqueue_add_inbuf (vi->vq, &sg,1 , vi->data,GFP_KERNEL );virtqueue_kick (vi->vq); }
@@ -55,6 +62,8 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) {int ret;struct virtrng_info *vi = (struct virtrng_info *)rng->priv; +unsigned int chunk; +size_t read;if (vi->hwrng_removed)return -ENODEV ;
@@ -62,19 +71,33 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (!vi->busy) { vi->busy = true;reinit_completion (&vi->have_data); -register_buffer (vi, buf, size); +register_buffer (vi); }if (!wait)return 0 ; - ret =wait_for_completion_killable (&vi->have_data); -if (ret <0 ) -return ret; + read =0 ; +while (size !=0 ) { + ret =wait_for_completion_killable (&vi->have_data); +if (ret <0 ) +return ret; + + chunk = min_t(unsigned int, size, vi->data_avail); +memcpy (buf + read, vi->data, chunk); + read += chunk; + size -= chunk; + vi->data_avail =0 ; + +if (size !=0 ) { +reinit_completion (&vi->have_data); +register_buffer (vi); + } + } vi->busy = false; -return vi->data_avail; +return read; }static void virtio_cleanup (struct hwrng *rng)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 197/509 hwrng: virtio - dont wait on cleanup
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 2bb31abdbe55742c89f4dc0cc26fcbc8467364f6 ]
When virtio-rng device was dropped by the hwrng core we were forced to wait the buffer to come back from the device to not have remaining ongoing operation that could spoil the buffer.
But now, as the buffer is internal to the virtio-rng we can release the waiting loop immediately, the buffer will be retrieve and use when the virtio-rng driver will be selected again.
This avoids to hang on an rng_current write command if the virtio-rng device is blocked by a lack of entropy. This allows to select another entropy source if the current one is empty.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/char/hw_random/virtio-rng.c +6 -1
@@ -82,6 +82,11 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret; +/* if vi->data_avail is 0, we have been interrupted +* by a cleanup, but buffer stays in the queue +*/ +if (vi->data_avail ==0 ) +return read; chunk = min_t(unsigned int, size, vi->data_avail);memcpy (buf + read, vi->data, chunk);
@@ -105,7 +110,7 @@ static void virtio_cleanup(struct hwrng *rng)struct virtrng_info *vi = (struct virtrng_info *)rng->priv;if (vi->busy) -wait_for_completion (&vi->have_data); +complete (&vi->have_data); }static int probe_common (struct virtio_device *vdev)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 198/509 hwrng: virtio - dont waste entropy
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 5c8e933050044d6dd2a000f9a5756ae73cbe7c44 ]
if we don't use all the entropy available in the buffer, keep it and use it later.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 52 +++++++++++++++++++---------- 1 file changed, 35 insertions(+), 17 deletions(-)
drivers/char/hw_random/virtio-rng.c +35 -17
@@ -26,6 +26,7 @@ struct virtrng_info {/* data transfer */ struct completion have_data;unsigned int data_avail; +unsigned int data_idx;/* minimal size returned by rng_buffer_size() */ #if SMP_CACHE_BYTES <32 u8 data[32 ];
@@ -42,6 +43,9 @@ static void random_recv_done(struct virtqueue *vq)if (!virtqueue_get_buf (vi->vq, &vi->data_avail))return ; + vi->data_idx =0 ; + vi->busy = false; +complete (&vi->have_data); }
@@ -58,6 +62,16 @@ static void register_buffer(struct virtrng_info *vi)virtqueue_kick (vi->vq); } +static unsigned int copy_data (struct virtrng_info *vi,void *buf, +unsigned int size) +{ + size = min_t(unsigned int, size, vi->data_avail); +memcpy (buf, vi->data + vi->data_idx, size); + vi->data_idx += size; + vi->data_avail -= size; +return size; +} +static int virtio_read (struct hwrng *rng,void *buf,size_t size,bool wait) {int ret;
@@ -68,17 +82,29 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (vi->hwrng_removed)return -ENODEV ; -if (!vi->busy) { - vi->busy = true; -reinit_completion (&vi->have_data); -register_buffer (vi); + read =0 ; + +/* copy available data */ +if (vi->data_avail) { + chunk =copy_data (vi, buf, size); + size -= chunk; + read += chunk; }if (!wait) -return 0 ; +return read; - read =0 ; +/* We have already copied available entropy, +* so either size is 0 or data_avail is 0 +*/ while (size !=0 ) { +/* data_avail is 0 */ +if (!vi->busy) { +/* no pending request, ask for more */ + vi->busy = true; +reinit_completion (&vi->have_data); +register_buffer (vi); + } ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret;
@@ -88,20 +114,11 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (vi->data_avail ==0 )return read; - chunk = min_t(unsigned int, size, vi->data_avail); -memcpy (buf + read, vi->data, chunk); - read += chunk; + chunk =copy_data (vi, buf + read, size); size -= chunk; - vi->data_avail =0 ; - -if (size !=0 ) { -reinit_completion (&vi->have_data); -register_buffer (vi); - } + read += chunk; } - vi->busy = false; -return read; }
@@ -161,6 +178,7 @@ static void remove_common(struct virtio_device *vdev) vi->hwrng_removed = true; vi->data_avail =0 ; + vi->data_idx =0 ;complete (&vi->have_data); vdev->config->reset (vdev); vi->busy = false;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 199/509 hwrng: virtio - always add a pending request
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 9a4b612d675b03f7fc9fa1957ca399c8223f3954 ]
If we ensure we have already some data available by enqueuing again the buffer once data are exhausted, we can return what we have without waiting for the device answer.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/char/hw_random/virtio-rng.c +12 -14
@@ -20,7 +20,6 @@ struct virtrng_info {struct virtqueue *vq;char name[25 ];int index; -bool busy;bool hwrng_register_done;bool hwrng_removed;/* data transfer */
@@ -44,16 +43,18 @@ static void random_recv_done(struct virtqueue *vq)return ; vi->data_idx =0 ; - vi->busy = false;complete (&vi->have_data); } -/* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer (struct virtrng_info *vi) +static void request_entropy (struct virtrng_info *vi) {struct scatterlist sg; +reinit_completion (&vi->have_data); + vi->data_avail =0 ; + vi->data_idx =0 ; +sg_init_one (&sg, vi->data,sizeof (vi->data));/* There should always be room for one buffer. */
@@ -69,6 +70,8 @@ static unsigned int copy_data(struct virtrng_info *vi, void *buf,memcpy (buf, vi->data + vi->data_idx, size); vi->data_idx += size; vi->data_avail -= size; +if (vi->data_avail ==0 ) +request_entropy (vi);return size; }
@@ -98,13 +101,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)* so either size is 0 or data_avail is 0 */ while (size !=0 ) { -/* data_avail is 0 */ -if (!vi->busy) { -/* no pending request, ask for more */ - vi->busy = true; -reinit_completion (&vi->have_data); -register_buffer (vi); - } +/* data_avail is 0 but a request is pending */ ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret;
@@ -126,8 +123,7 @@ static void virtio_cleanup(struct hwrng *rng) {struct virtrng_info *vi = (struct virtrng_info *)rng->priv; -if (vi->busy) -complete (&vi->have_data); +complete (&vi->have_data); }static int probe_common (struct virtio_device *vdev)
@@ -163,6 +159,9 @@ static int probe_common(struct virtio_device *vdev) goto err_find; } +/* we always have a pending entropy request */ +request_entropy (vi); +return 0 ; err_find:
@@ -181,7 +180,6 @@ static void remove_common(struct virtio_device *vdev) vi->data_idx =0 ;complete (&vi->have_data); vdev->config->reset (vdev); - vi->busy = false;if (vi->hwrng_register_done)hwrng_unregister (&vi->hwrng); vdev->config->del_vqs (vdev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 200/509 hwrng: virtio - Fix race on data_avail and actual data
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit ac52578d6e8d300dd50f790f29a24169b1edd26c ]
The virtio rng device kicks off a new entropy request whenever the data available reaches zero. When a new request occurs at the end of a read operation, that is, when the result of that request is only needed by the next reader, then there is a race between the writing of the new data and the next reader.
This is because there is no synchronisation whatsoever between the writer and the reader.
Fix this by writing data_avail with smp_store_release and reading it with smp_load_acquire when we first enter read. The subsequent reads are safe because they're either protected by the first load acquire, or by the completion mechanism.
Also remove the redundant zeroing of data_idx in random_recv_done (data_idx must already be zero at this point) and data_avail in request_entropy (ditto).
--- drivers/char/hw_random/virtio-rng.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/char/hw_random/virtio-rng.c +5 -5
@@ -4,6 +4,7 @@* Copyright (C) 2007, 2008 Rusty Russell IBM Corporation */ +#include <asm/barrier.h> #include <linux/err.h> #include <linux/hw_random.h> #include <linux/scatterlist.h>
@@ -37,13 +38,13 @@ struct virtrng_info {static void random_recv_done (struct virtqueue *vq) {struct virtrng_info *vi = vq->vdev->priv; +unsigned int len;/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */ -if (!virtqueue_get_buf (vi->vq, &vi->data_avail)) +if (!virtqueue_get_buf (vi->vq, &len))return ; - vi->data_idx =0 ; - +smp_store_release (&vi->data_avail, len);complete (&vi->have_data); }
@@ -52,7 +53,6 @@ static void request_entropy(struct virtrng_info *vi)struct scatterlist sg;reinit_completion (&vi->have_data); - vi->data_avail =0 ; vi->data_idx =0 ;sg_init_one (&sg, vi->data,sizeof (vi->data));
@@ -88,7 +88,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) read =0 ;/* copy available data */ -if (vi->data_avail) { +if (smp_load_acquire (&vi->data_avail)) { chunk =copy_data (vi, buf, size); size -= chunk; read += chunk;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 201/509 crypto: nx - fix build warnings when DEBUG_FS is not enabled
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b04b076fb56560b39d695ac3744db457e12278fd ]
Fix build warnings when DEBUG_FS is not enabled by using an empty do-while loop instead of a value:
In file included from ../drivers/crypto/nx/nx.c:27:../drivers/crypto/nx/nx.c: In function 'nx_register_algs':../drivers/crypto/nx/nx.h:173:33: warning: statement with no effect [-Wunused-value]
173 | #define NX_DEBUGFS_INIT(drv) (0)../drivers/crypto/nx/nx.c:573:9: note: in expansion of macro 'NX_DEBUGFS_INIT'
573 | NX_DEBUGFS_INIT(&nx_driver);../drivers/crypto/nx/nx.c: In function 'nx_remove':../drivers/crypto/nx/nx.h:174:33: warning: statement with no effect [-Wunused-value]
174 | #define NX_DEBUGFS_FINI(drv) (0)../drivers/crypto/nx/nx.c:793:17: note: in expansion of macro 'NX_DEBUGFS_FINI'
793 | NX_DEBUGFS_FINI(&nx_driver);
Also, there is no need to build nx_debugfs.o when DEBUG_FS is not enabled, so change the Makefile to accommodate that.
--- drivers/crypto/nx/Makefile | 2 +- drivers/crypto/nx/nx.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/nx/Makefile +1 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_CRYPTO_DEV_NX_ENCRYPT) += nx-crypto.o nx-crypto-objs := nx.o \ - nx_debugfs.o \ nx-aes-cbc.o \ nx-aes-ecb.o \ nx-aes-gcm.o \
@@ -11,6 +10,7 @@ nx-crypto-objs := nx.o \ nx-sha256.o \ nx-sha512.o +nx-crypto-$(CONFIG_DEBUG_FS) += nx_debugfs.o obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES) += nx-compress-pseries.o nx-compress.o obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV) += nx-compress-powernv.o nx-compress.o nx-compress-objs := nx-842.o
drivers/crypto/nx/nx.h +2 -2
@@ -170,8 +170,8 @@ struct nx_sg *nx_walk_and_build(struct nx_sg *, unsigned int,void nx_debugfs_init (struct nx_crypto_driver *);void nx_debugfs_fini (struct nx_crypto_driver *);#else -#define NX_DEBUGFS_INIT (drv) (0) -#define NX_DEBUGFS_FINI (drv) (0) +#define NX_DEBUGFS_INIT (drv) do {} while (0) +#define NX_DEBUGFS_FINI (drv) do {} while (0)#endif #define NX_PAGE_NUM (x) ((u64)(x) & 0xfffffffffffff000ULL)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 202/509 modpost: fix section mismatch message for R_ARM_ABS32
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit b7c63520f6703a25eebb4f8138fed764fcae1c6f ]
addend_arm_rel() processes R_ARM_ABS32 in a wrong way.
Here, test code.
[test code 1]
#include <linux/init.h>
int __initdata foo;
int get_foo(void) { return foo; }If you compile it with ARM versatile_defconfig, modpost will show the symbol name, (unknown).
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> (unknown) (section: .init.data)
(You need to use GNU linker instead of LLD to reproduce it.)
If you compile it for other architectures, modpost will show the correct symbol name.
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> foo (section: .init.data)
For R_ARM_ABS32, addend_arm_rel() sets r->r_addend to a wrong value.
I just mimicked the code in arch/arm/kernel/module.c.
However, there is more difficulty for ARM.
Here, test code.
[test code 2]
#include <linux/init.h>
int __initdata foo;
int get_foo(void) { return foo; }
int __initdata bar;
int get_bar(void) { return bar; }With this commit applied, modpost will show the following messages for ARM versatile_defconfig:
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> foo (section: .init.data)
WARNING: modpost: vmlinux.o: section mismatch in reference: get_bar (section: .text) -> foo (section: .init.data)
The reference from 'get_bar' to 'foo' seems wrong.
I have no solution for this because it is true in assembly level.
In the following output, relocation at 0x1c is no longer associated with 'bar'. The two relocation entries point to the same symbol, and the offset to 'bar' is encoded in the instruction 'r0, [r3, #4]'.
Disassembly of section .text:
00000000 <get_foo>:
0: e59f3004 ldr r3, [pc, #4] @ c <get_foo+0xc>
4: e5930000 ldr r0, [r3]
8: e12fff1e bx lr
c: 00000000 .word 0x00000000 00000010 <get_bar>:
10: e59f3004 ldr r3, [pc, #4] @ 1c <get_bar+0xc>
14: e5930004 ldr r0, [r3, #4]
18: e12fff1e bx lr
1c: 00000000 .word 0x00000000 Relocation section '.rel.text' at offset 0x244 contains 2 entries:
Offset Info Type Sym.Value Sym. Name
0000000c 00000c02 R_ARM_ABS32 00000000 .init.data 0000001c 00000c02 R_ARM_ABS32 00000000 .init.data
When find_elf_symbol() gets into a situation where relsym->st_name is zero, there is no guarantee to get the symbol name as written in C.
I am keeping the current logic because it is useful in many architectures, but the symbol name is not always correct depending on the optimization. I left some comments in find_tosym().
--- scripts/mod/modpost.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
scripts/mod/modpost.c +9 -3
@@ -1313,6 +1313,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,if (relsym->st_name !=0 )return relsym; +/* +* Strive to find a better symbol name, but the resulting name may not +* match the symbol referenced in the original code. +*/ relsym_secindex =get_secindex (elf, relsym);for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {if (get_secindex (elf, sym) != relsym_secindex)
@@ -1795,12 +1799,14 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)static int addend_arm_rel (struct elf_info *elf,Elf_Shdr *sechdr,Elf_Rela *r) {unsigned int r_typ =ELF_R_TYPE (r->r_info); +Elf_Sym *sym = elf->symtab_start +ELF_R_SYM (r->r_info); +void *loc =reloc_location (elf, sechdr, r); +uint32_t inst;switch (r_typ) {case R_ARM_ABS32 : -/* From ARM ABI: (S + A) | T */ - r->r_addend = (int )(long ) - (elf->symtab_start +ELF_R_SYM (r->r_info)); + inst =TO_NATIVE (*(uint32_t *)loc); + r->r_addend = inst + sym->st_value;break ;case R_ARM_PC24 :case R_ARM_CALL :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 203/509 modpost: fix section mismatch message for R_ARM_{PC24,CALL,JUMP24}
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 56a24b8ce6a7f9c4a21b2276a8644f6f3d8fc14d ]
addend_arm_rel() processes R_ARM_PC24, R_ARM_CALL, R_ARM_JUMP24 in a wrong way.
Here, test code.
[test code for R_ARM_JUMP24]
.section .init.text,"ax"
bar:
bx lr
.section .text,"ax"
.globl foo
foo:
b bar
[test code for R_ARM_CALL]
.section .init.text,"ax"
bar:
bx lr
.section .text,"ax"
.globl foo
foo:
push {lr}
bl bar
pop {pc}If you compile it with ARM multi_v7_defconfig, modpost will show the symbol name, (unknown).
WARNING: modpost: vmlinux.o: section mismatch in reference: foo (section: .text) -> (unknown) (section: .init.text)
(You need to use GNU linker instead of LLD to reproduce it.)
Fix the code to make modpost show the correct symbol name.
I imported (with adjustment) sign_extend32() from include/linux/bitops.h.
The '+8' is the compensation for pc-relative instruction. It is documented in "ELF for the Arm Architecture" [1].
"If the relocation is pc-relative then compensation for the PC bias (the PC value is 8 bytes ahead of the executing instruction in Arm state and 4 bytes in Thumb state) must be encoded in the relocation by the object producer."
[1]: https://github.com/ARM-software/abi-aa/blob/main/aaelf32/aaelf32.rst
--- scripts/mod/modpost.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
scripts/mod/modpost.c +12 -0
@@ -1796,12 +1796,20 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)#define R_ARM_THM_JUMP19 51#endif +static int32_t sign_extend32 (int32_t value,int index) +{ +uint8_t shift =31 - index; + +return (int32_t )(value << shift) >> shift; +} +static int addend_arm_rel (struct elf_info *elf,Elf_Shdr *sechdr,Elf_Rela *r) {unsigned int r_typ =ELF_R_TYPE (r->r_info);Elf_Sym *sym = elf->symtab_start +ELF_R_SYM (r->r_info);void *loc =reloc_location (elf, sechdr, r);uint32_t inst; +int32_t offset;switch (r_typ) {case R_ARM_ABS32 :
@@ -1811,6 +1819,10 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)case R_ARM_PC24 :case R_ARM_CALL :case R_ARM_JUMP24 : + inst =TO_NATIVE (*(uint32_t *)loc); + offset =sign_extend32 ((inst &0x00ffffff ) <<2 ,25 ); + r->r_addend = offset + sym->st_value +8 ; +break ;case R_ARM_THM_CALL :case R_ARM_THM_JUMP24 :case R_ARM_THM_JUMP19 :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 204/509 crypto: marvell/cesa - Fix type mismatch warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit efbc7764c4446566edb76ca05e903b5905673d2e ]
Commit df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3") uncovered a type mismatch in cesa 3des support that leads to a memcpy beyond the end of a structure:
In function 'fortify_memcpy_chk',
inlined from 'mv_cesa_des3_ede_setkey' at drivers/crypto/marvell/cesa/cipher.c:307:2:include/linux/fortify-string.h:583:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
583 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~This is probably harmless as the actual data that is copied has the correct type, but clearly worth fixing nonetheless.
--- drivers/crypto/marvell/cesa/cipher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/marvell/cesa/cipher.c +1 -1
@@ -287,7 +287,7 @@ static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key,static int mv_cesa_des3_ede_setkey (struct crypto_skcipher *cipher,const u8 *key,unsigned int len) { -struct mv_cesa_des_ctx *ctx =crypto_skcipher_ctx (cipher); +struct mv_cesa_des3_ctx *ctx =crypto_skcipher_ctx (cipher);int err; err =verify_skcipher_des3_key (cipher, key);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 205/509 modpost: fix off by one in is_executable_section()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 3a3f1e573a105328a2cca45a7cfbebabbf5e3192 ]
The > comparison should be >= to prevent an out of bounds array access.
--- scripts/mod/modpost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/mod/modpost.c +1 -1
@@ -1621,7 +1621,7 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,static int is_executable_section (struct elf_info * elf,unsigned int section_index) { -if (section_index > elf->num_sections) +if (section_index >= elf->num_sections)fatal ("section_index is outside elf->num_sections!\n" );return ((elf->sechdrs[section_index].sh_flags &SHF_EXECINSTR ) ==SHF_EXECINSTR );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 206/509 ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 92e2921eeafdfca9acd9b83f07d2b7ca099bac24 ]
ASM_NL is useful not only in *.S files but also in .c files for using inline assembler in C code.
On ARC, however, ASM_NL is evaluated inconsistently. It is expanded to a backquote (`) in *.S files, but a semicolon (;) in *.c files because arch/arc/include/asm/linkage.h defines it inside #ifdef __ASSEMBLY__, so the definition for C code falls back to the default value defined in include/linux/linkage.h.
If ASM_NL is used in inline assembler in .c files, it will result in wrong assembly code because a semicolon is not an instruction separator, but the start of a comment for ARC.
Move ASM_NL (also __ALIGN and __ALIGN_STR) out of the #ifdef.
--- arch/arc/include/asm/linkage.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arc/include/asm/linkage.h +4 -4
@@ -8,6 +8,10 @@#include <asm/dwarf.h> +#define ASM_NL `/* use '`' to mark new line in macro */ +#define __ALIGN .align 4 +#define __ALIGN_STR __stringify(__ALIGN) +#ifdef __ASSEMBLY__ .macro ST2 e, o, off
@@ -28,10 +32,6 @@#endif .endm -#define ASM_NL `/* use '`' to mark new line in macro */ -#define __ALIGN .align 4 -#define __ALIGN_STR __stringify(__ALIGN) - /* annotation for data we want in DCCM - if enabled in .config */ .macro ARCFP_DATA nm #ifdef CONFIG_ARC_HAS_DCCM
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 207/509 NFSv4.1: freeze the session table upon receiving NFS4ERR_BADSESSION
In reply to Greg Kroah-HartmanFrom: Olga Kornievskaia <[email protected]>
[ Upstream commit c907e72f58ed979a24a9fdcadfbc447c51d5e509 ]
When the client received NFS4ERR_BADSESSION, it schedules recovery and start the state manager thread which in turn freezes the session table and does not allow for any new requests to use the no-longer valid session. However, it is possible that before the state manager thread runs, a new operation would use the released slot that received BADSESSION and was therefore not updated its sequence number. Such re-use of the slot can lead the application errors.
--- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/nfs4proc.c +1 -0
@@ -926,6 +926,7 @@ static int nfs41_sequence_process(struct rpc_task *task, out_noaction:return ret; session_recover: +set_bit (NFS4_SLOT_TBL_DRAINING , &session->fc_slot_table.slot_tbl_state);nfs4_schedule_session_recovery (session, status);dprintk ("%s ERROR: %d Reset session\n" , __func__, status);nfs41_sequence_free_slot (res);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 208/509 dax: Fix dax_mapping_release() use after free
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
[ Upstream commit 6d24b170a9db0456f577b1ab01226a2254c016a8 ]
A CONFIG_DEBUG_KOBJECT_RELEASE test of removing a device-dax region provider (like modprobe -r dax_hmem) yields:
kobject: 'mapping0' (ffff93eb460e8800): kobject_release, parent 0000000000000000 (delayed 2000) [..]
DEBUG_LOCKS_WARN_ON(1)
WARNING: CPU: 23 PID: 282 at kernel/locking/lockdep.c:232 __lock_acquire+0x9fc/0x2260 [..] RIP: 0010:__lock_acquire+0x9fc/0x2260 [..] Call Trace: <TASK> [..] lock_acquire+0xd4/0x2c0 ? ida_free+0x62/0x130 _raw_spin_lock_irqsave+0x47/0x70 ? ida_free+0x62/0x130 ida_free+0x62/0x130 dax_mapping_release+0x1f/0x30 device_release+0x36/0x90 kobject_delayed_cleanup+0x46/0x150
Due to attempting ida_free() on an ida object that has already been freed. Devices typically only hold a reference on their parent while registered. If a child needs a parent object to complete its release it needs to hold a reference that it drops from its release callback. Arrange for a dax_mapping to pin its parent dev_dax instance until dax_mapping_release().
--- drivers/dax/bus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/dax/bus.c +4 -1
@@ -592,10 +592,12 @@ EXPORT_SYMBOL_GPL(alloc_dax_region);static void dax_mapping_release (struct device *dev) {struct dax_mapping *mapping =to_dax_mapping (dev); -struct dev_dax *dev_dax =to_dev_dax (dev->parent); +struct device *parent = dev->parent; +struct dev_dax *dev_dax =to_dev_dax (parent);ida_free (&dev_dax->ida, mapping->id);kfree (mapping); +put_device (parent); }static void unregister_dax_mapping (void *data)
@@ -735,6 +737,7 @@ static int devm_register_dax_mapping(struct dev_dax *dev_dax, int range_id) dev = &mapping->dev;device_initialize (dev); dev->parent = &dev_dax->dev; +get_device (dev->parent); dev->type = &dax_mapping_type;dev_set_name (dev,"mapping%d" , mapping->id); rc =device_add (dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 209/509 dax: Introduce alloc_dev_dax_id()
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
[ Upstream commit 70aab281e18c68a1284bc387de127c2fc0bed3f8 ]
The reference counting of dax_region objects is needlessly complicated, has lead to confusion [1], and has hidden a bug [2]. Towards cleaning up that mess introduce alloc_dev_dax_id() to minimize the holding of a dax_region reference to only what dev_dax_release() needs, the dax_region->ida.
Part of the reason for the mess was the design to dereference a dax_region in all cases in free_dev_dax_id() even if the id was statically assigned by the upper level dax_region driver. Remove the need to call "is_static(dax_region)" by tracking whether the id is dynamic directly in the dev_dax instance itself.
With that flag the dax_region pinning and release per dev_dax instance can move to alloc_dev_dax_id() and free_dev_dax_id() respectively.
A follow-on cleanup address the unnecessary references in the dax_region setup and drivers.
--- drivers/dax/bus.c | 56 ++++++++++++++++++++++++--------------- drivers/dax/dax-private.h | 4 ++- 2 files changed, 37 insertions(+), 23 deletions(-)
drivers/dax/bus.c +34 -22
@@ -403,18 +403,34 @@ static void unregister_dev_dax(void *dev)put_device (dev); } +static void dax_region_free (struct kref *kref) +{ +struct dax_region *dax_region; + + dax_region = container_of(kref, struct dax_region, kref); +kfree (dax_region); +} + +void dax_region_put (struct dax_region *dax_region) +{ +kref_put (&dax_region->kref, dax_region_free); +} +EXPORT_SYMBOL_GPL (dax_region_put); +/* a return value >= 0 indicates this invocation invalidated the id */ static int __free_dev_dax_id (struct dev_dax *dev_dax) { -struct dax_region *dax_region = dev_dax->region;struct device *dev = &dev_dax->dev; +struct dax_region *dax_region;int rc = dev_dax->id;device_lock_assert (dev); -if (is_static (dax_region) || dev_dax->id <0 ) +if (!dev_dax->dyn_id || dev_dax->id <0 )return -1 ; + dax_region = dev_dax->region;ida_free (&dax_region->ida, dev_dax->id); +dax_region_put (dax_region); dev_dax->id =-1 ;return rc; }
@@ -430,6 +446,20 @@ static int free_dev_dax_id(struct dev_dax *dev_dax)return rc; } +static int alloc_dev_dax_id (struct dev_dax *dev_dax) +{ +struct dax_region *dax_region = dev_dax->region; +int id; + + id =ida_alloc (&dax_region->ida,GFP_KERNEL ); +if (id <0 ) +return id; +kref_get (&dax_region->kref); + dev_dax->dyn_id = true; + dev_dax->id = id; +return id; +} +static ssize_t delete_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t len) {
@@ -517,20 +547,6 @@ static const struct attribute_group *dax_region_attribute_groups[] = { NULL, }; -static void dax_region_free (struct kref *kref) -{ -struct dax_region *dax_region; - - dax_region = container_of(kref, struct dax_region, kref); -kfree (dax_region); -} - -void dax_region_put (struct dax_region *dax_region) -{ -kref_put (&dax_region->kref, dax_region_free); -} -EXPORT_SYMBOL_GPL (dax_region_put); -static void dax_region_unregister (void *region) {struct dax_region *dax_region = region;
@@ -1270,12 +1286,10 @@ static const struct attribute_group *dax_attribute_groups[] = {static void dev_dax_release (struct device *dev) {struct dev_dax *dev_dax =to_dev_dax (dev); -struct dax_region *dax_region = dev_dax->region;struct dax_device *dax_dev = dev_dax->dax_dev;put_dax (dax_dev);free_dev_dax_id (dev_dax); -dax_region_put (dax_region);kfree (dev_dax->pgmap);kfree (dev_dax); }
@@ -1299,6 +1313,7 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data)if (!dev_dax)return ERR_PTR (-ENOMEM ); + dev_dax->region = dax_region;if (is_static (dax_region)) {if (dev_WARN_ONCE (parent, data->id <0 ,"dynamic id specified to static region\n" )) {
@@ -1314,13 +1329,11 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) goto err_id; } - rc =ida_alloc (&dax_region->ida,GFP_KERNEL ); + rc =alloc_dev_dax_id (dev_dax);if (rc <0 ) goto err_id; - dev_dax->id = rc; } - dev_dax->region = dax_region; dev = &dev_dax->dev;device_initialize (dev);dev_set_name (dev,"dax%d.%d" , dax_region->id, dev_dax->id);
@@ -1358,7 +1371,6 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) dev_dax->target_node = dax_region->target_node; dev_dax->align = dax_region->align;ida_init (&dev_dax->ida); -kref_get (&dax_region->kref); inode =dax_inode (dax_dev); dev->devt = inode->i_rdev;
drivers/dax/dax-private.h +3 -1
@@ -52,7 +52,8 @@ struct dax_mapping {* @region - parent region * @dax_dev - core dax functionality * @target_node: effective numa node if dev_dax memory range is onlined -* @id: ida allocated id +* @dyn_id: is this a dynamic or statically created instance +* @id: ida allocated id when the dax_region is not static * @ida: mapping id allocator * @dev - device core * @pgmap - pgmap for memmap setup / lifetime (driver owned)
@@ -64,6 +65,7 @@ struct dev_dax {struct dax_device *dax_dev;unsigned int align;int target_node; +bool dyn_id;int id;struct ida ida;struct device dev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 210/509 hwrng: st - keep clock enabled while hwrng is registered
In reply to Greg Kroah-HartmanFrom: Martin Kaiser <[email protected]>
[ Upstream commit 501e197a02d4aef157f53ba3a0b9049c3e52fedc ]
The st-rng driver uses devres to register itself with the hwrng core, the driver will be unregistered from hwrng when its device goes out of scope. This happens after the driver's remove function is called.
However, st-rng's clock is disabled in the remove function. There's a short timeframe where st-rng is still registered with the hwrng core although its clock is disabled. I suppose the clock must be active to access the hardware and serve requests from the hwrng core.
Switch to devm_clk_get_enabled and let devres disable the clock and unregister the hwrng. This avoids the race condition.
--- drivers/char/hw_random/st-rng.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
drivers/char/hw_random/st-rng.c +1 -20
@@ -42,7 +42,6 @@struct st_rng_data {void __iomem *base; -struct clk *clk;struct hwrng ops; };
@@ -85,26 +84,18 @@ static int st_rng_probe(struct platform_device *pdev)if (IS_ERR (base))return PTR_ERR (base); - clk =devm_clk_get (&pdev->dev,NULL ); + clk =devm_clk_get_enabled (&pdev->dev,NULL );if (IS_ERR (clk))return PTR_ERR (clk); - ret =clk_prepare_enable (clk); -if (ret) -return ret; - ddata->ops.priv = (unsigned long )ddata; ddata->ops.read = st_rng_read; ddata->ops.name = pdev->name; ddata->base = base; - ddata->clk = clk; - -dev_set_drvdata (&pdev->dev, ddata); ret =devm_hwrng_register (&pdev->dev, &ddata->ops);if (ret) {dev_err (&pdev->dev,"Failed to register HW RNG\n" ); -clk_disable_unprepare (clk);return ret; }
@@ -113,15 +104,6 @@ static int st_rng_probe(struct platform_device *pdev)return 0 ; } -static int st_rng_remove (struct platform_device *pdev) -{ -struct st_rng_data *ddata =dev_get_drvdata (&pdev->dev); - -clk_disable_unprepare (ddata->clk); - -return 0 ; -} -static const struct of_device_id st_rng_match[]__maybe_unused = { { .compatible ="st,rng" }, {},
@@ -134,7 +116,6 @@ static struct platform_driver st_rng_driver = { .of_match_table = of_match_ptr(st_rng_match), }, .probe = st_rng_probe, - .remove = st_rng_remove };module_platform_driver (st_rng_driver);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 211/509 io_uring: ensure IOPOLL locks around deferred work
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
No direct upstream commit exists for this issue. It was fixed in 5.18 as part of a larger rework of the completion side.
io_commit_cqring() writes the CQ ring tail to make it visible, but it also kicks off any deferred work we have. A ring setup with IOPOLL does not need any locking around the CQ ring updates, as we're always under the ctx uring_lock. But if we have deferred work that needs processing, then io_queue_deferred() assumes that the completion_lock is held, as it is for !IOPOLL.
Add a lockdep assertion to check and document this fact, and have io_iopoll_complete() check if we have deferred work and run that separately with the appropriate lock grabbed.
--- io_uring/io_uring.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
io_uring/io_uring.c +21 -4
@@ -1521,6 +1521,8 @@ static void io_kill_timeout(struct io_kistatic void io_queue_deferred (struct io_ring_ctx *ctx) { +lockdep_assert_held (&ctx->completion_lock); +while (!list_empty (&ctx->defer_list)) {struct io_defer_entry *de =list_first_entry (&ctx->defer_list, struct io_defer_entry, list);
@@ -1572,14 +1574,24 @@ static void __io_commit_cqring_flush(strio_queue_deferred (ctx); } -static inline void io_commit_cqring (struct io_ring_ctx *ctx) +static inline bool io_commit_needs_flush (struct io_ring_ctx *ctx) +{ +return ctx->off_timeout_used || ctx->drain_active; +} + +static inline void __io_commit_cqring (struct io_ring_ctx *ctx) { -if (unlikely (ctx->off_timeout_used || ctx->drain_active)) -__io_commit_cqring_flush (ctx);/* order cqe stores with ring update */ smp_store_release (&ctx->rings->cq.tail, ctx->cached_cq_tail); } +static inline void io_commit_cqring (struct io_ring_ctx *ctx) +{ +if (unlikely (io_commit_needs_flush (ctx))) +__io_commit_cqring_flush (ctx); +__io_commit_cqring (ctx); +} +static inline bool io_sqring_full (struct io_ring_ctx *ctx) {struct io_rings *r = ctx->rings;
@@ -2518,7 +2530,12 @@ static void io_iopoll_complete(struct ioio_req_free_batch (&rb, req, &ctx->submit_state); } -io_commit_cqring (ctx); +if (io_commit_needs_flush (ctx)) { +spin_lock (&ctx->completion_lock); +__io_commit_cqring_flush (ctx); +spin_unlock (&ctx->completion_lock); + } +__io_commit_cqring (ctx);io_cqring_ev_posted_iopoll (ctx);io_req_free_batch_finish (ctx, &rb); }
Greg Kroah-Hartman
maintainerPATCH 212/509 USB: serial: option: add LARA-R6 01B PIDs
In reply to Greg Kroah-HartmanFrom: Davide Tronchin <[email protected]>
commit ffa5f7a3bf28c1306eef85d4056539c2d4b8eb09 upstream.
The new LARA-R6 product variant identified by the "01B" string can be configured (by AT interface) in three different USB modes:
* Default mode (Vendor ID: 0x1546 Product ID: 0x1311) with 4 serial interfaces
* RmNet mode (Vendor ID: 0x1546 Product ID: 0x1312) with 4 serial interfaces and 1 RmNet virtual network interface
* CDC-ECM mode (Vendor ID: 0x1546 Product ID: 0x1313) with 4 serial interface and 1 CDC-ECM virtual network interface
The first 4 interfaces of all the 3 USB configurations (default, RmNet, CDC-ECM) are the same.
In default mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
In RmNet mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
If 4: RMNET interface
In CDC-ECM mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
If 4: CDC-ECM interface
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -1151,6 +1151,10 @@ static const struct usb_device_id option { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa), .driver_info = RSVD(3) },/* u-blox products */ + { USB_DEVICE(UBLOX_VENDOR_ID, 0x1311) }, /* u-blox LARA-R6 01B */ + { USB_DEVICE(UBLOX_VENDOR_ID, 0x1312), /* u-blox LARA-R6 01B (RMNET) */ + .driver_info = RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(UBLOX_VENDOR_ID, 0x1313, 0xff) }, /* u-blox LARA-R6 01B (ECM) */ { USB_DEVICE(UBLOX_VENDOR_ID, 0x1341) }, /* u-blox LARA-L6 */ { USB_DEVICE(UBLOX_VENDOR_ID, 0x1342), /* u-blox LARA-L6 (RMNET) */ .driver_info = RSVD(4) },
Greg Kroah-Hartman
maintainerPATCH 213/509 usb: dwc3: gadget: Propagate core init errors to UDC during pullup
In reply to Greg Kroah-HartmanFrom: Krishna Kurapati <[email protected]>
commit c0aabed9cabe057309779a9e26fe86a113d24dad upstream.
In scenarios where pullup relies on resume (get sync) to initialize the controller and set the run stop bit, then core_init is followed by gadget_resume which will eventually set run stop bit.
But in cases where the core_init fails, the return value is not sent back to udc appropriately. So according to UDC the controller has started but in reality we never set the run stop bit.
On systems like Android, there are uevents sent to HAL depending on whether the configfs_bind / configfs_disconnect were invoked. In the above mentioned scnenario, if the core init fails, the run stop won't be set and the cable plug-out won't result in generation of any disconnect event and userspace would never get any uevent regarding cable plug out and we never call pullup(0) again. Furthermore none of the next Plug-In/Plug-Out's would be known to configfs.
Return back the appropriate result to UDC to let the userspace/ configfs know that the pullup failed so they can take appropriate action.
Message-ID: <[email protected]>
--- drivers/usb/dwc3/gadget.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +3 -1
@@ -2215,7 +2215,9 @@ static int dwc3_gadget_pullup(struct usb ret =pm_runtime_get_sync (dwc->dev);if (!ret || ret <0 ) {pm_runtime_put (dwc->dev); -return 0 ; +if (ret <0 ) +pm_runtime_set_suspended (dwc->dev); +return ret; }if (dwc->pullups_connected == is_on) {
Greg Kroah-Hartman
maintainerPATCH 214/509 phy: tegra: xusb: Clear the driver reference in usb-phy dev
In reply to Greg Kroah-HartmanFrom: EJ Hsu <[email protected]>
commit c0c2fcb1325d0d4f3b322b5ee49385f8eca2560d upstream.
For the dual-role port, it will assign the phy dev to usb-phy dev and use the port dev driver as the dev driver of usb-phy.
When we try to destroy the port dev, it will destroy its dev driver as well. But we did not remove the reference from usb-phy dev. This might cause the use-after-free issue in KASAN.
--- drivers/phy/tegra/xusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/phy/tegra/xusb.c +1 -0
@@ -556,6 +556,7 @@ static void tegra_xusb_port_unregister(susb_role_switch_unregister (port->usb_role_sw);cancel_work_sync (&port->usb_phy_work);usb_remove_phy (&port->usb_phy); + port->usb_phy.dev->driver =NULL ; }if (port->ops->remove)
Greg Kroah-Hartman
maintainerPATCH 215/509 block: fix signed int overflow in Amiga partition support
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit fc3d092c6bb48d5865fec15ed5b333c12f36288c upstream.
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use sector_t as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted. This patch differs from Joanne's patch only in its use of sector_t instead of unsigned int. No checking for overflows is done (see patch 3 of this series for that).
Message-ID: <[email protected]>
--- block/partitions/amiga.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
block/partitions/amiga.c +5 -4
@@ -31,7 +31,8 @@ int amiga_partition(struct parsed_partitunsigned char *data;struct RigidDiskBlock *rdb;struct PartitionBlock *pb; -int start_sect, nr_sects, blk, part, res =0 ; +sector_t start_sect, nr_sects; +int blk, part, res =0 ;int blksize =1 ;/* Multiplier for disk block size */ int slot =1 ;char b[BDEVNAME_SIZE ];
@@ -97,14 +98,14 @@ int amiga_partition(struct parsed_partit/* Tell Kernel about it */ - nr_sects = (be32_to_cpu (pb->pb_Environment[10 ]) +1 - -be32_to_cpu (pb->pb_Environment[9 ])) * + nr_sects = ((sector_t )be32_to_cpu (pb->pb_Environment[10 ]) +1 - +be32_to_cpu (pb->pb_Environment[9 ])) *be32_to_cpu (pb->pb_Environment[3 ]) *be32_to_cpu (pb->pb_Environment[5 ]) * blksize;if (!nr_sects)continue ; - start_sect =be32_to_cpu (pb->pb_Environment[9 ]) * + start_sect = (sector_t )be32_to_cpu (pb->pb_Environment[9 ]) *be32_to_cpu (pb->pb_Environment[3 ]) *be32_to_cpu (pb->pb_Environment[5 ]) * blksize;
Greg Kroah-Hartman
maintainerPATCH 216/509 block: change all __u32 annotations to __be32 in affs_hardblocks.h
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit 95a55437dc49fb3342c82e61f5472a71c63d9ed0 upstream.
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes), so check for u64 overflow carefully to protect against overflowing sector_t.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted (now resubmitted as patch 1 of this series).
Patch 3 (this series) adds additional error checking and warning messages. One of the error checks now makes use of the previously unused rdb_CylBlocks field, which causes a 'sparse' warning (cast to restricted __be32).
Annotate all 32 bit fields in affs_hardblocks.h as __be32, as the on-disk format of RDB and partition blocks is always big endian.
Message-ID: <[email protected]>
--- include/uapi/linux/affs_hardblocks.h | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-)
include/uapi/linux/affs_hardblocks.h +34 -34
@@ -7,42 +7,42 @@/* Just the needed definitions for the RDB of an Amiga HD. */ struct RigidDiskBlock { -__u32 rdb_ID; +__be32 rdb_ID;__be32 rdb_SummedLongs; -__s32 rdb_ChkSum; -__u32 rdb_HostID; +__be32 rdb_ChkSum; +__be32 rdb_HostID;__be32 rdb_BlockBytes; -__u32 rdb_Flags; -__u32 rdb_BadBlockList; +__be32 rdb_Flags; +__be32 rdb_BadBlockList;__be32 rdb_PartitionList; -__u32 rdb_FileSysHeaderList; -__u32 rdb_DriveInit; -__u32 rdb_Reserved1[6 ]; -__u32 rdb_Cylinders; -__u32 rdb_Sectors; -__u32 rdb_Heads; -__u32 rdb_Interleave; -__u32 rdb_Park; -__u32 rdb_Reserved2[3 ]; -__u32 rdb_WritePreComp; -__u32 rdb_ReducedWrite; -__u32 rdb_StepRate; -__u32 rdb_Reserved3[5 ]; -__u32 rdb_RDBBlocksLo; -__u32 rdb_RDBBlocksHi; -__u32 rdb_LoCylinder; -__u32 rdb_HiCylinder; -__u32 rdb_CylBlocks; -__u32 rdb_AutoParkSeconds; -__u32 rdb_HighRDSKBlock; -__u32 rdb_Reserved4; +__be32 rdb_FileSysHeaderList; +__be32 rdb_DriveInit; +__be32 rdb_Reserved1[6 ]; +__be32 rdb_Cylinders; +__be32 rdb_Sectors; +__be32 rdb_Heads; +__be32 rdb_Interleave; +__be32 rdb_Park; +__be32 rdb_Reserved2[3 ]; +__be32 rdb_WritePreComp; +__be32 rdb_ReducedWrite; +__be32 rdb_StepRate; +__be32 rdb_Reserved3[5 ]; +__be32 rdb_RDBBlocksLo; +__be32 rdb_RDBBlocksHi; +__be32 rdb_LoCylinder; +__be32 rdb_HiCylinder; +__be32 rdb_CylBlocks; +__be32 rdb_AutoParkSeconds; +__be32 rdb_HighRDSKBlock; +__be32 rdb_Reserved4;char rdb_DiskVendor[8 ];char rdb_DiskProduct[16 ];char rdb_DiskRevision[4 ];char rdb_ControllerVendor[8 ];char rdb_ControllerProduct[16 ];char rdb_ControllerRevision[4 ]; -__u32 rdb_Reserved5[10 ]; +__be32 rdb_Reserved5[10 ]; };#define IDNAME_RIGIDDISK 0x5244534B/* "RDSK" */
@@ -50,16 +50,16 @@ struct RigidDiskBlock {struct PartitionBlock {__be32 pb_ID;__be32 pb_SummedLongs; -__s32 pb_ChkSum; -__u32 pb_HostID; +__be32 pb_ChkSum; +__be32 pb_HostID;__be32 pb_Next; -__u32 pb_Flags; -__u32 pb_Reserved1[2 ]; -__u32 pb_DevFlags; +__be32 pb_Flags; +__be32 pb_Reserved1[2 ]; +__be32 pb_DevFlags;__u8 pb_DriveName[32 ]; -__u32 pb_Reserved2[15 ]; +__be32 pb_Reserved2[15 ];__be32 pb_Environment[17 ]; -__u32 pb_EReserved[15 ]; +__be32 pb_EReserved[15 ]; };#define IDNAME_PARTITION 0x50415254/* "PART" */
Greg Kroah-Hartman
maintainerPATCH 217/509 SUNRPC: Fix UAF in svc_tcp_listen_data_ready()
In reply to Greg Kroah-HartmanFrom: Ding Hui <[email protected]>
commit fc80fc2d4e39137869da3150ee169b40bf879287 upstream.
After the listener svc_sock is freed, and before invoking svc_tcp_accept() for the established child sock, there is a window that the newsock retaining a freed listener svc_sock in sk_user_data which cloning from parent. In the race window, if data is received on the newsock, we will observe use-after-free report in svc_tcp_listen_data_ready().
Reproduce by two tasks:
1. while :; do rpc.nfsd 0 ; rpc.nfsd; done
2. while :; do echo "" | ncat -4 127.0.0.1 2049 ; done
KASAN report:
==================================================================
BUG: KASAN: slab-use-after-free in svc_tcp_listen_data_ready+0x1cf/0x1f0 [sunrpc] Read of size 8 at addr ffff888139d96228 by task nc/102553 CPU: 7 PID: 102553 Comm: nc Not tainted 6.3.0+ #18 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 11/12/2020 Call Trace: <IRQ> dump_stack_lvl+0x33/0x50 print_address_description.constprop.0+0x27/0x310 print_report+0x3e/0x70 kasan_report+0xae/0xe0 svc_tcp_listen_data_ready+0x1cf/0x1f0 [sunrpc] tcp_data_queue+0x9f4/0x20e0 tcp_rcv_established+0x666/0x1f60 tcp_v4_do_rcv+0x51c/0x850 tcp_v4_rcv+0x23fc/0x2e80 ip_protocol_deliver_rcu+0x62/0x300 ip_local_deliver_finish+0x267/0x350 ip_local_deliver+0x18b/0x2d0 ip_rcv+0x2fb/0x370 __netif_receive_skb_one_core+0x166/0x1b0 process_backlog+0x24c/0x5e0 __napi_poll+0xa2/0x500 net_rx_action+0x854/0xc90 __do_softirq+0x1bb/0x5de do_softirq+0xcb/0x100 </IRQ> <TASK> ... </TASK> Allocated by task 102371: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x7b/0x90 svc_setup_socket+0x52/0x4f0 [sunrpc] svc_addsock+0x20d/0x400 [sunrpc] __write_ports_addfd+0x209/0x390 [nfsd] write_ports+0x239/0x2c0 [nfsd] nfsctl_transaction_write+0xac/0x110 [nfsd] vfs_write+0x1c3/0xae0 ksys_write+0xed/0x1c0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 102551: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x50 __kasan_slab_free+0x106/0x190 __kmem_cache_free+0x133/0x270 svc_xprt_free+0x1e2/0x350 [sunrpc] svc_xprt_destroy_all+0x25a/0x440 [sunrpc] nfsd_put+0x125/0x240 [nfsd] nfsd_svc+0x2cb/0x3c0 [nfsd] write_threads+0x1ac/0x2a0 [nfsd] nfsctl_transaction_write+0xac/0x110 [nfsd] vfs_write+0x1c3/0xae0 ksys_write+0xed/0x1c0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc
Fix the UAF by simply doing nothing in svc_tcp_listen_data_ready() if state != TCP_LISTEN, that will avoid dereferencing svsk for all child socket.
--- net/sunrpc/svcsock.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
net/sunrpc/svcsock.c +11 -12
@@ -692,12 +692,6 @@ static void svc_tcp_listen_data_ready(st {struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data; -if (svsk) { -/* Refer to svc_setup_socket() for details. */ -rmb (); - svsk->sk_odata (sk); - } -/* * This callback may called twice when a new connection * is established as a child socket inherits everything
@@ -706,13 +700,18 @@ static void svc_tcp_listen_data_ready(st* when one of child sockets become ESTABLISHED. * 2) data_ready method of the child socket may be called * when it receives data before the socket is accepted. -* In case of 2, we should ignore it silently. +* In case of 2, we should ignore it silently and DO NOT +* dereference svsk. */ -if (sk->sk_state ==TCP_LISTEN ) { -if (svsk) { -set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); -svc_xprt_enqueue (&svsk->sk_xprt); - } +if (sk->sk_state !=TCP_LISTEN ) +return ; + +if (svsk) { +/* Refer to svc_setup_socket() for details. */ +rmb (); + svsk->sk_odata (sk); +set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); +svc_xprt_enqueue (&svsk->sk_xprt); } }
Greg Kroah-Hartman
maintainerPATCH 218/509 w1: w1_therm: fix locking behavior in convert_t
In reply to Greg Kroah-HartmanFrom: Stefan Wahren <[email protected]>
[ Upstream commit dca5480ab7b77a889088ab7cac81934604510ac7 ]
The commit 67b392f7b8ed ("w1_therm: optimizing temperature read timings") accidentially inverted the logic for lock handling of the bus mutex.
Before:
pullup -> release lock before sleep
no pullup -> release lock after sleep
After:
pullup -> release lock after sleep
no pullup -> release lock before sleep
This cause spurious measurements of 85 degree (powerup value) on the Tarragon board with connected 1-w temperature sensor (w1_therm.w1_strong_pull=0).
In the meantime a new feature for polling the conversion completion has been integrated in these branches with commit 021da53e65fd ("w1: w1_therm: Add sysfs entries to control conversion time and driver features"). But this feature isn't available for parasite power mode, so handle this separately.
--- drivers/w1/slaves/w1_therm.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)
drivers/w1/slaves/w1_therm.c +14 -17
@@ -1094,29 +1094,26 @@ static int convert_t(struct w1_slave *sl, struct therm_info *info)w1_write_8 (dev_master,W1_CONVERT_TEMP ); -if (strong_pullup) {/*some device need pullup */ +if (SLAVE_FEATURES (sl) &W1_THERM_POLL_COMPLETION ) { + ret =w1_poll_completion (dev_master,W1_POLL_CONVERT_TEMP ); +if (ret) { +dev_dbg (&sl->dev,"%s: Timeout\n" , __func__); + goto mt_unlock; + } +mutex_unlock (&dev_master->bus_mutex); + }else if (!strong_pullup) {/*no device need pullup */ sleep_rem =msleep_interruptible (t_conv);if (sleep_rem !=0 ) { ret = -EINTR ; goto mt_unlock; }mutex_unlock (&dev_master->bus_mutex); - }else {/*no device need pullup */ -if (SLAVE_FEATURES (sl) &W1_THERM_POLL_COMPLETION ) { - ret =w1_poll_completion (dev_master,W1_POLL_CONVERT_TEMP ); -if (ret) { -dev_dbg (&sl->dev,"%s: Timeout\n" , __func__); - goto mt_unlock; - } -mutex_unlock (&dev_master->bus_mutex); - }else { -/* Fixed delay */ -mutex_unlock (&dev_master->bus_mutex); - sleep_rem =msleep_interruptible (t_conv); -if (sleep_rem !=0 ) { - ret = -EINTR ; - goto dec_refcnt; - } + }else {/*some device need pullup */ +mutex_unlock (&dev_master->bus_mutex); + sleep_rem =msleep_interruptible (t_conv); +if (sleep_rem !=0 ) { + ret = -EINTR ; + goto dec_refcnt; } } ret =read_scratchpad (sl, info);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 219/509 w1: fix loop in w1_fini()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 83f3fcf96fcc7e5405b37d9424c7ef26bfa203f8 ]
The __w1_remove_master_device() function calls:
list_del(&dev->w1_master_entry);
So presumably this can cause an endless loop.
--- drivers/w1/w1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/w1/w1.c +2 -2
@@ -1228,10 +1228,10 @@ static int __init w1_init(void) static void __exit w1_fini(void) { -struct w1_master *dev; +struct w1_master *dev, *n;/* Set netlink removal messages and some cleanup */ -list_for_each_entry (dev, &w1_masters, w1_master_entry) +list_for_each_entry_safe (dev, n, &w1_masters, w1_master_entry)__w1_remove_master_device (dev);w1_fini_netlink ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 220/509 sh: j2: Use ioremap() to translate device tree address into kernel memory
In reply to Greg Kroah-HartmanFrom: John Paul Adrian Glaubitz <[email protected]>
[ Upstream commit bc9d1f0cecd2407cfb2364a7d4be2f52d1d46a9d ]
Addresses the following warning when building j2_defconfig:
arch/sh/kernel/cpu/sh2/probe.c: In function 'scan_cache':arch/sh/kernel/cpu/sh2/probe.c:24:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
24 | j2_ccr_base = (u32 __iomem *)of_flat_dt_translate_address(node);
|--- arch/sh/kernel/cpu/sh2/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/kernel/cpu/sh2/probe.c +1 -1
@@ -21,7 +21,7 @@ static int __init scan_cache(unsigned long node, const char *uname,if (!of_flat_dt_is_compatible (node,"jcore,cache" ))return 0 ; - j2_ccr_base = (u32 __iomem *)of_flat_dt_translate_address (node); + j2_ccr_base =ioremap (of_flat_dt_translate_address (node),4 );return 1 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 221/509 serial: 8250: omap: Fix freeing of resources on failed register
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit b9ab22c2bc8652324a803b3e2be69838920b4025 ]
If serial8250_register_8250_port() fails, the SoC can hang as the deferred PMQoS work will still run as is not flushed and removed.
--- drivers/tty/serial/8250/8250_omap.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_omap.c +2 -0
@@ -1469,7 +1469,9 @@ static int omap8250_probe(struct platform_device *pdev) err:pm_runtime_dont_use_autosuspend (&pdev->dev);pm_runtime_put_sync (&pdev->dev); +flush_work (&priv->qos_work);pm_runtime_disable (&pdev->dev); +cpu_latency_qos_remove_request (&priv->pm_qos_request);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 222/509 clk: qcom: gcc-ipq6018: Use floor ops for sdcc clocks
In reply to Greg Kroah-HartmanFrom: Mantas Pucka <[email protected]>
[ Upstream commit 56e5ae0116aef87273cf1812d608645b076e4f02 ]
SDCC clocks must be rounded down to avoid overclocking the controller.
--- drivers/clk/qcom/gcc-ipq6018.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gcc-ipq6018.c +1 -1
@@ -1654,7 +1654,7 @@ static struct clk_rcg2 sdcc1_apps_clk_src = { .name = "sdcc1_apps_clk_src", .parent_data = gcc_xo_gpll0_gpll2_gpll0_out_main_div2, .num_parents = 4, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 223/509 media: usb: Check az6007_read() return value
In reply to Greg Kroah-HartmanFrom: Daniil Dulov <[email protected]>
[ Upstream commit fdaca63186f59fc664b346c45b76576624b48e57 ]
If az6007_read() returns error, there is no sence to continue.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/usb/dvb-usb-v2/az6007.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb-v2/az6007.c +2 -1
@@ -202,7 +202,8 @@ static int az6007_rc_query(struct dvb_usb_device *d)unsigned code;enum rc_proto proto; -az6007_read (d,AZ6007_READ_IR ,0 ,0 , st->data,10 ); +if (az6007_read (d,AZ6007_READ_IR ,0 ,0 , st->data,10 ) <0 ) +return -EIO ;if (st->data[1 ] ==0x44 )return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 224/509 media: videodev2.h: Fix struct v4l2_input tuner index comment
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 26ae58f65e64fa7ba61d64bae752e59e08380c6a ]
VIDIOC_ENUMINPUT documentation describes the tuner field of struct v4l2_input as index:
Documentation/userspace-api/media/v4l/vidioc-enuminput.rst "
* - __u32
- ``tuner``
- Capture devices can have zero or more tuners (RF demodulators). When the ``type`` is set to ``V4L2_INPUT_TYPE_TUNER`` this is an RF connector and this field identifies the tuner. It corresponds to struct :c:type:v4l2_tuner field ``index``. For details on tuners see :ref:tuner.
"
Drivers I could find also use the 'tuner' field as an index, e.g.:drivers/media/pci/bt8xx/bttv-driver.c bttv_enum_input() drivers/media/usb/go7007/go7007-v4l2.c vidioc_enum_input()
However, the UAPI comment claims this field is 'enum v4l2_tuner_type':include/uapi/linux/videodev2.h
This field being 'enum v4l2_tuner_type' is unlikely as it seems to be never used that way in drivers, and documentation confirms it. It seem this comment got in accidentally in the commit which this patch fixes. Fix the UAPI comment to stop confusion.
This was pointed out by Dmitry while reviewing VIDIOC_ENUMINPUT support for strace.
--- include/uapi/linux/videodev2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/videodev2.h +1 -1
@@ -1644,7 +1644,7 @@ struct v4l2_input {__u8 name[32 ];/* Label */ __u32 type;/* Type of input */ __u32 audioset;/* Associated audios (bitfield) */ -__u32 tuner;/* enum v4l2_tuner_type */ +__u32 tuner;/* Tuner index */ v4l2_std_id std;__u32 status;__u32 capabilities;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 225/509 media: usb: siano: Fix warning due to null work_func_t function pointer
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 6f489a966fbeb0da63d45c2c66a8957eab604bf6 ]
The previous commit ebad8e731c1c ("media: usb: siano: Fix use after free bugs caused by do_submit_urb") adds cancel_work_sync() in smsusb_stop_streaming(). But smsusb_stop_streaming() may be called, even if the work_struct surb->wq has not been initialized. As a result, the warning will occur. One of the processes that could lead to warning is shown below:
smsusb_probe()
smsusb_init_device()
if (!dev->in_ep || !dev->out_ep || align < 0) {
smsusb_term_device(intf);
smsusb_stop_streaming()
cancel_work_sync(&dev->surbs[i].wq);
__cancel_work_timer()
__flush_work()
if (WARN_ON(!work->func)) // work->func is nullThe log reported by syzbot is shown below:
WARNING: CPU: 0 PID: 897 at kernel/workqueue.c:3066 __flush_work+0x798/0xa80 kernel/workqueue.c:3063 Modules linked in: CPU: 0 PID: 897 Comm: kworker/0:2 Not tainted 6.2.0-rc1-syzkaller #0 RIP: 0010:__flush_work+0x798/0xa80 kernel/workqueue.c:3066 ... RSP: 0018:ffffc9000464ebf8 EFLAGS: 00010246 RAX: 1ffff11002dbb420 RBX: 0000000000000021 RCX: 1ffffffff204fa4e RDX: dffffc0000000000 RSI: 0000000000000001 RDI: ffff888016dda0e8 RBP: ffffc9000464ed98 R08: 0000000000000001 R09: ffffffff90253b2f R10: 0000000000000001 R11: 0000000000000000 R12: ffff888016dda0e8 R13: ffff888016dda0e8 R14: ffff888016dda100 R15: 0000000000000001 FS: 0000000000000000(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffd4331efe8 CR3: 000000000b48e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> __cancel_work_timer+0x315/0x460 kernel/workqueue.c:3160 smsusb_stop_streaming drivers/media/usb/siano/smsusb.c:182 [inline] smsusb_term_device+0xda/0x2d0 drivers/media/usb/siano/smsusb.c:344 smsusb_init_device+0x400/0x9ce drivers/media/usb/siano/smsusb.c:419 smsusb_probe+0xbbd/0xc55 drivers/media/usb/siano/smsusb.c:567
...
This patch adds check before cancel_work_sync(). If surb->wq has not been initialized, the cancel_work_sync() will not be executed.
--- drivers/media/usb/siano/smsusb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/siano/smsusb.c +2 -1
@@ -179,7 +179,8 @@ static void smsusb_stop_streaming(struct smsusb_device_t *dev)for (i =0 ; i <MAX_URBS ; i++) {usb_kill_urb (&dev->surbs[i].urb); -cancel_work_sync (&dev->surbs[i].wq); +if (dev->surbs[i].wq.func) +cancel_work_sync (&dev->surbs[i].wq);if (dev->surbs[i].cb) {smscore_putbuffer (dev->coredev, dev->surbs[i].cb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 226/509 clk: qcom: reset: Allow specifying custom reset delay
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 2cb8a39b6781ea23accd1fa93b3ad000d0948aec ]
The amount of time required between asserting and deasserting the reset signal can vary depending on the involved hardware component. Sometimes 1 us might not be enough and a larger delay is necessary to conform to the specifications.
Usually this is worked around in the consuming drivers, by replacing reset_control_reset() with a sequence of reset_control_assert(), waiting for a custom delay, followed by reset_control_deassert().
However, in some cases the driver making use of the reset is generic and can be used with different reset controllers. In this case the reset time requirement is better handled directly by the reset controller driver.
Make this possible by adding an "udelay" field to the qcom_reset_map that allows setting a different reset delay (in microseconds).
Stable-dep-of: 349b5bed539b ("clk: qcom: ipq6018: fix networking resets")
--- drivers/clk/qcom/reset.c | 4 +++- drivers/clk/qcom/reset.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/clk/qcom/reset.c +3 -1
@@ -13,8 +13,10 @@static int qcom_reset (struct reset_controller_dev *rcdev,unsigned long id) { +struct qcom_reset_controller *rst =to_qcom_reset_controller (rcdev); + rcdev->ops->assert (rcdev, id); -udelay (1 ); +udelay (rst->reset_map[id].udelay ?:1 );/* use 1 us as default */ rcdev->ops->deassert (rcdev, id);return 0 ; }
drivers/clk/qcom/reset.h +1 -0
@@ -11,6 +11,7 @@struct qcom_reset_map {unsigned int reg;u8 bit; +u8 udelay; };struct regmap ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 227/509 clk: qcom: reset: support resetting multiple bits
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit 4a5210893625f89723ea210d7c630b730abb37ad ]
This patch adds the support for giving the complete bitmask in reset structure and reset operation will use this bitmask for all reset operations.
Currently, reset structure only takes a single bit for each reset and then calculates the bitmask by using the BIT() macro.
However, this is not sufficient anymore for newer SoC-s like IPQ8074, IPQ6018 and more, since their networking resets require multiple bits to be asserted in order to properly reset the HW block completely.
So, in order to allow asserting multiple bits add "bitmask" field to qcom_reset_map, and then use that bitmask value if its populated in the driver, if its not populated, then we just default to existing behaviour and calculate the bitmask on the fly.
Stable-dep-of: 349b5bed539b ("clk: qcom: ipq6018: fix networking resets")
--- drivers/clk/qcom/reset.c | 4 ++-- drivers/clk/qcom/reset.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/clk/qcom/reset.c +2 -2
@@ -30,7 +30,7 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id) rst =to_qcom_reset_controller (rcdev); map = &rst->reset_map[id]; - mask =BIT (map->bit); + mask = map->bitmask ? map->bitmask :BIT (map->bit);return regmap_update_bits (rst->regmap, map->reg, mask, mask); }
@@ -44,7 +44,7 @@ qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id) rst =to_qcom_reset_controller (rcdev); map = &rst->reset_map[id]; - mask =BIT (map->bit); + mask = map->bitmask ? map->bitmask :BIT (map->bit);return regmap_update_bits (rst->regmap, map->reg, mask,0 ); }
drivers/clk/qcom/reset.h +1 -0
@@ -12,6 +12,7 @@ struct qcom_reset_map {unsigned int reg;u8 bit;u8 udelay; +u32 bitmask; };struct regmap ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 228/509 clk: qcom: ipq6018: fix networking resets
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit 349b5bed539b491b7894a5186a895751fd8ba6c7 ]
Networking resets in IPQ6018 all use bitmask as they require multiple bits to be set and cleared instead of a single bit.
So, current networking resets have the same register and bit 0 set which is clearly incorrect.
--- drivers/clk/qcom/gcc-ipq6018.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/clk/qcom/gcc-ipq6018.c +16 -16
@@ -4517,24 +4517,24 @@ static const struct qcom_reset_map gcc_ipq6018_resets[] = { [GCC_PCIE0_AHB_ARES] = { 0x75040, 5 }, [GCC_PCIE0_AXI_MASTER_STICKY_ARES] = { 0x75040, 6 }, [GCC_PCIE0_AXI_SLAVE_STICKY_ARES] = { 0x75040, 7 }, - [GCC_PPE_FULL_RESET] = { 0x68014, 0 }, - [GCC_UNIPHY0_SOFT_RESET] = { 0x56004, 0 }, + [GCC_PPE_FULL_RESET] = { .reg = 0x68014, .bitmask = 0xf0000 }, + [GCC_UNIPHY0_SOFT_RESET] = { .reg = 0x56004, .bitmask = 0x3ff2 }, [GCC_UNIPHY0_XPCS_RESET] = { 0x56004, 2 }, - [GCC_UNIPHY1_SOFT_RESET] = { 0x56104, 0 }, + [GCC_UNIPHY1_SOFT_RESET] = { .reg = 0x56104, .bitmask = 0x32 }, [GCC_UNIPHY1_XPCS_RESET] = { 0x56104, 2 }, - [GCC_EDMA_HW_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT1_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT2_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT3_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT4_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT5_RESET] = { 0x68014, 0 }, - [GCC_UNIPHY0_PORT1_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT2_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT3_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT4_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT5_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT_4_5_RESET] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT_4_RESET] = { 0x56004, 0 }, + [GCC_EDMA_HW_RESET] = { .reg = 0x68014, .bitmask = 0x300000 }, + [GCC_NSSPORT1_RESET] = { .reg = 0x68014, .bitmask = 0x1000003 }, + [GCC_NSSPORT2_RESET] = { .reg = 0x68014, .bitmask = 0x200000c }, + [GCC_NSSPORT3_RESET] = { .reg = 0x68014, .bitmask = 0x4000030 }, + [GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = 0x8000300 }, + [GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = 0x10000c00 }, + [GCC_UNIPHY0_PORT1_ARES] = { .reg = 0x56004, .bitmask = 0x30 }, + [GCC_UNIPHY0_PORT2_ARES] = { .reg = 0x56004, .bitmask = 0xc0 }, + [GCC_UNIPHY0_PORT3_ARES] = { .reg = 0x56004, .bitmask = 0x300 }, + [GCC_UNIPHY0_PORT4_ARES] = { .reg = 0x56004, .bitmask = 0xc00 }, + [GCC_UNIPHY0_PORT5_ARES] = { .reg = 0x56004, .bitmask = 0x3000 }, + [GCC_UNIPHY0_PORT_4_5_RESET] = { .reg = 0x56004, .bitmask = 0x3c02 }, + [GCC_UNIPHY0_PORT_4_RESET] = { .reg = 0x56004, .bitmask = 0xc02 }, [GCC_LPASS_BCR] = {0x1F000, 0}, [GCC_UBI32_TBU_BCR] = {0x65000, 0}, [GCC_LPASS_TBU_BCR] = {0x6C000, 0},
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 229/509 usb: dwc3: qcom: Fix potential memory leak
In reply to Greg Kroah-HartmanFrom: Vladislav Efanov <[email protected]>
[ Upstream commit 097fb3ee710d4de83b8d4f5589e8ee13e0f0541e ]
Function dwc3_qcom_probe() allocates memory for resource structure which is pointed by parent_res pointer. This memory is not freed. This leads to memory leak. Use stack memory to prevent memory leak.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/usb/dwc3/dwc3-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +3 -3
@@ -722,6 +722,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct dwc3_qcom *qcom;struct resource *res, *parent_res =NULL ; +struct resource local_res;int ret, i;bool ignore_pipe_clk;
@@ -772,9 +773,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)if (np) { parent_res = res; }else { - parent_res =kmemdup (res,sizeof (struct resource ),GFP_KERNEL ); -if (!parent_res) -return -ENOMEM ; +memcpy (&local_res, res,sizeof (struct resource )); + parent_res = &local_res; parent_res->start = res->start + qcom->acpi_pdata->qscratch_base_offset;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 230/509 usb: gadget: u_serial: Add null pointer check in gserial_suspend
In reply to Greg Kroah-HartmanFrom: Prashanth K <[email protected]>
[ Upstream commit 2f6ecb89fe8feb2b60a53325b0eeb9866d88909a ]
Consider a case where gserial_disconnect has already cleared gser->ioport. And if gserial_suspend gets called afterwards, it will lead to accessing of gser->ioport and thus causing null pointer dereference.
Avoid this by adding a null pointer check. Added a static spinlock to prevent gser->ioport from becoming null after the newly added null pointer check.
--- drivers/usb/gadget/function/u_serial.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/u_serial.c +11 -2
@@ -1421,10 +1421,19 @@ EXPORT_SYMBOL_GPL(gserial_disconnect);void gserial_suspend (struct gserial *gser) { -struct gs_port *port = gser->ioport; +struct gs_port *port;unsigned long flags; -spin_lock_irqsave (&port->port_lock, flags); +spin_lock_irqsave (&serial_port_lock, flags); + port = gser->ioport; + +if (!port) { +spin_unlock_irqrestore (&serial_port_lock, flags); +return ; + } + +spin_lock (&port->port_lock); +spin_unlock (&serial_port_lock); port->suspended = true;spin_unlock_irqrestore (&port->port_lock, flags); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 231/509 extcon: Fix kernel doc of property fields to avoid warnings
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 7e77e0b7a9f4cdf91cb0950749b40c840ea63efc ]
Kernel documentation has to be synchronized with a code, otherwise the validator is not happy:
Function parameter or member 'usb_propval' not described in 'extcon_cable' Function parameter or member 'chg_propval' not described in 'extcon_cable' Function parameter or member 'jack_propval' not described in 'extcon_cable' Function parameter or member 'disp_propval' not described in 'extcon_cable'
Describe the fields added in the past.
--- drivers/extcon/extcon.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/extcon/extcon.c +4 -0
@@ -196,6 +196,10 @@ static const struct __extcon_info {* @attr_name: "name" sysfs entry * @attr_state: "state" sysfs entry * @attrs: the array pointing to attr_name and attr_state for attr_g +* @usb_propval: the array of USB connector properties +* @chg_propval: the array of charger connector properties +* @jack_propval: the array of jack connector properties +* @disp_propval: the array of display connector properties */ struct extcon_cable {struct extcon_dev *edev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 232/509 extcon: Fix kernel doc of property capability fields to avoid warnings
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 73346b9965ebda2feb7fef8629e9b28baee820e3 ]
Kernel documentation has to be synchronized with a code, otherwise the validator is not happy:
Function parameter or member 'usb_bits' not described in 'extcon_cable' Function parameter or member 'chg_bits' not described in 'extcon_cable' Function parameter or member 'jack_bits' not described in 'extcon_cable' Function parameter or member 'disp_bits' not described in 'extcon_cable'
Describe the fields added in the past.
--- drivers/extcon/extcon.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/extcon/extcon.c +4 -0
@@ -200,6 +200,10 @@ static const struct __extcon_info {* @chg_propval: the array of charger connector properties * @jack_propval: the array of jack connector properties * @disp_propval: the array of display connector properties +* @usb_bits: the bit array of the USB connector property capabilities +* @chg_bits: the bit array of the charger connector property capabilities +* @jack_bits: the bit array of the jack connector property capabilities +* @disp_bits: the bit array of the display connector property capabilities */ struct extcon_cable {struct extcon_dev *edev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 233/509 usb: phy: phy-tahvo: fix memory leak in tahvo_usb_probe()
In reply to Greg Kroah-HartmanFrom: Li Yang <[email protected]>
[ Upstream commit 342161c11403ea00e9febc16baab1d883d589d04 ]
Smatch reports:drivers/usb/phy/phy-tahvo.c: tahvo_usb_probe()
warn: missing unwind goto?
After geting irq, if ret < 0, it will return without error handling to free memory.
Just add error handling to fix this problem.
--- drivers/usb/phy/phy-tahvo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/phy/phy-tahvo.c +1 -1
@@ -395,7 +395,7 @@ static int tahvo_usb_probe(struct platform_device *pdev) tu->irq = ret =platform_get_irq (pdev,0 );if (ret <0 ) -return ret; + goto err_remove_phy; ret =request_threaded_irq (tu->irq,NULL , tahvo_usb_vbus_interrupt,IRQF_ONESHOT ,"tahvo-vbus" , tu);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 234/509 usb: hide unused usbfs_notify_suspend/resume functions
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 8e6bd945e6dde64fbc60ec3fe252164493a8d3a2 ]
The declaration is in an #ifdef, which causes warnings when building with 'make W=1' and without CONFIG_PM:
drivers/usb/core/devio.c:742:6: error: no previous prototype for 'usbfs_notify_suspend' drivers/usb/core/devio.c:747:6: error: no previous prototype for 'usbfs_notify_resume'
Use the same #ifdef check around the function definitions to avoid the warnings and slightly shrink the USB core.
--- drivers/usb/core/devio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/core/devio.c +2 -0
@@ -734,6 +734,7 @@ static int driver_resume(struct usb_interface *intf)return 0 ; } +#ifdef CONFIG_PM /* The following routines apply to the entire device, not interfaces */ void usbfs_notify_suspend (struct usb_device *udev) {
@@ -752,6 +753,7 @@ void usbfs_notify_resume(struct usb_device *udev) }mutex_unlock (&usbfs_mutex); } +#endif struct usb_driver usbfs_driver = { .name ="usbfs" ,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 235/509 serial: 8250: lock port for stop_rx() in omap8250_irq()
In reply to Greg Kroah-HartmanFrom: John Ogness <[email protected]>
[ Upstream commit ca73a892c5bec4b08a2fa22b3015e98ed905abb7 ]
The uarts_ops stop_rx() callback expects that the port->lock is taken and interrupts are disabled.
--- drivers/tty/serial/8250/8250_omap.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_omap.c +2 -0
@@ -655,7 +655,9 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id) up->ier = port->serial_in (port,UART_IER );if (up->ier & (UART_IER_RLSI |UART_IER_RDI )) { +spin_lock (&port->lock); port->ops->stop_rx (port); +spin_unlock (&port->lock); }else {/* Keep restarting the timer until * the input overrun subsides.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 236/509 serial: 8250: lock port for UART_IER access in omap8250_irq()
In reply to Greg Kroah-HartmanFrom: John Ogness <[email protected]>
[ Upstream commit 25614735a647693c1260f253dc3ab32127697806 ]
omap8250_irq() accesses UART_IER. This register is modified twice by each console write (serial8250_console_write()) under the port lock. omap8250_irq() must also take the port lock to guanentee synchronized access to UART_IER.
Since the port lock is already being taken for the stop_rx() callback and since it is safe to call cancel_delayed_work() while holding the port lock, simply extend the port lock region to include UART_IER access.
--- drivers/tty/serial/8250/8250_omap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_omap.c +3 -2
@@ -653,17 +653,18 @@ static irqreturn_t omap8250_irq(int irq, void *dev_id)if ((lsr &UART_LSR_OE ) && up->overrun_backoff_time_ms >0 ) {unsigned long delay; +/* Synchronize UART_IER access against the console. */ +spin_lock (&port->lock); up->ier = port->serial_in (port,UART_IER );if (up->ier & (UART_IER_RLSI |UART_IER_RDI )) { -spin_lock (&port->lock); port->ops->stop_rx (port); -spin_unlock (&port->lock); }else {/* Keep restarting the timer until * the input overrun subsides. */ cancel_delayed_work (&up->overrun_backoff); } +spin_unlock (&port->lock); delay =msecs_to_jiffies (up->overrun_backoff_time_ms);schedule_delayed_work (&up->overrun_backoff, delay);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 237/509 kernfs: fix missing kernfs_idr_lock to remove an ID from the IDR
In reply to Greg Kroah-HartmanFrom: Muchun Song <[email protected]>
[ Upstream commit 30480b988f88c279752f3202a26b6fee5f586aef ]
The root->ino_idr is supposed to be protected by kernfs_idr_lock, fix it.
--- fs/kernfs/dir.c | 2 ++ 1 file changed, 2 insertions(+)
fs/kernfs/dir.c +2 -0
@@ -679,7 +679,9 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,return kn; err_out3: +spin_lock (&kernfs_idr_lock);idr_remove (&root->ino_idr, (u32 )kernfs_ino (kn)); +spin_unlock (&kernfs_idr_lock); err_out2:kmem_cache_free (kernfs_node_cache, kn); err_out1:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 238/509 coresight: Fix loss of connection info when a module is unloaded
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
[ Upstream commit c45b2835e7b205783bdfe08cc98fa86a7c5eeb74 ]
child_fwnode should be a read only property based on the DT or ACPI. If it's cleared on the parent device when a child is unloaded, then when the child is loaded again the connection won't be remade.
child_dev should be cleared instead which signifies that the connection should be remade when the child_fwnode registers a new coresight_device.
Similarly the reference count shouldn't be decremented as long as the parent device exists. The correct place to drop the reference is in coresight_release_platform_data() which is already done.
Reproducible on Juno with the following steps:
# load all coresight modules. $ cd /sys/bus/coresight/devices/ $ echo 1 > tmc_etr0/enable_sink $ echo 1 > etm0/enable_source # Works fine ^
$ echo 0 > etm0/enable_source $ rmmod coresight-funnel $ modprobe coresight-funnel $ echo 1 > etm0/enable_source -bash: echo: write error: Invalid argument
--- drivers/hwtracing/coresight/coresight-core.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/hwtracing/coresight/coresight-core.c +2 -7
@@ -1376,13 +1376,8 @@ static int coresight_remove_match(struct device *dev, void *data)if (csdev->dev.fwnode == conn->child_fwnode) { iterator->orphan = true;coresight_remove_links (iterator, conn); -/* -* Drop the reference to the handle for the remote -* device acquired in parsing the connections from -* platform data. -*/ -fwnode_handle_put (conn->child_fwnode); - conn->child_fwnode =NULL ; + + conn->child_dev =NULL ;/* No need to continue */ break ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 239/509 mfd: rt5033: Drop rt5033-battery sub-device
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 43db1344e0f8c1eb687a1d6cd5b0de3009ab66cb ]
The fuel gauge in the RT5033 PMIC (rt5033-battery) has its own I2C bus and interrupt lines. Therefore, it is not part of the MFD device and needs to be specified separately in the device tree.
--- drivers/mfd/rt5033.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mfd/rt5033.c +0 -3
@@ -41,9 +41,6 @@ static const struct mfd_cell rt5033_devs[] = { { .name = "rt5033-charger", .of_compatible = "richtek,rt5033-charger", - }, { - .name = "rt5033-battery", - .of_compatible = "richtek,rt5033-battery", }, { .name = "rt5033-led", .of_compatible = "richtek,rt5033-led",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 240/509 media: venus: helpers: Fix ALIGN() of non power of two
In reply to Greg Kroah-HartmanFrom: Rikard Falkeborn <[email protected]>
[ Upstream commit 927e78ac8bc58155316cf6f46026e1912bbbbcfc ]
ALIGN() expects its second argument to be a power of 2, otherwise incorrect results are produced for some inputs. The output can be both larger or smaller than what is expected.
For example, ALIGN(304, 192) equals 320 instead of 384, and ALIGN(65, 192) equals 256 instead of 192.
However, nestling two ALIGN() as is done in this case seem to only produce results equal to or bigger than the expected result if ALIGN() had handled non powers of two, and that in turn results in framesizes that are either the correct size or too large.
Fortunately, since 192 * 4 / 3 equals 256, it turns out that one ALIGN() is sufficient.
--- drivers/media/platform/qcom/venus/helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/helpers.c +2 -2
@@ -917,8 +917,8 @@ static u32 get_framesize_raw_yuv420_tp10_ubwc(u32 width, u32 height)u32 extradata =SZ_16K ;u32 size; - y_stride =ALIGN (ALIGN (width,192 ) *4 /3 ,256 ); - uv_stride =ALIGN (ALIGN (width,192 ) *4 /3 ,256 ); + y_stride =ALIGN (width *4 /3 ,256 ); + uv_stride =ALIGN (width *4 /3 ,256 ); y_sclines =ALIGN (height,16 ); uv_sclines =ALIGN ((height +1 ) >>1 ,16 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 241/509 media: atomisp: gmin_platform: fix out_len in gmin_get_config_dsm_var()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 1657f2934daf89e8d9fa4b2697008909eb22c73e ]
Ideally, strlen(cur->string.pointer) and strlen(out) would be the same. But this code is using strscpy() to avoid a potential buffer overflow. So in the same way we should take the strlen() of the smaller string to avoid a buffer overflow in the caller, gmin_get_var_int().
--- drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c +1 -1
@@ -1198,7 +1198,7 @@ static int gmin_get_config_dsm_var(struct device *dev,dev_info (dev,"found _DSM entry for '%s': %s\n" , var, cur->string.pointer);strscpy (out, cur->string.pointer, *out_len); - *out_len =strlen (cur->string.pointer); + *out_len =strlen (out);ACPI_FREE (obj);return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 242/509 KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes
In reply to Greg Kroah-HartmanFrom: Nico Boehr <[email protected]>
[ Upstream commit 285cff4c0454340a4dc53f46e67f2cb1c293bd74 ]
The KVM_S390_GET_CMMA_BITS ioctl may return incorrect values when userspace specifies a start_gfn outside of memslots.
This can occur when a VM has multiple memslots with a hole in between:
+-----+----------+--------+--------+
| ... | Slot N-1 | <hole> | Slot N |
+-----+----------+--------+--------+
^ ^ ^ ^
| | | |
GFN A A+B | |
A+B+C |
A+B+C+DWhen userspace specifies a GFN in [A+B, A+B+C), it would expect to get the CMMA values of the first dirty page in Slot N. However, userspace may get a start_gfn of A+B+C+D with a count of 0, hence completely skipping over any dirty pages in slot N.
The error is in kvm_s390_next_dirty_cmma(), which assumes gfn_to_memslot_approx() will return the memslot _below_ the specified GFN when the specified GFN lies outside a memslot. In reality it may return either the memslot below or above the specified GFN.
When a memslot above the specified GFN is returned this happens:
- ofs is calculated, but since the memslot's base_gfn is larger than the specified cur_gfn, ofs will underflow to a huge number.
- ofs is passed to find_next_bit(). Since ofs will exceed the memslot's number of pages, the number of pages in the memslot is returned, completely skipping over all bits in the memslot userspace would be interested in.
Fix this by resetting ofs to zero when a memslot _above_ cur_gfn is returned (cur_gfn < ms->base_gfn).
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/s390/kvm/kvm-s390.c +4 -0
@@ -2005,6 +2005,10 @@ static unsigned long kvm_s390_next_dirty_cmma(struct kvm_memslots *slots, ms = slots->memslots + slotidx; ofs =0 ; } + +if (cur_gfn < ms->base_gfn) + ofs =0 ; + ofs =find_next_bit (kvm_second_dirty_bitmap (ms), ms->npages, ofs);while ((slotidx >0 ) && (ofs >= ms->npages)) { slotidx--;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 243/509 usb: dwc3: qcom: Release the correct resources in dwc3_qcom_remove()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 8fd95da2cfb5046c4bb5a3cdc9eb7963ba8b10dd ]
In the probe, some resources are allocated with dwc3_qcom_of_register_core() or dwc3_qcom_acpi_register_core(). The corresponding resources are already coorectly freed in the error handling path of the probe, but not in the remove function.
Fix it.
Message-ID: <c0215a84cdf18fb3514c81842783ec53cf149deb.1685891059.git.christophe.jaillet@wanadoo.fr>
--- drivers/usb/dwc3/dwc3-qcom.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-qcom.c +5 -1
@@ -869,10 +869,14 @@ reset_assert:static int dwc3_qcom_remove (struct platform_device *pdev) {struct dwc3_qcom *qcom =platform_get_drvdata (pdev); +struct device_node *np = pdev->dev.of_node;struct device *dev = &pdev->dev;int i; -of_platform_depopulate (dev); +if (np) +of_platform_depopulate (&pdev->dev); +else +platform_device_put (pdev);for (i = qcom->num_clocks -1 ; i >=0 ; i--) {clk_disable_unprepare (qcom->clks[i]);
Greg Kroah-Hartman
maintainerPATCH 244/509 usb: dwc3: qcom: Fix an error handling path in dwc3_qcom_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 4a944da707123686d372ec01ea60056902fadf35 ]
If dwc3_qcom_create_urs_usb_platdev() fails, some resources still need to be released, as already done in the other error handling path of the probe.
Message-ID: <b69fa8dd68d816e7d24c88d3eda776ceb28c5dc5.1685890571.git.christophe.jaillet@wanadoo.fr>
--- drivers/usb/dwc3/dwc3-qcom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +3 -2
@@ -786,9 +786,10 @@ static int dwc3_qcom_probe(struct platfoif (IS_ERR_OR_NULL (qcom->urs_usb)) {dev_err (dev,"failed to create URS USB platdev\n" );if (!qcom->urs_usb) -return -ENODEV ; + ret = -ENODEV ;else -return PTR_ERR (qcom->urs_usb); + ret =PTR_ERR (qcom->urs_usb); + goto clk_disable; } } }
Greg Kroah-Hartman
maintainerPATCH 245/509 usb: common: usb-conn-gpio: Set last role to unknown before initial detection
In reply to Greg Kroah-HartmanFrom: Prashanth K <[email protected]>
[ Upstream commit edd60d24bd858cef165274e4cd6cab43bdc58d15 ]
Currently if we bootup a device without cable connected, then usb-conn-gpio won't call set_role() since last_role is same as current role. This happens because during probe last_role gets initialised to zero.
To avoid this, added a new constant in enum usb_role, last_role is set to USB_ROLE_UNKNOWN before performing initial detection.
While at it, also handle default case for the usb_role switch in cdns3, intel-xhci-usb-role-switch & musb/jz4740 to avoid build warnings.
Message-ID: <[email protected]>
--- drivers/usb/cdns3/core.c | 2 ++ drivers/usb/common/usb-conn-gpio.c | 3 +++ drivers/usb/musb/jz4740.c | 2 ++ drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 ++ include/linux/usb/role.h | 1 + 5 files changed, 10 insertions(+)
drivers/usb/cdns3/core.c +2 -0
@@ -243,6 +243,8 @@ static enum usb_role cdns3_hw_role_state_machine(struct cdns3 *cdns)if (!vbus) role =USB_ROLE_NONE ;break ; +default : +break ; }dev_dbg (cdns->dev,"role %d -> %d\n" , cdns->role, role);
drivers/usb/common/usb-conn-gpio.c +3 -0
@@ -276,6 +276,9 @@ static int usb_conn_probe(struct platform_device *pdev)platform_set_drvdata (pdev, info); +/* Set last role to unknown before performing the initial detection */ + info->last_role =USB_ROLE_UNKNOWN ; +/* Perform initial detection */ usb_conn_queue_dwork (info,0 );
drivers/usb/musb/jz4740.c +2 -0
@@ -91,6 +91,8 @@ static int jz4740_musb_role_switch_set(struct usb_role_switch *sw,case USB_ROLE_HOST :atomic_notifier_call_chain (&phy->notifier,USB_EVENT_ID , phy);break ; +default : +break ; }return 0 ;
drivers/usb/roles/intel-xhci-usb-role-switch.c +2 -0
@@ -97,6 +97,8 @@ static int intel_xhci_usb_set_role(struct usb_role_switch *sw, val |=SW_VBUS_VALID ; drd_config =DRD_CONFIG_STATIC_DEVICE ;break ; +default : +break ; } val |=SW_IDPIN_EN ;if (data->enable_sw_switch) {
include/linux/usb/role.h +1 -0
@@ -11,6 +11,7 @@ enum usb_role {USB_ROLE_NONE ,USB_ROLE_HOST ,USB_ROLE_DEVICE , + USB_ROLE_UNKNOWN, }; typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 246/509 usb: dwc3-meson-g12a: Fix an error handling path in dwc3_meson_g12a_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 01052b91c9808e3c3b068ae2721cb728ec9aa4c0 ]
If dwc3_meson_g12a_otg_init() fails, resources allocated by the previous of_platform_populate() call should be released, as already done in the error handling path.
Message-ID: <9d28466de1808ccc756b4cc25fc72c482d133d13.1686403934.git.christophe.jaillet@wanadoo.fr>
--- drivers/usb/dwc3/dwc3-meson-g12a.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-meson-g12a.c +4 -1
@@ -805,7 +805,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev) ret =dwc3_meson_g12a_otg_init (pdev, priv);if (ret) - goto err_phys_power; + goto err_plat_depopulate;pm_runtime_set_active (dev);pm_runtime_enable (dev);
@@ -813,6 +813,9 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)return 0 ; +err_plat_depopulate: +of_platform_depopulate (dev); + err_phys_power:for (i =0 ; i <PHY_COUNT ; ++i)phy_power_off (priv->phys[i]);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 247/509 mfd: intel-lpss: Add missing check for platform_get_resource
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit d918e0d5824495a75d00b879118b098fcab36fdb ]
Add the missing check for platform_get_resource and return error if it fails.
--- drivers/mfd/intel-lpss-acpi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mfd/intel-lpss-acpi.c +3 -0
@@ -114,6 +114,9 @@ static int intel_lpss_acpi_probe(struct platform_device *pdev)return -ENOMEM ; info->mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!info->mem) +return -ENODEV ; + info->irq =platform_get_irq (pdev,0 ); ret =intel_lpss_probe (&pdev->dev, info);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 248/509 Revert "usb: common: usb-conn-gpio: Set last role to unknown before initial detection"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit df49f2a0ac4a34c0cb4b5c233fcfa0add644c43c ]
This reverts commit edd60d24bd858cef165274e4cd6cab43bdc58d15.
Heikki reports that this should not be a global flag just to work around one broken driver and should be fixed differently, so revert it.
--- drivers/usb/cdns3/core.c | 2 -- drivers/usb/common/usb-conn-gpio.c | 3 --- drivers/usb/musb/jz4740.c | 2 -- drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 -- include/linux/usb/role.h | 1 - 5 files changed, 10 deletions(-)
drivers/usb/cdns3/core.c +0 -2
@@ -243,8 +243,6 @@ static enum usb_role cdns3_hw_role_state_machine(struct cdns3 *cdns)if (!vbus) role =USB_ROLE_NONE ;break ; -default : -break ; }dev_dbg (cdns->dev,"role %d -> %d\n" , cdns->role, role);
drivers/usb/common/usb-conn-gpio.c +0 -3
@@ -276,9 +276,6 @@ static int usb_conn_probe(struct platform_device *pdev)platform_set_drvdata (pdev, info); -/* Set last role to unknown before performing the initial detection */ - info->last_role =USB_ROLE_UNKNOWN ; -/* Perform initial detection */ usb_conn_queue_dwork (info,0 );
drivers/usb/musb/jz4740.c +0 -2
@@ -91,8 +91,6 @@ static int jz4740_musb_role_switch_set(struct usb_role_switch *sw,case USB_ROLE_HOST :atomic_notifier_call_chain (&phy->notifier,USB_EVENT_ID , phy);break ; -default : -break ; }return 0 ;
drivers/usb/roles/intel-xhci-usb-role-switch.c +0 -2
@@ -97,8 +97,6 @@ static int intel_xhci_usb_set_role(struct usb_role_switch *sw, val |=SW_VBUS_VALID ; drd_config =DRD_CONFIG_STATIC_DEVICE ;break ; -default : -break ; } val |=SW_IDPIN_EN ;if (data->enable_sw_switch) {
include/linux/usb/role.h +0 -1
@@ -11,7 +11,6 @@ enum usb_role {USB_ROLE_NONE ,USB_ROLE_HOST , USB_ROLE_DEVICE, - USB_ROLE_UNKNOWN, }; typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 249/509 serial: 8250_omap: Use force_suspend and resume for system suspend
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 20a41a62618df85f3a2981008edec5cadd785e0a ]
We should not rely on autosuspend timeout for system suspend. Instead, let's use force_suspend and force_resume functions. Otherwise the serial port controller device may not be idled on suspend.
As we are doing a register write on suspend to configure the serial port, we still need to runtime PM resume the port on suspend.
While at it, let's switch to pm_runtime_resume_and_get() and check for errors returned. And let's add the missing line break before return to the suspend function while at it.
Message-ID: <[email protected]>
--- drivers/tty/serial/8250/8250_omap.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/tty/serial/8250/8250_omap.c +15 -5
@@ -1521,25 +1521,35 @@ static int omap8250_suspend(struct device *dev) {struct omap8250_priv *priv =dev_get_drvdata (dev);struct uart_8250_port *up =serial8250_get_port (priv->line); +int err;serial8250_suspend_port (priv->line); -pm_runtime_get_sync (dev); + err =pm_runtime_resume_and_get (dev); +if (err) +return err;if (!device_may_wakeup (dev)) priv->wer =0 ;serial_out (up,UART_OMAP_WER , priv->wer); -pm_runtime_mark_last_busy (dev); -pm_runtime_put_autosuspend (dev); - + err =pm_runtime_force_suspend (dev);flush_work (&priv->qos_work); -return 0 ; + +return err; }static int omap8250_resume (struct device *dev) {struct omap8250_priv *priv =dev_get_drvdata (dev); +int err; + err =pm_runtime_force_resume (dev); +if (err) +return err;serial8250_resume_port (priv->line); +/* Paired with pm_runtime_resume_and_get() in omap8250_suspend() */ +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev); +return 0 ; }#else
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 250/509 test_firmware: return ENOMEM instead of ENOSPC on failed memory allocation
In reply to Greg Kroah-HartmanFrom: Mirsad Goran Todorovac <[email protected]>
[ Upstream commit 7dae593cd226a0bca61201cf85ceb9335cf63682 ]
In a couple of situations like
name = kstrndup(buf, count, GFP_KERNEL); if (!name) return -ENOSPC;
the error is not actually "No space left on device", but "Out of memory".
It is semantically correct to return -ENOMEM in all failed kstrndup() and kzalloc() cases in this driver, as it is not a problem with disk space, but with kernel memory allocator failing allocation.
The semantically correct should be:
name = kstrndup(buf, count, GFP_KERNEL);
if (!name)
return -ENOMEM;Message-ID: <[email protected]>
--- lib/test_firmware.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
lib/test_firmware.c +6 -6
@@ -183,7 +183,7 @@ static int __kstrncpy(char **dst, const char *name, size_t count, gfp_t gfp) { *dst =kstrndup (name, count, gfp);if (!*dst) -return -ENOSPC ; +return -ENOMEM ;return count; }
@@ -606,7 +606,7 @@ static ssize_t trigger_request_store(struct device *dev, name =kstrndup (buf, count,GFP_KERNEL );if (!name) -return -ENOSPC ; +return -ENOMEM ;pr_info ("loading '%s'\n" , name);
@@ -654,7 +654,7 @@ static ssize_t trigger_request_platform_store(struct device *dev, name =kstrndup (buf, count,GFP_KERNEL );if (!name) -return -ENOSPC ; +return -ENOMEM ;pr_info ("inserting test platform fw '%s'\n" , name); efi_embedded_fw.name = name;
@@ -707,7 +707,7 @@ static ssize_t trigger_async_request_store(struct device *dev, name =kstrndup (buf, count,GFP_KERNEL );if (!name) -return -ENOSPC ; +return -ENOMEM ;pr_info ("loading '%s'\n" , name);
@@ -752,7 +752,7 @@ static ssize_t trigger_custom_fallback_store(struct device *dev, name =kstrndup (buf, count,GFP_KERNEL );if (!name) -return -ENOSPC ; +return -ENOMEM ;pr_info ("loading '%s' using custom fallback mechanism\n" , name);
@@ -803,7 +803,7 @@ static int test_fw_run_batch_request(void *data) test_buf =kzalloc (TEST_FIRMWARE_BUF_SIZE ,GFP_KERNEL );if (!test_buf) -return -ENOSPC ; +return -ENOMEM ;if (test_fw_config->partial) req->rc = request_partial_firmware_into_buf
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 251/509 mfd: stmfx: Fix error path in stmfx_chip_init
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit f592cf624531286f8b52e40dcfc157a5a7fb115c ]
In error path, disable vdd regulator if it exists, but don't overload ret. Because if regulator_disable() is successful, stmfx_chip_init will exit successfully while chip init failed.
--- drivers/mfd/stmfx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/stmfx.c +1 -1
@@ -387,7 +387,7 @@ static int stmfx_chip_init(struct i2c_client *client) err:if (stmfx->vdd) -return regulator_disable (stmfx->vdd); +regulator_disable (stmfx->vdd);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 252/509 mfd: stmfx: Nullify stmfx->vdd in case of error
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit 7c81582c0bccb4757186176f0ee12834597066ad ]
Nullify stmfx->vdd in case devm_regulator_get_optional() returns an error. And simplify code by returning an error only if return code is not -ENODEV, which means there is no vdd regulator and it is not an issue.
--- drivers/mfd/stmfx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/mfd/stmfx.c +2 -3
@@ -330,9 +330,8 @@ static int stmfx_chip_init(struct i2c_client *client) stmfx->vdd =devm_regulator_get_optional (&client->dev,"vdd" ); ret =PTR_ERR_OR_ZERO (stmfx->vdd);if (ret) { -if (ret == -ENODEV ) - stmfx->vdd =NULL ; -else + stmfx->vdd =NULL ; +if (ret != -ENODEV )return dev_err_probe (&client->dev, ret,"Failed to get VDD regulator\n" ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 253/509 KVM: s390: vsie: fix the length of APCB bitmap
In reply to Greg Kroah-HartmanFrom: Pierre Morel <[email protected]>
[ Upstream commit 246be7d2720ea9a795b576067ecc5e5c7a1e7848 ]
bit_and() uses the count of bits as the woking length. Fix the previous implementation and effectively use the right bitmap size.
--- arch/s390/kvm/vsie.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/s390/kvm/vsie.c +4 -2
@@ -168,7 +168,8 @@ static int setup_apcb00(struct kvm_vcpu *vcpu, unsigned long *apcb_s, sizeof(struct kvm_s390_apcb0)))return -EFAULT ; -bitmap_and (apcb_s, apcb_s, apcb_h,sizeof (struct kvm_s390_apcb0 )); +bitmap_and (apcb_s, apcb_s, apcb_h, +BITS_PER_BYTE *sizeof (struct kvm_s390_apcb0 ));return 0 ; }
@@ -190,7 +191,8 @@ static int setup_apcb11(struct kvm_vcpu *vcpu, unsigned long *apcb_s, sizeof(struct kvm_s390_apcb1)))return -EFAULT ; -bitmap_and (apcb_s, apcb_s, apcb_h,sizeof (struct kvm_s390_apcb1 )); +bitmap_and (apcb_s, apcb_s, apcb_h, +BITS_PER_BYTE *sizeof (struct kvm_s390_apcb1 ));return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 254/509 mfd: stmpe: Only disable the regulators if they are enabled
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 104d32bd81f620bb9f67fbf7d1159c414e89f05f ]
In stmpe_probe(), if some regulator_enable() calls fail, probing continues and there is only a dev_warn().
So, if stmpe_probe() is called the regulator may not be enabled. It is cleaner to test it before calling regulator_disable() in the remove function.
--- drivers/mfd/stmpe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mfd/stmpe.c +2 -2
@@ -1494,9 +1494,9 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)int stmpe_remove (struct stmpe *stmpe) { -if (!IS_ERR (stmpe->vio)) +if (!IS_ERR (stmpe->vio) &®ulator_is_enabled (stmpe->vio))regulator_disable (stmpe->vio); -if (!IS_ERR (stmpe->vcc)) +if (!IS_ERR (stmpe->vcc) &®ulator_is_enabled (stmpe->vcc))regulator_disable (stmpe->vcc);__stmpe_disable (stmpe,STMPE_BLOCK_ADC );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 255/509 phy: tegra: xusb: check return value of devm_kzalloc()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 44faada0f38fc333d392af04c343b0e23f8f5d81 ]
devm_kzalloc() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/phy/tegra/xusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/phy/tegra/xusb.c +3 -0
@@ -663,6 +663,9 @@ static int tegra_xusb_setup_usb_role_switch(struct tegra_xusb_port *port) port->dev.driver =devm_kzalloc (&port->dev,sizeof (struct device_driver ),GFP_KERNEL ); +if (!port->dev.driver) +return -ENOMEM ; + port->dev.driver->owner =THIS_MODULE ; port->usb_role_sw = usb_role_switch_register(&port->dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 256/509 pwm: imx-tpm: force real_period to be zero in suspend
In reply to Greg Kroah-HartmanFrom: Fancy Fang <[email protected]>
[ Upstream commit 661dfb7f46298e53f6c3deaa772fa527aae86193 ]
During suspend, all the tpm registers will lose values. So the 'real_period' value of struct 'imx_tpm_pwm_chip' should be forced to be zero to force the period update code can be executed after system resume back.
--- drivers/pwm/pwm-imx-tpm.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/pwm/pwm-imx-tpm.c +7 -0
@@ -403,6 +403,13 @@ static int __maybe_unused pwm_imx_tpm_suspend(struct device *dev)if (tpm->enable_count >0 )return -EBUSY ; +/* +* Force 'real_period' to be zero to force period update code +* can be executed after system resume back, since suspend causes +* the period related registers to become their reset values. +*/ + tpm->real_period =0 ; +clk_disable_unprepare (tpm->clk);return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 257/509 pwm: sysfs: Do not apply state to already disabled PWMs
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 38ba83598633373f47951384cfc389181c8d1bed ]
If the PWM is exported but not enabled, do not call pwm_class_apply_state(). First of all, in this case, period may still be unconfigured and this would make pwm_class_apply_state() return -EINVAL, and then suspend would fail. Second, it makes little sense to apply state onto PWM that is not enabled before suspend.
Failing case:
"
$ echo 1 > /sys/class/pwm/pwmchip4/export $ echo mem > /sys/power/state ... pwm pwmchip4: PM: dpm_run_callback(): pwm_class_suspend+0x1/0xa8 returns -22 pwm pwmchip4: PM: failed to suspend: error -22 PM: Some devices failed to suspend, or early wake event detected "
Working case:
"
$ echo 1 > /sys/class/pwm/pwmchip4/export $ echo 100 > /sys/class/pwm/pwmchip4/pwm1/period $ echo 10 > /sys/class/pwm/pwmchip4/pwm1/duty_cycle $ echo mem > /sys/power/state ... "
Do not call pwm_class_apply_state() in case the PWM is disabled to fix this issue.
--- drivers/pwm/sysfs.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/pwm/sysfs.c +17 -0
@@ -424,6 +424,13 @@ static int pwm_class_resume_npwm(struct device *parent, unsigned int npwm)if (!export)continue ; +/* If pwmchip was not enabled before suspend, do nothing. */ +if (!export->suspend.enabled) { +/* release lock taken in pwm_class_get_state */ +mutex_unlock (&export->lock); +continue ; + } + state.enabled = export->suspend.enabled; ret =pwm_class_apply_state (export, pwm, &state);if (ret <0 )
@@ -448,7 +455,17 @@ static int __maybe_unused pwm_class_suspend(struct device *parent)if (!export)continue ; +/* +* If pwmchip was not enabled before suspend, save +* state for resume time and do nothing else. +*/ export->suspend = state; +if (!state.enabled) { +/* release lock taken in pwm_class_get_state */ +mutex_unlock (&export->lock); +continue ; + } + state.enabled = false; ret =pwm_class_apply_state (export, pwm, &state);if (ret <0 ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 258/509 rtc: st-lpc: Release some resources in st_rtc_probe() in case of error
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 06c6e1b01d9261f03629cefd1f3553503291e6cf ]
If an error occurs after clk_get(), the corresponding resources should be released.
Use devm_clk_get() to fix it.
--- drivers/rtc/rtc-st-lpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-st-lpc.c +1 -1
@@ -228,7 +228,7 @@ static int st_rtc_probe(struct platform_device *pdev)enable_irq_wake (rtc->irq);disable_irq (rtc->irq); - rtc->clk =clk_get (&pdev->dev,NULL ); + rtc->clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (rtc->clk)) {dev_err (&pdev->dev,"Unable to request clock\n" );return PTR_ERR (rtc->clk);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 259/509 media: cec: i2c: ch7322: also select REGMAP
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 29f96ac23648b2259f42d40703c47dd18fd172ca ]
Selecting only REGMAP_I2C can leave REGMAP unset, causing build errors, so also select REGMAP to prevent the build errors.
../drivers/media/cec/i2c/ch7322.c:158:21: error: variable 'ch7322_regmap' has initializer but incomplete type
158 | static const struct regmap_config ch7322_regmap = {../drivers/media/cec/i2c/ch7322.c:159:10: error: 'const struct regmap_config' has no member named 'reg_bits'
159 | .reg_bits = 8,../drivers/media/cec/i2c/ch7322.c:159:21: warning: excess elements in struct initializer
159 | .reg_bits = 8,../drivers/media/cec/i2c/ch7322.c:160:10: error: 'const struct regmap_config' has no member named 'val_bits'
160 | .val_bits = 8,../drivers/media/cec/i2c/ch7322.c:160:21: warning: excess elements in struct initializer
160 | .val_bits = 8,../drivers/media/cec/i2c/ch7322.c:161:10: error: 'const struct regmap_config' has no member named 'max_register'
161 | .max_register = 0x7f,../drivers/media/cec/i2c/ch7322.c:161:25: warning: excess elements in struct initializer
161 | .max_register = 0x7f,../drivers/media/cec/i2c/ch7322.c:162:10: error: 'const struct regmap_config' has no member named 'disable_locking'
162 | .disable_locking = true,../drivers/media/cec/i2c/ch7322.c:162:28: warning: excess elements in struct initializer
162 | .disable_locking = true,../drivers/media/cec/i2c/ch7322.c: In function 'ch7322_probe':../drivers/media/cec/i2c/ch7322.c:468:26: error: implicit declaration of function 'devm_regmap_init_i2c' [-Werror=implicit-function-declaration]
468 | ch7322->regmap = devm_regmap_init_i2c(client, &ch7322_regmap);../drivers/media/cec/i2c/ch7322.c:468:24: warning: assignment to 'struct regmap *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
468 | ch7322->regmap = devm_regmap_init_i2c(client, &ch7322_regmap);../drivers/media/cec/i2c/ch7322.c: At top level:../drivers/media/cec/i2c/ch7322.c:158:35: error: storage size of 'ch7322_regmap' isn't known
158 | static const struct regmap_config ch7322_regmap = {
--- drivers/media/cec/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/cec/i2c/Kconfig +1 -0
@@ -5,6 +5,7 @@ config CEC_CH7322 tristate "Chrontel CH7322 CEC controller" depends on I2C + select REGMAP select REGMAP_I2C select CEC_CORE help
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 260/509 sctp: fix potential deadlock on &net->sctp.addr_wq_lock
In reply to Greg Kroah-HartmanFrom: Chengfeng Ye <[email protected]>
[ Upstream commit 6feb37b3b06e9049e20dcf7e23998f92c9c5be9a ]
As &net->sctp.addr_wq_lock is also acquired by the timer sctp_addr_wq_timeout_handler() in protocal.c, the same lock acquisition at sctp_auto_asconf_init() seems should disable irq since it is called from sctp_accept() under process context.
Possible deadlock scenario:sctp_accept()
-> sctp_sock_migrate()
-> sctp_auto_asconf_init()
-> spin_lock(&net->sctp.addr_wq_lock)
<timer interrupt>
-> sctp_addr_wq_timeout_handler()
-> spin_lock_bh(&net->sctp.addr_wq_lock); (deadlock here)This flaw was found using an experimental static analysis tool we are developing for irq-related deadlock.
The tentative patch fix the potential deadlock by spin_lock_bh().
--- net/sctp/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sctp/socket.c +2 -2
@@ -362,9 +362,9 @@ static void sctp_auto_asconf_init(struct sctp_sock *sp)struct net *net =sock_net (&sp->inet.sk);if (net->sctp.default_auto_asconf) { -spin_lock (&net->sctp.addr_wq_lock); +spin_lock_bh (&net->sctp.addr_wq_lock);list_add_tail (&sp->auto_asconf_list, &net->sctp.auto_asconf_splist); -spin_unlock (&net->sctp.addr_wq_lock); +spin_unlock_bh (&net->sctp.addr_wq_lock); sp->do_auto_asconf =1 ; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 261/509 Add MODULE_FIRMWARE() for FIRMWARE_TG357766.
In reply to Greg Kroah-HartmanFrom: Tobias Heider <[email protected]>
[ Upstream commit 046f753da6143ee16452966915087ec8b0de3c70 ]
Fixes a bug where on the M1 mac mini initramfs-tools fails to include the necessary firmware into the initrd.
--- drivers/net/ethernet/broadcom/tg3.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/broadcom/tg3.c +1 -0
@@ -224,6 +224,7 @@ MODULE_AUTHOR("David S. Miller ([email protected]) and Jeff Garzik (jgarzik@poboxMODULE_DESCRIPTION ("Broadcom Tigon3 ethernet driver" );MODULE_LICENSE ("GPL" );MODULE_FIRMWARE (FIRMWARE_TG3 ); +MODULE_FIRMWARE (FIRMWARE_TG357766 );MODULE_FIRMWARE (FIRMWARE_TG3TSO );MODULE_FIRMWARE (FIRMWARE_TG3TSO5 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 262/509 net: dsa: vsc73xx: fix MTU configuration
In reply to Greg Kroah-HartmanFrom: Pawel Dembicki <[email protected]>
[ Upstream commit 3cf62c8177adb0db9e15c8b898c44f997acf3ebf ]
Switch in MAXLEN register stores the maximum size of a data frame. The MTU size is 18 bytes smaller than the frame size.
The current settings are causing problems with packet forwarding. This patch fixes the MTU settings to proper values.
--- drivers/net/dsa/vitesse-vsc73xx-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/dsa/vitesse-vsc73xx-core.c +3 -3
@@ -1025,17 +1025,17 @@ static int vsc73xx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)struct vsc73xx *vsc = ds->priv;return vsc73xx_write (vsc,VSC73XX_BLOCK_MAC , port, -VSC73XX_MAXLEN , new_mtu); +VSC73XX_MAXLEN , new_mtu +ETH_HLEN +ETH_FCS_LEN ); }/* According to application not "VSC7398 Jumbo Frames" setting -* up the MTU to 9.6 KB does not affect the performance on standard +* up the frame size to 9.6 KB does not affect the performance on standard * frames. It is clear from the application note that * "9.6 kilobytes" == 9600 bytes. */ static int vsc73xx_get_max_mtu (struct dsa_switch *ds,int port) { -return 9600 ; +return 9600 -ETH_HLEN -ETH_FCS_LEN ; }static const struct dsa_switch_ops vsc73xx_ds_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 263/509 spi: bcm-qspi: return error if neither hif_mspi nor mspi is available
In reply to Greg Kroah-HartmanFrom: Jonas Gorski <[email protected]>
[ Upstream commit 7c1f23ad34fcdace50275a6aa1e1969b41c6233f ]
If neither a "hif_mspi" nor "mspi" resource is present, the driver will just early exit in probe but still return success. Apart from not doing anything meaningful, this would then also lead to a null pointer access on removal, as platform_get_drvdata() would return NULL, which it would then try to dereference when trying to unregister the spi master.
Fix this by unconditionally calling devm_ioremap_resource(), as it can handle a NULL res and will then return a viable ERR_PTR() if we get one.
The "return 0;" was previously a "goto qspi_resource_err;" where then ret was returned, but since ret was still initialized to 0 at this place this was a valid conversion in 63c5395bb7a9 ("spi: bcm-qspi: Fix use-after-free on unbind"). The issue was not introduced by this commit, only made more obvious.
--- drivers/spi/spi-bcm-qspi.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/spi/spi-bcm-qspi.c +3 -7
@@ -1369,13 +1369,9 @@ int bcm_qspi_probe(struct platform_device *pdev, res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"mspi" ); -if (res) { - qspi->base[MSPI ] =devm_ioremap_resource (dev, res); -if (IS_ERR (qspi->base[MSPI ])) -return PTR_ERR (qspi->base[MSPI ]); - }else { -return 0 ; - } + qspi->base[MSPI ] =devm_ioremap_resource (dev, res); +if (IS_ERR (qspi->base[MSPI ])) +return PTR_ERR (qspi->base[MSPI ]); res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"bspi" );if (res) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 264/509 mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit 1b712f18c461bd75f018033a15cf381e712806b5 ]
Sec proxy/message manager data buffer is 60 bytes with the last of the registers indicating transmission completion. This however poses a bit of a challenge.
The backing memory for sec_proxy / message manager is regular memory, and all sec proxy does is to trigger a burst of all 60 bytes of data over to the target thread backing ring accelerator. It doesn't do a memory scrub when it moves data out in the burst. When we transmit multiple messages, remnants of previous message is also transmitted which results in some random data being set in TISCI fields of messages that have been expanded forward.
The entire concept of backward compatibility hinges on the fact that the unused message fields remain 0x0 allowing for 0x0 value to be specially considered when backward compatibility of message extension is done.
So, instead of just writing the completion register, we continue to fill the message buffer up with 0x0 (note: for partial message involving completion, we already do this).
This allows us to scale and introduce ABI changes back also work with other boot stages that may have left data in the internal memory.
While at this, be consistent and explicit with the data_reg pointer increment.
--- drivers/mailbox/ti-msgmgr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/mailbox/ti-msgmgr.c +9 -3
@@ -385,14 +385,20 @@ static int ti_msgmgr_send_data(struct mbox_chan *chan, void *data)/* Ensure all unused data is 0 */ data_trail &=0xFFFFFFFF >> (8 * (sizeof (u32) - trail_bytes));writel (data_trail, data_reg); - data_reg++; + data_reg +=sizeof (u32); } +/* * 'data_reg' indicates next register to write. If we did not already * write on tx complete reg(last reg), we must do so for transmit +* In addition, we also need to make sure all intermediate data +* registers(if any required), are reset to 0 for TISCI backward +* compatibility to be maintained. */ -if (data_reg <= qinst->queue_buff_end) -writel (0 , qinst->queue_buff_end); +while (data_reg <= qinst->queue_buff_end) { +writel (0 , data_reg); + data_reg +=sizeof (u32); + }return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 265/509 f2fs: fix error path handling in truncate_dnode()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 0135c482fa97e2fd8245cb462784112a00ed1211 ]
If truncate_node() fails in truncate_dnode(), it missed to call f2fs_put_page(), fix it.
--- fs/f2fs/node.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/node.c +3 -1
@@ -884,8 +884,10 @@ static int truncate_dnode(struct dnode_of_data *dn) dn->ofs_in_node =0 ;f2fs_truncate_data_blocks (dn); err =truncate_node (dn); -if (err) +if (err) { +f2fs_put_page (page,1 );return err; + }return 1 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 266/509 octeontx2-af: Fix mapping for NIX block from CGX connection
In reply to Greg Kroah-HartmanFrom: Hariprasad Kelam <[email protected]>
[ Upstream commit 2e7bc57b976bb016c6569a54d95c1b8d88f9450a ]
Firmware configures NIX block mapping for all MAC blocks. The current implementation reads the configuration and creates the mapping between RVU PF and NIX blocks. But this configuration is only valid for silicons that support multiple blocks. For all other silicons, all MAC blocks map to NIX0.
This patch corrects the mapping by adding a check for the same.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 11 +++++++++++ drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +11 -0
@@ -20,6 +20,7 @@#define PCI_DEVID_OCTEONTX2_RVU_AF 0xA065/* Subsystem Device ID */ +#define PCI_SUBSYS_DEVID_98XX 0xB100#define PCI_SUBSYS_DEVID_96XX 0xB200/* PCI BAR nos */
@@ -403,6 +404,16 @@ static inline bool is_rvu_96xx_B0(struct rvu *rvu) (pdev->subsystem_device ==PCI_SUBSYS_DEVID_96XX ); } +static inline bool is_rvu_supports_nix1 (struct rvu *rvu) +{ +struct pci_dev *pdev = rvu->pdev; + +if (pdev->subsystem_device ==PCI_SUBSYS_DEVID_98XX ) +return true; + +return false; +} +/* Function Prototypes * RVU */
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +1 -1
@@ -84,7 +84,7 @@ static void rvu_map_cgx_nix_block(struct rvu *rvu, int pf, p2x =cgx_lmac_get_p2x (cgx_id, lmac_id);/* Firmware sets P2X_SELECT as either NIX0 or NIX1 */ pfvf->nix_blkaddr =BLKADDR_NIX0 ; -if (p2x ==CMR_P2X_SEL_NIX1 ) +if (is_rvu_supports_nix1 (rvu) && p2x ==CMR_P2X_SEL_NIX1 ) pfvf->nix_blkaddr =BLKADDR_NIX1 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 267/509 powerpc: allow PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 39f49684036d24af800ff194c33c7b2653c591d7 ]
In a randconfig with CONFIG_SERIAL_CPM=m and CONFIG_PPC_EARLY_DEBUG_CPM=y, there is a build error:
ERROR: modpost: "udbg_putc" [drivers/tty/serial/cpm_uart/cpm_uart.ko] undefined!
Prevent the build error by allowing PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y.
--- arch/powerpc/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/Kconfig.debug +1 -1
@@ -234,7 +234,7 @@ config PPC_EARLY_DEBUG_40x config PPC_EARLY_DEBUG_CPM bool "Early serial debugging for Freescale CPM-based serial ports" - depends on SERIAL_CPM + depends on SERIAL_CPM=y help Select this to enable early debugging for Freescale chips using a CPM-based serial port. This assumes that the bootwrapper
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 268/509 net: bridge: keep ports without IFF_UNICAST_FLT in BR_PROMISC mode
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 6ca3c005d0604e8d2b439366e3923ea58db99641 ]
According to the synchronization rules for .ndo_get_stats() as seen in Documentation/networking/netdevices.rst, acquiring a plain spin_lock() should not be illegal, but the bridge driver implementation makes it so.
After running these commands, I am being faced with the following lockdep splat:
$ ip link add link swp0 name macsec0 type macsec encrypt on && ip link set swp0 up $ ip link add dev br0 type bridge vlan_filtering 1 && ip link set br0 up $ ip link set macsec0 master br0 && ip link set macsec0 up
========================================================
WARNING: possible irq lock inversion dependency detected 6.4.0-04295-g31b577b4bd4a #603 Not tainted
--------------------------------------------------------
swapper/1/0 just changed the state of lock:
ffff6bd348724cd8 (&br->lock){+.-.}-{3:3}, at: br_forward_delay_timer_expired+0x34/0x198 but this lock took another, SOFTIRQ-unsafe lock in the past:
(&ocelot->stats_lock){+.+.}-{3:3}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Chain exists of:
&br->lock --> &br->hash_lock --> &ocelot->stats_lockPossible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&ocelot->stats_lock);
local_irq_disable();
lock(&br->lock);
lock(&br->hash_lock);
<Interrupt>
lock(&br->lock);*** DEADLOCK ***
(details about the 3 locks skipped)
swp0 is instantiated by drivers/net/dsa/ocelot/felix.c, and this only matters to the extent that its .ndo_get_stats64() method calls spin_lock(&ocelot->stats_lock).
Documentation/locking/lockdep-design.rst says:
| A lock is irq-safe means it was ever used in an irq context, while a lock | is irq-unsafe means it was ever acquired with irq enabled.
(...)
| Furthermore, the following usage based lock dependencies are not allowed | between any two lock-classes:: | | <hardirq-safe> -> <hardirq-unsafe> | <softirq-safe> -> <softirq-unsafe>
Lockdep marks br->hash_lock as softirq-safe, because it is sometimes taken in softirq context (for example br_fdb_update() which runs in NET_RX softirq), and when it's not in softirq context it blocks softirqs by using spin_lock_bh().
Lockdep marks ocelot->stats_lock as softirq-unsafe, because it never blocks softirqs from running, and it is never taken from softirq context. So it can always be interrupted by softirqs.
There is a call path through which a function that holds br->hash_lock:fdb_add_hw_addr() will call a function that acquires ocelot->stats_lock:ocelot_port_get_stats64(). This can be seen below:
ocelot_port_get_stats64+0x3c/0x1e0 felix_get_stats64+0x20/0x38 dsa_slave_get_stats64+0x3c/0x60 dev_get_stats+0x74/0x2c8 rtnl_fill_stats+0x4c/0x150 rtnl_fill_ifinfo+0x5cc/0x7b8 rtmsg_ifinfo_build_skb+0xe4/0x150 rtmsg_ifinfo+0x5c/0xb0 __dev_notify_flags+0x58/0x200 __dev_set_promiscuity+0xa0/0x1f8 dev_set_promiscuity+0x30/0x70 macsec_dev_change_rx_flags+0x68/0x88 __dev_set_promiscuity+0x1a8/0x1f8 __dev_set_rx_mode+0x74/0xa8 dev_uc_add+0x74/0xa0 fdb_add_hw_addr+0x68/0xd8 fdb_add_local+0xc4/0x110 br_fdb_add_local+0x54/0x88 br_add_if+0x338/0x4a0 br_add_slave+0x20/0x38 do_setlink+0x3a4/0xcb8 rtnl_newlink+0x758/0x9d0 rtnetlink_rcv_msg+0x2f0/0x550 netlink_rcv_skb+0x128/0x148 rtnetlink_rcv+0x24/0x38
the plain English explanation for it is:
The macsec0 bridge port is created without p->flags & BR_PROMISC, because it is what br_manage_promisc() decides for a VLAN filtering bridge with a single auto port.
As part of the br_add_if() procedure, br_fdb_add_local() is called for the MAC address of the device, and this results in a call to dev_uc_add() for macsec0 while the softirq-safe br->hash_lock is taken.
Because macsec0 does not have IFF_UNICAST_FLT, dev_uc_add() ends up calling __dev_set_promiscuity() for macsec0, which is propagated by its implementation, macsec_dev_change_rx_flags(), to the lower device: swp0. This triggers the call path:
dev_set_promiscuity(swp0)
-> rtmsg_ifinfo()
-> dev_get_stats()
-> ocelot_port_get_stats64()
with a calling context that lockdep doesn't like (br->hash_lock held).
Normally we don't see this, because even though many drivers that can be bridge ports don't support IFF_UNICAST_FLT, we need a driver that
(a) doesn't support IFF_UNICAST_FLT, *and*
(b) it forwards the IFF_PROMISC flag to another driver, and
(c) *that* driver implements ndo_get_stats64() using a softirq-unsafe spinlock.
Condition (b) is necessary because the first __dev_set_rx_mode() calls __dev_set_promiscuity() with "bool notify=false", and thus, the rtmsg_ifinfo() code path won't be entered.
The same criteria also hold true for DSA switches which don't report IFF_UNICAST_FLT. When the DSA master uses a spin_lock() in its ndo_get_stats64() method, the same lockdep splat can be seen.
I think the deadlock possibility is real, even though I didn't reproduce it, and I'm thinking of the following situation to support that claim:
fdb_add_hw_addr() runs on a CPU A, in a context with softirqs locally disabled and br->hash_lock held, and may end up attempting to acquire ocelot->stats_lock.
In parallel, ocelot->stats_lock is currently held by a thread B (say, ocelot_check_stats_work()), which is interrupted while holding it by a softirq which attempts to lock br->hash_lock.
Thread B cannot make progress because br->hash_lock is held by A. Whereas thread A cannot make progress because ocelot->stats_lock is held by B.
When taking the issue at face value, the bridge can avoid that problem by simply making the ports promiscuous from a code path with a saner calling context (br->hash_lock not held). A bridge port without IFF_UNICAST_FLT is going to become promiscuous as soon as we call dev_uc_add() on it (which we do unconditionally), so why not be preemptive and make it promiscuous right from the beginning, so as to not be taken by surprise.
With this, we've broken the links between code that holds br->hash_lock or br->lock and code that calls into the ndo_change_rx_flags() or ndo_get_stats64() ops of the bridge port.
--- net/bridge/br_if.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/bridge/br_if.c +3 -2
@@ -157,8 +157,9 @@ void br_manage_promisc(struct net_bridge *br)* This lets us disable promiscuous mode and write * this config to hw. */ -if (br->auto_cnt ==0 || - (br->auto_cnt ==1 &&br_auto_port (p))) +if ((p->dev->priv_flags &IFF_UNICAST_FLT ) && + (br->auto_cnt ==0 || + (br->auto_cnt ==1 &&br_auto_port (p))))br_port_clear_promisc (p);else br_port_set_promisc (p);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 269/509 tcp: annotate data races in __tcp_oow_rate_limited()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 998127cdb4699b9d470a9348ffe9f1154346be5f ]
request sockets are lockless, __tcp_oow_rate_limited() could be called on the same object from different cpus. This is harmless.
Add READ_ONCE()/WRITE_ONCE() annotations to avoid a KCSAN report.
--- net/ipv4/tcp_input.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/ipv4/tcp_input.c +9 -3
@@ -3560,8 +3560,11 @@ static int tcp_ack_update_window(struct sock *sk, const struct sk_buff *skb, u32static bool __tcp_oow_rate_limited (struct net *net,int mib_idx,u32 *last_oow_ack_time) { -if (*last_oow_ack_time) { -s32 elapsed = (s32)(tcp_jiffies32 - *last_oow_ack_time); +/* Paired with the WRITE_ONCE() in this function. */ +u32 val =READ_ONCE (*last_oow_ack_time); + +if (val) { +s32 elapsed = (s32)(tcp_jiffies32 - val);if (0 <= elapsed && elapsed <READ_ONCE (net->ipv4.sysctl_tcp_invalid_ratelimit)) {
@@ -3570,7 +3573,10 @@ static bool __tcp_oow_rate_limited(struct net *net, int mib_idx, } } - *last_oow_ack_time = tcp_jiffies32; +/* Paired with the prior READ_ONCE() and with itself, +* as we might be lockless. +*/ +WRITE_ONCE (*last_oow_ack_time, tcp_jiffies32);return false;/* not rate-limited: go ahead, send dupack now! */ }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 270/509 xsk: Honor SO_BINDTODEVICE on bind
In reply to Greg Kroah-HartmanFrom: Ilya Maximets <[email protected]>
[ Upstream commit f7306acec9aae9893d15e745c8791124d42ab10a ]
Initial creation of an AF_XDP socket requires CAP_NET_RAW capability. A privileged process might create the socket and pass it to a non-privileged process for later use. However, that process will be able to bind the socket to any network interface. Even though it will not be able to receive any traffic without modification of the BPF map, the situation is not ideal.
Sockets already have a mechanism that can be used to restrict what interface they can be attached to. That is SO_BINDTODEVICE.
To change the SO_BINDTODEVICE binding the process will need CAP_NET_RAW.
Make xsk_bind() honor the SO_BINDTODEVICE in order to allow safer workflow when non-privileged process is using AF_XDP.
The intended workflow is following:
1. First process creates a bare socket with socket(AF_XDP, ...).
2. First process loads the XSK program to the interface.
3. First process adds the socket fd to a BPF map.
4. First process ties socket fd to a particular interface using SO_BINDTODEVICE.
5. First process sends socket fd to a second process.
6. Second process allocates UMEM.
7. Second process binds socket to the interface with bind(...).
8. Second process sends/receives the traffic.
All the steps above are possible today if the first process is privileged and the second one has sufficient RLIMIT_MEMLOCK and no capabilities. However, the second process will be able to bind the socket to any interface it wants on step 7 and send traffic from it. With the proposed change, the second process will be able to bind the socket only to a specific interface chosen by the first process at step 4.
--- Documentation/networking/af_xdp.rst | 9 +++++++++ net/xdp/xsk.c | 5 +++++ 2 files changed, 14 insertions(+)
Documentation/networking/af_xdp.rst +9 -0
@@ -433,6 +433,15 @@ start N bytes into the buffer leaving the first N bytes for the application to use. The final option is the flags field, but it will be dealt with in separate sections for each UMEM flag. +SO_BINDTODEVICE setsockopt +-------------------------- + +This is a generic SOL_SOCKET option that can be used to tie AF_XDP +socket to a particular network interface. It is useful when a socket +is created by a privileged process and passed to a non-privileged one. +Once the option is set, kernel will refuse attempts to bind that socket +to a different interface. Updating the value requires CAP_NET_RAW. + XDP_STATISTICS getsockopt -------------------------
net/xdp/xsk.c +5 -0
@@ -667,6 +667,7 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len)struct sock *sk = sock->sk;struct xdp_sock *xs =xdp_sk (sk);struct net_device *dev; +int bound_dev_if;u32 flags, qid;int err =0 ;
@@ -680,6 +681,10 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len) XDP_USE_NEED_WAKEUP))return -EINVAL ; + bound_dev_if =READ_ONCE (sk->sk_bound_dev_if); +if (bound_dev_if && bound_dev_if != sxdp->sxdp_ifindex) +return -EINVAL ; +rtnl_lock ();mutex_lock (&xs->mutex);if (xs->state !=XSK_READY ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 271/509 net/sched: act_pedit: Add size check for TCA_PEDIT_PARMS_EX
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
[ Upstream commit 30c45b5361d39b4b793780ffac5538090b9e2eb1 ]
The attribute TCA_PEDIT_PARMS_EX is not be included in pedit_policy and one malicious user could fake a TCA_PEDIT_PARMS_EX whose length is smaller than the intended sizeof(struct tc_pedit). Hence, the dereference in tcf_pedit_init() could access dirty heap data.
static int tcf_pedit_init(...)
{
// ...
pattr = tb[TCA_PEDIT_PARMS]; // TCA_PEDIT_PARMS is included if (!pattr)
pattr = tb[TCA_PEDIT_PARMS_EX]; // but this is not
// ... parm = nla_data(pattr);
index = parm->index; // parm is able to be smaller than 4 bytes
// and this dereference gets dirty skb_buff
// data created in netlink_sendmsg
}This commit adds TCA_PEDIT_PARMS_EX length in pedit_policy which avoid the above case, just like the TCA_PEDIT_PARMS.
--- net/sched/act_pedit.c | 1 + 1 file changed, 1 insertion(+)
net/sched/act_pedit.c +1 -0
@@ -26,6 +26,7 @@ static struct tc_action_ops act_pedit_ops;static const struct nla_policy pedit_policy[TCA_PEDIT_MAX +1 ] = { [TCA_PEDIT_PARMS ] = { .len =sizeof (struct tc_pedit ) }, + [TCA_PEDIT_PARMS_EX ] = { .len =sizeof (struct tc_pedit ) }, [TCA_PEDIT_KEYS_EX ] = { .type =NLA_NESTED }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 272/509 pptp: Fix fib lookup calls.
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 84bef5b6037c15180ef88ac4216dc621d16df1a6 ]
PPTP uses pppox sockets (struct pppox_sock). These sockets don't embed an inet_sock structure, so it's invalid to call inet_sk() on them.
Therefore, the ip_route_output_ports() call in pptp_connect() has two problems:
* The tos variable is set with RT_CONN_FLAGS(sk), which calls inet_sk() on the pppox socket.
* ip_route_output_ports() tries to retrieve routing flags using inet_sk_flowi_flags(), which is also going to call inet_sk() on the pppox socket.
While PPTP doesn't use inet sockets, it's actually really layered on top of IP and therefore needs a proper way to do fib lookups. So let's define pptp_route_output() to get a struct rtable from a pptp socket. Let's also replace the ip_route_output_ports() call of pptp_xmit() for consistency.
In practice, this means that:
* pptp_connect() sets ->flowi4_tos and ->flowi4_flags to zero instead of using bits of unrelated struct pppox_sock fields.
* pptp_xmit() now respects ->sk_mark and ->sk_uid.
* pptp_xmit() now calls the security_sk_classify_flow() security
hook, thus allowing to set ->flowic_secid.
* pptp_xmit() now passes the pppox socket to xfrm_lookup_route().
Found by code inspection.
--- drivers/net/ppp/pptp.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/net/ppp/pptp.c +20 -11
@@ -24,6 +24,7 @@#include <linux/in.h> #include <linux/ip.h> #include <linux/rcupdate.h> +#include <linux/security.h> #include <linux/spinlock.h> #include <net/sock.h>
@@ -128,6 +129,23 @@ static void del_chan(struct pppox_sock *sock)spin_unlock (&chan_lock); } +static struct rtable *pptp_route_output (struct pppox_sock *po, +struct flowi4 *fl4) +{ +struct sock *sk = &po->sk; +struct net *net; + + net =sock_net (sk); +flowi4_init_output (fl4, sk->sk_bound_dev_if, sk->sk_mark,0 , +RT_SCOPE_UNIVERSE ,IPPROTO_GRE ,0 , + po->proto.pptp.dst_addr.sin_addr.s_addr, + po->proto.pptp.src_addr.sin_addr.s_addr, +0 ,0 ,sock_net_uid (net, sk)); +security_sk_classify_flow (sk,flowi4_to_flowi_common (fl4)); + +return ip_route_output_flow (net, fl4, sk); +} +static int pptp_xmit (struct ppp_channel *chan,struct sk_buff *skb) {struct sock *sk = (struct sock *) chan->private;
@@ -151,11 +169,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)if (sk_pppox (po)->sk_state &PPPOX_DEAD ) goto tx_error; - rt =ip_route_output_ports (net, &fl4,NULL , - opt->dst_addr.sin_addr.s_addr, - opt->src_addr.sin_addr.s_addr, -0 ,0 ,IPPROTO_GRE , -RT_TOS (0 ), sk->sk_bound_dev_if); + rt =pptp_route_output (po, &fl4);if (IS_ERR (rt)) goto tx_error;
@@ -440,12 +454,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, po->chan.private = sk; po->chan.ops = &pptp_chan_ops; - rt =ip_route_output_ports (sock_net (sk), &fl4, sk, - opt->dst_addr.sin_addr.s_addr, - opt->src_addr.sin_addr.s_addr, -0 ,0 , -IPPROTO_GRE ,RT_CONN_FLAGS (sk), - sk->sk_bound_dev_if); + rt =pptp_route_output (po, &fl4);if (IS_ERR (rt)) { error = -EHOSTUNREACH ; goto end;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 273/509 net: dsa: tag_sja1105: fix MAC DA patching from meta frames
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 1dcf6efd5f0c1f4496b3ef7ec5a7db104a53b38c ]
The SJA1105 manual says that at offset 4 into the meta frame payload we have "MAC destination byte 2" and at offset 5 we have "MAC destination byte 1". These are counted from the LSB, so byte 1 is h_dest[ETH_HLEN-2] aka h_dest[4] and byte 2 is h_dest[ETH_HLEN-3] aka h_dest[3].
The sja1105_meta_unpack() function decodes these the other way around, so a frame with MAC DA 01:80:c2:11:22:33 is received by the network stack as having 01:80:c2:22:11:33.
--- net/dsa/tag_sja1105.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/dsa/tag_sja1105.c +2 -2
@@ -48,8 +48,8 @@ static void sja1105_meta_unpack(const struct sk_buff *skb,* a unified unpacking command for both device series. */ packing (buf, &meta->tstamp,31 ,0 ,4 ,UNPACK ,0 ); -packing (buf +4 , &meta->dmac_byte_4,7 ,0 ,1 ,UNPACK ,0 ); -packing (buf +5 , &meta->dmac_byte_3,7 ,0 ,1 ,UNPACK ,0 ); +packing (buf +4 , &meta->dmac_byte_3,7 ,0 ,1 ,UNPACK ,0 ); +packing (buf +5 , &meta->dmac_byte_4,7 ,0 ,1 ,UNPACK ,0 );packing (buf +6 , &meta->source_port,7 ,0 ,1 ,UNPACK ,0 );packing (buf +7 , &meta->switch_id,7 ,0 ,1 ,UNPACK ,0 ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 274/509 s390/qeth: Fix vipa deletion
In reply to Greg Kroah-HartmanFrom: Thorsten Winkler <[email protected]>
[ Upstream commit 80de809bd35e2a8999edf9f5aaa2d8de18921f11 ]
Change boolean parameter of function "qeth_l3_vipa_store" inside the "qeth_l3_dev_vipa_del4_store" function from "true" to "false" because "true" is used for adding a virtual ip address and "false" for deleting.
--- drivers/s390/net/qeth_l3_sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/net/qeth_l3_sys.c +1 -1
@@ -652,7 +652,7 @@ static QETH_DEVICE_ATTR(vipa_add4, add4, 0644,static ssize_t qeth_l3_dev_vipa_del4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { -return qeth_l3_vipa_store (dev, buf, true, count,QETH_PROT_IPV4 ); +return qeth_l3_vipa_store (dev, buf, false, count,QETH_PROT_IPV4 ); } static QETH_DEVICE_ATTR(vipa_del4, del4, 0200, NULL,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 275/509 sh: dma: Fix DMA channel offset calculation
In reply to Greg Kroah-HartmanFrom: Artur Rojek <[email protected]>
[ Upstream commit e82e47584847129a20b8c9f4a1dcde09374fb0e0 ]
Various SoCs of the SH3, SH4 and SH4A family, which use this driver, feature a differing number of DMA channels, which can be distributed between up to two DMAC modules. The existing implementation fails to correctly accommodate for all those variations, resulting in wrong channel offset calculations and leading to kernel panics.
Rewrite dma_base_addr() in order to properly calculate channel offsets in a DMAC module. Fix dmaor_read_reg() and dmaor_write_reg(), so that the correct DMAC module base is selected for the DMAOR register.
--- arch/sh/drivers/dma/dma-sh.c | 37 +++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-)
arch/sh/drivers/dma/dma-sh.c +24 -13
@@ -18,6 +18,18 @@#include <cpu/dma-register.h> #include <cpu/dma.h> +/* +* Some of the SoCs feature two DMAC modules. In such a case, the channels are +* distributed equally among them. +*/ +#ifdef SH_DMAC_BASE1 +#define SH_DMAC_NR_MD_CH (CONFIG_NR_ONCHIP_DMA_CHANNELS / 2) +#else +#define SH_DMAC_NR_MD_CH CONFIG_NR_ONCHIP_DMA_CHANNELS +#endif + +#define SH_DMAC_CH_SZ 0x10 +/* * Define the default configuration for dual address memory-memory transfer. * The 0x400 value represents auto-request, external->external.
@@ -29,7 +41,7 @@ static unsigned long dma_find_base(unsigned int chan)unsigned long base =SH_DMAC_BASE0 ;#ifdef SH_DMAC_BASE1 -if (chan >=6 ) +if (chan >=SH_DMAC_NR_MD_CH ) base =SH_DMAC_BASE1 ;#endif
@@ -40,13 +52,13 @@ static unsigned long dma_base_addr(unsigned int chan) {unsigned long base =dma_find_base (chan); -/* Normalize offset calculation */ -if (chan >=9 ) - chan -=6 ; -if (chan >=4 ) - base +=0x10 ; + chan = (chan %SH_DMAC_NR_MD_CH ) *SH_DMAC_CH_SZ ; + +/* DMAOR is placed inside the channel register space. Step over it. */ +if (chan >=DMAOR ) + base +=SH_DMAC_CH_SZ ; -return base + (chan *0x10 ); +return base + chan; }#ifdef CONFIG_SH_DMA_IRQ_MULTI
@@ -250,12 +262,11 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan)#define NR_DMAOR 1#endif -/* -* DMAOR bases are broken out amongst channel groups. DMAOR0 manages -* channels 0 - 5, DMAOR1 6 - 11 (optional). -*/ -#define dmaor_read_reg (n) __raw_readw(dma_find_base((n)*6)) -#define dmaor_write_reg (n, data) __raw_writew(data, dma_find_base(n)*6) +#define dmaor_read_reg (n) __raw_readw(dma_find_base((n) * \ + SH_DMAC_NR_MD_CH) + DMAOR) +#define dmaor_write_reg (n, data) __raw_writew(data, \ + dma_find_base((n) * \ + SH_DMAC_NR_MD_CH) + DMAOR)static inline int dmaor_reset (int no) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 276/509 apparmor: fix missing error check for rhashtable_insert_fast
In reply to Greg Kroah-HartmanFrom: Danila Chernetsov <[email protected]>
[ Upstream commit 000518bc5aef25d3f703592a0296d578c98b1517 ]
rhashtable_insert_fast() could return err value when memory allocation is failed. but unpack_profile() do not check values and this always returns success value. This patch just adds error check code.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- security/apparmor/policy_unpack.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
security/apparmor/policy_unpack.c +7 -2
@@ -909,8 +909,13 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) goto fail; } -rhashtable_insert_fast (profile->data, &data->head, - profile->data->p); +if (rhashtable_insert_fast (profile->data, &data->head, + profile->data->p)) { +kfree_sensitive (data->key); +kfree_sensitive (data); + info ="failed to insert data to table" ; + goto fail; + } }if (!unpack_nameX (e,AA_STRUCTEND ,NULL )) {
Signature · 1 line
2.39.2