5.19.2-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 877/1157 null_blk: fix ida error handling in null_add_dev()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit ee452a8d984f94fa8e894f003a52e776e4572881 ]
There needs to be some error checking if ida_simple_get() fails. Also call ida_free() if there are errors later.
--- drivers/block/null_blk/main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/block/null_blk/main.c +11 -3
@@ -2043,8 +2043,13 @@ static int null_add_dev(struct nullb_device *dev)blk_queue_flag_clear (QUEUE_FLAG_ADD_RANDOM , nullb->q);mutex_lock (&lock); - nullb->index =ida_simple_get (&nullb_indexes,0 ,0 ,GFP_KERNEL ); - dev->index = nullb->index; + rv =ida_simple_get (&nullb_indexes,0 ,0 ,GFP_KERNEL ); +if (rv <0 ) { +mutex_unlock (&lock); + goto out_cleanup_zone; + } + nullb->index = rv; + dev->index = rv;mutex_unlock (&lock);blk_queue_logical_block_size (nullb->q, dev->blocksize);
@@ -2070,7 +2075,7 @@ static int null_add_dev(struct nullb_device *dev) rv =null_gendisk_register (nullb);if (rv) - goto out_cleanup_zone; + goto out_ida_free;mutex_lock (&lock);list_add_tail (&nullb->list, &nullb_list);
@@ -2079,6 +2084,9 @@ static int null_add_dev(struct nullb_device *dev)pr_info ("disk %s created\n" , nullb->disk_name);return 0 ; + +out_ida_free: +ida_free (&nullb_indexes, nullb->index); out_cleanup_zone:null_free_zoned_dev (dev); out_cleanup_disk:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 878/1157 nbd: add missing definition of pr_fmt
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit bc9da6dd0630efd81b5c72ff6fa0169aa029a73f ]
commit 1243172d5894 ("nbd: use pr_err to output error message") tries to define pr_fmt and use short pr_err() to output error message, however, the definition is missed.
This patch also remove existing "nbd:" inside pr_err().
--- drivers/block/nbd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/block/nbd.c +4 -2
@@ -11,6 +11,8 @@* (part of code stolen from loop.c) */ +#define pr_fmt (fmt) "nbd: " fmt +#include <linux/major.h> #include <linux/blkdev.h>
@@ -1951,7 +1953,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) test_bit(NBD_DISCONNECT_REQUESTED, &nbd->flags)) || !refcount_inc_not_zero(&nbd->refs)) {mutex_unlock (&nbd_index_mutex); -pr_err ("nbd: device at index %d is going down\n" , +pr_err ("device at index %d is going down\n" , index);return -EINVAL ; }
@@ -1962,7 +1964,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)if (!nbd) { nbd =nbd_dev_add (index,2 );if (IS_ERR (nbd)) { -pr_err ("nbd: failed to add new device\n" ); +pr_err ("failed to add new device\n" );return PTR_ERR (nbd); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 879/1157 mtip32xx: fix device removal
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit e8b58ef09e84c15cf782b01cfc73cc5b1180d519 ]
Use the proper helper to mark a surpise removal, remove the gendisk as soon as possible when removing the device and implement the ->free_disk callback to ensure the private data is alive as long as the gendisk has references.
--- drivers/block/mtip32xx/mtip32xx.c | 157 +++++++++--------------------- drivers/block/mtip32xx/mtip32xx.h | 1 - 2 files changed, 44 insertions(+), 114 deletions(-)
drivers/block/mtip32xx/mtip32xx.c +44 -113
@@ -146,11 +146,8 @@ static bool mtip_check_surprise_removal(struct driver_data *dd)pci_read_config_word (dd->pdev,0x00 , &vendor_id);if (vendor_id ==0xFFFF ) { dd->sr = true; -if (dd->queue) -blk_queue_flag_set (QUEUE_FLAG_DEAD , dd->queue); -else -dev_warn (&dd->pdev->dev, -"%s: dd->queue is NULL\n" , __func__); +if (dd->disk) +blk_mark_disk_dead (dd->disk);return true;/* device removed */ }
@@ -3297,26 +3294,12 @@ static int mtip_block_getgeo(struct block_device *dev,return 0 ; } -static int mtip_block_open (struct block_device *dev,fmode_t mode) +static void mtip_block_free_disk (struct gendisk *disk) { -struct driver_data *dd; - -if (dev && dev->bd_disk) { - dd = (struct driver_data *) dev->bd_disk->private_data; - -if (dd) { -if (test_bit (MTIP_DDF_REMOVAL_BIT , - &dd->dd_flag)) { -return -ENODEV ; - } -return 0 ; - } - } -return -ENODEV ; -} +struct driver_data *dd = disk->private_data; -static void mtip_block_release (struct gendisk *disk,fmode_t mode) -{ +ida_free (&rssd_index_ida, dd->index); +kfree (dd); }/*
@@ -3326,13 +3309,12 @@ static void mtip_block_release(struct gendisk *disk, fmode_t mode)* layer. */ static const struct block_device_operations mtip_block_ops = { - .open = mtip_block_open, - .release = mtip_block_release, .ioctl = mtip_block_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = mtip_block_compat_ioctl, #endif .getgeo = mtip_block_getgeo, + .free_disk = mtip_block_free_disk, .owner =THIS_MODULE };
@@ -3673,72 +3655,6 @@ static int mtip_block_initialize(struct driver_data *dd)return rv; } -static bool mtip_no_dev_cleanup (struct request *rq,void *data,bool reserv) -{ -struct mtip_cmd *cmd =blk_mq_rq_to_pdu (rq); - - cmd->status =BLK_STS_IOERR ; -blk_mq_complete_request (rq); -return true; -} - -/* -* Block layer deinitialization function. -* -* Called by the PCI layer as each P320 device is removed. -* -* @dd Pointer to the driver data structure. -* -* return value -* 0 -*/ -static int mtip_block_remove (struct driver_data *dd) -{ -mtip_hw_debugfs_exit (dd); - -if (dd->mtip_svc_handler) { -set_bit (MTIP_PF_SVC_THD_STOP_BIT , &dd->port->flags); -wake_up_interruptible (&dd->port->svc_wait); -kthread_stop (dd->mtip_svc_handler); - } - -if (!dd->sr) { -/* -* Explicitly wait here for IOs to quiesce, -* as mtip_standby_drive usually won't wait for IOs. -*/ -if (!mtip_quiesce_io (dd->port,MTIP_QUIESCE_IO_TIMEOUT_MS )) -mtip_standby_drive (dd); - } -else -dev_info (&dd->pdev->dev,"device %s surprise removal\n" , - dd->disk->disk_name); - -blk_freeze_queue_start (dd->queue); -blk_mq_quiesce_queue (dd->queue); -blk_mq_tagset_busy_iter (&dd->tags, mtip_no_dev_cleanup, dd); -blk_mq_unquiesce_queue (dd->queue); - -if (dd->disk) { -if (test_bit (MTIP_DDF_INIT_DONE_BIT , &dd->dd_flag)) -del_gendisk (dd->disk); -if (dd->disk->queue) { -blk_cleanup_queue (dd->queue); -blk_mq_free_tag_set (&dd->tags); - dd->queue =NULL ; - } -put_disk (dd->disk); - } - dd->disk =NULL ; - -ida_free (&rssd_index_ida, dd->index); - -/* De-initialize the protocol layer. */ -mtip_hw_exit (dd); - -return 0 ; -} -/* * Function called by the PCI layer when just before the * machine shuts down.
@@ -3755,23 +3671,15 @@ static int mtip_block_shutdown(struct driver_data *dd) {mtip_hw_shutdown (dd); -/* Delete our gendisk structure, and cleanup the blk queue. */ -if (dd->disk) { -dev_info (&dd->pdev->dev, -"Shutting down %s ...\n" , dd->disk->disk_name); +dev_info (&dd->pdev->dev, +"Shutting down %s ...\n" , dd->disk->disk_name); -if (test_bit (MTIP_DDF_INIT_DONE_BIT , &dd->dd_flag)) -del_gendisk (dd->disk); -if (dd->disk->queue) { -blk_cleanup_queue (dd->queue); -blk_mq_free_tag_set (&dd->tags); - } -put_disk (dd->disk); - dd->disk =NULL ; - dd->queue =NULL ; - } +if (test_bit (MTIP_DDF_INIT_DONE_BIT , &dd->dd_flag)) +del_gendisk (dd->disk); -ida_free (&rssd_index_ida, dd->index); +blk_cleanup_queue (dd->queue); +blk_mq_free_tag_set (&dd->tags); +put_disk (dd->disk);return 0 ; }
@@ -4087,8 +3995,6 @@ static void mtip_pci_remove(struct pci_dev *pdev)struct driver_data *dd =pci_get_drvdata (pdev);unsigned long flags, to; -set_bit (MTIP_DDF_REMOVAL_BIT , &dd->dd_flag); -spin_lock_irqsave (&dev_lock, flags);list_del_init (&dd->online_list);list_add (&dd->remove_list, &removing_list);
@@ -4109,11 +4015,36 @@ static void mtip_pci_remove(struct pci_dev *pdev) "Completion workers still active!\n"); } -blk_mark_disk_dead (dd->disk);set_bit (MTIP_DDF_REMOVE_PENDING_BIT , &dd->dd_flag); -/* Clean up the block layer. */ -mtip_block_remove (dd); +if (test_bit (MTIP_DDF_INIT_DONE_BIT , &dd->dd_flag)) +del_gendisk (dd->disk); + +mtip_hw_debugfs_exit (dd); + +if (dd->mtip_svc_handler) { +set_bit (MTIP_PF_SVC_THD_STOP_BIT , &dd->port->flags); +wake_up_interruptible (&dd->port->svc_wait); +kthread_stop (dd->mtip_svc_handler); + } + +if (!dd->sr) { +/* +* Explicitly wait here for IOs to quiesce, +* as mtip_standby_drive usually won't wait for IOs. +*/ +if (!mtip_quiesce_io (dd->port,MTIP_QUIESCE_IO_TIMEOUT_MS )) +mtip_standby_drive (dd); + } +else +dev_info (&dd->pdev->dev,"device %s surprise removal\n" , + dd->disk->disk_name); + +blk_cleanup_queue (dd->queue); +blk_mq_free_tag_set (&dd->tags); + +/* De-initialize the protocol layer. */ +mtip_hw_exit (dd);if (dd->isr_workq) {destroy_workqueue (dd->isr_workq);
@@ -4128,10 +4059,10 @@ static void mtip_pci_remove(struct pci_dev *pdev)list_del_init (&dd->remove_list);spin_unlock_irqrestore (&dev_lock, flags); -kfree (dd); -pcim_iounmap_regions (pdev,1 <<MTIP_ABAR );pci_set_drvdata (pdev,NULL ); + +put_disk (dd->disk); }/*
drivers/block/mtip32xx/mtip32xx.h +0 -1
@@ -149,7 +149,6 @@ enum {MTIP_DDF_RESUME_BIT =6 ,MTIP_DDF_INIT_DONE_BIT =7 ,MTIP_DDF_REBUILD_FAILED_BIT =8 , -MTIP_DDF_REMOVAL_BIT =9 , MTIP_DDF_STOP_IO = ((1 << MTIP_DDF_REMOVE_PENDING_BIT) | (1 << MTIP_DDF_SEC_LOCK_BIT) |
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 880/1157 nvme: use command_id instead of req->tag in trace_nvme_complete_rq()
In reply to Greg Kroah-HartmanFrom: Bean Huo <[email protected]>
[ Upstream commit 679c54f2de672b7d79d02f8c4ad483ff6dd8ce2e ]
Use command_id instead of req->tag in trace_nvme_complete_rq(), because of commit e7006de6c238 ("nvme: code command_id with a genctr for use authentication after release"), cmd->common.command_id is set to ((genctl & 0xf)< 12 | req->tag), no longer req->tag, which makes cid in trace_nvme_complete_rq and trace_nvme_setup_cmd are not the same.
--- drivers/nvme/host/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/trace.h +1 -1
@@ -98,7 +98,7 @@ TRACE_EVENT(nvme_complete_rq,TP_fast_assign ( __entry->ctrl_id = nvme_req(req)->ctrl->instance; __entry->qid =nvme_req_qid (req); - __entry->cid = req->tag; + __entry->cid =nvme_req (req)->cmd->common.command_id; __entry->result =le64_to_cpu (nvme_req (req)->result.u64); __entry->retries =nvme_req (req)->retries; __entry->flags =nvme_req (req)->flags;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 881/1157 nvme: define compat_ioctl again to unbreak 32-bit userspace.
In reply to Greg Kroah-HartmanFrom: Nick Bowler <[email protected]>
[ Upstream commit a25d4261582cf00dad884c194d21084836663d3d ]
Commit 89b3d6e60550 ("nvme: simplify the compat ioctl handling") removed the initialization of compat_ioctl from the nvme block_device_operations structures.
Presumably the expectation was that 32-bit ioctls would be directed through the regular handler but this is not the case: failing to assign .compat_ioctl actually means that the compat case is disabled entirely, and any attempt to submit nvme ioctls from 32-bit userspace fails outright with -ENOTTY.
For example:
% smartctl -x /dev/nvme0n1
[...]
Read NVMe Identify Controller failed: NVME_IOCTL_ADMIN_CMD: Inappropriate ioctl for device
The blkdev_compat_ptr_ioctl helper can be used to direct compat calls through the main ioctl handler and makes things work again.
--- drivers/nvme/host/core.c | 1 + drivers/nvme/host/multipath.c | 1 + 2 files changed, 2 insertions(+)
drivers/nvme/host/core.c +1 -0
@@ -2123,6 +2123,7 @@ static int nvme_report_zones(struct gendisk *disk, sector_t sector,static const struct block_device_operations nvme_bdev_ops = { .owner =THIS_MODULE , .ioctl = nvme_ioctl, + .compat_ioctl = blkdev_compat_ptr_ioctl, .open = nvme_open, .release = nvme_release, .getgeo = nvme_getgeo,
drivers/nvme/host/multipath.c +1 -0
@@ -408,6 +408,7 @@ const struct block_device_operations nvme_ns_head_ops = { .open = nvme_ns_head_open, .release = nvme_ns_head_release, .ioctl = nvme_ns_head_ioctl, + .compat_ioctl = blkdev_compat_ptr_ioctl, .getgeo = nvme_getgeo, .report_zones = nvme_ns_head_report_zones, .pr_ops = &nvme_pr_ops,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 882/1157 nvme: catch -ENODEV from nvme_revalidate_zones again
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit e06b425bc835ead08b9fd935bf5e47eef473e7a0 ]
nvme_revalidate_zones can also return -ENODEV if e.g. zone sizes aren't constant or not a power of two. In that case we should jump to marking the gendisk hidden and only support pass through.
--- drivers/nvme/host/core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/nvme/host/core.c +7 -6
@@ -1927,8 +1927,10 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)if (ns->head->ids.csi ==NVME_CSI_ZNS ) { ret =nvme_update_zone_info (ns, lbaf); -if (ret) - goto out_unfreeze; +if (ret) { +blk_mq_unfreeze_queue (ns->disk->queue); + goto out; + } } set_disk_ro(ns->disk, (id->nsattr & NVME_NS_ATTR_RO) ||
@@ -1939,7 +1941,7 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)if (blk_queue_is_zoned (ns->queue)) { ret =nvme_revalidate_zones (ns);if (ret && !nvme_first_scan (ns->disk)) -return ret; + goto out; }if (nvme_ns_head_multipath (ns->head)) {
@@ -1954,9 +1956,9 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)disk_update_readahead (ns->head->disk);blk_mq_unfreeze_queue (ns->head->disk->queue); } -return 0 ; -out_unfreeze: + ret =0 ; +out:/* * If probing fails due an unsupported feature, hide the block device, * but still allow other access.
@@ -1966,7 +1968,6 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id)set_bit (NVME_NS_READY , &ns->flags); ret =0 ; } -blk_mq_unfreeze_queue (ns->disk->queue);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 883/1157 block/bio: remove duplicate append pages code
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
[ Upstream commit c58c0074c54c2e2bb3bb0d5a4d8896bb660cc8bc ]
The getting pages setup for zone append and normal IO are identical. Use common code for each.
--- block/bio.c | 102 ++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 60 deletions(-)
block/bio.c +42 -60
@@ -1159,6 +1159,37 @@ static void bio_put_pages(struct page **pages, size_t size, size_t off)put_page (pages[i]); } +static int bio_iov_add_page (struct bio *bio,struct page *page, +unsigned int len,unsigned int offset) +{ +bool same_page = false; + +if (!__bio_try_merge_page (bio, page, len, offset, &same_page)) { +if (WARN_ON_ONCE (bio_full (bio, len))) +return -EINVAL ; +__bio_add_page (bio, page, len, offset); +return 0 ; + } + +if (same_page) +put_page (page); +return 0 ; +} + +static int bio_iov_add_zone_append_page (struct bio *bio,struct page *page, +unsigned int len,unsigned int offset) +{ +struct request_queue *q =bdev_get_queue (bio->bi_bdev); +bool same_page = false; + +if (bio_add_hw_page (q, bio, page, len, offset, +queue_max_zone_append_sectors (q), &same_page) != len) +return -EINVAL ; +if (same_page) +put_page (page); +return 0 ; +} +#define PAGE_PTRS_PER_BVEC (sizeof(struct bio_vec) / sizeof(struct page *))/**
@@ -1177,7 +1208,6 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt;struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;struct page **pages = (struct page **)bv; -bool same_page = false;ssize_t size, left;unsigned len, i;size_t offset;
@@ -1186,7 +1216,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)* Move page array up in the allocated memory for the bio vecs as far as * possible so that we can start filling biovecs from the beginning * without overwriting the temporary page array. -*/ +*/ BUILD_BUG_ON (PAGE_PTRS_PER_BVEC <2 ); pages += entries_left * (PAGE_PTRS_PER_BVEC -1 );
@@ -1196,18 +1226,18 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)for (left = size, i =0 ; left >0 ; left -= len, i++) {struct page *page = pages[i]; +int ret; len =min_t (size_t,PAGE_SIZE - offset, left); +if (bio_op (bio) ==REQ_OP_ZONE_APPEND ) + ret =bio_iov_add_zone_append_page (bio, page, len, + offset); +else + ret =bio_iov_add_page (bio, page, len, offset); -if (__bio_try_merge_page (bio, page, len, offset, &same_page)) { -if (same_page) -put_page (page); - }else { -if (WARN_ON_ONCE (bio_full (bio, len))) { -bio_put_pages (pages + i, left, offset); -return -EINVAL ; - } -__bio_add_page (bio, page, len, offset); +if (ret) { +bio_put_pages (pages + i, left, offset); +return ret; } offset =0 ; }
@@ -1216,51 +1246,6 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)return 0 ; } -static int __bio_iov_append_get_pages (struct bio *bio,struct iov_iter *iter) -{ -unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt; -unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt; -struct request_queue *q =bdev_get_queue (bio->bi_bdev); -unsigned int max_append_sectors =queue_max_zone_append_sectors (q); -struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt; -struct page **pages = (struct page **)bv; -ssize_t size, left; -unsigned len, i; -size_t offset; -int ret =0 ; - -/* -* Move page array up in the allocated memory for the bio vecs as far as -* possible so that we can start filling biovecs from the beginning -* without overwriting the temporary page array. -*/ -BUILD_BUG_ON (PAGE_PTRS_PER_BVEC <2 ); - pages += entries_left * (PAGE_PTRS_PER_BVEC -1 ); - - size =iov_iter_get_pages (iter, pages,LONG_MAX , nr_pages, &offset); -if (unlikely (size <=0 )) -return size ? size : -EFAULT ; - -for (left = size, i =0 ; left >0 ; left -= len, i++) { -struct page *page = pages[i]; -bool same_page = false; - - len =min_t (size_t,PAGE_SIZE - offset, left); -if (bio_add_hw_page (q, bio, page, len, offset, - max_append_sectors, &same_page) != len) { -bio_put_pages (pages + i, left, offset); - ret = -EINVAL ; -break ; - } -if (same_page) -put_page (page); - offset =0 ; - } - -iov_iter_advance (iter, size - left); -return ret; -} -/** * bio_iov_iter_get_pages - add user or kernel pages to a bio * @bio: bio to add pages to
@@ -1295,10 +1280,7 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) }do { -if (bio_op (bio) ==REQ_OP_ZONE_APPEND ) - ret =__bio_iov_append_get_pages (bio, iter); -else - ret =__bio_iov_iter_get_pages (bio, iter); + ret =__bio_iov_iter_get_pages (bio, iter); }while (!ret &&iov_iter_count (iter) && !bio_full (bio,0 ));/* don't account direct I/O as memory stall */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 884/1157 block: ensure iov_iter advances for added pages
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
[ Upstream commit 325347d965e7ccf5424a05398807a6d801846612 ]
There are cases where a bio may not accept additional pages, and the iov needs to advance to the last data length that was accepted. The zone append used to handle this correctly, but was inadvertently broken when the setup was made common with the normal r/w case.
--- block/bio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
block/bio.c +4 -4
@@ -1211,6 +1211,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)ssize_t size, left;unsigned len, i;size_t offset; +int ret =0 ;/* * Move page array up in the allocated memory for the bio vecs as far as
@@ -1226,7 +1227,6 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)for (left = size, i =0 ; left >0 ; left -= len, i++) {struct page *page = pages[i]; -int ret; len =min_t (size_t,PAGE_SIZE - offset, left);if (bio_op (bio) ==REQ_OP_ZONE_APPEND )
@@ -1237,13 +1237,13 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)if (ret) {bio_put_pages (pages + i, left, offset); -return ret; +break ; } offset =0 ; } -iov_iter_advance (iter, size); -return 0 ; +iov_iter_advance (iter, size - left); +return ret; }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 885/1157 jbd2: fix outstanding credits assert in jbd2_journal_commit_transaction()
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
[ Upstream commit a89573ce4ad32f19f43ec669771726817e185be0 ]
We catch an assert problem in jbd2_journal_commit_transaction() when doing fsstress and request falut injection tests. The problem is happened in a race condition between jbd2_journal_commit_transaction() and ext4_end_io_end(). Firstly, ext4_writepages() writeback dirty pages and start reserved handle, and then the journal was aborted due to some previous metadata IO error, jbd2_journal_abort() start to commit current running transaction, the committing procedure could be raced by ext4_end_io_end() and lead to subtract j_reserved_credits twice from commit_transaction->t_outstanding_credits, finally the t_outstanding_credits is mistakenly smaller than t_nr_buffers and trigger assert.
kjournald2 kworker
jbd2_journal_commit_transaction()
write_unlock(&journal->j_state_lock); atomic_sub(j_reserved_credits, t_outstanding_credits); //sub once
jbd2_journal_start_reserved()
start_this_handle() //detect aborted journal
jbd2_journal_free_reserved() //get running transaction
read_lock(&journal->j_state_lock)
__jbd2_journal_unreserve_handle()
atomic_sub(j_reserved_credits, t_outstanding_credits);
//sub again
read_unlock(&journal->j_state_lock); journal->j_running_transaction = NULL; J_ASSERT(t_nr_buffers <= t_outstanding_credits) //bomb!!!
Fix this issue by using journal->j_state_lock to protect the subtraction in jbd2_journal_commit_transaction().
--- fs/jbd2/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jbd2/commit.c +1 -1
@@ -553,13 +553,13 @@ void jbd2_journal_commit_transaction(journal_t *journal)*/ jbd2_journal_switch_revoke_table (journal); +write_lock (&journal->j_state_lock);/* * Reserved credits cannot be claimed anymore, free them */ atomic_sub (atomic_read (&journal->j_reserved_credits), &commit_transaction->t_outstanding_credits); -write_lock (&journal->j_state_lock);trace_jbd2_commit_flushing (journal, commit_transaction); stats.run.rs_flushing = jiffies; stats.run.rs_locked = jbd2_time_diff(stats.run.rs_locked,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 886/1157 ext4: recover csum seed of tmp_inode after migrating to extents
In reply to Greg Kroah-HartmanFrom: Li Lingfeng <[email protected]>
[ Upstream commit 07ea7a617d6b278fb7acedb5cbe1a81ce2de7d0c ]
When migrating to extents, the checksum seed of temporary inode need to be replaced by inode's, otherwise the inode checksums will be incorrect when swapping the inodes data.
However, the temporary inode can not match it's checksum to itself since it has lost it's own checksum seed.
mkfs.ext4 -F /dev/sdc
mount /dev/sdc /mnt/sdcxfs_io -fc "pwrite 4k 4k" -c "fsync" /mnt/sdc/testfile chattr -e /mnt/sdc/testfile
chattr +e /mnt/sdc/testfile
umount /dev/sdc
fsck -fn /dev/sdc
========
...
Pass 1: Checking inodes, blocks, and sizes
Inode 13 passes checks, but checksum does not match inode. Fix? no
...
========
The fix is simple, save the checksum seed of temporary inode, and recover it after migrating to extents.
--- fs/ext4/migrate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ext4/migrate.c +3 -1
@@ -417,7 +417,7 @@ int ext4_ext_migrate(struct inode *inode)struct inode *tmp_inode =NULL ;struct migrate_struct lb;unsigned long max_entries; -__u32 goal; +__u32 goal, tmp_csum_seed;uid_t owner[2 ];/*
@@ -465,6 +465,7 @@ int ext4_ext_migrate(struct inode *inode)* the migration. */ ei =EXT4_I (inode); + tmp_csum_seed =EXT4_I (tmp_inode)->i_csum_seed;EXT4_I (tmp_inode)->i_csum_seed = ei->i_csum_seed;i_size_write (tmp_inode,i_size_read (inode));/*
@@ -575,6 +576,7 @@ int ext4_ext_migrate(struct inode *inode)* the inode is not visible to user space. */ tmp_inode->i_blocks =0 ; +EXT4_I (tmp_inode)->i_csum_seed = tmp_csum_seed;/* Reset the extent details */ ext4_ext_tree_init (handle, tmp_inode);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 887/1157 jbd2: fix assertion jh->b_frozen_data == NULL failure when journal aborted
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit 4a734f0869f970b8a9b65062ea40b09a5da9dba8 ]
Following process will fail assertion 'jh->b_frozen_data == NULL' in jbd2_journal_dirty_metadata():
jbd2_journal_commit_transaction
unlink(dir/a)
jh->b_transaction = trans1
jh->b_jlist = BJ_Metadata
journal->j_running_transaction = NULL
trans1->t_state = T_COMMITunlink(dir/b)
handle->h_trans = trans2
do_get_write_access
jh->b_modified = 0
jh->b_frozen_data = frozen_buffer
jh->b_next_transaction = trans2
jbd2_journal_dirty_metadata
is_handle_aborted
is_journal_aborted // return false
--> jbd2 abort <--
while (commit_transaction->t_buffers)
if (is_journal_aborted)
jbd2_journal_refile_buffer
__jbd2_journal_refile_buffer
WRITE_ONCE(jh->b_transaction,
jh->b_next_transaction)
WRITE_ONCE(jh->b_next_transaction, NULL)
__jbd2_journal_file_buffer(jh, BJ_Reserved)
J_ASSERT_JH(jh, jh->b_frozen_data == NULL) // assertion failure !The reproducer (See detail in [Link]) reports:
------------[ cut here ]------------ kernel BUG at fs/jbd2/transaction.c:1629! invalid opcode: 0000 [#1] PREEMPT SMP CPU: 2 PID: 584 Comm: unlink Tainted: G W 5.19.0-rc6-00115-g4a57a8400075-dirty #697 RIP: 0010:jbd2_journal_dirty_metadata+0x3c5/0x470 RSP: 0018:ffffc90000be7ce0 EFLAGS: 00010202 Call Trace: <TASK> __ext4_handle_dirty_metadata+0xa0/0x290 ext4_handle_dirty_dirblock+0x10c/0x1d0 ext4_delete_entry+0x104/0x200 __ext4_unlink+0x22b/0x360 ext4_unlink+0x275/0x390 vfs_unlink+0x20b/0x4c0 do_unlinkat+0x42f/0x4c0 __x64_sys_unlink+0x37/0x50 do_syscall_64+0x35/0x80
After journal aborting, __jbd2_journal_refile_buffer() is executed with holding @jh->b_state_lock, we can fix it by moving 'is_handle_aborted()' into the area protected by @jh->b_state_lock.
--- fs/jbd2/transaction.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
fs/jbd2/transaction.c +12 -2
@@ -1486,8 +1486,6 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)struct journal_head *jh;int ret =0 ; -if (is_handle_aborted (handle)) -return -EROFS ;if (!buffer_jbd (bh))return -EUCLEAN ;
@@ -1534,6 +1532,18 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) journal = transaction->t_journal;spin_lock (&jh->b_state_lock); +if (is_handle_aborted (handle)) { +/* +* Check journal aborting with @jh->b_state_lock locked, +* since 'jh->b_transaction' could be replaced with +* 'jh->b_next_transaction' during old transaction +* committing if journal aborted, which may fail +* assertion on 'jh->b_frozen_data == NULL'. +*/ + ret = -EROFS ; + goto out_unlock_bh; + } +if (jh->b_modified ==0 ) {/* * This buffer's got modified and becoming part
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 888/1157 usb: cdns3: Dont use priv_dev uninitialized in cdns3_gadget_ep_enable()
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 78acd4ca433425e6dd4032cfc2156c60e34931f2 ]
Clang warns:
drivers/usb/cdns3/cdns3-gadget.c:2290:11: error: variable 'priv_dev' is uninitialized when used here [-Werror,-Wuninitialized]
dev_dbg(priv_dev->dev, "usbss: invalid parameters\n");
^~~~~~~~
include/linux/dev_printk.h:155:18: note: expanded from macro 'dev_dbg'
dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
^~~
include/linux/dynamic_debug.h:167:7: note: expanded from macro 'dynamic_dev_dbg'
dev, fmt, ##__VA_ARGS__)
^~~
include/linux/dynamic_debug.h:152:56: note: expanded from macro '_dynamic_func_call'
__dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__)
^~~~~~~~~~~
include/linux/dynamic_debug.h:134:15: note: expanded from macro '__dynamic_func_call'
func(&id, ##__VA_ARGS__); \
^~~~~~~~~~~
drivers/usb/cdns3/cdns3-gadget.c:2278:31: note: initialize the variable 'priv_dev' to silence this warning
struct cdns3_device *priv_dev;
^
= NULL1 error generated.
The priv_dev assignment was moved below the if statement to avoid potentially dereferencing ep before it was checked but priv_dev is used in the dev_dbg() call.
To fix this, move the priv_dev and comp_desc assignments back to their original spot and hoist the ep check above those assignments with a call to pr_debug() instead of dev_dbg().
--- drivers/usb/cdns3/cdns3-gadget.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/usb/cdns3/cdns3-gadget.c +8 -4
@@ -2284,16 +2284,20 @@ static int cdns3_gadget_ep_enable(struct usb_ep *ep,int ret =0 ;int val; +if (!ep) { +pr_debug ("usbss: ep not configured?\n" ); +return -EINVAL ; + } + priv_ep =ep_to_cdns3_ep (ep); + priv_dev = priv_ep->cdns3_dev; + comp_desc = priv_ep->endpoint.comp_desc; -if (!ep || !desc || desc->bDescriptorType !=USB_DT_ENDPOINT ) { +if (!desc || desc->bDescriptorType !=USB_DT_ENDPOINT ) {dev_dbg (priv_dev->dev,"usbss: invalid parameters\n" );return -EINVAL ; } - comp_desc = priv_ep->endpoint.comp_desc; - priv_dev = priv_ep->cdns3_dev; -if (!desc->wMaxPacketSize) {dev_err (priv_dev->dev,"usbss: missing wMaxPacketSize\n" );return -EINVAL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 889/1157 opp: Fix error check in dev_pm_opp_attach_genpd()
In reply to Greg Kroah-HartmanFrom: Tang Bin <[email protected]>
[ Upstream commit 4ea9496cbc959eb5c78f3e379199aca9ef4e386b ]
dev_pm_domain_attach_by_name() may return NULL in some cases, so IS_ERR() doesn't meet the requirements. Thus fix it.
--- drivers/opp/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/opp/core.c +2 -2
@@ -2528,8 +2528,8 @@ struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, } virt_dev =dev_pm_domain_attach_by_name (dev, *name); -if (IS_ERR (virt_dev)) { - ret =PTR_ERR (virt_dev); +if (IS_ERR_OR_NULL (virt_dev)) { + ret =PTR_ERR (virt_dev) ? : -ENODEV ;dev_err (dev,"Couldn't attach to pm_domain: %d\n" , ret); goto err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 890/1157 ASoC: cros_ec_codec: Fix refcount leak in cros_ec_codec_platform_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 0a034d93ee929a9ea89f3fa5f1d8492435b9ee6e ]
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.
--- sound/soc/codecs/cros_ec_codec.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cros_ec_codec.c +1 -0
@@ -995,6 +995,7 @@ static int cros_ec_codec_platform_probe(struct platform_device *pdev)dev_dbg (dev,"ap_shm_phys_addr=%#llx len=%#x\n" , priv->ap_shm_phys_addr, priv->ap_shm_len); } +of_node_put (node); }#endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 891/1157 ASoC: samsung: Fix error handling in aries_audio_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 3e2649c5e8643bea0867bb1dd970fedadb0eb7f3 ]
of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. This function is missing of_node_put(cpu) in the error path. Fix this by goto out label. of_node_put() will check NULL pointer.
--- sound/soc/samsung/aries_wm8994.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/samsung/aries_wm8994.c +4 -2
@@ -628,8 +628,10 @@ static int aries_audio_probe(struct platform_device *pdev)return -EINVAL ; codec =of_get_child_by_name (dev->of_node,"codec" ); -if (!codec) -return -EINVAL ; +if (!codec) { + ret = -EINVAL ; + goto out; + }for_each_card_prelinks (card, i, dai_link) { dai_link->codecs->of_node = of_parse_phandle(codec,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 892/1157 ASoC: imx-audmux: Silence a clang warning
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 2f4a8171da06609bb6a063630ed546ee3d93dad7 ]
Change the of_device_get_match_data() cast to (uintptr_t) to silence the following clang warning:
sound/soc/fsl/imx-audmux.c:301:16: warning: cast to smaller integer type 'enum imx_audmux_type' from 'const void *' [-Wvoid-pointer-to-enum-cast]
--- sound/soc/fsl/imx-audmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/imx-audmux.c +1 -1
@@ -298,7 +298,7 @@ static int imx_audmux_probe(struct platform_device *pdev) audmux_clk =NULL ; } - audmux_type = (enum imx_audmux_type )of_device_get_match_data (&pdev->dev); + audmux_type = (uintptr_t )of_device_get_match_data (&pdev->dev);switch (audmux_type) {case IMX31_AUDMUX :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 893/1157 ASoC: mediatek: mt8173: Fix refcount leak in mt8173_rt5650_rt5676_dev_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit ae4f11c1ed2d67192fdf3d89db719ee439827c11 ]
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Fix missing of_node_put() in error paths.
--- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +7 -3
@@ -256,14 +256,16 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)if (!mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S ].codecs[0 ].of_node) {dev_err (&pdev->dev,"Property 'audio-codec' missing or invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_node; } mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S ].codecs[1 ].of_node =of_parse_phandle (pdev->dev.of_node,"mediatek,audio-codec" ,1 );if (!mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S ].codecs[1 ].of_node) {dev_err (&pdev->dev,"Property 'audio-codec' missing or invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_node; } mt8173_rt5650_rt5676_codec_conf[0 ].dlc.of_node = mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S ].codecs[1 ].of_node;
@@ -276,13 +278,15 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)if (!mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S ].codecs->of_node) {dev_err (&pdev->dev,"Property 'audio-codec' missing or invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_node; } card->dev = &pdev->dev; ret =devm_snd_soc_register_card (&pdev->dev, card); +put_node:of_node_put (platform_node);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 894/1157 ASoC: max98390: use linux/gpio/consumer.h to fix build
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit aa7407f807b250eca7697e5fe9a699bc6c2fab71 ]
Change the header file to fix build errors in max98390.c:
../sound/soc/codecs/max98390.c: In function 'max98390_i2c_probe':../sound/soc/codecs/max98390.c:1076:22: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_regulator_get_optional'? [-Werror=implicit-function-declaration]
1076 | reset_gpio = devm_gpiod_get_optional(&i2c->dev,../sound/soc/codecs/max98390.c:1077:55: error: 'GPIOD_OUT_HIGH' undeclared (first use in this function); did you mean 'GPIOF_INIT_HIGH'?
1077 | "reset", GPIOD_OUT_HIGH);../sound/soc/codecs/max98390.c:1077:55: note: each undeclared identifier is reported only once for each function it appears in ../sound/soc/codecs/max98390.c:1083:17: error: implicit declaration of function 'gpiod_set_value_cansleep'; did you mean 'gpio_set_value_cansleep'? [-Werror=implicit-function-declaration]
1083 | gpiod_set_value_cansleep(reset_gpio, 0);
--- sound/soc/codecs/max98390.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/max98390.c +1 -1
@@ -10,7 +10,7 @@#include <linux/cdev.h> #include <linux/dmi.h> #include <linux/firmware.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/module.h> #include <linux/of_gpio.h>
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 895/1157 ASoC: mt6797-mt6351: Fix refcount leak in mt6797_mt6351_dev_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 7472eb8d7dd12b6b9b1a4f4527719cc9c7f5965f ]
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.
--- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/mediatek/mt6797/mt6797-mt6351.c +5 -1
@@ -217,7 +217,8 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev)if (!codec_node) {dev_err (&pdev->dev,"Property 'audio-codec' missing or invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_platform_node; }for_each_card_prelinks (card, i, dai_link) {if (dai_link->codecs->name)
@@ -230,6 +231,9 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev)dev_err (&pdev->dev,"%s snd_soc_register_card fail %d\n" , __func__, ret); +of_node_put (codec_node); +put_platform_node: +of_node_put (platform_node);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 896/1157 ASoC: codecs: da7210: add check for i2c_add_driver
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 82fa8f581a954ddeec1602bed9f8b4a09d100e6e ]
As i2c_add_driver could return error if fails, it should be better to check the return value.
However, if the CONFIG_I2C and CONFIG_SPI_MASTER are both true, the return value of i2c_add_driver will be covered by spi_register_driver.
Therefore, it is necessary to add check and return error if fails.
--- sound/soc/codecs/da7210.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/da7210.c +2 -0
@@ -1335,6 +1335,8 @@ static int __init da7210_modinit(void)int ret =0 ;#if IS_ENABLED (CONFIG_I2C ) ret =i2c_add_driver (&da7210_i2c_driver); +if (ret) +return ret;#endif #if defined(CONFIG_SPI_MASTER ) ret =spi_register_driver (&da7210_spi_driver);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 897/1157 ASoC: mediatek: mt8173-rt5650: Fix refcount leak in mt8173_rt5650_dev_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit efe2178d1a32492f99e7f1f2568eea5c88a85729 ]
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Fix refcount leak in some error paths.
--- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
sound/soc/mediatek/mt8173/mt8173-rt5650.c +6 -3
@@ -280,7 +280,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)if (!mt8173_rt5650_dais[DAI_LINK_CODEC_I2S ].codecs[0 ].of_node) {dev_err (&pdev->dev,"Property 'audio-codec' missing or invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_platform_node; } mt8173_rt5650_dais[DAI_LINK_CODEC_I2S ].codecs[1 ].of_node = mt8173_rt5650_dais[DAI_LINK_CODEC_I2S ].codecs[0 ].of_node;
@@ -293,7 +294,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)dev_err (&pdev->dev,"%s codec_capture_dai name fail %d\n" , __func__, ret); -return ret; + goto put_platform_node; } mt8173_rt5650_dais[DAI_LINK_CODEC_I2S ].codecs[1 ].dai_name = codec_capture_dai;
@@ -315,12 +316,14 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)if (!mt8173_rt5650_dais[DAI_LINK_HDMI_I2S ].codecs->of_node) {dev_err (&pdev->dev,"Property 'audio-codec' missing or invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_platform_node; } card->dev = &pdev->dev; ret =devm_snd_soc_register_card (&pdev->dev, card); +put_platform_node:of_node_put (platform_node);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 898/1157 serial: pic32: fix missing clk_disable_unprepare() on error in pic32_uart_startup()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 6f3cdf2bf1ba9b70de6c2921a415951a0d59873b ]
Fix the missing clk_disable_unprepare() before return from pic32_uart_startup() in the error handling case.
--- drivers/tty/serial/pic32_uart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/tty/serial/pic32_uart.c +3 -1
@@ -503,7 +503,7 @@ static int pic32_uart_startup(struct uart_port *port)if (!sport->irq_fault_name) {dev_err (port->dev,"%s: kasprintf err!" , __func__); ret = -ENOMEM ; - goto out_done; + goto out_disable_clk; }irq_set_status_flags (sport->irq_fault,IRQ_NOAUTOEN ); ret = request_irq(sport->irq_fault, pic32_uart_fault_interrupt,
@@ -579,6 +579,8 @@ static int pic32_uart_startup(struct uart_port *port) out_f:free_irq (sport->irq_fault, port);kfree (sport->irq_fault_name); +out_disable_clk: +clk_disable_unprepare (sport->clk); out_done:return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 899/1157 serial: 8250: Create serial_lsr_in()
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit bdb70c424df1543bc02ee2639aecebd20318c599 ]
LSR register readers need to be careful in order to not lose bits that are not preserved across reads. Create a helper that takes care of storing the non-preserved bits into lsr_save_flags.
--- drivers/tty/serial/8250/8250.h | 20 ++++++++++++++++++++ drivers/tty/serial/8250/8250_core.c | 3 +-- drivers/tty/serial/8250/8250_port.c | 15 ++++----------- 3 files changed, 25 insertions(+), 13 deletions(-)
drivers/tty/serial/8250/8250.h +20 -0
@@ -123,6 +123,26 @@ static inline void serial_out(struct uart_8250_port *up, int offset, int value) up->port.serial_out (&up->port, offset, value); } +/** +* serial_lsr_in - Read LSR register and preserve flags across reads +* @up: uart 8250 port +* +* Read LSR register and handle saving non-preserved flags across reads. +* The flags that are not preserved across reads are stored into +* up->lsr_saved_flags. +* +* Returns LSR value or'ed with the preserved flags (if any). +*/ +static inline unsigned int serial_lsr_in (struct uart_8250_port *up) +{ +unsigned int lsr = up->lsr_saved_flags; + + lsr |=serial_in (up,UART_LSR ); + up->lsr_saved_flags = lsr &LSR_SAVE_FLAGS ; + +return lsr; +} +/* * For the 16C950 */
drivers/tty/serial/8250/8250_core.c +1 -2
@@ -277,8 +277,7 @@ static void serial8250_backup_timeout(struct timer_list *t)* the "Diva" UART used on the management processor on many HP * ia64 and parisc boxes. */ - lsr =serial_in (up,UART_LSR ); - up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; + lsr =serial_lsr_in (up);if ((iir &UART_IIR_NO_INT ) && (up->ier &UART_IER_THRI ) && (!uart_circ_empty (&up->port.state->xmit) || up->port.x_char) && (lsr &UART_LSR_THRE )) {
drivers/tty/serial/8250/8250_port.c +4 -11
@@ -1514,11 +1514,9 @@ static inline void __stop_tx(struct uart_8250_port *p)struct uart_8250_em485 *em485 = p->em485;if (em485) { -unsigned char lsr =serial_in (p,UART_LSR ); +unsigned char lsr =serial_lsr_in (p);u64 stop_delay =0 ; - p->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; -if (!(lsr &UART_LSR_THRE ))return ;/*
@@ -1573,10 +1571,8 @@ static inline void __start_tx(struct uart_port *port)if (serial8250_set_THRI (up)) {if (up->bugs &UART_BUG_TXEN ) { -unsigned char lsr; +unsigned char lsr =serial_lsr_in (up); - lsr =serial_in (up,UART_LSR ); - up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ;if (lsr &UART_LSR_THRE )serial8250_tx_chars (up); }
@@ -2007,8 +2003,7 @@ static unsigned int serial8250_tx_empty(struct uart_port *port)serial8250_rpm_get (up);spin_lock_irqsave (&port->lock, flags); - lsr =serial_port_in (port,UART_LSR ); - up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; + lsr =serial_lsr_in (up);spin_unlock_irqrestore (&port->lock, flags);serial8250_rpm_put (up);
@@ -2084,9 +2079,7 @@ static void wait_for_lsr(struct uart_8250_port *up, int bits)/* Wait up to 10ms for the character(s) to be sent. */ for (;;) { - status =serial_in (up,UART_LSR ); - - up->lsr_saved_flags |= status &LSR_SAVE_FLAGS ; + status =serial_lsr_in (up);if ((status & bits) == bits)break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 900/1157 serial: 8250: Get preserved flags using serial_lsr_in()
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit 6a4241e8f9b17aa17f55842d6478f280c22d2b44 ]
serial8250_handle_irq() assumes it's the first to read LSR register. However, there are 8250 drivers which perform LSR read in their own irq handler prior to calling serial8250_handle_irq(). As not all flags are preserved across LSR reads, use serial_lsr_in() helper to get all the preserved flags.
This commit might fix other commits too besides the ones for DW UART mentioned below. It's just not clear to me which of the other devices clear some of the LSR flags on read. AFAIK, nobody has complained about this problem (either against DW or other devices) so it might not have that bad impact in the end.
--- drivers/tty/serial/8250/8250_port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/8250/8250_port.c +1 -1
@@ -1922,7 +1922,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)spin_lock_irqsave (&port->lock, flags); - status =serial_port_in (port,UART_LSR ); + status =serial_lsr_in (up);/* * If port is stopped and there are no error conditions in the
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 901/1157 serial: 8250_dw: Use serial_lsr_in() in dw8250_handle_irq()
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit 197eb5c416ff0e52d152e6ff59b4e759d2f3e10d ]
dw8250_handle_irq() reads LSR under a few conditions, convert both to use serial_lsr_in() in order to preserve LSR flags properly across reads.
--- drivers/tty/serial/8250/8250_dw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_dw.c +2 -2
@@ -253,7 +253,7 @@ static int dw8250_handle_irq(struct uart_port *p)*/ if (!up->dma && rx_timeout) {spin_lock_irqsave (&p->lock, flags); - status = p->serial_in (p,UART_LSR ); + status =serial_lsr_in (up);if (!(status & (UART_LSR_DR |UART_LSR_BI ))) (void ) p->serial_in (p,UART_RX );
@@ -263,7 +263,7 @@ static int dw8250_handle_irq(struct uart_port *p)/* Manually stop the Rx DMA transfer when acting as flow controller */ if (quirks &DW_UART_QUIRK_IS_DMA_FC && up->dma && up->dma->rx_running && rx_timeout) { - status = p->serial_in (p,UART_LSR ); + status =serial_lsr_in (up);if (status & (UART_LSR_DR |UART_LSR_BI )) {dw8250_writel_ext (p,RZN1_UART_RDMACR ,0 );dw8250_writel_ext (p,DW_UART_DMASA ,1 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 902/1157 serial: 8250_dw: Store LSR into lsr_saved_flags in dw8250_tx_wait_empty()
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit af14f3007e2dca0d112f10f6717ba43093f74e81 ]
Make sure LSR flags are preserved in dw8250_tx_wait_empty(). This function is called from a low-level out function and therefore cannot call serial_lsr_in() as it would lead to infinite recursion.
It is borderline if the flags need to be saved here at all since this code relates to writing LCR register which usually implies no important characters should be arriving.
--- drivers/tty/serial/8250/8250_dw.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/8250/8250_dw.c +3 -0
@@ -122,12 +122,15 @@ static void dw8250_check_lcr(struct uart_port *p, int value)/* Returns once the transmitter is empty or we run out of retries */ static void dw8250_tx_wait_empty (struct uart_port *p) { +struct uart_8250_port *up =up_to_u8250p (p);unsigned int tries =20000 ;unsigned int delay_threshold = tries -1000 ;unsigned int lsr;while (tries--) { lsr =readb (p->membase + (UART_LSR << p->regshift)); + up->lsr_saved_flags |= lsr &LSR_SAVE_FLAGS ; +if (lsr &UART_LSR_TEMT )break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 903/1157 ASoC: SOF: make ctx_store and ctx_restore as optional
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit 03f69725749f453b9a4d454a92805f8eb5f095c2 ]
Commit 657774acd00f ("ASoC: SOF: Make sof_suspend/resume IPC agnostic") did not marked ctx_store and ctx_restore as Optional.
--- sound/soc/sof/sof-priv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/sof/sof-priv.h +2 -2
@@ -378,8 +378,8 @@ struct sof_ipc_fw_tracing_ops {/** * struct sof_ipc_pm_ops - IPC-specific PM ops -* @ctx_save: Function pointer for context save -* @ctx_restore: Function pointer for context restore +* @ctx_save: Optional function pointer for context save +* @ctx_restore: Optional function pointer for context restore */ struct sof_ipc_pm_ops {int (*ctx_save)(struct snd_sof_dev *sdev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 904/1157 ASoC: codecs: msm8916-wcd-digital: move gains from SX_TLV to S8_TLV
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 5babb012c847beb6c8c7108fd78f650b7a2c6054 ]
move all the digital gains form using SX_TLV to S8_TLV, these gains are actually 8 bit gains with 7th signed bit and ranges from -84dB to +40dB
rest of the Qualcomm wcd codecs uses these properly.
--- sound/soc/codecs/msm8916-wcd-digital.c | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-)
sound/soc/codecs/msm8916-wcd-digital.c +23 -23
@@ -328,8 +328,8 @@ static const struct snd_kcontrol_new rx1_mix2_inp1_mux = SOC_DAPM_ENUM(static const struct snd_kcontrol_new rx2_mix2_inp1_mux =SOC_DAPM_ENUM ("RX2 MIX2 INP1 Mux" , rx2_mix2_inp1_chain_enum); -/* Digital Gain control -38.4 dB to +38.4 dB in 0.3 dB steps */ -static const DECLARE_TLV_DB_SCALE(digital_gain, -3840, 30, 0); +/* Digital Gain control -84 dB to +40 dB in 1 dB steps */ +static const DECLARE_TLV_DB_SCALE(digital_gain, -8400, 100, -8400);/* Cutoff Freq for High Pass Filter at -3dB */ static const char *const hpf_cutoff_text[] = {
@@ -510,15 +510,15 @@ static int wcd_iir_filter_info(struct snd_kcontrol *kcontrol,static const struct snd_kcontrol_new msm8916_wcd_digital_snd_controls[] = {SOC_SINGLE_S8_TLV ("RX1 Digital Volume" ,LPASS_CDC_RX1_VOL_CTL_B2_CTL , --128 ,127 , digital_gain), +-84 ,40 , digital_gain),SOC_SINGLE_S8_TLV ("RX2 Digital Volume" ,LPASS_CDC_RX2_VOL_CTL_B2_CTL , --128 ,127 , digital_gain), +-84 ,40 , digital_gain),SOC_SINGLE_S8_TLV ("RX3 Digital Volume" ,LPASS_CDC_RX3_VOL_CTL_B2_CTL , --128 ,127 , digital_gain), +-84 ,40 , digital_gain),SOC_SINGLE_S8_TLV ("TX1 Digital Volume" ,LPASS_CDC_TX1_VOL_CTL_GAIN , --128 ,127 , digital_gain), +-84 ,40 , digital_gain),SOC_SINGLE_S8_TLV ("TX2 Digital Volume" ,LPASS_CDC_TX2_VOL_CTL_GAIN , --128 ,127 , digital_gain), +-84 ,40 , digital_gain),SOC_ENUM ("TX1 HPF Cutoff" , tx1_hpf_cutoff_enum),SOC_ENUM ("TX2 HPF Cutoff" , tx2_hpf_cutoff_enum),SOC_SINGLE ("TX1 HPF Switch" ,LPASS_CDC_TX1_MUX_CTL ,3 ,1 ,0 ),
@@ -553,22 +553,22 @@ static const struct snd_kcontrol_new msm8916_wcd_digital_snd_controls[] = {WCD_IIR_FILTER_CTL ("IIR2 Band3" ,IIR2 ,BAND3 ),WCD_IIR_FILTER_CTL ("IIR2 Band4" ,IIR2 ,BAND4 ),WCD_IIR_FILTER_CTL ("IIR2 Band5" ,IIR2 ,BAND5 ), -SOC_SINGLE_SX_TLV ("IIR1 INP1 Volume" ,LPASS_CDC_IIR1_GAIN_B1_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("IIR1 INP2 Volume" ,LPASS_CDC_IIR1_GAIN_B2_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("IIR1 INP3 Volume" ,LPASS_CDC_IIR1_GAIN_B3_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("IIR1 INP4 Volume" ,LPASS_CDC_IIR1_GAIN_B4_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("IIR2 INP1 Volume" ,LPASS_CDC_IIR2_GAIN_B1_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("IIR2 INP2 Volume" ,LPASS_CDC_IIR2_GAIN_B2_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("IIR2 INP3 Volume" ,LPASS_CDC_IIR2_GAIN_B3_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("IIR2 INP4 Volume" ,LPASS_CDC_IIR2_GAIN_B4_CTL , - 0, -84, 40, digital_gain), +SOC_SINGLE_S8_TLV ("IIR1 INP1 Volume" ,LPASS_CDC_IIR1_GAIN_B1_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("IIR1 INP2 Volume" ,LPASS_CDC_IIR1_GAIN_B2_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("IIR1 INP3 Volume" ,LPASS_CDC_IIR1_GAIN_B3_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("IIR1 INP4 Volume" ,LPASS_CDC_IIR1_GAIN_B4_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("IIR2 INP1 Volume" ,LPASS_CDC_IIR2_GAIN_B1_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("IIR2 INP2 Volume" ,LPASS_CDC_IIR2_GAIN_B2_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("IIR2 INP3 Volume" ,LPASS_CDC_IIR2_GAIN_B3_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("IIR2 INP4 Volume" ,LPASS_CDC_IIR2_GAIN_B4_CTL , + -84, 40, digital_gain), };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 905/1157 ASoC: codecs: wcd9335: move gains from SX_TLV to S8_TLV
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 2fbe0953732e06b471cdedbf6f615b84235580d8 ]
move all the digital gains form using SX_TLV to S8_TLV, these gains are actually 8 bit gains with 7th signed bit and ranges from -84dB to +40dB
rest of the Qualcomm wcd codecs uses these properly.
--- sound/soc/codecs/wcd9335.c | 81 +++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 45 deletions(-)
sound/soc/codecs/wcd9335.c +36 -45
@@ -2264,51 +2264,42 @@ static int wcd9335_rx_hph_mode_put(struct snd_kcontrol *kc,static const struct snd_kcontrol_new wcd9335_snd_controls[] = {/* -84dB min - 40dB max */ -SOC_SINGLE_SX_TLV ("RX0 Digital Volume" ,WCD9335_CDC_RX0_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX1 Digital Volume" ,WCD9335_CDC_RX1_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX2 Digital Volume" ,WCD9335_CDC_RX2_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX3 Digital Volume" ,WCD9335_CDC_RX3_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX4 Digital Volume" ,WCD9335_CDC_RX4_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX5 Digital Volume" ,WCD9335_CDC_RX5_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX6 Digital Volume" ,WCD9335_CDC_RX6_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX7 Digital Volume" ,WCD9335_CDC_RX7_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX8 Digital Volume" ,WCD9335_CDC_RX8_RX_VOL_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX0 Mix Digital Volume" , -WCD9335_CDC_RX0_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX1 Mix Digital Volume" , -WCD9335_CDC_RX1_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX2 Mix Digital Volume" , -WCD9335_CDC_RX2_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX3 Mix Digital Volume" , -WCD9335_CDC_RX3_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX4 Mix Digital Volume" , -WCD9335_CDC_RX4_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX5 Mix Digital Volume" , -WCD9335_CDC_RX5_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX6 Mix Digital Volume" , -WCD9335_CDC_RX6_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX7 Mix Digital Volume" , -WCD9335_CDC_RX7_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), -SOC_SINGLE_SX_TLV ("RX8 Mix Digital Volume" , -WCD9335_CDC_RX8_RX_VOL_MIX_CTL , -0 ,-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX0 Digital Volume" ,WCD9335_CDC_RX0_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX1 Digital Volume" ,WCD9335_CDC_RX1_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX2 Digital Volume" ,WCD9335_CDC_RX2_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX3 Digital Volume" ,WCD9335_CDC_RX3_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX4 Digital Volume" ,WCD9335_CDC_RX4_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX5 Digital Volume" ,WCD9335_CDC_RX5_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX6 Digital Volume" ,WCD9335_CDC_RX6_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX7 Digital Volume" ,WCD9335_CDC_RX7_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX8 Digital Volume" ,WCD9335_CDC_RX8_RX_VOL_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX0 Mix Digital Volume" ,WCD9335_CDC_RX0_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX1 Mix Digital Volume" ,WCD9335_CDC_RX1_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX2 Mix Digital Volume" ,WCD9335_CDC_RX2_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX3 Mix Digital Volume" ,WCD9335_CDC_RX3_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX4 Mix Digital Volume" ,WCD9335_CDC_RX4_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX5 Mix Digital Volume" ,WCD9335_CDC_RX5_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX6 Mix Digital Volume" ,WCD9335_CDC_RX6_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX7 Mix Digital Volume" ,WCD9335_CDC_RX7_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain), +SOC_SINGLE_S8_TLV ("RX8 Mix Digital Volume" ,WCD9335_CDC_RX8_RX_VOL_MIX_CTL , +-84 ,40 , digital_gain),SOC_ENUM ("RX INT0_1 HPF cut off" , cf_int0_1_enum),SOC_ENUM ("RX INT0_2 HPF cut off" , cf_int0_2_enum),SOC_ENUM ("RX INT1_1 HPF cut off" , cf_int1_1_enum),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 906/1157 ASoC: cs35l45: Add endianness flag in snd_soc_component_driver
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit d919630fe77904931277e663c902582ea6f4e4cf ]
The endianness flag is used on the CODEC side to specify an ambivalence to endian, typically because it is lost over the hardware link. This device receives audio over an I2S DAI and as such should have endianness applied.
--- sound/soc/codecs/cs35l45.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/cs35l45.c +2 -0
@@ -500,6 +500,8 @@ static const struct snd_soc_component_driver cs35l45_component = { .num_controls = ARRAY_SIZE(cs35l45_controls), .name = "cs35l45", + + .endianness = 1, };static int __maybe_unused cs35l45_runtime_suspend (struct device *dev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 907/1157 rpmsg: char: Add mutex protection for rpmsg_eptdev_open()
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit abe13e9a561d6b3e82b21362c0d6dd3ecd8a5b13 ]
There is no mutex protection for rpmsg_eptdev_open(), especially for eptdev->ept read and write operation. It may cause issues when multiple instances call rpmsg_eptdev_open() in parallel,the return state may be success or EBUSY.
--- drivers/rpmsg/rpmsg_char.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/rpmsg/rpmsg_char.c +6 -1
@@ -120,8 +120,11 @@ static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)struct rpmsg_device *rpdev = eptdev->rpdev;struct device *dev = &eptdev->dev; -if (eptdev->ept) +mutex_lock (&eptdev->ept_lock); +if (eptdev->ept) { +mutex_unlock (&eptdev->ept_lock);return -EBUSY ; + }get_device (dev);
@@ -137,11 +140,13 @@ static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)if (!ept) {dev_err (dev,"failed to open %s\n" , eptdev->chinfo.name);put_device (dev); +mutex_unlock (&eptdev->ept_lock);return -EINVAL ; } eptdev->ept = ept; filp->private_data = eptdev; +mutex_unlock (&eptdev->ept_lock);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 908/1157 rpmsg: mtk_rpmsg: Fix circular locking dependency
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 353d9214682e65c55cdffad8c82139a3321c5f13 ]
During execution of the worker that's used to register rpmsg devices we are safely locking the channels mutex but, when creating a new endpoint for such devices, we are registering a IPI on the SCP, which then makes the SCP to trigger an interrupt, lock its own mutex and in turn register more subdevices.
This creates a circular locking dependency situation, as the mtk_rpmsg channels_lock will then depend on the SCP IPI lock.
[ 15.447736] ======================================================
[ 15.460158] WARNING: possible circular locking dependency detected
[ 15.460161] 5.17.0-next-20220324+ #399 Not tainted
[ 15.460165] ------------------------------------------------------
[ 15.460166] kworker/0:3/155 is trying to acquire lock:
[ 15.460170] ffff5b4d0eaf1308 (&scp->ipi_desc[i].lock){+.+.}-{4:4}, at: scp_ipi_lock+0x34/0x50 [mtk_scp_ipi]
[ 15.504958]
[] but task is already holding lock:
[ 15.504960] ffff5b4d0e8f1918 (&mtk_subdev->channels_lock){+.+.}-{4:4}, at: mtk_register_device_work_function+0x50/0x1cc [mtk_rpmsg]
[ 15.504978][] which lock already depends on the new lock.
[ 15.504980]
[] the existing dependency chain (in reverse order) is:
[ 15.504982]
[] -> #1 (&mtk_subdev->channels_lock){+.+.}-{4:4}:
[ 15.504990] lock_acquire+0x68/0x84
[ 15.504999] __mutex_lock+0xa4/0x3e0
[ 15.505007] mutex_lock_nested+0x40/0x70
[ 15.505012] mtk_rpmsg_ns_cb+0xe4/0x134 [mtk_rpmsg]
[ 15.641684] mtk_rpmsg_ipi_handler+0x38/0x64 [mtk_rpmsg]
[ 15.641693] scp_ipi_handler+0xbc/0x180 [mtk_scp]
[ 15.663905] mt8192_scp_irq_handler+0x44/0xa4 [mtk_scp]
[ 15.663915] scp_irq_handler+0x6c/0xa0 [mtk_scp]
[ 15.685779] irq_thread_fn+0x34/0xa0
[ 15.685785] irq_thread+0x18c/0x240
[ 15.685789] kthread+0x104/0x110
[ 15.709579] ret_from_fork+0x10/0x20
[ 15.709586]
[] -> #0 (&scp->ipi_desc[i].lock){+.+.}-{4:4}:
[ 15.731271] __lock_acquire+0x11e4/0x1910
[ 15.740367] lock_acquire.part.0+0xd8/0x220
[ 15.749813] lock_acquire+0x68/0x84
[ 15.757861] __mutex_lock+0xa4/0x3e0
[ 15.766084] mutex_lock_nested+0x40/0x70
[ 15.775006] scp_ipi_lock+0x34/0x50 [mtk_scp_ipi]
[ 15.785503] scp_ipi_register+0x40/0xa4 [mtk_scp_ipi]
[ 15.796697] scp_register_ipi+0x1c/0x30 [mtk_scp]
[ 15.807194] mtk_rpmsg_create_ept+0xa0/0x108 [mtk_rpmsg]
[ 15.818912] rpmsg_create_ept+0x44/0x60
[ 15.827660] cros_ec_rpmsg_probe+0x15c/0x1f0
[ 15.837282] rpmsg_dev_probe+0x128/0x1d0
[ 15.846203] really_probe.part.0+0xa4/0x2a0
[ 15.855649] __driver_probe_device+0xa0/0x150
[ 15.865443] driver_probe_device+0x48/0x150
[ 15.877157] __device_attach_driver+0xc0/0x12c
[ 15.889359] bus_for_each_drv+0x80/0xe0
[ 15.900330] __device_attach+0xe4/0x190
[ 15.911303] device_initial_probe+0x1c/0x2c
[ 15.922969] bus_probe_device+0xa8/0xb0
[ 15.933927] device_add+0x3a8/0x8a0
[ 15.944193] device_register+0x28/0x40
[ 15.954970] rpmsg_register_device+0x5c/0xa0
[ 15.966782] mtk_register_device_work_function+0x148/0x1cc [mtk_rpmsg]
[ 15.983146] process_one_work+0x294/0x664
[ 15.994458] worker_thread+0x7c/0x45c
[ 16.005069] kthread+0x104/0x110
[ 16.014789] ret_from_fork+0x10/0x20
[ 16.025201][] other info that might help us debug this:
[ 16.047769] Possible unsafe locking scenario:
[ 16.063942] CPU0 CPU1 [ 16.075166] ---- ---- [ 16.086376] lock(&mtk_subdev->channels_lock); [ 16.097592] lock(&scp->ipi_desc[i].lock); [ 16.113188] lock(&mtk_subdev->channels_lock); [ 16.129482] lock(&scp->ipi_desc[i].lock); [ 16.140020]
[] *** DEADLOCK ***
[ 16.158282] 4 locks held by kworker/0:3/155:
[ 16.168978] #0: ffff5b4d00008748 ((wq_completion)events){+.+.}-{0:0}, at: process_one_work+0x1fc/0x664
[ 16.190017] #1: ffff80000953bdc8 ((work_completion)(&mtk_subdev->register_work)){+.+.}-{0:0}, at: process_one_work+0x1fc/0x664
[ 16.215269] #2: ffff5b4d0e8f1918 (&mtk_subdev->channels_lock){+.+.}-{4:4}, at: mtk_register_device_work_function+0x50/0x1cc [mtk_rpmsg]
[ 16.242131] #3: ffff5b4d05964190 (&dev->mutex){....}-{4:4}, at: __device_attach+0x44/0x190To solve this, simply unlock the channels_lock mutex before calling mtk_rpmsg_register_device() and relock it right after, as safety is still ensured by the locking mechanism that happens right after through SCP.
--- drivers/rpmsg/mtk_rpmsg.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/rpmsg/mtk_rpmsg.c +2 -0
@@ -234,7 +234,9 @@ static void mtk_register_device_work_function(struct work_struct *register_work)if (info->registered)continue ; +mutex_unlock (&subdev->channels_lock); ret =mtk_rpmsg_register_device (subdev, &info->info); +mutex_lock (&subdev->channels_lock);if (ret) {dev_err (&pdev->dev,"Can't create rpmsg_device\n" );continue ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 909/1157 remoteproc: k3-r5: Fix refcount leak in k3_r5_cluster_of_init
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit fa220c05d282e7479abe08b54e3bdffd06c25e97 ]
Every iteration of for_each_available_child_of_node() decrements the reference count of the previous node.
When breaking early from a for_each_available_child_of_node() loop, we need to explicitly call of_node_put() on the child node. Add missing of_node_put() to avoid refcount leak.
--- drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/remoteproc/ti_k3_r5_remoteproc.c +2 -0
@@ -1655,6 +1655,7 @@ static int k3_r5_cluster_of_init(struct platform_device *pdev)if (!cpdev) { ret = -ENODEV ;dev_err (dev,"could not get R5 core platform device\n" ); +of_node_put (child); goto fail; }
@@ -1663,6 +1664,7 @@ static int k3_r5_cluster_of_init(struct platform_device *pdev)dev_err (dev,"k3_r5_core_of_init failed, ret = %d\n" , ret);put_device (&cpdev->dev); +of_node_put (child); goto fail; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 910/1157 selftests/livepatch: better synchronize test_klp_callbacks_busy
In reply to Greg Kroah-HartmanFrom: Joe Lawrence <[email protected]>
[ Upstream commit 55eb9a6c8bf3e2099863118ef53e02d9f44f85a8 ]
The test_klp_callbacks_busy module conditionally blocks a future livepatch transition by busy waiting inside its workqueue function, busymod_work_func(). After scheduling this work, a test livepatch is loaded, introducing the transition under test.
Both events are marked in the kernel log for later verification, but there is no synchronization to ensure that busymod_work_func() logs its function entry message before subsequent selftest commands log their own messages. This can lead to a rare test failure due to unexpected ordering like:
# --- expected # +++ result # @@ -1,7 +1,7 @@
# % modprobe test_klp_callbacks_busy block_transition=Y
# test_klp_callbacks_busy: test_klp_callbacks_busy_init
# -test_klp_callbacks_busy: busymod_work_func enter
# % modprobe test_klp_callbacks_demo
# +test_klp_callbacks_busy: busymod_work_func enter
# livepatch: enabling patch 'test_klp_callbacks_demo' # livepatch: 'test_klp_callbacks_demo': initializing patching transition # test_klp_callbacks_demo: pre_patch_callback: vmlinux
Force the module init function to wait until busymod_work_func() has started (and logged its message), before exiting to the next selftest steps.
--- lib/livepatch/test_klp_callbacks_busy.c | 8 ++++++++ 1 file changed, 8 insertions(+)
lib/livepatch/test_klp_callbacks_busy.c +8 -0
@@ -16,10 +16,12 @@ MODULE_PARM_DESC(block_transition, "block_transition (default=false)");static void busymod_work_func (struct work_struct *work); static DECLARE_WORK(work, busymod_work_func); +static DECLARE_COMPLETION (busymod_work_started);static void busymod_work_func (struct work_struct *work) {pr_info ("%s enter\n" , __func__); +complete (&busymod_work_started);while (READ_ONCE (block_transition)) {/*
@@ -37,6 +39,12 @@ static int test_klp_callbacks_busy_init(void)pr_info ("%s\n" , __func__);schedule_work (&work); +/* +* To synchronize kernel messages, hold the init function from +* exiting until the work function's entry message has printed. +*/ +wait_for_completion (&busymod_work_started); +if (!block_transition) {/* * Serialize output: print all messages from the work
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 911/1157 profiling: fix shift too large makes kernel panic
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 0fe6ee8f123a4dfb529a5aff07536bb481f34043 ]
2d186afd04d6 ("profiling: fix shift-out-of-bounds bugs") limits shift value by [0, BITS_PER_LONG -1], which means [0, 63].
However, syzbot found that the max shift value should be the bit number of (_etext - _stext). If shift is outside of this, the "buffer_bytes" will be zero and will cause kzalloc(0). Then the kernel panics due to dereferencing the returned pointer 16.
This can be easily reproduced by passing a large number like 60 to enable profiling and then run readprofile.
LOGS:
BUG: kernel NULL pointer dereference, address: 0000000000000010 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page PGD 6148067 P4D 6148067 PUD 6142067 PMD 0 PREEMPT SMP CPU: 4 PID: 184 Comm: readprofile Not tainted 5.18.0+ #162 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.15.0-0-g2dd4b9b3f840-prebuilt.qemu.org 04/01/2014 RIP: 0010:read_profile+0x104/0x220 RSP: 0018:ffffc900006fbe80 EFLAGS: 00000202 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff888006150000 RSI: 0000000000000001 RDI: ffffffff82aba4a0 RBP: 000000000188bb60 R08: 0000000000000010 R09: ffff888006151000 R10: 0000000000000000 R11: 0000000000000000 R12: ffffffff82aba4a0 R13: 0000000000000000 R14: ffffc900006fbf08 R15: 0000000000020c30 FS: 000000000188a8c0(0000) GS:ffff88803ed00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000010 CR3: 0000000006144000 CR4: 00000000000006e0 Call Trace: <TASK> proc_reg_read+0x56/0x70 vfs_read+0x9a/0x1b0 ksys_read+0xa1/0xe0 ? fpregs_assert_state_consistent+0x1e/0x40 do_syscall_64+0x3a/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 RIP: 0033:0x4d4b4e RSP: 002b:00007ffebb668d58 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 RAX: ffffffffffffffda RBX: 000000000188a8a0 RCX: 00000000004d4b4e RDX: 0000000000000400 RSI: 000000000188bb60 RDI: 0000000000000003 RBP: 0000000000000003 R08: 000000000000006e R09: 0000000000000000 R10: 0000000000000041 R11: 0000000000000246 R12: 000000000188bb60 R13: 0000000000000400 R14: 0000000000000000 R15: 000000000188bb60 </TASK> Modules linked in: CR2: 0000000000000010 Killed ---[ end trace 0000000000000000 ]---
Check prof_len in profile_init() to prevent it be zero.
--- kernel/profile.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/profile.c +7 -0
@@ -109,6 +109,13 @@ int __ref profile_init(void)/* only text is profiled */ prof_len = (_etext - _stext) >> prof_shift; + +if (!prof_len) { +pr_warn ("profiling shift: %u too large\n" , prof_shift); + prof_on =0 ; +return -EINVAL ; + } + buffer_bytes = prof_len*sizeof (atomic_t);if (!alloc_cpumask_var (&prof_cpu_mask,GFP_KERNEL ))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 912/1157 remoteproc: imx_rproc: Fix refcount leak in imx_rproc_addr_init
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 61afafe8b938bc74841cf4b1a73dd08b9d287c5a ]
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not needed anymore. This function has two paths missing of_node_put().
--- drivers/remoteproc/imx_rproc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/remoteproc/imx_rproc.c +4 -3
@@ -594,16 +594,17 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, node =of_parse_phandle (np,"memory-region" , a);/* Not map vdevbuffer, vdevring region */ -if (!strncmp (node->name,"vdev" ,strlen ("vdev" ))) +if (!strncmp (node->name,"vdev" ,strlen ("vdev" ))) { +of_node_put (node);continue ; + } err =of_address_to_resource (node,0 , &res); +of_node_put (node);if (err) {dev_err (dev,"unable to resolve memory region\n" );return err; } -of_node_put (node); -if (b >=IMX_RPROC_MEM_MAX )break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 913/1157 KVM: PPC: Book3s: Fix warning about xics_rm_h_xirr_x
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit a784101f77b1bef4b40f4ad68af3f54fcfa5321b ]
This fixes "no previous prototype":
arch/powerpc/kvm/book3s_hv_rm_xics.c:482:15:
warning: no previous prototype for 'xics_rm_h_xirr_x' [-Wmissing-prototypes]
Reported by the kernel test robot.
--- arch/powerpc/kvm/book3s_xics.h | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kvm/book3s_xics.h +1 -0
@@ -143,6 +143,7 @@ static inline struct kvmppc_ics *kvmppc_xics_find_ics(struct kvmppc_xics *xics, }extern unsigned long xics_rm_h_xirr (struct kvm_vcpu *vcpu); +extern unsigned long xics_rm_h_xirr_x (struct kvm_vcpu *vcpu);extern int xics_rm_h_ipi (struct kvm_vcpu *vcpu,unsigned long server,unsigned long mfrr);extern int xics_rm_h_cppr (struct kvm_vcpu *vcpu,unsigned long cppr);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 914/1157 rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
[ Upstream commit d7bd416d35121c95fe47330e09a5c04adbc5f928 ]
rpmsg_register_device_override need to call put_device to free vch when driver_set_override fails.
Fix this by adding a put_device() to the error path.
--- drivers/rpmsg/rpmsg_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/rpmsg/rpmsg_core.c +1 -0
@@ -618,6 +618,7 @@ int rpmsg_register_device_override(struct rpmsg_device *rpdev, strlen(driver_override));if (ret) {dev_err (dev,"device_set_override failed: %d\n" , ret); +put_device (dev);return ret; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 915/1157 selftests/powerpc: Skip energy_scale_info test on older firmware
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 4228a996b072d36f3baafb4afdc2d2d66d2cbadf ]
Older machines don't have the firmware feature that enables the code this test is testing. Skip the test if the sysfs directory doesn't exist. Also use the FAIL_IF() macro to provide more verbose error reporting if an error is encountered.
--- .../powerpc/papr_attributes/attr_test.c | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-)
tools/testing/selftests/powerpc/papr_attributes/attr_test.c +18 -12
@@ -7,6 +7,7 @@* Copyright 2022, Pratik Rajesh Sampat, IBM Corp. */ +#include <errno.h> #include <stdio.h> #include <string.h> #include <dirent.h>
@@ -32,7 +33,7 @@ enum type { NUM_VAL }; -int value_type (int id) +static int value_type (int id) {int val_type;
@@ -54,15 +55,21 @@ int value_type(int id)return val_type; } -int verify_energy_info (void ) +static int verify_energy_info (void ) {const char *path ="/sys/firmware/papr/energy_scale_info" ;struct dirent *entry;struct stat s;DIR *dirp; -if (stat (path, &s) || !S_ISDIR (s.st_mode)) -return -1 ; + errno =0 ; +if (stat (path, &s)) { +SKIP_IF (errno ==ENOENT ); +FAIL_IF (errno); + } + +FAIL_IF (!S_ISDIR (s.st_mode)); + dirp =opendir (path);while ((entry =readdir (dirp)) !=NULL ) {
@@ -76,25 +83,24 @@ int verify_energy_info(void) id =atoi (entry->d_name); attr_type =value_type (id); -if (attr_type ==INVALID ) -return -1 ; +FAIL_IF (attr_type ==INVALID );/* Check if the files exist and have data in them */ sprintf (file_name,"%s/%d/desc" , path, id); f =fopen (file_name,"r" ); -if (!f ||fgetc (f) ==EOF ) -return -1 ; +FAIL_IF (!f); +FAIL_IF (fgetc (f) ==EOF );sprintf (file_name,"%s/%d/value" , path, id); f =fopen (file_name,"r" ); -if (!f ||fgetc (f) ==EOF ) -return -1 ; +FAIL_IF (!f); +FAIL_IF (fgetc (f) ==EOF );if (attr_type ==STR_VAL ) {sprintf (file_name,"%s/%d/value_desc" , path, id); f =fopen (file_name,"r" ); -if (!f ||fgetc (f) ==EOF ) -return -1 ; +FAIL_IF (!f); +FAIL_IF (fgetc (f) ==EOF ); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 916/1157 ASoC: samsung: h1940_uda1380: include proepr GPIO consumer header
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit bd10b0dafdcf0ec1677cad70101e1f97b9e28f2e ]
h1940_uda1380 uses gpiod*/GPIOD* so it should include GPIO consumer header.
--- sound/soc/samsung/h1940_uda1380.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/samsung/h1940_uda1380.c +1 -1
@@ -8,7 +8,7 @@// Based on version from Arnaud Patard <[email protected]> #include <linux/types.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <sound/soc.h>
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 917/1157 powerpc/perf: Optimize clearing the pending PMI and remove WARN_ON for PMI check in power_pmu_disable
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit 890005a7d98f7452cfe86dcfb2aeeb7df01132ce ]
commit 2c9ac51b850d ("powerpc/perf: Fix PMU callbacks to clear pending PMI before resetting an overflown PMC") added a new function "pmi_irq_pending" in hw_irq.h. This function is to check if there is a PMI marked as pending in Paca (PACA_IRQ_PMI).This is used in power_pmu_disable in a WARN_ON. The intention here is to provide a warning if there is PMI pending, but no counter is found overflown.
During some of the perf runs, below warning is hit:
WARNING: CPU: 36 PID: 0 at arch/powerpc/perf/core-book3s.c:1332 power_pmu_disable+0x25c/0x2c0 Modules linked in: -----
NIP [c000000000141c3c] power_pmu_disable+0x25c/0x2c0 LR [c000000000141c8c] power_pmu_disable+0x2ac/0x2c0
Call Trace: [c000000baffcfb90] [c000000000141c8c] power_pmu_disable+0x2ac/0x2c0 (unreliable) [c000000baffcfc10] [c0000000003e2f8c] perf_pmu_disable+0x4c/0x60 [c000000baffcfc30] [c0000000003e3344] group_sched_out.part.124+0x44/0x100 [c000000baffcfc80] [c0000000003e353c] __perf_event_disable+0x13c/0x240 [c000000baffcfcd0] [c0000000003dd334] event_function+0xc4/0x140 [c000000baffcfd20] [c0000000003d855c] remote_function+0x7c/0xa0 [c000000baffcfd50] [c00000000026c394] flush_smp_call_function_queue+0xd4/0x300 [c000000baffcfde0] [c000000000065b24] smp_ipi_demux_relaxed+0xa4/0x100 [c000000baffcfe20] [c0000000000cb2b0] xive_muxed_ipi_action+0x20/0x40 [c000000baffcfe40] [c000000000207c3c] __handle_irq_event_percpu+0x8c/0x250 [c000000baffcfee0] [c000000000207e2c] handle_irq_event_percpu+0x2c/0xa0 [c000000baffcff10] [c000000000210a04] handle_percpu_irq+0x84/0xc0 [c000000baffcff40] [c000000000205f14] generic_handle_irq+0x54/0x80 [c000000baffcff60] [c000000000015740] __do_irq+0x90/0x1d0 [c000000baffcff90] [c000000000016990] __do_IRQ+0xc0/0x140 [c0000009732f3940] [c000000bafceaca8] 0xc000000bafceaca8 [c0000009732f39d0] [c000000000016b78] do_IRQ+0x168/0x1c0 [c0000009732f3a00] [c0000000000090c8] hardware_interrupt_common_virt+0x218/0x220
This means that there is no PMC overflown among the active events in the PMU, but there is a PMU pending in Paca. The function "any_pmc_overflown" checks the PMCs on active events in cpuhw->n_events. Code snippet:
<<>>
if (any_pmc_overflown(cpuhw))
clear_pmi_irq_pending();
else
WARN_ON(pmi_irq_pending());
<<>>
Here the PMC overflown is not from active event. Example: When we do perf record, default cycles and instructions will be running on PMC6 and PMC5 respectively. It could happen that overflowed event is currently not active and pending PMI is for the inactive event. Debug logs from trace_printk:
<<>>any_pmc_overflown: idx is 5: pmc value is 0xd9apower_pmu_disable: PMC1: 0x0, PMC2: 0x0, PMC3: 0x0, PMC4: 0x0, PMC5: 0xd9a, PMC6: 0x80002011 <<>>
Here active PMC (from idx) is PMC5 , but overflown PMC is PMC6(0x80002011). When we handle PMI interrupt for such cases, if the PMC overflown is from inactive event, it will be ignored. Reference commit:
commit bc09c219b2e6 ("powerpc/perf: Fix finding overflowed PMC in interrupt")
Patch addresses two changes:
1) Fix 1 : Removal of warning ( WARN_ON(pmi_irq_pending()); ) We were printing warning if no PMC is found overflown among active PMU events, but PMI pending in PACA. But this could happen in cases where PMC overflown is not in active PMC. An inactive event could have caused the overflow. Hence the warning is not needed. To know pending PMI is from an inactive event, we need to loop through all PMC's which will cause more SPR reads via mfspr and increase in context switch. Also in existing function: perf_event_interrupt, already we ignore PMI's overflown when it is from an inactive PMC.
2) Fix 2: optimization in clearing pending PMI.
Currently we check for any active PMC overflown before clearing PMI pending in Paca. This is causing additional SPR read also. From point 1, we know that if PMI pending in Paca from inactive cases, that is going to be ignored during replay. Hence if there is pending PMI in Paca, just clear it irrespective of PMC overflown or not.
In summary, remove the any_pmc_overflown check entirely in power_pmu_disable. ie If there is a pending PMI in Paca, clear it, since we are in pmu_disable. There could be cases where PMI is pending because of inactive PMC ( which later when replayed also will get ignored ), so WARN_ON could give false warning. Hence removing it.
--- arch/powerpc/perf/core-book3s.c | 35 ++++++++++++++------------------- 1 file changed, 15 insertions(+), 20 deletions(-)
arch/powerpc/perf/core-book3s.c +15 -20
@@ -1349,27 +1349,22 @@ static void power_pmu_disable(struct pmu *pmu)* a PMI happens during interrupt replay and perf counter * values are cleared by PMU callbacks before replay. * -* If any PMC corresponding to the active PMU events are -* overflown, disable the interrupt by clearing the paca -* bit for PMI since we are disabling the PMU now. -* Otherwise provide a warning if there is PMI pending, but -* no counter is found overflown. +* Disable the interrupt by clearing the paca bit for PMI +* since we are disabling the PMU now. Otherwise provide a +* warning if there is PMI pending, but no counter is found +* overflown. +* +* Since power_pmu_disable runs under local_irq_save, it +* could happen that code hits a PMC overflow without PMI +* pending in paca. Hence only clear PMI pending if it was +* set. +* +* If a PMI is pending, then MSR[EE] must be disabled (because +* the masked PMI handler disabling EE). So it is safe to +* call clear_pmi_irq_pending(). */ -if (any_pmc_overflown (cpuhw)) { -/* -* Since power_pmu_disable runs under local_irq_save, it -* could happen that code hits a PMC overflow without PMI -* pending in paca. Hence only clear PMI pending if it was -* set. -* -* If a PMI is pending, then MSR[EE] must be disabled (because -* the masked PMI handler disabling EE). So it is safe to -* call clear_pmi_irq_pending(). -*/ -if (pmi_irq_pending ()) -clear_pmi_irq_pending (); - }else -WARN_ON (pmi_irq_pending ()); +if (pmi_irq_pending ()) +clear_pmi_irq_pending (); val = mmcra = cpuhw->mmcr.mmcra;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 918/1157 ASoC: soc-core.c: fixup snd_soc_of_get_dai_link_cpus()
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit 586fb2641371cf7f23a401ab1c79b17e3ec457f4 ]
commit 900dedd7e47cc3f ("ASoC: Introduce snd_soc_of_get_dai_link_cpus") adds new snd_soc_of_get_dai_link_cpus(), but it is using "codec" everywhere. It is very strange, and is issue when error case. It should call cpu instead of codec in error case.
This patch tidyup it.
--- sound/soc/soc-core.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
sound/soc/soc-core.c +9 -9
@@ -3433,26 +3433,26 @@ int snd_soc_of_get_dai_link_cpus(struct device *dev,struct of_phandle_args args;struct snd_soc_dai_link_component *component;char *name; -int index, num_codecs, ret; +int index, num_cpus, ret; -/* Count the number of CODECs */ +/* Count the number of CPUs */ name ="sound-dai" ; - num_codecs =of_count_phandle_with_args (of_node, name, + num_cpus =of_count_phandle_with_args (of_node, name,"#sound-dai-cells" ); -if (num_codecs <=0 ) { -if (num_codecs == -ENOENT ) +if (num_cpus <=0 ) { +if (num_cpus == -ENOENT )dev_err (dev,"No 'sound-dai' property\n" );else dev_err (dev,"Bad phandle in 'sound-dai'\n" ); -return num_codecs; +return num_cpus; } component =devm_kcalloc (dev, - num_codecs,sizeof (*component), + num_cpus,sizeof (*component),GFP_KERNEL );if (!component)return -ENOMEM ; dai_link->cpus = component; - dai_link->num_cpus = num_codecs; + dai_link->num_cpus = num_cpus;/* Parse the list */ for_each_link_cpus (dai_link, index, component) {
@@ -3468,7 +3468,7 @@ int snd_soc_of_get_dai_link_cpus(struct device *dev, }return 0 ; err: -snd_soc_of_put_dai_link_codecs (dai_link); +snd_soc_of_put_dai_link_cpus (dai_link); dai_link->cpus =NULL ; dai_link->num_cpus =0 ;return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 919/1157 ASoC: samsung: change gpiod_speaker_power and rx1950_audio from global to static variables
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit d2294461b90e0c5b3bbfaaf2c8baff4fd3e2bb13 ]
sparse reportssound/soc/samsung/rx1950_uda1380.c:131:18: warning: symbol 'gpiod_speaker_power' was not declared. Should it be static? sound/soc/samsung/rx1950_uda1380.c:231:24: warning: symbol 'rx1950_audio' was not declared. Should it be static?
Both gpiod_speaker_power and rx1950_audio are only used in rx1950_uda1380.c, so their storage class specifiers should be static.
--- sound/soc/samsung/rx1950_uda1380.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/samsung/rx1950_uda1380.c +2 -2
@@ -128,7 +128,7 @@ static int rx1950_startup(struct snd_pcm_substream *substream) &hw_rates); } -struct gpio_desc *gpiod_speaker_power; +static struct gpio_desc *gpiod_speaker_power;static int rx1950_spk_power (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event)
@@ -228,7 +228,7 @@ static int rx1950_probe(struct platform_device *pdev)return devm_snd_soc_register_card (dev, &rx1950_asoc); } -struct platform_driver rx1950_audio = { +static struct platform_driver rx1950_audio = { .driver = { .name ="rx1950-audio" , .pm = &snd_soc_pm_ops,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 920/1157 serial: 8250_dw: Take port lock while accessing LSR
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit b9491b2e45d71eb64245560e208897af95ffbf95 ]
Accessing LSR requires port lock because it mutates lsr_saved_flags in serial_lsr_in().
--- drivers/tty/serial/8250/8250_dw.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/8250/8250_dw.c +3 -0
@@ -266,7 +266,10 @@ static int dw8250_handle_irq(struct uart_port *p)/* Manually stop the Rx DMA transfer when acting as flow controller */ if (quirks &DW_UART_QUIRK_IS_DMA_FC && up->dma && up->dma->rx_running && rx_timeout) { +spin_lock_irqsave (&p->lock, flags); status =serial_lsr_in (up); +spin_unlock_irqrestore (&p->lock, flags); +if (status & (UART_LSR_DR |UART_LSR_BI )) {dw8250_writel_ext (p,RZN1_UART_RDMACR ,0 );dw8250_writel_ext (p,DW_UART_DMASA ,1 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 921/1157 ASoC: codecs: wsa881x: handle timeouts in resume path
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit cf6af24b54903f9f70c29b3e5b19cb72cc862d60 ]
Currently we do not check if SoundWire slave initialization timeout expired before continuing to access its registers.
Its possible that the registers are not accessible if timeout is expired. Handle this by returning timeout in resume path.
--- sound/soc/codecs/wsa881x.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
sound/soc/codecs/wsa881x.c +8 -2
@@ -1175,11 +1175,17 @@ static int __maybe_unused wsa881x_runtime_resume(struct device *dev)struct sdw_slave *slave =dev_to_sdw_dev (dev);struct regmap *regmap =dev_get_regmap (dev,NULL );struct wsa881x_priv *wsa881x =dev_get_drvdata (dev); +unsigned long time;gpiod_direction_output (wsa881x->sd_n,1 ); -wait_for_completion_timeout (&slave->initialization_complete, -msecs_to_jiffies (WSA881X_PROBE_TIMEOUT )); + time =wait_for_completion_timeout (&slave->initialization_complete, +msecs_to_jiffies (WSA881X_PROBE_TIMEOUT )); +if (!time) { +dev_err (dev,"Initialization not complete, timed out\n" ); +gpiod_direction_output (wsa881x->sd_n,0 ); +return -ETIMEDOUT ; + }regcache_cache_only (regmap, false);regcache_sync (regmap);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 922/1157 vfio/mlx5: Protect mlx5vf_disable_fds() upon close device
In reply to Greg Kroah-HartmanFrom: Yishai Hadas <[email protected]>
[ Upstream commit 2b1c1906286fa547845f5385ee72db74b2b0251d ]
Protect mlx5vf_disable_fds() upon close device to be called under the state mutex as done in all other places.
This will prevent a race with any other flow which calls mlx5vf_disable_fds() as of health/recovery upon MLX5_PF_NOTIFY_DISABLE_VF event.
Encapsulate this functionality in a separate function named mlx5vf_cmd_close_migratable() to consider migration caps and for further usage upon close device.
--- drivers/vfio/pci/mlx5/cmd.c | 10 ++++++++++ drivers/vfio/pci/mlx5/cmd.h | 1 + drivers/vfio/pci/mlx5/main.c | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-)
drivers/vfio/pci/mlx5/cmd.c +10 -0
@@ -88,6 +88,16 @@ static int mlx5fv_vf_event(struct notifier_block *nb,return 0 ; } +void mlx5vf_cmd_close_migratable (struct mlx5vf_pci_core_device *mvdev) +{ +if (!mvdev->migrate_cap) +return ; + +mutex_lock (&mvdev->state_mutex); +mlx5vf_disable_fds (mvdev); +mlx5vf_state_mutex_unlock (mvdev); +} +void mlx5vf_cmd_remove_migratable (struct mlx5vf_pci_core_device *mvdev) {if (!mvdev->migrate_cap)
drivers/vfio/pci/mlx5/cmd.h +1 -0
@@ -64,6 +64,7 @@ int mlx5vf_cmd_query_vhca_migration_state(struct mlx5vf_pci_core_device *mvdev, size_t *state_size);void mlx5vf_cmd_set_migratable (struct mlx5vf_pci_core_device *mvdev);void mlx5vf_cmd_remove_migratable (struct mlx5vf_pci_core_device *mvdev); +void mlx5vf_cmd_close_migratable (struct mlx5vf_pci_core_device *mvdev);int mlx5vf_cmd_save_vhca_state (struct mlx5vf_pci_core_device *mvdev,struct mlx5_vf_migration_file *migf); int mlx5vf_cmd_load_vhca_state(struct mlx5vf_pci_core_device *mvdev,
drivers/vfio/pci/mlx5/main.c +1 -1
@@ -570,7 +570,7 @@ static void mlx5vf_pci_close_device(struct vfio_device *core_vdev)struct mlx5vf_pci_core_device *mvdev =container_of ( core_vdev, struct mlx5vf_pci_core_device, core_device.vdev); -mlx5vf_disable_fds (mvdev); +mlx5vf_cmd_close_migratable (mvdev);vfio_pci_core_close_device (core_vdev); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 923/1157 vfio: Split migration ops from main device ops
In reply to Greg Kroah-HartmanFrom: Yishai Hadas <[email protected]>
[ Upstream commit 6e97eba8ad8748fabb795cffc5d9e1a7dcfd7367 ]
vfio core checks whether the driver sets some migration op (e.g. set_state/get_state) and accordingly calls its op.
However, currently mlx5 driver sets the above ops without regards to its migration caps.
This might lead to unexpected usage/Oops if user space may call to the above ops even if the driver doesn't support migration. As for example, the migration state_mutex is not initialized in that case.
The cleanest way to manage that seems to split the migration ops from the main device ops, this will let the driver setting them separately from the main ops when it's applicable.
As part of that, validate ops construction on registration and include a check for VFIO_MIGRATION_STOP_COPY since the uAPI claims it must be set in migration_flags.
HISI driver was changed as well to match this scheme.
This scheme may enable down the road to come with some extra group of ops (e.g. DMA log) that can be set without regards to the other options based on driver caps.
--- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 11 +++++-- drivers/vfio/pci/mlx5/cmd.c | 4 ++- drivers/vfio/pci/mlx5/cmd.h | 3 +- drivers/vfio/pci/mlx5/main.c | 9 ++++-- drivers/vfio/pci/vfio_pci_core.c | 7 +++++ drivers/vfio/vfio.c | 11 ++++--- include/linux/vfio.h | 30 ++++++++++++------- 7 files changed, 51 insertions(+), 24 deletions(-)
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +8 -3
@@ -1185,7 +1185,7 @@ static int hisi_acc_vfio_pci_open_device(struct vfio_device *core_vdev)if (ret)return ret; -if (core_vdev->ops->migration_set_state) { +if (core_vdev->mig_ops) { ret =hisi_acc_vf_qm_init (hisi_acc_vdev);if (ret) {vfio_pci_core_disable (vdev);
@@ -1208,6 +1208,11 @@ static void hisi_acc_vfio_pci_close_device(struct vfio_device *core_vdev)vfio_pci_core_close_device (core_vdev); } +static const struct vfio_migration_ops hisi_acc_vfio_pci_migrn_state_ops = { + .migration_set_state = hisi_acc_vfio_pci_set_device_state, + .migration_get_state = hisi_acc_vfio_pci_get_device_state, +}; +static const struct vfio_device_ops hisi_acc_vfio_pci_migrn_ops = { .name ="hisi-acc-vfio-pci-migration" , .open_device = hisi_acc_vfio_pci_open_device,
@@ -1219,8 +1224,6 @@ static const struct vfio_device_ops hisi_acc_vfio_pci_migrn_ops = { .mmap = hisi_acc_vfio_pci_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, - .migration_set_state = hisi_acc_vfio_pci_set_device_state, - .migration_get_state = hisi_acc_vfio_pci_get_device_state, };static const struct vfio_device_ops hisi_acc_vfio_pci_ops = {
@@ -1272,6 +1275,8 @@ static int hisi_acc_vfio_pci_probe(struct pci_dev *pdev, const struct pci_deviceif (!ret) {vfio_pci_core_init_device (&hisi_acc_vdev->core_device, pdev, &hisi_acc_vfio_pci_migrn_ops); + hisi_acc_vdev->core_device.vdev.mig_ops = + &hisi_acc_vfio_pci_migrn_state_ops; }else {pci_warn (pdev,"migration support failed, continue with generic interface\n" ); vfio_pci_core_init_device(&hisi_acc_vdev->core_device, pdev,
drivers/vfio/pci/mlx5/cmd.c +3 -1
@@ -108,7 +108,8 @@ void mlx5vf_cmd_remove_migratable(struct mlx5vf_pci_core_device *mvdev)destroy_workqueue (mvdev->cb_wq); } -void mlx5vf_cmd_set_migratable (struct mlx5vf_pci_core_device *mvdev) +void mlx5vf_cmd_set_migratable (struct mlx5vf_pci_core_device *mvdev, +const struct vfio_migration_ops *mig_ops) {struct pci_dev *pdev = mvdev->core_device.pdev;int ret;
@@ -149,6 +150,7 @@ void mlx5vf_cmd_set_migratable(struct mlx5vf_pci_core_device *mvdev) mvdev->core_device.vdev.migration_flags =VFIO_MIGRATION_STOP_COPY |VFIO_MIGRATION_P2P ; + mvdev->core_device.vdev.mig_ops = mig_ops; end:mlx5_vf_put_core_dev (mvdev->mdev);
drivers/vfio/pci/mlx5/cmd.h +2 -1
@@ -62,7 +62,8 @@ int mlx5vf_cmd_suspend_vhca(struct mlx5vf_pci_core_device *mvdev, u16 op_mod);int mlx5vf_cmd_resume_vhca (struct mlx5vf_pci_core_device *mvdev,u16 op_mod);int mlx5vf_cmd_query_vhca_migration_state (struct mlx5vf_pci_core_device *mvdev,size_t *state_size); -void mlx5vf_cmd_set_migratable (struct mlx5vf_pci_core_device *mvdev); +void mlx5vf_cmd_set_migratable (struct mlx5vf_pci_core_device *mvdev, +const struct vfio_migration_ops *mig_ops);void mlx5vf_cmd_remove_migratable (struct mlx5vf_pci_core_device *mvdev);void mlx5vf_cmd_close_migratable (struct mlx5vf_pci_core_device *mvdev); int mlx5vf_cmd_save_vhca_state(struct mlx5vf_pci_core_device *mvdev,
drivers/vfio/pci/mlx5/main.c +6 -3
@@ -574,6 +574,11 @@ static void mlx5vf_pci_close_device(struct vfio_device *core_vdev)vfio_pci_core_close_device (core_vdev); } +static const struct vfio_migration_ops mlx5vf_pci_mig_ops = { + .migration_set_state = mlx5vf_pci_set_device_state, + .migration_get_state = mlx5vf_pci_get_device_state, +}; +static const struct vfio_device_ops mlx5vf_pci_ops = { .name ="mlx5-vfio-pci" , .open_device = mlx5vf_pci_open_device,
@@ -585,8 +590,6 @@ static const struct vfio_device_ops mlx5vf_pci_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, - .migration_set_state = mlx5vf_pci_set_device_state, - .migration_get_state = mlx5vf_pci_get_device_state, }; static int mlx5vf_pci_probe(struct pci_dev *pdev,
@@ -599,7 +602,7 @@ static int mlx5vf_pci_probe(struct pci_dev *pdev,if (!mvdev)return -ENOMEM ;vfio_pci_core_init_device (&mvdev->core_device, pdev, &mlx5vf_pci_ops); -mlx5vf_cmd_set_migratable (mvdev); +mlx5vf_cmd_set_migratable (mvdev, &mlx5vf_pci_mig_ops);dev_set_drvdata (&pdev->dev, &mvdev->core_device); ret =vfio_pci_core_register_device (&mvdev->core_device);if (ret)
drivers/vfio/pci/vfio_pci_core.c +7 -0
@@ -1855,6 +1855,13 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev)if (pdev->hdr_type !=PCI_HEADER_TYPE_NORMAL )return -EINVAL ; +if (vdev->vdev.mig_ops) { +if (!(vdev->vdev.mig_ops->migration_get_state && + vdev->vdev.mig_ops->migration_set_state) || + !(vdev->vdev.migration_flags &VFIO_MIGRATION_STOP_COPY )) +return -EINVAL ; + } +/* * Prevent binding to PFs with VFs enabled, the VFs might be in use * by the host or other users. We cannot capture the VFs if they
drivers/vfio/vfio.c +5 -6
@@ -1544,8 +1544,7 @@ vfio_ioctl_device_feature_mig_device_state(struct vfio_device *device,struct file *filp =NULL ;int ret; -if (!device->ops->migration_set_state || - !device->ops->migration_get_state) +if (!device->mig_ops)return -ENOTTY ; ret = vfio_check_feature(flags, argsz,
@@ -1561,7 +1560,8 @@ vfio_ioctl_device_feature_mig_device_state(struct vfio_device *device,if (flags &VFIO_DEVICE_FEATURE_GET ) {enum vfio_device_mig_state curr_state; - ret = device->ops->migration_get_state (device, &curr_state); + ret = device->mig_ops->migration_get_state (device, + &curr_state);if (ret)return ret; mig.device_state = curr_state;
@@ -1569,7 +1569,7 @@ vfio_ioctl_device_feature_mig_device_state(struct vfio_device *device, }/* Handle the VFIO_DEVICE_FEATURE_SET */ - filp = device->ops->migration_set_state (device, mig.device_state); + filp = device->mig_ops->migration_set_state (device, mig.device_state);if (IS_ERR (filp) || !filp) goto out_copy;
@@ -1592,8 +1592,7 @@ static int vfio_ioctl_device_feature_migration(struct vfio_device *device, };int ret; -if (!device->ops->migration_set_state || - !device->ops->migration_get_state) +if (!device->mig_ops)return -ENOTTY ; ret = vfio_check_feature(flags, argsz, VFIO_DEVICE_FEATURE_GET,
include/linux/vfio.h +20 -10
@@ -32,6 +32,11 @@ struct vfio_device_set {struct vfio_device {struct device *dev;const struct vfio_device_ops *ops; +/* +* mig_ops is a static property of the vfio_device which must be set +* prior to registering the vfio_device. +*/ +const struct vfio_migration_ops *mig_ops;struct vfio_group *group;struct vfio_device_set *dev_set;struct list_head dev_set_list;
@@ -61,16 +66,6 @@ struct vfio_device {* match, -errno for abort (ex. match with insufficient or incorrect * additional args) * @device_feature: Optional, fill in the VFIO_DEVICE_FEATURE ioctl -* @migration_set_state: Optional callback to change the migration state for -* devices that support migration. It's mandatory for -* VFIO_DEVICE_FEATURE_MIGRATION migration support. -* The returned FD is used for data transfer according to the FSM -* definition. The driver is responsible to ensure that FD reaches end -* of stream or error whenever the migration FSM leaves a data transfer -* state or before close_device() returns. -* @migration_get_state: Optional callback to get the migration state for -* devices that support migration. It's mandatory for -* VFIO_DEVICE_FEATURE_MIGRATION migration support. */ struct vfio_device_ops {char *name;
@@ -87,6 +82,21 @@ struct vfio_device_ops {int (*match)(struct vfio_device *vdev,char *buf);int (*device_feature)(struct vfio_device *device,u32 flags,void __user *arg,size_t argsz); +}; + +/** +* @migration_set_state: Optional callback to change the migration state for +* devices that support migration. It's mandatory for +* VFIO_DEVICE_FEATURE_MIGRATION migration support. +* The returned FD is used for data transfer according to the FSM +* definition. The driver is responsible to ensure that FD reaches end +* of stream or error whenever the migration FSM leaves a data transfer +* state or before close_device() returns. +* @migration_get_state: Optional callback to get the migration state for +* devices that support migration. It's mandatory for +* VFIO_DEVICE_FEATURE_MIGRATION migration support. +*/ +struct vfio_migration_ops {struct file *(*migration_set_state)(struct vfio_device *device,enum vfio_device_mig_state new_state);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 924/1157 net/ice: fix initializing the bitmap in the switch code
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 2f7ee2a72ccec8b85a05c4644d7ec9f40c1c50c8 ]
Kbuild spotted the following bug during the testing of one of the optimizations:
In file included from include/linux/cpumask.h:12,
[...]
from drivers/net/ethernet/intel/ice/ice_switch.c:4:drivers/net/ethernet/intel/ice/ice_switch.c: In function 'ice_find_free_recp_res_idx.constprop':include/linux/bitmap.h:447:22: warning: 'possible_idx[0]' is used uninitialized [-Wuninitialized]
447 | *map |= GENMASK(start + nbits - 1, start);
| ^~In file included from drivers/net/ethernet/intel/ice/ice.h:7,
from drivers/net/ethernet/intel/ice/ice_lib.h:7,
from drivers/net/ethernet/intel/ice/ice_switch.c:4:drivers/net/ethernet/intel/ice/ice_switch.c:4929:24: note: 'possible_idx[0]' was declared here
4929 | DECLARE_BITMAP(possible_idx, ICE_MAX_FV_WORDS);
| ^~~~~~~~~~~~include/linux/types.h:11:23: note: in definition of macro 'DECLARE_BITMAP'
11 | unsigned long name[BITS_TO_LONGS(bits)]
| ^~~~
%ICE_MAX_FV_WORDS is 48, so bitmap_set() here was initializing only 48 bits, leaving a junk in the rest 16.
It was previously hidden due to that filling 48 bits makes bitmap_set() call external __bitmap_set(), but after making it use plain bit arithmetics on small bitmaps, compilers started seeing the issue. It was still working because those 16 weren't used anywhere anyhow.
bitmap_{clear,set}() are not really intended to initialize bitmaps, rather to modify already initialized ones, as they don't do anything past the passed number of bits. The correct function to do this in that particular case is bitmap_fill(), so use it here. It will do *possible_idx = ~0UL instead of *possible_idx |= GENMASK(47, 0), not leaving anything in an undefined state.
--- drivers/net/ethernet/intel/ice/ice_switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_switch.c +1 -1
@@ -4934,7 +4934,7 @@ ice_find_free_recp_res_idx(struct ice_hw *hw, const unsigned long *profiles,bitmap_zero (recipes,ICE_MAX_NUM_RECIPES );bitmap_zero (used_idx,ICE_MAX_FV_WORDS ); -bitmap_set (possible_idx,0 ,ICE_MAX_FV_WORDS ); +bitmap_fill (possible_idx,ICE_MAX_FV_WORDS );/* For each profile we are going to associate the recipe with, add the * recipes that are associated with that profile. This will give us
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 925/1157 tty: n_gsm: fix user open not possible at responder until initiator open
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit ac77f0077c3265197d378158c85a55eee6d21508 ]
After setting up the control channel on both sides the responder side may want to open a virtual tty to listen on until the initiator starts an application on a user channel. The current implementation allows the open() but no other operation, like termios. These fail with EINVAL. The responder sided application has no means to detect an open by the initiator sided application this way. And the initiator sided applications usually expect the responder sided application to listen on the user channel upon open.
Set the user channel into half-open state on responder side once a user application opens the virtual tty to allow IO operations on it. Furthermore, keep the user channel constipated until the initiator side opens it to give the responder sided application the chance to detect the new connection and to avoid data loss if the responder sided application starts sending before the user channel is open.
--- drivers/tty/n_gsm.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)
drivers/tty/n_gsm.c +29 -2
@@ -1510,6 +1510,8 @@ static void gsm_dlci_close(struct gsm_dlci *dlci)if (debug &8 )pr_debug ("DLCI %d goes closed.\n" , dlci->addr); dlci->state =DLCI_CLOSED ; +/* Prevent us from sending data before the link is up again */ + dlci->constipated = true;if (dlci->addr !=0 ) {tty_port_tty_hangup (&dlci->port, false);spin_lock_irqsave (&dlci->lock, flags);
@@ -1539,6 +1541,7 @@ static void gsm_dlci_open(struct gsm_dlci *dlci)del_timer (&dlci->t1);/* This will let a tty open continue */ dlci->state =DLCI_OPEN ; + dlci->constipated = false;if (debug &8 )pr_debug ("DLCI %d goes open.\n" , dlci->addr);/* Send current modem state */
@@ -1619,6 +1622,25 @@ static void gsm_dlci_begin_open(struct gsm_dlci *dlci)mod_timer (&dlci->t1, jiffies + gsm->t1 *HZ /100 ); } +/** +* gsm_dlci_set_opening - change state to opening +* @dlci: DLCI to open +* +* Change internal state to wait for DLCI open from initiator side. +* We set off timers and responses upon reception of an SABM. +*/ +static void gsm_dlci_set_opening (struct gsm_dlci *dlci) +{ +switch (dlci->state) { +case DLCI_CLOSED : +case DLCI_CLOSING : + dlci->state =DLCI_OPENING ; +break ; +default : +break ; + } +} +/** * gsm_dlci_begin_close - start channel open procedure * @dlci: DLCI to open
@@ -1762,10 +1784,13 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr) dlci->addr = addr; dlci->adaption = gsm->adaption; dlci->state =DLCI_CLOSED ; -if (addr) +if (addr) { dlci->data = gsm_dlci_data; -else +/* Prevent us from sending data before the link is up */ + dlci->constipated = true; + }else { dlci->data = gsm_dlci_command; + } gsm->dlci[addr] = dlci;return dlci; }
@@ -3174,6 +3199,8 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)/* Start sending off SABM messages */ if (gsm->initiator)gsm_dlci_begin_open (dlci); +else +gsm_dlci_set_opening (dlci);/* And wait for virtual carrier */ return tty_port_block_til_ready (port, tty, filp); }
Signature · 1 line
2.35.1
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.2 release. There are 1157 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 Aug 2022 18:01:29 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.2-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.2 release. There are 1157 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Hi Greg,
Perhaps its time that you just send a single email to LKML pointing where to find the stable releases. These patch bombs are bringing vger down to its knees, and causing delays in people's workflows. This doesn't just affect LKML, but all other vger mailing lists. Probably because LKML has the biggest subscriber base that patch bombs to it can slow everything else down.
I sent 3 patches to the linux-trace-devel list almost 4 hours ago, and they still haven't shown up. I was going to point people to it tonight but it's now going to have to wait till tomorrow.
I really do not think LKML needs to see all 1157 patches that are being backported. There's other places to send them that will not be as disruptive.
Thanks,
-- Steve
Greg Kroah-Hartman
maintainerQuoted 14 lines · Steven Rostedt
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.2 release. There are 1157 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Hi Greg,
Perhaps its time that you just send a single email to LKML pointing where to find the stable releases. These patch bombs are bringing vger down to its knees, and causing delays in people's workflows. This doesn't just affect LKML, but all other vger mailing lists. Probably because LKML has the biggest subscriber base that patch bombs to it can slow everything else down.
Quoted 3 lines
I sent 3 patches to the linux-trace-devel list almost 4 hours ago, and they still haven't shown up. I was going to point people to it tonight but it's now going to have to wait till tomorrow.
Email is async, sometimes it takes longer than others to recieve messages.
My "patch bombs" get sent out slow to the mail servers, there is work to fix up vger and move it over to the LF-managed infrastructure, perhaps work with the vger admins to help that effort out?
Quoted 2 lines
I really do not think LKML needs to see all 1157 patches that are being backported. There's other places to send them that will not be as disruptive.
And where would that be?
Getting the patches out for review is good, and necessary. Patches should never be considered "noise" as it is what we are doing here. If we have infrastructure issues handling these messages, we should work to resolve them as really, 3000 emails should not be a lot to manage, unless you are being throttled by your email provider?
thanks,
greg k-h
Big load on lkml created by -stable patchbombs was Re: [PATCH 5.19 0000/1157] 5.19.2-rc1 review
Hi!
Quoted 13 lines
Quoted 13 lines
Quoted 4 lines
This is the start of the stable review cycle for the 5.19.2 release. There are 1157 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Hi Greg,
Perhaps its time that you just send a single email to LKML pointing where to find the stable releases. These patch bombs are bringing vger down to its knees, and causing delays in people's workflows. This doesn't just affect LKML, but all other vger mailing lists. Probably because LKML has the biggest subscriber base that patch bombs to it can slow everything else down.
Quoted 6 lines
Quoted 3 lines
I sent 3 patches to the linux-trace-devel list almost 4 hours ago, and they still haven't shown up. I was going to point people to it tonight but it's now going to have to wait till tomorrow.
Email is async, sometimes it takes longer than others to recieve messages.
Well, email is pretty fast most of the month.
Quoted 3 lines
My "patch bombs" get sent out slow to the mail servers, there is work to fix up vger and move it over to the LF-managed infrastructure, perhaps work with the vger admins to help that effort out?
I'm pretty used to -stable patches going to l-k, so I got used to current workflow. OTOH ... -stable _is_ quite significant fraction of total lkml traffic, and I see how people may hate that.
Is not it ultimately for vger admins to decide what kind of load they consider acceptable?
Would it make sense to somehow batch the messages, or perhaps to modify patchbombing scripts to send patches "slowly" so that -stable does not DoS other lkml users?
Actually, if the patch is same between multiple -stable releases (which is rather common case) sending it just once tagged with "this goes to 4.9, 4.14, 4.19 and 5.10" would both take less bandwidth and make review easier. (But I see it may not be that easy).
Best regards,
Pavel
PS: ...who is currently on EDGE connection. LF-managed infrastructure is not going to help for people who use slow links to access lkml.
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Re: Big load on lkml created by -stable patchbombs was Re: [PATCH 5.19 0000/1157] 5.19.2-rc1 review
Quoted 3 lines · On Tue, 16 Aug 2022 13:56:14 +0200 Pavel Machek <[email protected]> wrote:
I'm pretty used to -stable patches going to l-k, so I got used to current workflow. OTOH ... -stable _is_ quite significant fraction of total lkml traffic, and I see how people may hate that.
The thing I hate is that this slows down the other mailing lists. It doesn't just affect LKML. It affects *all* lists. Even the ones that just get a dozen emails a day. But the emails that do come, are important.
Perhaps another answer is to dedicate the LKML emails to their own servers, and let the other mailing lists run separately such that the patch bombs to LKML do not affect any of the other lists.
That would be an acceptable solution for me ;-)
-- Steve
Quoted 7 lines · On Tue, 16 Aug 2022 07:17:36 +0200 Greg Kroah-Hartman…
Quoted 4 lines
I sent 3 patches to the linux-trace-devel list almost 4 hours ago, and they still haven't shown up. I was going to point people to it tonight but it's now going to have to wait till tomorrow.
Email is async, sometimes it takes longer than others to recieve messages.
The delays always happen when you do these patch bombs. In fact, that's how I knew you sent them just now. My patches finally arrived, just under 8 hours since I sent them!
Quoted 4 lines
My "patch bombs" get sent out slow to the mail servers, there is work to fix up vger and move it over to the LF-managed infrastructure, perhaps work with the vger admins to help that effort out?
I'm not sure what I can do to help out. I'm not a very good email admin. (I'm struggling to fix my wife's email now).
Quoted 5 lines
Quoted 3 lines
I really do not think LKML needs to see all 1157 patches that are being backported. There's other places to send them that will not be as disruptive.
And where would that be?
You already Cc [email protected]. Does lore track that?
My point is, LKML has what, 10,000 subscribers? Maybe only 5000? Even at 5000, probably at most 50 subscribers look at the stable patches (and I'm being optimistic). That means, these 3000 emails go to 4950 people that will never look at them. That's 14,850,000 emails that are wasting disk space, CPU cycles and electricity. Think of the environment :-)
Quoted 6 lines
Getting the patches out for review is good, and necessary. Patches should never be considered "noise" as it is what we are doing here. If we have infrastructure issues handling these messages, we should work to resolve them as really, 3000 emails should not be a lot to manage, unless you are being throttled by your email provider?
I'm not saying that they should not be sent out. I'm asking, do they need to be sent out to the list with the most subscribers? You already (rightfully) Cc the maintainers of the patches. Since they already go to the stable list, and if lore archives them, then you could just send a link to LKML to the lore patch set. Then people could still review them.
Do those that review these patches really just read LKML to do so?
Or is this the spam approach of sending out to 1000x more than you need to, just so that you get a few more eyes?
And the issue I have with this, is that it affects *all* mailing list on vger not just LKML. I don't read LKML anymore, but I do read the smaller lists. And blocking emails for 8 hours to these lists does have an effect on productivity.
-- Steve
Greg Kroah-Hartman
maintainerPATCH 926/1157 tty: n_gsm: fix tty registration before control channel open
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 01aecd917114577c423f07cec0d186ad007d76fc ]
The current implementation registers/deregisters the user ttys at mux attach/detach. That means that the user devices are available before any control channel is open. However, user channel initialization requires an open control channel. Furthermore, the user is not informed if the mux restarts due to configuration changes.
Put the registration/deregistration procedure into separate function to improve readability.
Move registration to mux activation and deregistration to mux cleanup to keep the user devices only open as long as a control channel exists. The user will be informed via the device driver if the mux was reconfigured in a way that required a mux re-activation.
This makes it necessary to add T2 initialization to gsmld_open() for the ldisc open code path (not the reconfiguration code path) to avoid deletion of an uninitialized T2 at mux cleanup.
--- drivers/tty/n_gsm.c | 117 ++++++++++++++++++++++++++++++-------------- 1 file changed, 79 insertions(+), 38 deletions(-)
drivers/tty/n_gsm.c +79 -38
@@ -235,6 +235,7 @@ struct gsm_mux {struct gsm_dlci *dlci[NUM_DLCI ];int old_c_iflag;/* termios c_iflag value before attach */ bool constipated;/* Asked by remote to shut up */ +bool has_devices;/* Devices were registered */ spinlock_t tx_lock;unsigned int tx_bytes;/* TX data outstanding */
@@ -463,6 +464,68 @@ static void gsm_hex_dump_bytes(const char *fname, const u8 *data,kfree (prefix); } +/** +* gsm_register_devices - register all tty devices for a given mux index +* +* @driver: the tty driver that describes the tty devices +* @index: the mux number is used to calculate the minor numbers of the +* ttys for this mux and may differ from the position in the +* mux array. +*/ +static int gsm_register_devices (struct tty_driver *driver,unsigned int index) +{ +struct device *dev; +int i; +unsigned int base; + +if (!driver || index >=MAX_MUX ) +return -EINVAL ; + + base = index *NUM_DLCI ;/* first minor for this index */ +for (i =1 ; i <NUM_DLCI ; i++) { +/* Don't register device 0 - this is the control channel +* and not a usable tty interface +*/ + dev =tty_register_device (gsm_tty_driver, base + i,NULL ); +if (IS_ERR (dev)) { +if (debug &8 ) +pr_info ("%s failed to register device minor %u" , + __func__, base + i); +for (i--; i >=1 ; i--) +tty_unregister_device (gsm_tty_driver, base + i); +return PTR_ERR (dev); + } + } + +return 0 ; +} + +/** +* gsm_unregister_devices - unregister all tty devices for a given mux index +* +* @driver: the tty driver that describes the tty devices +* @index: the mux number is used to calculate the minor numbers of the +* ttys for this mux and may differ from the position in the +* mux array. +*/ +static void gsm_unregister_devices (struct tty_driver *driver, +unsigned int index) +{ +int i; +unsigned int base; + +if (!driver || index >=MAX_MUX ) +return ; + + base = index *NUM_DLCI ;/* first minor for this index */ +for (i =1 ; i <NUM_DLCI ; i++) { +/* Don't unregister device 0 - this is the control +* channel and not a usable tty interface +*/ +tty_unregister_device (gsm_tty_driver, base + i); + } +} +/** * gsm_print_packet - display a frame for debug * @hdr: header to print before decode
@@ -2204,6 +2267,10 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc)del_timer_sync (&gsm->t2_timer);/* Free up any link layer users and finally the control channel */ +if (gsm->has_devices) { +gsm_unregister_devices (gsm_tty_driver, gsm->num); + gsm->has_devices = false; + }for (i =NUM_DLCI -1 ; i >=0 ; i--)if (gsm->dlci[i])gsm_dlci_release (gsm->dlci[i]);
@@ -2227,6 +2294,7 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc)static int gsm_activate_mux (struct gsm_mux *gsm) {struct gsm_dlci *dlci; +int ret;timer_setup (&gsm->t2_timer, gsm_control_retransmit,0 );init_waitqueue_head (&gsm->event);
@@ -2238,9 +2306,14 @@ static int gsm_activate_mux(struct gsm_mux *gsm)else gsm->receive = gsm1_receive; + ret =gsm_register_devices (gsm_tty_driver, gsm->num); +if (ret) +return ret; + dlci =gsm_dlci_alloc (gsm,0 );if (dlci ==NULL )return -ENOMEM ; + gsm->has_devices = true; gsm->dead = false;/* Tty opens are now permissible */ return 0 ; }
@@ -2500,39 +2573,14 @@ static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len)* will need moving to an ioctl path. */ -static int gsmld_attach_gsm (struct tty_struct *tty,struct gsm_mux *gsm) +static void gsmld_attach_gsm (struct tty_struct *tty,struct gsm_mux *gsm) { -unsigned int base; -int ret, i; - gsm->tty =tty_kref_get (tty);/* Turn off tty XON/XOFF handling to handle it explicitly. */ gsm->old_c_iflag = tty->termios.c_iflag; tty->termios.c_iflag &= (IXON |IXOFF ); - ret =gsm_activate_mux (gsm); -if (ret !=0 ) -tty_kref_put (gsm->tty); -else { -/* Don't register device 0 - this is the control channel and not -a usable tty interface */ - base =mux_num_to_base (gsm);/* Base for this MUX */ -for (i =1 ; i <NUM_DLCI ; i++) { -struct device *dev; - - dev =tty_register_device (gsm_tty_driver, - base + i,NULL ); -if (IS_ERR (dev)) { -for (i--; i >=1 ; i--) -tty_unregister_device (gsm_tty_driver, - base + i); -return PTR_ERR (dev); - } - } - } -return ret; } -/** * gsmld_detach_gsm - stop doing 0710 mux * @tty: tty attached to the mux
@@ -2543,12 +2591,7 @@ static int gsmld_attach_gsm(struct tty_struct *tty, struct gsm_mux *gsm)static void gsmld_detach_gsm (struct tty_struct *tty,struct gsm_mux *gsm) { -unsigned int base =mux_num_to_base (gsm);/* Base for this MUX */ -int i; -WARN_ON (tty != gsm->tty); -for (i =1 ; i <NUM_DLCI ; i++) -tty_unregister_device (gsm_tty_driver, base + i);/* Restore tty XON/XOFF handling. */ gsm->tty->termios.c_iflag = gsm->old_c_iflag;tty_kref_put (gsm->tty);
@@ -2640,7 +2683,6 @@ static void gsmld_close(struct tty_struct *tty)static int gsmld_open (struct tty_struct *tty) {struct gsm_mux *gsm; -int ret;if (tty->ops->write ==NULL )return -EINVAL ;
@@ -2656,12 +2698,11 @@ static int gsmld_open(struct tty_struct *tty)/* Attach the initial passive connection */ gsm->encoding =1 ; - ret =gsmld_attach_gsm (tty, gsm); -if (ret !=0 ) { -gsm_cleanup_mux (gsm, false); -mux_put (gsm); - } -return ret; +gsmld_attach_gsm (tty, gsm); + +timer_setup (&gsm->t2_timer, gsm_control_retransmit,0 ); + +return 0 ; }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 927/1157 tty: n_gsm: fix wrong queuing behavior in gsm_dlci_data_output()
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 556fc8ac06513cced381588d6d58c184d95cc4fe ]
1) The function drains the fifo for the given user tty/DLCI without considering 'TX_THRESH_HI' and different to gsm_dlci_data_output_framed(), which moves only one packet from the user side to the internal transmission queue. We can only handle one packet at a time here if we want to allow DLCI priority handling in gsm_dlci_data_sweep() to avoid link starvation.
2) Furthermore, the additional header octet from convergence layer type 2 is not counted against MTU. It is part of the UI/UIH frame message which needs to be limited to MTU. Hence, it is wrong not to consider this octet.
3) Finally, the waiting user tty is not informed about freed space in its send queue.
Take at most one packet worth of data out of the DLCI fifo to fix 1). Limit the max user data size per packet to MTU - 1 in case of convergence layer type 2 to leave space for the control signal octet which is added in the later part of the function. This fixes 2).
Add tty_port_tty_wakeup() to wake up the user tty if new write space has been made available to fix 3).
--- drivers/tty/n_gsm.c | 74 +++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 32 deletions(-)
drivers/tty/n_gsm.c +42 -32
@@ -886,41 +886,51 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci) {struct gsm_msg *msg;u8 *dp; -int len, total_size, size; -int h = dlci->adaption -1 ; +int h, len, size; - total_size =0 ; -while (1 ) { - len =kfifo_len (&dlci->fifo); -if (len ==0 ) -return total_size; - -/* MTU/MRU count only the data bits */ -if (len > gsm->mtu) - len = gsm->mtu; - - size = len + h; - - msg =gsm_data_alloc (gsm, dlci->addr, size, gsm->ftype); -/* FIXME: need a timer or something to kick this so it can't -get stuck with no work outstanding and no buffer free */ -if (msg ==NULL ) -return -ENOMEM ; - dp = msg->data; -switch (dlci->adaption) { -case 1 :/* Unstructured */ -break ; -case 2 :/* Unstructed with modem bits. -Always one byte as we never send inline break data */ - *dp++ = (gsm_encode_modem (dlci) <<1 ) |EA ; -break ; - } -WARN_ON (kfifo_out_locked (&dlci->fifo, dp , len, &dlci->lock) != len); -__gsm_data_queue (dlci, msg); - total_size += size; +/* for modem bits without break data */ + h = ((dlci->adaption ==1 ) ?0 :1 ); + + len =kfifo_len (&dlci->fifo); +if (len ==0 ) +return 0 ; + +/* MTU/MRU count only the data bits but watch adaption mode */ +if ((len + h) > gsm->mtu) + len = gsm->mtu - h; + + size = len + h; + + msg =gsm_data_alloc (gsm, dlci->addr, size, gsm->ftype); +/* FIXME: need a timer or something to kick this so it can't +* get stuck with no work outstanding and no buffer free +*/ +if (!msg) +return -ENOMEM ; + dp = msg->data; +switch (dlci->adaption) { +case 1 :/* Unstructured */ +break ; +case 2 :/* Unstructured with modem bits. +* Always one byte as we never send inline break data +*/ + *dp++ = (gsm_encode_modem (dlci) <<1 ) |EA ; +break ; +default : +pr_err ("%s: unsupported adaption %d\n" , __func__, + dlci->adaption); +break ; } + +WARN_ON (len !=kfifo_out_locked (&dlci->fifo, dp, len, + &dlci->lock)); + +/* Notify upper layer about available send space. */ +tty_port_tty_wakeup (&dlci->port); + +__gsm_data_queue (dlci, msg);/* Bytes of data we used up */ -return total_size; +return size; }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 928/1157 tty: n_gsm: fix missing timer to handle stalled links
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit c568f7086c6e771c77aad13d727c70ef70e07243 ]
The current implementation does not handle the situation that no data is in the internal queue and needs to be sent out while the user tty fifo is full.
Add a timer that moves more data from user tty down to the internal queue which is then serialized on the ldisc. This timer is triggered if no data was moved from a user tty to the internal queue within 10 * T1.
--- drivers/tty/n_gsm.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-)
drivers/tty/n_gsm.c +35 -8
@@ -244,6 +244,7 @@ struct gsm_mux {struct list_head tx_list;/* Pending data packets */ /* Control messages */ +struct timer_list kick_timer;/* Kick TX queuing on timeout */ struct timer_list t2_timer;/* Retransmit timer for commands */ int cretries;/* Command retry counter */ struct gsm_control *pending_cmd;/* Our current pending command */
@@ -850,6 +851,7 @@ static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)list_add_tail (&msg->list, &gsm->tx_list); gsm->tx_bytes += msg->len;gsm_data_kick (gsm, dlci); +mod_timer (&gsm->kick_timer, jiffies +10 * gsm->t1 *HZ /100 ); }/**
@@ -902,9 +904,6 @@ static int gsm_dlci_data_output(struct gsm_mux *gsm, struct gsm_dlci *dlci) size = len + h; msg =gsm_data_alloc (gsm, dlci->addr, size, gsm->ftype); -/* FIXME: need a timer or something to kick this so it can't -* get stuck with no work outstanding and no buffer free -*/ if (!msg)return -ENOMEM ; dp = msg->data;
@@ -981,9 +980,6 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm, size = len + overhead; msg =gsm_data_alloc (gsm, dlci->addr, size, gsm->ftype); - -/* FIXME: need a timer or something to kick this so it can't -get stuck with no work outstanding and no buffer free */ if (msg ==NULL ) {skb_queue_tail (&dlci->skb_list, dlci->skb); dlci->skb =NULL ;
@@ -1079,9 +1075,9 @@ static int gsm_dlci_modem_output(struct gsm_mux *gsm, struct gsm_dlci *dlci,* renegotiate DLCI priorities with optional stuff. Needs optimising. */ -static void gsm_dlci_data_sweep (struct gsm_mux *gsm) +static int gsm_dlci_data_sweep (struct gsm_mux *gsm) { -int len; +int len, ret =0 ;/* Priority ordering: We should do priority with RR of the groups */ int i =1 ;
@@ -1104,7 +1100,11 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm)/* DLCI empty - try the next */ if (len ==0 ) i++; +else + ret++; } + +return ret; }/**
@@ -1823,6 +1823,30 @@ static void gsm_dlci_command(struct gsm_dlci *dlci, const u8 *data, int len) } } +/** +* gsm_kick_timer - transmit if possible +* @t: timer contained in our gsm object +* +* Transmit data from DLCIs if the queue is empty. We can't rely on +* a tty wakeup except when we filled the pipe so we need to fire off +* new data ourselves in other cases. +*/ +static void gsm_kick_timer (struct timer_list *t) +{ +struct gsm_mux *gsm =from_timer (gsm, t, kick_timer); +unsigned long flags; +int sent =0 ; + +spin_lock_irqsave (&gsm->tx_lock, flags); +/* If we have nothing running then we need to fire up */ +if (gsm->tx_bytes <TX_THRESH_LO ) + sent =gsm_dlci_data_sweep (gsm); +spin_unlock_irqrestore (&gsm->tx_lock, flags); + +if (sent && debug &4 ) +pr_info ("%s TX queue stalled\n" , __func__); +} +/* * Allocate/Free DLCI channels */
@@ -2274,6 +2298,7 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc) }/* Finish outstanding timers, making sure they are done */ +del_timer_sync (&gsm->kick_timer);del_timer_sync (&gsm->t2_timer);/* Free up any link layer users and finally the control channel */
@@ -2306,6 +2331,7 @@ static int gsm_activate_mux(struct gsm_mux *gsm)struct gsm_dlci *dlci;int ret; +timer_setup (&gsm->kick_timer, gsm_kick_timer,0 );timer_setup (&gsm->t2_timer, gsm_control_retransmit,0 );init_waitqueue_head (&gsm->event);spin_lock_init (&gsm->control_lock);
@@ -2710,6 +2736,7 @@ static int gsmld_open(struct tty_struct *tty)gsmld_attach_gsm (tty, gsm); +timer_setup (&gsm->kick_timer, gsm_kick_timer,0 );timer_setup (&gsm->t2_timer, gsm_control_retransmit,0 );return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 929/1157 tty: n_gsm: fix non flow control frames during mux flow off
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit bec0224816d19abe4fe503586d16d51890540615 ]
n_gsm is based on the 3GPP 07.010 and its newer version is the 3GPP 27.010.
See https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1516
The changes from 07.010 to 27.010 are non-functional. Therefore, I refer to
the newer 27.010 here. Chapter 5.4.6.3.6 states that FCoff stops the
transmission on all channels except the control channel. This is already
implemented in gsm_data_kick(). However, chapter 5.4.8.1 explains that this
shall result in the same behavior as software flow control on the ldisc in
advanced option mode. That means only flow control frames shall be sent
during flow off. The current implementation does not consider this case.
Change gsm_data_kick() to send only flow control frames if constipated to abide the standard. gsm_read_ea_val() and gsm_is_flow_ctrl_msg() are introduced as helper functions for this.
It is planned to use gsm_read_ea_val() in later code cleanups for other functions, too.
--- drivers/tty/n_gsm.c | 54 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-)
drivers/tty/n_gsm.c +53 -1
@@ -421,6 +421,27 @@ static int gsm_read_ea(unsigned int *val, u8 c)return c &EA ; } +/** +* gsm_read_ea_val - read a value until EA +* @val: variable holding value +* @data: buffer of data +* @dlen: length of data +* +* Processes an EA value. Updates the passed variable and +* returns the processed data length. +*/ +static unsigned int gsm_read_ea_val (unsigned int *val,const u8 *data,int dlen) +{ +unsigned int len =0 ; + +for (; dlen >0 ; dlen--) { + len++; +if (gsm_read_ea (val, *data++)) +break ; + } +return len; +} +/** * gsm_encode_modem - encode modem data bits * @dlci: DLCI to encode from
@@ -746,6 +767,37 @@ static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len,return m; } +/** +* gsm_is_flow_ctrl_msg - checks if flow control message +* @msg: message to check +* +* Returns true if the given message is a flow control command of the +* control channel. False is returned in any other case. +*/ +static bool gsm_is_flow_ctrl_msg (struct gsm_msg *msg) +{ +unsigned int cmd; + +if (msg->addr >0 ) +return false; + +switch (msg->ctrl & ~PF ) { +case UI : +case UIH : + cmd =0 ; +if (gsm_read_ea_val (&cmd, msg->data +2 , msg->len -2 ) <1 ) +break ; +switch (cmd & ~PF ) { +case CMD_FCOFF : +case CMD_FCON : +return true; + } +break ; + } + +return false; +} +/** * gsm_data_kick - poke the queue * @gsm: GSM Mux
@@ -765,7 +817,7 @@ static void gsm_data_kick(struct gsm_mux *gsm, struct gsm_dlci *dlci)int len;list_for_each_entry_safe (msg, nmsg, &gsm->tx_list, list) { -if (gsm->constipated && msg->addr) +if (gsm->constipated && !gsm_is_flow_ctrl_msg (msg))continue ;if (gsm->encoding !=0 ) { gsm->txframe[0 ] =GSM1_SOF ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 930/1157 tty: n_gsm: fix packet re-transmission without open control channel
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 4fae831b3a71fc5a44cc5c7d0b8c1267ee7659f5 ]
In the current implementation control packets are re-transmitted even if the control channel closed down during T2. This is wrong. Check whether the control channel is open before re-transmitting any packets. Note that control channel open/close is handled by T1 and not T2 and remains unaffected by this.
--- drivers/tty/n_gsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/n_gsm.c +1 -1
@@ -1532,7 +1532,7 @@ static void gsm_control_retransmit(struct timer_list *t)spin_lock_irqsave (&gsm->control_lock, flags); ctrl = gsm->pending_cmd;if (ctrl) { -if (gsm->cretries ==0 ) { +if (gsm->cretries ==0 || !gsm->dlci[0 ] || gsm->dlci[0 ]->dead) { gsm->pending_cmd =NULL ; ctrl->error = -ETIMEDOUT ; ctrl->done =1 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 931/1157 tty: n_gsm: fix race condition in gsmld_write()
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 32dd59f96924f45e33bc79854f7a00679c0fa28e ]
The function may be used by the user directly and also by the n_gsm internal functions. They can lead into a race condition which results in interleaved frames if both are writing at the same time. The receiving side is not able to decode those interleaved frames correctly.
Add a lock around the low side tty write to avoid race conditions and frame interleaving between user originated writes and n_gsm writes.
--- drivers/tty/n_gsm.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/tty/n_gsm.c +17 -4
@@ -2859,11 +2859,24 @@ static ssize_t gsmld_read(struct tty_struct *tty, struct file *file,static ssize_t gsmld_write (struct tty_struct *tty,struct file *file,const unsigned char *buf,size_t nr) { -int space =tty_write_room (tty); +struct gsm_mux *gsm = tty->disc_data; +unsigned long flags; +int space; +int ret; + +if (!gsm) +return -ENODEV ; + + ret = -ENOBUFS ; +spin_lock_irqsave (&gsm->tx_lock, flags); + space =tty_write_room (tty);if (space >= nr) -return tty->ops->write (tty, buf, nr); -set_bit (TTY_DO_WRITE_WAKEUP , &tty->flags); -return -ENOBUFS ; + ret = tty->ops->write (tty, buf, nr); +else +set_bit (TTY_DO_WRITE_WAKEUP , &tty->flags); +spin_unlock_irqrestore (&gsm->tx_lock, flags); + +return ret; }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 932/1157 tty: n_gsm: fix deadlock and link starvation in outgoing data path
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 0af021678d5d30c31f5a6b631f404ead3575212a ]
The current implementation queues up new control and user packets as needed and processes this queue down to the ldisc in the same code path. That means that the upper and the lower layer are hard coupled in the code. Due to this deadlocks can happen as seen below while transmitting data, especially during ldisc congestion. Furthermore, the data channels starve the control channel on high transmission load on the ldisc.
Introduce an additional control channel data queue to prevent timeouts and link hangups during ldisc congestion. This is being processed before the user channel data queue in gsm_data_kick(), i.e. with the highest priority. Put the queue to ldisc data path into a workqueue and trigger it whenever new data has been put into the transmission queue. Change gsm_dlci_data_sweep() accordingly to fill up the transmission queue until TX_THRESH_HI. This solves the locking issue, keeps latency low and provides good performance on high data load.
Note that now all packets from a DLCI are removed from the internal queue if the associated DLCI was closed. This ensures that no data is sent by the introduced write task to an already closed DLCI.
BUG: spinlock recursion on CPU#0, test_v24_loop/124 lock: serial8250_ports+0x3a8/0x7500, .magic: dead4ead, .owner: test_v24_loop/124, .owner_cpu: 0 CPU: 0 PID: 124 Comm: test_v24_loop Tainted: G O 5.18.0-rc2 #3 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Call Trace: <IRQ> dump_stack_lvl+0x34/0x44 do_raw_spin_lock+0x76/0xa0 _raw_spin_lock_irqsave+0x72/0x80 uart_write_room+0x3b/0xc0 gsm_data_kick+0x14b/0x240 [n_gsm] gsmld_write_wakeup+0x35/0x70 [n_gsm] tty_wakeup+0x53/0x60 tty_port_default_wakeup+0x1b/0x30 serial8250_tx_chars+0x12f/0x220 serial8250_handle_irq.part.0+0xfe/0x150 serial8250_default_handle_irq+0x48/0x80 serial8250_interrupt+0x56/0xa0 __handle_irq_event_percpu+0x78/0x1f0 handle_irq_event+0x34/0x70 handle_fasteoi_irq+0x90/0x1e0 __common_interrupt+0x69/0x100 common_interrupt+0x48/0xc0 asm_common_interrupt+0x1e/0x40 RIP: 0010:__do_softirq+0x83/0x34e Code: 2a 0a ff 0f b7 ed c7 44 24 10 0a 00 00 00 48 c7 c7 51 2a 64 82 e8 2d
e2 d5 ff 65 66 c7 05 83 af 1e 7e 00 00 fb b8 ff ff ff ff <49> c7 c2 40 61 80 82 0f bc c5 41 89 c4 41 83 c4 01 0f 84 e6 00 00
RSP: 0018:ffffc90000003f98 EFLAGS: 00000286
RAX: 00000000ffffffff RBX: 0000000000000000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffffffff82642a51 RDI: ffffffff825bb5e7
RBP: 0000000000000200 R08: 00000008de3271a8 R09: 0000000000000000
R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000
R13: 0000000000000030 R14: 0000000000000000 R15: 0000000000000000
? __do_softirq+0x73/0x34e irq_exit_rcu+0xb5/0x100 common_interrupt+0xa4/0xc0 </IRQ> <TASK> asm_common_interrupt+0x1e/0x40 RIP: 0010:_raw_spin_unlock_irqrestore+0x2e/0x50 Code: 00 55 48 89 fd 48 83 c7 18 53 48 89 f3 48 8b 74 24 10 e8 85 28 36 ff
48 89 ef e8 cd 58 36 ff 80 e7 02 74 01 fb bf 01 00 00 00 <e8> 3d 97 33 ff 65 8b 05 96 23 2b 7e 85 c0 74 03 5b 5d c3 0f 1f 44
RSP: 0018:ffffc9000020fd08 EFLAGS: 00000202
RAX: 0000000000000000 RBX: 0000000000000246 RCX: 0000000000000000
RDX: 0000000000000004 RSI: ffffffff8257fd74 RDI: 0000000000000001
RBP: ffff8880057de3a0 R08: 00000008de233000 R09: 0000000000000000
R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000000
R13: 0000000000000100 R14: 0000000000000202 R15: ffff8880057df0b8
? _raw_spin_unlock_irqrestore+0x23/0x50 gsmtty_write+0x65/0x80 [n_gsm] n_tty_write+0x33f/0x530 ? swake_up_all+0xe0/0xe0 file_tty_write.constprop.0+0x1b1/0x320 ? n_tty_flush_buffer+0xb0/0xb0 new_sync_write+0x10c/0x190 vfs_write+0x282/0x310 ksys_write+0x68/0xe0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f3e5e35c15c Code: 8b 7c 24 08 89 c5 e8 c5 ff ff ff 89 ef 89 44 24 08 e8 58 bc 02 00 8b
44 24 08 48 83 c4 10 5d c3 48 63 ff b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 76 10 48 8b 15 fd fc 05 00 f7 d8 64 89 02 48 83
RSP: 002b:00007ffcee77cd18 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
RAX: ffffffffffffffda RBX: 00007ffcee77cd70 RCX: 00007f3e5e35c15c
RDX: 0000000000000100 RSI: 00007ffcee77cd90 RDI: 0000000000000003
RBP: 0000000000000100 R08: 0000000000000000 R09: 7efefefefefefeff
R10: 00007f3e5e3bddeb R11: 0000000000000246 R12: 00007ffcee77ce8f
R13: 0000000000000001 R14: 000056214404e010 R15: 00007ffcee77cd90
</TASK>
--- drivers/tty/n_gsm.c | 407 ++++++++++++++++++++++++++++++-------------- 1 file changed, 279 insertions(+), 128 deletions(-)
drivers/tty/n_gsm.c +279 -128
@@ -5,6 +5,14 @@* * * THIS IS A DEVELOPMENT SNAPSHOT IT IS NOT A FINAL RELEASE * * +* Outgoing path: +* tty -> DLCI fifo -> scheduler -> GSM MUX data queue ---o-> ldisc +* control message -> GSM MUX control queue --´ +* +* Incoming path: +* ldisc -> gsm_queue() -o--> tty +* `-> gsm_control_response() +* * TO DO: * Mostly done: ioctls for setting modes/timing * Partly done: hooks so you can pull off frames to non tty devs
@@ -210,6 +218,9 @@ struct gsm_mux {/* Events on the GSM channel */ wait_queue_head_t event; +/* ldisc send work */ +struct work_struct tx_work; +/* Bits for GSM mode decoding */ /* Framing Layer */
@@ -241,7 +252,8 @@ struct gsm_mux {unsigned int tx_bytes;/* TX data outstanding */ #define TX_THRESH_HI 8192#define TX_THRESH_LO 2048 -struct list_head tx_list;/* Pending data packets */ +struct list_head tx_ctrl_list;/* Pending control packets */ +struct list_head tx_data_list;/* Pending data packets */ /* Control messages */ struct timer_list kick_timer;/* Kick TX queuing on timeout */
@@ -371,6 +383,11 @@ static const u8 gsm_fcs8[256] = {static int gsmld_output (struct gsm_mux *gsm,u8 *data,int len);static int gsm_modem_update (struct gsm_dlci *dlci,u8 brk); +static struct gsm_msg *gsm_data_alloc (struct gsm_mux *gsm,u8 addr,int len, +u8 ctrl); +static int gsm_send_packet (struct gsm_mux *gsm,struct gsm_msg *msg); +static void gsmld_write_trigger (struct gsm_mux *gsm); +static void gsmld_write_task (struct work_struct *work);/** * gsm_fcs_add - update FCS
@@ -655,57 +672,73 @@ static int gsm_stuff_frame(const u8 *input, u8 *output, int len)* @cr: command/response bit seen as initiator * @control: control byte including PF bit * -* Format up and transmit a control frame. These do not go via the -* queueing logic as they should be transmitted ahead of data when -* they are needed. -* -* FIXME: Lock versus data TX path +* Format up and transmit a control frame. These should be transmitted +* ahead of data when they are needed. */ - -static void gsm_send (struct gsm_mux *gsm,int addr,int cr,int control) +static int gsm_send (struct gsm_mux *gsm,int addr,int cr,int control) { -int len; -u8 cbuf[10 ]; -u8 ibuf[3 ]; +struct gsm_msg *msg; +u8 *dp;int ocr; +unsigned long flags; + + msg =gsm_data_alloc (gsm, addr,0 , control); +if (!msg) +return -ENOMEM ;/* toggle C/R coding if not initiator */ ocr = cr ^ (gsm->initiator ?0 :1 ); -switch (gsm->encoding) { -case 0 : - cbuf[0 ] =GSM0_SOF ; - cbuf[1 ] = (addr <<2 ) | (ocr <<1 ) |EA ; - cbuf[2 ] = control; - cbuf[3 ] =EA ;/* Length of data = 0 */ - cbuf[4 ] =0xFF -gsm_fcs_add_block (INIT_FCS , cbuf +1 ,3 ); - cbuf[5 ] =GSM0_SOF ; - len =6 ; -break ; -case 1 : -case 2 : -/* Control frame + packing (but not frame stuffing) in mode 1 */ - ibuf[0 ] = (addr <<2 ) | (ocr <<1 ) |EA ; - ibuf[1 ] = control; - ibuf[2 ] =0xFF -gsm_fcs_add_block (INIT_FCS , ibuf,2 ); -/* Stuffing may double the size worst case */ - len =gsm_stuff_frame (ibuf, cbuf +1 ,3 ); -/* Now add the SOF markers */ - cbuf[0 ] =GSM1_SOF ; - cbuf[len +1 ] =GSM1_SOF ; -/* FIXME: we can omit the lead one in many cases */ - len +=2 ; -break ; -default : -WARN_ON (1 ); -return ; - } -gsmld_output (gsm, cbuf, len); -if (!gsm->initiator) { - cr = cr & gsm->initiator; - control = control & ~PF ; + msg->data -=3 ; + dp = msg->data; + *dp++ = (addr <<2 ) | (ocr <<1 ) |EA ; + *dp++ = control; + +if (gsm->encoding ==0 ) + *dp++ =EA ;/* Length of data = 0 */ + + *dp =0xFF -gsm_fcs_add_block (INIT_FCS , msg->data, dp - msg->data); + msg->len = (dp - msg->data) +1 ; + +gsm_print_packet ("Q->" , addr, cr, control,NULL ,0 ); + +spin_lock_irqsave (&gsm->tx_lock, flags); +list_add_tail (&msg->list, &gsm->tx_ctrl_list); + gsm->tx_bytes += msg->len; +spin_unlock_irqrestore (&gsm->tx_lock, flags); +gsmld_write_trigger (gsm); + +return 0 ; +} + +/** +* gsm_dlci_clear_queues - remove outstanding data for a DLCI +* @gsm: mux +* @dlci: clear for this DLCI +* +* Clears the data queues for a given DLCI. +*/ +static void gsm_dlci_clear_queues (struct gsm_mux *gsm,struct gsm_dlci *dlci) +{ +struct gsm_msg *msg, *nmsg; +int addr = dlci->addr; +unsigned long flags; + +/* Clear DLCI write fifo first */ +spin_lock_irqsave (&dlci->lock, flags); +kfifo_reset (&dlci->fifo); +spin_unlock_irqrestore (&dlci->lock, flags); + +/* Clear data packets in MUX write queue */ +spin_lock_irqsave (&gsm->tx_lock, flags); +list_for_each_entry_safe (msg, nmsg, &gsm->tx_data_list, list) { +if (msg->addr != addr) +continue ; + gsm->tx_bytes -= msg->len; +list_del (&msg->list); +kfree (msg); } -gsm_print_packet ("-->" , addr, cr, control,NULL ,0 ); +spin_unlock_irqrestore (&gsm->tx_lock, flags); }/**
@@ -767,6 +800,45 @@ static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len,return m; } +/** +* gsm_send_packet - sends a single packet +* @gsm: GSM Mux +* @msg: packet to send +* +* The given packet is encoded and sent out. No memory is freed. +* The caller must hold the gsm tx lock. +*/ +static int gsm_send_packet (struct gsm_mux *gsm,struct gsm_msg *msg) +{ +int len, ret; + + +if (gsm->encoding ==0 ) { + gsm->txframe[0 ] =GSM0_SOF ; +memcpy (gsm->txframe +1 , msg->data, msg->len); + gsm->txframe[msg->len +1 ] =GSM0_SOF ; + len = msg->len +2 ; + }else { + gsm->txframe[0 ] =GSM1_SOF ; + len =gsm_stuff_frame (msg->data, gsm->txframe +1 , msg->len); + gsm->txframe[len +1 ] =GSM1_SOF ; + len +=2 ; + } + +if (debug &4 ) +gsm_hex_dump_bytes (__func__, gsm->txframe, len); +gsm_print_packet ("-->" , msg->addr, gsm->initiator, msg->ctrl, msg->data, + msg->len); + + ret =gsmld_output (gsm, gsm->txframe, len); +if (ret <=0 ) +return ret; +/* FIXME: Can eliminate one SOF in many more cases */ + gsm->tx_bytes -= msg->len; + +return 0 ; +} +/** * gsm_is_flow_ctrl_msg - checks if flow control message * @msg: message to check
@@ -799,59 +871,81 @@ static bool gsm_is_flow_ctrl_msg(struct gsm_msg *msg) }/** -* gsm_data_kick - poke the queue +* gsm_data_kick - poke the queue * @gsm: GSM Mux -* @dlci: DLCI sending the data * * The tty device has called us to indicate that room has appeared in -* the transmit queue. Ram more data into the pipe if we have any +* the transmit queue. Ram more data into the pipe if we have any. * If we have been flow-stopped by a CMD_FCOFF, then we can only -* send messages on DLCI0 until CMD_FCON -* -* FIXME: lock against link layer control transmissions +* send messages on DLCI0 until CMD_FCON. The caller must hold +* the gsm tx lock. */ - -static void gsm_data_kick (struct gsm_mux *gsm,struct gsm_dlci *dlci) +static int gsm_data_kick (struct gsm_mux *gsm) {struct gsm_msg *msg, *nmsg; -int len; +struct gsm_dlci *dlci; +int ret; -list_for_each_entry_safe (msg, nmsg, &gsm->tx_list, list) { +clear_bit (TTY_DO_WRITE_WAKEUP , &gsm->tty->flags); + +/* Serialize control messages and control channel messages first */ +list_for_each_entry_safe (msg, nmsg, &gsm->tx_ctrl_list, list) {if (gsm->constipated && !gsm_is_flow_ctrl_msg (msg)) +return -EAGAIN ; + ret =gsm_send_packet (gsm, msg); +switch (ret) { +case -ENOSPC : +return -ENOSPC ; +case -ENODEV : +/* ldisc not open */ + gsm->tx_bytes -= msg->len; +list_del (&msg->list); +kfree (msg);continue ; -if (gsm->encoding !=0 ) { - gsm->txframe[0 ] =GSM1_SOF ; - len =gsm_stuff_frame (msg->data, - gsm->txframe +1 , msg->len); - gsm->txframe[len +1 ] =GSM1_SOF ; - len +=2 ; - }else { - gsm->txframe[0 ] =GSM0_SOF ; -memcpy (gsm->txframe +1 , msg->data, msg->len); - gsm->txframe[msg->len +1 ] =GSM0_SOF ; - len = msg->len +2 ; - } - -if (debug &4 ) -gsm_hex_dump_bytes (__func__, gsm->txframe, len); -if (gsmld_output (gsm, gsm->txframe, len) <=0 ) +default : +if (ret >=0 ) { +list_del (&msg->list); +kfree (msg); + }break ; -/* FIXME: Can eliminate one SOF in many more cases */ - gsm->tx_bytes -= msg->len; - -list_del (&msg->list); -kfree (msg); + } + } -if (dlci) { -tty_port_tty_wakeup (&dlci->port); - }else { -int i =0 ; +if (gsm->constipated) +return -EAGAIN ; -for (i =0 ; i <NUM_DLCI ; i++) -if (gsm->dlci[i]) -tty_port_tty_wakeup (&gsm->dlci[i]->port); +/* Serialize other channels */ +if (list_empty (&gsm->tx_data_list)) +return 0 ; +list_for_each_entry_safe (msg, nmsg, &gsm->tx_data_list, list) { + dlci = gsm->dlci[msg->addr]; +/* Send only messages for DLCIs with valid state */ +if (dlci->state !=DLCI_OPEN ) { + gsm->tx_bytes -= msg->len; +list_del (&msg->list); +kfree (msg); +continue ; + } + ret =gsm_send_packet (gsm, msg); +switch (ret) { +case -ENOSPC : +return -ENOSPC ; +case -ENODEV : +/* ldisc not open */ + gsm->tx_bytes -= msg->len; +list_del (&msg->list); +kfree (msg); +continue ; +default : +if (ret >=0 ) { +list_del (&msg->list); +kfree (msg); + } +break ; } } + +return 1 ; }/**
@@ -900,9 +994,21 @@ static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg) msg->data = dp;/* Add to the actual output queue */ -list_add_tail (&msg->list, &gsm->tx_list); +switch (msg->ctrl & ~PF ) { +case UI : +case UIH : +if (msg->addr >0 ) { +list_add_tail (&msg->list, &gsm->tx_data_list); +break ; + } + fallthrough; +default : +list_add_tail (&msg->list, &gsm->tx_ctrl_list); +break ; + } gsm->tx_bytes += msg->len; -gsm_data_kick (gsm, dlci); + +gsmld_write_trigger (gsm);mod_timer (&gsm->kick_timer, jiffies +10 * gsm->t1 *HZ /100 ); }
@@ -1129,32 +1235,39 @@ static int gsm_dlci_modem_output(struct gsm_mux *gsm, struct gsm_dlci *dlci,static int gsm_dlci_data_sweep (struct gsm_mux *gsm) { -int len, ret =0 ;/* Priority ordering: We should do priority with RR of the groups */ -int i =1 ; - -while (i <NUM_DLCI ) { -struct gsm_dlci *dlci; +int i, len, ret =0 ; +bool sent; +struct gsm_dlci *dlci; -if (gsm->tx_bytes >TX_THRESH_HI ) -break ; - dlci = gsm->dlci[i]; -if (dlci ==NULL || dlci->constipated) { - i++; -continue ; +while (gsm->tx_bytes <TX_THRESH_HI ) { +for (sent = false, i =1 ; i <NUM_DLCI ; i++) { + dlci = gsm->dlci[i]; +/* skip unused or blocked channel */ +if (!dlci || dlci->constipated) +continue ; +/* skip channels with invalid state */ +if (dlci->state !=DLCI_OPEN ) +continue ; +/* count the sent data per adaption */ +if (dlci->adaption <3 && !dlci->net) + len =gsm_dlci_data_output (gsm, dlci); +else + len =gsm_dlci_data_output_framed (gsm, dlci); +/* on error exit */ +if (len <0 ) +return ret; +if (len >0 ) { + ret++; + sent = true; +/* The lower DLCs can starve the higher DLCs! */ +break ; + } +/* try next */ } -if (dlci->adaption <3 && !dlci->net) - len =gsm_dlci_data_output (gsm, dlci); -else - len =gsm_dlci_data_output_framed (gsm, dlci); -if (len <0 ) +if (!sent)break ; -/* DLCI empty - try the next */ -if (len ==0 ) - i++; -else - ret++; - } + };return ret; }
@@ -1402,7 +1515,6 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command, const u8 *data, int clen) {u8 buf[1 ]; -unsigned long flags;switch (command) {case CMD_CLD : {
@@ -1424,9 +1536,7 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command, gsm->constipated = false;gsm_control_reply (gsm,CMD_FCON ,NULL ,0 );/* Kick the link in case it is idling */ -spin_lock_irqsave (&gsm->tx_lock, flags); -gsm_data_kick (gsm,NULL ); -spin_unlock_irqrestore (&gsm->tx_lock, flags); +gsmld_write_trigger (gsm);break ;case CMD_FCOFF :/* Modem wants us to STFU */
@@ -1629,8 +1739,6 @@ static int gsm_control_wait(struct gsm_mux *gsm, struct gsm_control *control)static void gsm_dlci_close (struct gsm_dlci *dlci) { -unsigned long flags; -del_timer (&dlci->t1);if (debug &8 )pr_debug ("DLCI %d goes closed.\n" , dlci->addr);
@@ -1639,17 +1747,16 @@ static void gsm_dlci_close(struct gsm_dlci *dlci) dlci->constipated = true;if (dlci->addr !=0 ) {tty_port_tty_hangup (&dlci->port, false); -spin_lock_irqsave (&dlci->lock, flags); -kfifo_reset (&dlci->fifo); -spin_unlock_irqrestore (&dlci->lock, flags); +gsm_dlci_clear_queues (dlci->gsm, dlci);/* Ensure that gsmtty_open() can return. */ tty_port_set_initialized (&dlci->port,0 );wake_up_interruptible (&dlci->port.open_wait); }else dlci->gsm->dead = true; -wake_up (&dlci->gsm->event);/* A DLCI 0 close is a MUX termination so we need to kick that back to userspace somehow */ +gsm_dlci_data_kick (dlci); +wake_up (&dlci->gsm->event); }/**
@@ -1672,6 +1779,7 @@ static void gsm_dlci_open(struct gsm_dlci *dlci)/* Send current modem state */ if (dlci->addr)gsm_modem_update (dlci,0 ); +gsm_dlci_data_kick (dlci);wake_up (&dlci->gsm->event); }
@@ -2222,7 +2330,7 @@ static void gsm1_receive(struct gsm_mux *gsm, unsigned char c) }else if ((c &ISO_IEC_646_MASK ) ==XOFF ) { gsm->constipated = false;/* Kick the link in case it is idling */ -gsm_data_kick (gsm,NULL ); +gsmld_write_trigger (gsm);return ; }if (c ==GSM1_SOF ) {
@@ -2353,6 +2461,9 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc)del_timer_sync (&gsm->kick_timer);del_timer_sync (&gsm->t2_timer); +/* Finish writing to ldisc */ +flush_work (&gsm->tx_work); +/* Free up any link layer users and finally the control channel */ if (gsm->has_devices) {gsm_unregister_devices (gsm_tty_driver, gsm->num);
@@ -2364,9 +2475,12 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm, bool disc)mutex_unlock (&gsm->mutex);/* Now wipe the queues */ tty_ldisc_flush (gsm->tty); -list_for_each_entry_safe (txq, ntxq, &gsm->tx_list, list) +list_for_each_entry_safe (txq, ntxq, &gsm->tx_ctrl_list, list) +kfree (txq); +INIT_LIST_HEAD (&gsm->tx_ctrl_list); +list_for_each_entry_safe (txq, ntxq, &gsm->tx_data_list, list)kfree (txq); -INIT_LIST_HEAD (&gsm->tx_list); +INIT_LIST_HEAD (&gsm->tx_data_list); }/**
@@ -2385,6 +2499,7 @@ static int gsm_activate_mux(struct gsm_mux *gsm)timer_setup (&gsm->kick_timer, gsm_kick_timer,0 );timer_setup (&gsm->t2_timer, gsm_control_retransmit,0 ); +INIT_WORK (&gsm->tx_work, gsmld_write_task);init_waitqueue_head (&gsm->event);spin_lock_init (&gsm->control_lock);spin_lock_init (&gsm->tx_lock);
@@ -2494,7 +2609,8 @@ static struct gsm_mux *gsm_alloc_mux(void)spin_lock_init (&gsm->lock);mutex_init (&gsm->mutex);kref_init (&gsm->ref); -INIT_LIST_HEAD (&gsm->tx_list); +INIT_LIST_HEAD (&gsm->tx_ctrl_list); +INIT_LIST_HEAD (&gsm->tx_data_list); gsm->t1 =T1 ; gsm->t2 =T2 ;
@@ -2651,6 +2767,47 @@ static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len)return gsm->tty->ops->write (gsm->tty, data, len); } + +/** +* gsmld_write_trigger - schedule ldisc write task +* @gsm: our mux +*/ +static void gsmld_write_trigger (struct gsm_mux *gsm) +{ +if (!gsm || !gsm->dlci[0 ] || gsm->dlci[0 ]->dead) +return ; +schedule_work (&gsm->tx_work); +} + + +/** +* gsmld_write_task - ldisc write task +* @work: our tx write work +* +* Writes out data to the ldisc if possible. We are doing this here to +* avoid dead-locking. This returns if no space or data is left for output. +*/ +static void gsmld_write_task (struct work_struct *work) +{ + struct gsm_mux *gsm = container_of(work, struct gsm_mux, tx_work); +unsigned long flags; +int i, ret; + +/* All outstanding control channel and control messages and one data +* frame is sent. +*/ + ret = -ENODEV ; +spin_lock_irqsave (&gsm->tx_lock, flags); +if (gsm->tty) + ret =gsm_data_kick (gsm); +spin_unlock_irqrestore (&gsm->tx_lock, flags); + +if (ret >=0 ) +for (i =0 ; i <NUM_DLCI ; i++) +if (gsm->dlci[i]) +tty_port_tty_wakeup (&gsm->dlci[i]->port); +} +/** * gsmld_attach_gsm - mode set up * @tty: our tty structure
@@ -2790,6 +2947,7 @@ static int gsmld_open(struct tty_struct *tty)timer_setup (&gsm->kick_timer, gsm_kick_timer,0 );timer_setup (&gsm->t2_timer, gsm_control_retransmit,0 ); +INIT_WORK (&gsm->tx_work, gsmld_write_task);return 0 ; }
@@ -2806,16 +2964,9 @@ static int gsmld_open(struct tty_struct *tty)static void gsmld_write_wakeup (struct tty_struct *tty) {struct gsm_mux *gsm = tty->disc_data; -unsigned long flags;/* Queue poll */ -clear_bit (TTY_DO_WRITE_WAKEUP , &tty->flags); -spin_lock_irqsave (&gsm->tx_lock, flags); -gsm_data_kick (gsm,NULL ); -if (gsm->tx_bytes <TX_THRESH_LO ) { -gsm_dlci_data_sweep (gsm); - } -spin_unlock_irqrestore (&gsm->tx_lock, flags); +gsmld_write_trigger (gsm); }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 933/1157 tty: n_gsm: fix resource allocation order in gsm_activate_mux()
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 7349660438603ed19282e75949561406531785a5 ]
Within gsm_activate_mux() all timers and locks are initiated before the actual resource for the control channel is allocated. This can lead to race conditions.
Allocate the control channel DLCI object first to avoid race conditions.
--- drivers/tty/n_gsm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/tty/n_gsm.c +4 -3
@@ -2497,6 +2497,10 @@ static int gsm_activate_mux(struct gsm_mux *gsm)struct gsm_dlci *dlci;int ret; + dlci =gsm_dlci_alloc (gsm,0 ); +if (dlci ==NULL ) +return -ENOMEM ; +timer_setup (&gsm->kick_timer, gsm_kick_timer,0 );timer_setup (&gsm->t2_timer, gsm_control_retransmit,0 );INIT_WORK (&gsm->tx_work, gsmld_write_task);
@@ -2513,9 +2517,6 @@ static int gsm_activate_mux(struct gsm_mux *gsm)if (ret)return ret; - dlci =gsm_dlci_alloc (gsm,0 ); -if (dlci ==NULL ) -return -ENOMEM ; gsm->has_devices = true; gsm->dead = false;/* Tty opens are now permissible */ return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 934/1157 ASoC: qcom: Fix missing of_node_put() in asoc_qcom_lpass_cpu_platform_probe()
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit f507c0c67dac57d2bcd5dcae4b6139b0305d8957 ]
We should call of_node_put() for the reference 'dsp_of_node' returned by of_parse_phandle() which will increase the refcount.
--- sound/soc/qcom/lpass-cpu.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/qcom/lpass-cpu.c +1 -0
@@ -1090,6 +1090,7 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) dsp_of_node =of_parse_phandle (pdev->dev.of_node,"qcom,adsp" ,0 );if (dsp_of_node) {dev_err (dev,"DSP exists and holds audio resources\n" ); +of_node_put (dsp_of_node);return -EBUSY ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 935/1157 MIPS: Loongson64: Fix section mismatch warning
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 08472f6ebdc23334ad11dcd761d2d52c32897793 ]
prom_init_numa_memory() is annotated __init and not used by any module, thus don't export it.
Remove not needed EXPORT_SYMBOL for prom_init_numa_memory() to fix the following section mismatch warning:
LD vmlinux.o
MODPOST vmlinux.symvers
WARNING: modpost: vmlinux.o(___ksymtab+prom_init_numa_memory+0x0): Section mismatch in reference from the variable __ksymtab_prom_init_numa_memory to the function .init.text:prom_init_numa_memory() The symbol prom_init_numa_memory is exported and annotated __init
Fix this by removing the __init annotation of prom_init_numa_memory or drop the export.
This is build on Linux 5.19-rc4.
--- arch/mips/loongson64/numa.c | 1 - 1 file changed, 1 deletion(-)
arch/mips/loongson64/numa.c +0 -1
@@ -196,7 +196,6 @@ void __init prom_init_numa_memory(void)pr_info ("CP0_PageGrain: CP0 5.1 (0x%x)\n" ,read_c0_pagegrain ());prom_meminit (); } -EXPORT_SYMBOL (prom_init_numa_memory);pg_data_t *__init arch_alloc_nodedata (int nid) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 936/1157 ASoC: imx-card: Fix DSD/PDM mclk frequency
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit c0fabd12a8570cb932f13d9388f3d887ad44369b ]
The DSD/PDM rate not only DSD64/128/256/512, which are the multiple rate of 44.1kHz, but also support the multiple rate of 8kHz, so can't force all mclk frequency to be 22579200Hz, need to assign the frequency according to rate.
--- sound/soc/fsl/imx-card.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
sound/soc/fsl/imx-card.c +11 -3
@@ -17,6 +17,9 @@#include "fsl_sai.h" +#define IMX_CARD_MCLK_22P5792MHZ 22579200 +#define IMX_CARD_MCLK_24P576MHZ 24576000 +enum codec_type {CODEC_DUMMY =0 ,CODEC_AK5558 =1 ,
@@ -353,9 +356,14 @@ static int imx_aif_hw_params(struct snd_pcm_substream *substream, mclk_freq =akcodec_get_mclk_rate (substream, params, slots, slot_width); else mclk_freq =params_rate (params) * slots * slot_width; -/* Use the maximum freq from DSD512 (512*44100 = 22579200) */ -if (format_is_dsd (params)) - mclk_freq =22579200 ; + +if (format_is_dsd (params)) { +/* Use the maximum freq from DSD512 (512*44100 = 22579200) */ +if (!(params_rate (params) %11025 )) + mclk_freq =IMX_CARD_MCLK_22P5792MHZ ; +else + mclk_freq =IMX_CARD_MCLK_24P576MHZ ; + } ret =snd_soc_dai_set_sysclk (cpu_dai, link_data->cpu_sysclk_id, mclk_freq,SND_SOC_CLOCK_OUT );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 937/1157 remoteproc: qcom: wcnss: Fix handling of IRQs
In reply to Greg Kroah-HartmanFrom: Sireesh Kodali <[email protected]>
[ Upstream commit bed0adac1ded4cb486ba19a3a7e730fbd9a1c9c6 ]
The wcnss_get_irq function is expected to return a value > 0 in the event that an IRQ is succssfully obtained, but it instead returns 0. This causes the stop and ready IRQs to never actually be used despite being defined in the device-tree. This patch fixes that.
--- drivers/remoteproc/qcom_wcnss.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/remoteproc/qcom_wcnss.c +8 -2
@@ -467,6 +467,7 @@ static int wcnss_request_irq(struct qcom_wcnss *wcnss, irq_handler_t thread_fn) {int ret; +int irq_number; ret =platform_get_irq_byname (pdev, name);if (ret <0 && optional) {
@@ -477,14 +478,19 @@ static int wcnss_request_irq(struct qcom_wcnss *wcnss,return ret; } + irq_number = ret; + ret =devm_request_threaded_irq (&pdev->dev, ret,NULL , thread_fn,IRQF_TRIGGER_RISING |IRQF_ONESHOT ,"wcnss" , wcnss); -if (ret) +if (ret) {dev_err (&pdev->dev,"request %s IRQ failed\n" , name); +return ret; + } -return ret; +/* Return the IRQ number if the IRQ was successfully acquired */ +return irq_number; }static int wcnss_alloc_memory_region (struct qcom_wcnss *wcnss)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 938/1157 vfio/ccw: Remove UUID from s390 debug log
In reply to Greg Kroah-HartmanFrom: Michael Kawano <[email protected]>
[ Upstream commit 3566ee1d776c1393393564b2514f9cd52a49c16e ]
As vfio-ccw devices are created/destroyed, the uuid of the associated mdevs that are recorded in $S390DBF/vfio_ccw_msg/sprintf get lost. This is because a pointer to the UUID is stored instead of the UUID itself, and that memory may have been repurposed if/when the logs are examined. The result is usually garbage UUID data in the logs, though there is an outside chance of an oops happening here.
Simply remove the UUID from the traces, as the subchannel number will provide useful configuration information for problem determination, and is stored directly into the log instead of a pointer.
As we were the only consumer of mdev_uuid(), remove that too.
--- drivers/s390/cio/vfio_ccw_drv.c | 5 ++--- drivers/s390/cio/vfio_ccw_fsm.c | 26 ++++++++++++-------------- drivers/s390/cio/vfio_ccw_ops.c | 8 ++++---- include/linux/mdev.h | 5 ----- 4 files changed, 18 insertions(+), 26 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +2 -3
@@ -14,7 +14,6 @@#include <linux/init.h> #include <linux/device.h> #include <linux/slab.h> -#include <linux/uuid.h> #include <linux/mdev.h> #include <asm/isc.h>
@@ -358,8 +357,8 @@ static int vfio_ccw_chp_event(struct subchannel *sch,return 0 ;trace_vfio_ccw_chp_event (private->sch->schid, mask, event); -VFIO_CCW_MSG_EVENT (2 ,"%pUl (%x.%x.%04x): mask=0x%x event=%d\n" , -mdev_uuid (private->mdev), sch->schid.cssid, +VFIO_CCW_MSG_EVENT (2 ,"sch %x.%x.%04x: mask=0x%x event=%d\n" , + sch->schid.cssid, sch->schid.ssid, sch->schid.sch_no, mask, event);
drivers/s390/cio/vfio_ccw_fsm.c +12 -14
@@ -10,7 +10,6 @@*/ #include <linux/vfio.h> -#include <linux/mdev.h> #include "ioasm.h" #include "vfio_ccw_private.h"
@@ -242,7 +241,6 @@ static void fsm_io_request(struct vfio_ccw_private *private,union orb *orb;union scsw *scsw = &private->scsw;struct ccw_io_region *io_region = private->io_region; -struct mdev_device *mdev = private->mdev;char *errstr ="request" ;struct subchannel_id schid =get_schid (private);
@@ -256,8 +254,8 @@ static void fsm_io_request(struct vfio_ccw_private *private,if (orb->tm.b) { io_region->ret_code = -EOPNOTSUPP ;VFIO_CCW_MSG_EVENT (2 , -"%pUl (%x.%x.%04x): transport mode\n" , -mdev_uuid (mdev), schid.cssid, +"sch %x.%x.%04x: transport mode\n" , + schid.cssid, schid.ssid, schid.sch_no); errstr ="transport mode" ; goto err_out;
@@ -265,8 +263,8 @@ static void fsm_io_request(struct vfio_ccw_private *private, io_region->ret_code =cp_init (&private->cp, orb);if (io_region->ret_code) {VFIO_CCW_MSG_EVENT (2 , -"%pUl (%x.%x.%04x): cp_init=%d\n" , -mdev_uuid (mdev), schid.cssid, +"sch %x.%x.%04x: cp_init=%d\n" , + schid.cssid, schid.ssid, schid.sch_no, io_region->ret_code); errstr ="cp init" ;
@@ -276,8 +274,8 @@ static void fsm_io_request(struct vfio_ccw_private *private, io_region->ret_code =cp_prefetch (&private->cp);if (io_region->ret_code) {VFIO_CCW_MSG_EVENT (2 , -"%pUl (%x.%x.%04x): cp_prefetch=%d\n" , -mdev_uuid (mdev), schid.cssid, +"sch %x.%x.%04x: cp_prefetch=%d\n" , + schid.cssid, schid.ssid, schid.sch_no, io_region->ret_code); errstr ="cp prefetch" ;
@@ -289,8 +287,8 @@ static void fsm_io_request(struct vfio_ccw_private *private, io_region->ret_code =fsm_io_helper (private);if (io_region->ret_code) {VFIO_CCW_MSG_EVENT (2 , -"%pUl (%x.%x.%04x): fsm_io_helper=%d\n" , -mdev_uuid (mdev), schid.cssid, +"sch %x.%x.%04x: fsm_io_helper=%d\n" , + schid.cssid, schid.ssid, schid.sch_no, io_region->ret_code); errstr ="cp fsm_io_helper" ;
@@ -300,16 +298,16 @@ static void fsm_io_request(struct vfio_ccw_private *private,return ; }else if (scsw->cmd.fctl &SCSW_FCTL_HALT_FUNC ) {VFIO_CCW_MSG_EVENT (2 , -"%pUl (%x.%x.%04x): halt on io_region\n" , -mdev_uuid (mdev), schid.cssid, +"sch %x.%x.%04x: halt on io_region\n" , + schid.cssid, schid.ssid, schid.sch_no);/* halt is handled via the async cmd region */ io_region->ret_code = -EOPNOTSUPP ; goto err_out; }else if (scsw->cmd.fctl &SCSW_FCTL_CLEAR_FUNC ) {VFIO_CCW_MSG_EVENT (2 , -"%pUl (%x.%x.%04x): clear on io_region\n" , -mdev_uuid (mdev), schid.cssid, +"sch %x.%x.%04x: clear on io_region\n" , + schid.cssid, schid.ssid, schid.sch_no);/* clear is handled via the async cmd region */ io_region->ret_code = -EOPNOTSUPP ;
drivers/s390/cio/vfio_ccw_ops.c +4 -4
@@ -131,8 +131,8 @@ static int vfio_ccw_mdev_probe(struct mdev_device *mdev) private->mdev = mdev; private->state =VFIO_CCW_STATE_IDLE ; -VFIO_CCW_MSG_EVENT (2 ,"mdev %pUl, sch %x.%x.%04x: create\n" , -mdev_uuid (mdev), private->sch->schid.cssid, +VFIO_CCW_MSG_EVENT (2 ,"sch %x.%x.%04x: create\n" , + private->sch->schid.cssid, private->sch->schid.ssid, private->sch->schid.sch_no);
@@ -154,8 +154,8 @@ static void vfio_ccw_mdev_remove(struct mdev_device *mdev) {struct vfio_ccw_private *private =dev_get_drvdata (mdev->dev.parent); -VFIO_CCW_MSG_EVENT (2 ,"mdev %pUl, sch %x.%x.%04x: remove\n" , -mdev_uuid (mdev), private->sch->schid.cssid, +VFIO_CCW_MSG_EVENT (2 ,"sch %x.%x.%04x: remove\n" , + private->sch->schid.cssid, private->sch->schid.ssid, private->sch->schid.sch_no);
include/linux/mdev.h +0 -5
@@ -65,11 +65,6 @@ struct mdev_driver {struct device_driver driver; }; -static inline const guid_t *mdev_uuid (struct mdev_device *mdev) -{ -return &mdev->uuid; -} -extern struct bus_type mdev_bus_type;int mdev_register_device (struct device *dev,struct mdev_driver *mdev_driver);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 939/1157 vfio/ccw: Fix FSM state if mdev probe fails
In reply to Greg Kroah-HartmanFrom: Eric Farman <[email protected]>
[ Upstream commit f6c876d67e956de8d69349b0ee43bc7277c09e5c ]
The FSM is in STANDBY state when arriving in vfio_ccw_mdev_probe(), and this routine converts it to IDLE as part of its processing. The error exit sets it to IDLE (again) but clears the private->mdev pointer.
The FSM should of course be managing the state itself, but the correct thing for vfio_ccw_mdev_probe() to do would be to put the state back the way it found it.
The corresponding check of private->mdev in vfio_ccw_sch_io_todo() can be removed, since the distinction is unnecessary at this point.
--- drivers/s390/cio/vfio_ccw_drv.c | 5 +++-- drivers/s390/cio/vfio_ccw_ops.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +3 -2
@@ -106,9 +106,10 @@ static void vfio_ccw_sch_io_todo(struct work_struct *work)/* * Reset to IDLE only if processing of a channel program * has finished. Do not overwrite a possible processing -* state if the final interrupt was for HSCH or CSCH. +* state if the interrupt was unsolicited, or if the final +* interrupt was for HSCH or CSCH. */ -if (private->mdev && cp_is_finished) +if (cp_is_finished) private->state =VFIO_CCW_STATE_IDLE ;if (private->io_trigger)
drivers/s390/cio/vfio_ccw_ops.c +1 -1
@@ -146,7 +146,7 @@ static int vfio_ccw_mdev_probe(struct mdev_device *mdev)vfio_uninit_group_dev (&private->vdev);atomic_inc (&private->avail); private->mdev =NULL ; - private->state =VFIO_CCW_STATE_IDLE ; + private->state =VFIO_CCW_STATE_STANDBY ;return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 940/1157 vfio/ccw: Do not change FSM state in subchannel event
In reply to Greg Kroah-HartmanFrom: Eric Farman <[email protected]>
[ Upstream commit cffcc109fd682075dee79bade3d60a07152a8fd1 ]
The routine vfio_ccw_sch_event() is tasked with handling subchannel events, specifically machine checks, on behalf of vfio-ccw. It correctly calls cio_update_schib(), and if that fails (meaning the subchannel is gone) it makes an FSM event call to mark the subchannel Not Operational.
If that worked, however, then it decides that if the FSM state was already Not Operational (implying the subchannel just came back), then it should simply change the FSM to partially- or fully-open.
Remove this trickery, since a subchannel returning will require more probing than simply "oh all is well again" to ensure it works correctly.
--- drivers/s390/cio/vfio_ccw_drv.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +3 -11
@@ -301,19 +301,11 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process)if (work_pending (&sch->todo_work)) goto out_unlock; -if (cio_update_schib (sch)) { -vfio_ccw_fsm_event (private,VFIO_CCW_EVENT_NOT_OPER ); - rc =0 ; - goto out_unlock; - } - - private =dev_get_drvdata (&sch->dev); -if (private->state ==VFIO_CCW_STATE_NOT_OPER ) { - private->state = private->mdev ?VFIO_CCW_STATE_IDLE : -VFIO_CCW_STATE_STANDBY ; - } rc =0 ; +if (cio_update_schib (sch)) +vfio_ccw_fsm_event (private,VFIO_CCW_EVENT_NOT_OPER ); + out_unlock:spin_unlock_irqrestore (sch->lock, flags);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 941/1157 ASoC: audio-graph-card2.c: use of_property_read_u32() for rate
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit 817a62108dfacebd548e38451bf0e7eee023e97f ]
Audio Graph Card2 is using of_get_property(), but it should use of_property_read_u32() to getting rate. Otherwise the setting will be strange value. This patch fixup it.
--- sound/soc/generic/audio-graph-card2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/generic/audio-graph-card2.c +3 -2
@@ -856,7 +856,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv,struct device_node *port0, *port1, *ports;struct device_node *codec0_port, *codec1_port;struct device_node *ep0, *ep1; -u32 val; +u32 val =0 ;int ret = -EINVAL ;/*
@@ -880,7 +880,8 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, ports =of_get_parent (port0); port1 =of_get_next_child (ports, lnk); -if (!of_get_property (ports,"rate" , &val)) { +of_property_read_u32 (ports,"rate" , &val); +if (!val) {struct device *dev =simple_priv_to_dev (priv);dev_err (dev,"Codec2Codec needs rate settings\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 942/1157 serial: 8250_fsl: Dont report FE, PE and OE twice
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 9d3aaceb73acadf134596a2f8db9c451c1332d3d ]
Some Freescale 8250 implementations have the problem that a single long break results in one irq per character frame time. The code in fsl8250_handle_irq() that is supposed to handle that uses the BI bit in lsr_saved_flags to detect such a situation and then skip the second received character. However it also stores other error bits and so after a single frame error the character received in the next irq handling is passed to the upper layer with a frame error, too.
So after a spike on the data line (which is correctly recognized as a frame error) the following valid character is thrown away, because the driver reports a frame error for that one, too.
To weaken this problem restrict saving LSR to only the BI bit.
Note however that the handling is still broken:
- lsr_saved_flags is updated using orig_lsr which is the LSR content for the first received char, but there might be more in the FIFO, so a character is thrown away that is received later and not necessarily the one following the break.
- The doubled break might be the 2nd and 3rd char in the FIFO, so the workaround doesn't catch these, because serial8250_rx_chars() doesn't handle the workaround.
- lsr_saved_flags might have set UART_LSR_BI at the entry of fsl8250_handle_irq() which doesn't originate from fsl8250_handle_irq()'s "up->lsr_saved_flags |= orig_lsr & UART_LSR_BI;" but from e.g. from serial8250_tx_empty().
- For a long or a short break this isn't about two characters, but more or only a single one.
--- drivers/tty/serial/8250/8250_fsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/8250/8250_fsl.c +1 -1
@@ -77,7 +77,7 @@ int fsl8250_handle_irq(struct uart_port *port)if ((lsr &UART_LSR_THRE ) && (up->ier &UART_IER_THRI ))serial8250_tx_chars (up); - up->lsr_saved_flags = orig_lsr; + up->lsr_saved_flags |= orig_lsr &UART_LSR_BI ;uart_unlock_and_check_sysrq_irqrestore (&up->port, flags);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 943/1157 tty: n_gsm: fix wrong T1 retry count handling
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit f30e10caa80aa1f35508bc17fc302dbbde9a833c ]
n_gsm is based on the 3GPP 07.010 and its newer version is the 3GPP 27.010.
See https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1516
The changes from 07.010 to 27.010 are non-functional. Therefore, I refer to
the newer 27.010 here. Chapter 5.7.3 states that the valid range for the
maximum number of retransmissions (N2) is from 0 to 255 (both including).gsm_dlci_t1() handles this number incorrectly by performing N2 - 1
retransmission attempts. Setting N2 to zero results in more than 255
retransmission attempts.
Fix gsm_dlci_t1() to comply with 3GPP 27.010.
--- drivers/tty/n_gsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/n_gsm.c +2 -2
@@ -1805,8 +1805,8 @@ static void gsm_dlci_t1(struct timer_list *t)switch (dlci->state) {case DLCI_OPENING : - dlci->retries--;if (dlci->retries) { + dlci->retries--;gsm_command (dlci->gsm, dlci->addr,SABM |PF );mod_timer (&dlci->t1, jiffies + gsm->t1 *HZ /100 ); }else if (!dlci->addr && gsm->control == (DM |PF )) {
@@ -1821,8 +1821,8 @@ static void gsm_dlci_t1(struct timer_list *t)break ;case DLCI_CLOSING : - dlci->retries--;if (dlci->retries) { + dlci->retries--;gsm_command (dlci->gsm, dlci->addr,DISC |PF );mod_timer (&dlci->t1, jiffies + gsm->t1 *HZ /100 ); }else
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 944/1157 tty: n_gsm: fix DM command
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 18a948c7d90995d127785e308fa7b701df4c499f ]
n_gsm is based on the 3GPP 07.010 and its newer version is the 3GPP 27.010.
See https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=1516
The changes from 07.010 to 27.010 are non-functional. Therefore, I refer to
the newer 27.010 here. Chapter 5.3.3 defines the DM response. There exists
no DM command. However, the current implementation incorrectly sends DM as
command in case of unexpected UIH frames in gsm_queue().
Correct this behavior by always sending DM as response.
--- drivers/tty/n_gsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/n_gsm.c +1 -1
@@ -2207,7 +2207,7 @@ static void gsm_queue(struct gsm_mux *gsm)case UIH :case UIH |PF :if (dlci ==NULL || dlci->state !=DLCI_OPEN ) { -gsm_command (gsm, address,DM |PF ); +gsm_response (gsm, address,DM |PF );return ; } dlci->data (dlci, gsm->buf, gsm->len);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 945/1157 tty: n_gsm: fix flow control handling in tx path
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 59ff0680ecbfec742b1e0381e7cc46b41eb06647 ]
The current implementation constipates all transmission paths during flow control except for flow control frames. However, these may not be located at the beginning of the transmission queue of the control channel. Ensure that flow control frames in the transmission queue for the control channel are always handled even if constipated by skipping through other messages.
--- drivers/tty/n_gsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/n_gsm.c +1 -1
@@ -891,7 +891,7 @@ static int gsm_data_kick(struct gsm_mux *gsm)/* Serialize control messages and control channel messages first */ list_for_each_entry_safe (msg, nmsg, &gsm->tx_ctrl_list, list) {if (gsm->constipated && !gsm_is_flow_ctrl_msg (msg)) -return -EAGAIN ; +continue ; ret =gsm_send_packet (gsm, msg);switch (ret) {case -ENOSPC :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 946/1157 tty: n_gsm: fix missing corner cases in gsmld_poll()
In reply to Greg Kroah-HartmanFrom: Daniel Starke <[email protected]>
[ Upstream commit 7e5b4322cde067e1d0f1bf8f490e93f664a7c843 ]
gsmld_poll() currently fails to handle the following corner cases correctly:
- remote party closed the associated tty
Add the missing checks and map those to EPOLLHUP. Reorder the checks to group them by their reaction.
--- drivers/tty/n_gsm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/tty/n_gsm.c +5 -2
@@ -3053,12 +3053,15 @@ static __poll_t gsmld_poll(struct tty_struct *tty, struct file *file,poll_wait (file, &tty->read_wait, wait);poll_wait (file, &tty->write_wait, wait); + +if (gsm->dead) + mask |=EPOLLHUP ;if (tty_hung_up_p (file)) mask |=EPOLLHUP ; +if (test_bit (TTY_OTHER_CLOSED , &tty->flags)) + mask |=EPOLLHUP ;if (!tty_is_writelocked (tty) &&tty_write_room (tty) >0 ) mask |=EPOLLOUT |EPOLLWRNORM ; -if (gsm->dead) - mask |=EPOLLHUP ;return mask; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 947/1157 MIPS: vdso: Utilize __pa() for gic_pfn
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 8baa65126e19af5ee9f3c07e7bb53da41c39e4b1 ]
The GIC user offset is mapped into every process' virtual address and is therefore part of the hot-path of arch_setup_additional_pages(). Utilize __pa() such that we are more optimal even when CONFIG_DEBUG_VIRTUAL is enabled, and while at it utilize PFN_DOWN() instead of open-coding the right shift by PAGE_SHIFT.
--- arch/mips/kernel/vdso.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/vdso.c +1 -1
@@ -159,7 +159,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)/* Map GIC user page. */ if (gic_size) { gic_base = (unsigned long )mips_gic_base +MIPS_GIC_USER_OFS ; - gic_pfn =virt_to_phys ((void *)gic_base) >>PAGE_SHIFT ; + gic_pfn =PFN_DOWN (__pa (gic_base)); ret =io_remap_pfn_range (vma, base, gic_pfn, gic_size,pgprot_noncached (vma->vm_page_prot));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 948/1157 ASoC: SOF: mediatek: fix mt8195 StatvectorSel wrong setting
In reply to Greg Kroah-HartmanFrom: YC Hung <[email protected]>
[ Upstream commit 99bad468846f7a255dcfc95454401c83ae02e89b ]
Fix StatVectorSel wrong setting.
--- sound/soc/sof/mediatek/mt8195/mt8195-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/mediatek/mt8195/mt8195-loader.c +1 -1
@@ -21,7 +21,7 @@ void sof_hifixdsp_boot_sequence(struct snd_sof_dev *sdev, u32 boot_addr)/* pull high StatVectorSel to use AltResetVec (set bit4 to 1) */ snd_sof_dsp_update_bits (sdev,DSP_REG_BAR ,DSP_RESET_SW , -DSP_RESET_SW ,DSP_RESET_SW ); +STATVECTOR_SEL ,STATVECTOR_SEL );/* toggle DReset & BReset */ /* pull high DReset & BReset */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 949/1157 swiotlb: fail map correctly with failed io_tlb_default_mem
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit c51ba246cb172c9e947dc6fb8868a1eaf0b2a913 ]
In the failure case of trying to use a buffer which we'd previously failed to allocate, the "!mem" condition is no longer sufficient since io_tlb_default_mem became static and assigned by default. Update the condition to work as intended per the rest of that conversion.
--- kernel/dma/swiotlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/dma/swiotlb.c +1 -1
@@ -580,7 +580,7 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr,int index;phys_addr_t tlb_addr; -if (!mem) +if (!mem || !mem->nslabs)panic ("Can not allocate SWIOTLB buffer earlier and can't now provide you with the DMA bounce buffer" );if (cc_platform_has (CC_ATTR_MEM_ENCRYPT ))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 950/1157 lib/bitmap: fix off-by-one in bitmap_to_arr64()
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 428bc098635680a664779f26f24fe9197d186172 ]
GENMASK*() family takes the first and the last bits of the mask *including* them. So, with the current code bitmap_to_arr64() doesn't clear the tail properly:
nbits % exp mask must be 1 GENMASK(1, 0) 0x3 0x1
...
63 GENMASK(63, 0) 0xffffffffffffffff 0x7fffffffffffffff
This was found by making the function always available instead of 32-bit BE systems only (for reusing in some new functionality). Turn the number of bits into the last bit set by subtracting 1. @nbits is already checked to be positive beforehand.
--- lib/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bitmap.c +1 -1
@@ -1564,7 +1564,7 @@ void bitmap_to_arr64(u64 *buf, const unsigned long *bitmap, unsigned int nbits)/* Clear tail bits in the last element of array beyond nbits. */ if (nbits %64 ) - buf[-1] &= GENMASK_ULL(nbits % 64, 0); + buf[-1] &= GENMASK_ULL((nbits - 1) % 64, 0); }EXPORT_SYMBOL (bitmap_to_arr64);#endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 951/1157 ASoC: SOF: ipc3-topology: Prevent double freeing of ipc_control_data via load_bytes
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit d5bd47f3ca124058a8e87eae4508afeda2132611 ]
We have sanity checks for byte controls and if any of the fail the locally allocated scontrol->ipc_control_data is freed up, but not set to NULL.
On a rollback path of the error the higher level code will also try to free the scontrol->ipc_control_data which will eventually going to lead to memory corruption as double freeing memory is not a good thing.
--- sound/soc/sof/ipc3-topology.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/sof/ipc3-topology.c +1 -0
@@ -1628,6 +1628,7 @@ static int sof_ipc3_control_load_bytes(struct snd_sof_dev *sdev, struct snd_sof_return 0 ; err:kfree (scontrol->ipc_control_data); + scontrol->ipc_control_data =NULL ;return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 952/1157 cpufreq: mediatek: fix error return code in mtk_cpu_dvfs_info_init()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 72d67d6b3447303a441a8cedc34f7224b75f64b5 ]
If regulator_get_voltage() fails, it should return the error code in mtk_cpu_dvfs_info_init().
--- drivers/cpufreq/mediatek-cpufreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/mediatek-cpufreq.c +1 -0
@@ -478,6 +478,7 @@ static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)if (info->soc_data->ccifreq_supported) { info->vproc_on_boot =regulator_get_voltage (info->proc_reg);if (info->vproc_on_boot <0 ) { + ret = info->vproc_on_boot;dev_err (info->cpu_dev,"invalid Vproc value: %d\n" , info->vproc_on_boot); goto out_disable_inter_clock;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 953/1157 ASoc: audio-graph-card2: Fix refcount leak bug in __graph_get_type()
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit eda26893dabfc6da7a1e1ff5f8628ed9faab3ab9 ]
We should call of_node_put() for the reference before its replacement as it returned by of_get_parent() which has increased the refcount. Besides, we should also call of_node_put() before return.
--- sound/soc/generic/audio-graph-card2.c | 35 +++++++++++++++++++-------- 1 file changed, 25 insertions(+), 10 deletions(-)
sound/soc/generic/audio-graph-card2.c +25 -10
@@ -229,7 +229,8 @@ enum graph_type {static enum graph_type __graph_get_type (struct device_node *lnk) { -struct device_node *np; +struct device_node *np, *parent_np; +enum graph_type ret;/* * target {
@@ -240,19 +241,33 @@ static enum graph_type __graph_get_type(struct device_node *lnk)* }; */ np =of_get_parent (lnk); -if (of_node_name_eq (np,"ports" )) - np =of_get_parent (np); +if (of_node_name_eq (np,"ports" )) { + parent_np =of_get_parent (np); +of_node_put (np); + np = parent_np; + } -if (of_node_name_eq (np,GRAPH_NODENAME_MULTI )) -return GRAPH_MULTI ; +if (of_node_name_eq (np,GRAPH_NODENAME_MULTI )) { + ret =GRAPH_MULTI ; + goto out_put; + } -if (of_node_name_eq (np,GRAPH_NODENAME_DPCM )) -return GRAPH_DPCM ; +if (of_node_name_eq (np,GRAPH_NODENAME_DPCM )) { + ret =GRAPH_DPCM ; + goto out_put; + } -if (of_node_name_eq (np,GRAPH_NODENAME_C2C )) -return GRAPH_C2C ; +if (of_node_name_eq (np,GRAPH_NODENAME_C2C )) { + ret =GRAPH_C2C ; + goto out_put; + } + + ret =GRAPH_NORMAL ; + +out_put: +of_node_put (np); +return ret; -return GRAPH_NORMAL ; } static enum graph_type graph_get_type(struct asoc_simple_priv *priv,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 954/1157 ASoC: mt6359: Fix refcount leak bug
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit a8d5df69e2ec702d979f7d04ed519caf8691a032 ]
In mt6359_parse_dt() and mt6359_accdet_parse_dt(), we should call of_node_put() for the reference returned by of_get_child_by_name() which has increased the refcount.
--- sound/soc/codecs/mt6359-accdet.c | 1 + sound/soc/codecs/mt6359.c | 1 + 2 files changed, 2 insertions(+)
sound/soc/codecs/mt6359-accdet.c +1 -0
@@ -675,6 +675,7 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) sizeof(struct three_key_threshold)); } +of_node_put (node);dev_warn (priv->dev,"accdet caps=%x\n" , priv->caps);return 0 ;
sound/soc/codecs/mt6359.c +1 -0
@@ -2778,6 +2778,7 @@ static int mt6359_parse_dt(struct mt6359_priv *priv) ret =of_property_read_u32 (np,"mediatek,mic-type-2" , &priv->mux_select[MUX_MIC_TYPE_2 ]); +of_node_put (np);if (ret) { dev_info(priv->dev, "%s() failed to read mic-type-2, use default (%d)\n",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 955/1157 ASoC: SOF: ipc-msg-injector: fix copy in sof_msg_inject_ipc4_dfs_write()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit fa9b878ff86f4adccddf62492a5894fbdb04f97d ]
There are two bugs that have to do with when we copy the payload:
size = simple_write_to_buffer(ipc4_msg->data_ptr, priv->max_msg_size, ppos, buffer, count);
The value of "*ppos" was supposed to be zero but it is sizeof(ipc4_msg->header_u64) so it will copy the data into the middle of the "ipc4_msg->data_ptr" buffer instead of to the start. The second problem is "buffer" should be "buffer + sizeof(ipc4_msg->header_u64)".
This function is used for fuzz testing so the data is normally random and this bug likely does not affect anyone very much.
In this context, it's simpler and more appropriate to use copy_from_user() instead of simple_write_to_buffer() so I have re-written the function.
--- sound/soc/sof/sof-client-ipc-msg-injector.c | 29 +++++++++------------ 1 file changed, 12 insertions(+), 17 deletions(-)
sound/soc/sof/sof-client-ipc-msg-injector.c +12 -17
@@ -181,7 +181,7 @@ static ssize_t sof_msg_inject_ipc4_dfs_write(struct file *file,struct sof_client_dev *cdev = file->private_data;struct sof_msg_inject_priv *priv = cdev->data;struct sof_ipc4_msg *ipc4_msg = priv->tx_buffer; -ssize_t size; +size_t data_size;int ret;if (*ppos)
@@ -191,25 +191,20 @@ static ssize_t sof_msg_inject_ipc4_dfs_write(struct file *file,return -EINVAL ;/* copy the header first */ - size =simple_write_to_buffer (&ipc4_msg->header_u64, -sizeof (ipc4_msg->header_u64), - ppos, buffer, count); -if (size <0 ) -return size; -if (size !=sizeof (ipc4_msg->header_u64)) +if (copy_from_user (&ipc4_msg->header_u64, buffer, +sizeof (ipc4_msg->header_u64)))return -EFAULT ; - count -= size; + data_size = count -sizeof (ipc4_msg->header_u64); +if (data_size > priv->max_msg_size) +return -EINVAL ; +/* Copy the payload */ - size =simple_write_to_buffer (ipc4_msg->data_ptr, - priv->max_msg_size, ppos, buffer, - count); -if (size <0 ) -return size; -if (size != count) +if (copy_from_user (ipc4_msg->data_ptr, + buffer +sizeof (ipc4_msg->header_u64), data_size))return -EFAULT ; - ipc4_msg->data_size = count; + ipc4_msg->data_size = data_size;/* Initialize the reply storage */ ipc4_msg = priv->rx_buffer;
@@ -221,9 +216,9 @@ static ssize_t sof_msg_inject_ipc4_dfs_write(struct file *file,/* return the error code if test failed */ if (ret <0 ) - size = ret; +return ret; -return size; +return count; };static int sof_msg_inject_dfs_release (struct inode *inode,struct file *file)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 956/1157 serial: 8250_bcm7271: Save/restore RTS in suspend/resume
In reply to Greg Kroah-HartmanFrom: Doug Berger <[email protected]>
[ Upstream commit 3182efd036c1b955403d131258234896cbd9fbeb ]
Commit 9cabe26e65a8 ("serial: 8250_bcm7271: UART errors after resuming from S2") prevented an early enabling of RTS during resume, but it did not actively restore the RTS state after resume.
--- drivers/tty/serial/8250/8250_bcm7271.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/tty/serial/8250/8250_bcm7271.c +18 -6
@@ -1139,16 +1139,19 @@ static int __maybe_unused brcmuart_suspend(struct device *dev)struct brcmuart_priv *priv =dev_get_drvdata (dev);struct uart_8250_port *up =serial8250_get_port (priv->line);struct uart_port *port = &up->port; - -serial8250_suspend_port (priv->line); -clk_disable_unprepare (priv->baud_mux_clk); +unsigned long flags;/* * This will prevent resume from enabling RTS before the -* baud rate has been resored. +* baud rate has been restored. */ +spin_lock_irqsave (&port->lock, flags); priv->saved_mctrl = port->mctrl; - port->mctrl =0 ; + port->mctrl &= ~TIOCM_RTS ; +spin_unlock_irqrestore (&port->lock, flags); + +serial8250_suspend_port (priv->line); +clk_disable_unprepare (priv->baud_mux_clk);return 0 ; }
@@ -1158,6 +1161,7 @@ static int __maybe_unused brcmuart_resume(struct device *dev)struct brcmuart_priv *priv =dev_get_drvdata (dev);struct uart_8250_port *up =serial8250_get_port (priv->line);struct uart_port *port = &up->port; +unsigned long flags;int ret; ret =clk_prepare_enable (priv->baud_mux_clk);
@@ -1180,7 +1184,15 @@ static int __maybe_unused brcmuart_resume(struct device *dev)start_rx_dma (serial8250_get_port (priv->line)); }serial8250_resume_port (priv->line); - port->mctrl = priv->saved_mctrl; + +if (priv->saved_mctrl &TIOCM_RTS ) { +/* Restore RTS */ +spin_lock_irqsave (&port->lock, flags); + port->mctrl |=TIOCM_RTS ; + port->ops->set_mctrl (port, port->mctrl); +spin_unlock_irqrestore (&port->lock, flags); + } +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 957/1157 iommu/exynos: Handle failed IOMMU device registration properly
In reply to Greg Kroah-HartmanFrom: Sam Protsenko <[email protected]>
[ Upstream commit fce398d2d02c0a9a2bedf7c7201b123e153e8963 ]
If iommu_device_register() fails in exynos_sysmmu_probe(), the previous calls have to be cleaned up. In this case, the iommu_device_sysfs_add() should be cleaned up, by calling its remove counterpart call.
--- drivers/iommu/exynos-iommu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iommu/exynos-iommu.c +5 -1
@@ -630,7 +630,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) ret =iommu_device_register (&data->iommu, &exynos_iommu_ops, dev);if (ret) -return ret; + goto err_iommu_register;platform_set_drvdata (pdev, data);
@@ -657,6 +657,10 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)pm_runtime_enable (dev);return 0 ; + +err_iommu_register: +iommu_device_sysfs_remove (&data->iommu); +return ret; }static int __maybe_unused exynos_sysmmu_suspend (struct device *dev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 958/1157 9p: Drop kref usage
In reply to Greg Kroah-HartmanFrom: Kent Overstreet <[email protected]>
[ Upstream commit 6cda12864cb0f99810a5809e11e3ee5b102c9a47 ]
An upcoming patch is going to require passing the client through p9_req_put() -> p9_req_free(), but that's awkward with the kref indirection - so this patch switches to using refcount_t directly.
--- include/net/9p/client.h | 6 +++--- net/9p/client.c | 19 ++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-)
include/net/9p/client.h +3 -3
@@ -76,7 +76,7 @@ enum p9_req_status_t {struct p9_req_t {int status;int t_err; -struct kref refcount; +refcount_t refcount;wait_queue_head_t wq;struct p9_fcall tc;struct p9_fcall rc;
@@ -227,12 +227,12 @@ struct p9_req_t *p9_tag_lookup(struct p9_client *c, u16 tag);static inline void p9_req_get (struct p9_req_t *r) { -kref_get (&r->refcount); +refcount_inc (&r->refcount); }static inline int p9_req_try_get (struct p9_req_t *r) { -return kref_get_unless_zero (&r->refcount); +return refcount_inc_not_zero (&r->refcount); }int p9_req_put (struct p9_req_t *r);
net/9p/client.c +8 -11
@@ -305,7 +305,7 @@ p9_tag_alloc(struct p9_client *c, int8_t type, unsigned int max_size)* callback), so p9_client_cb eats the second ref there * as the pointer is duplicated directly by virtqueue_add_sgs() */ -refcount_set (&req->refcount.refcount,2 ); +refcount_set (&req->refcount,2 );return req;
@@ -370,18 +370,15 @@ static int p9_tag_remove(struct p9_client *c, struct p9_req_t *r)return p9_req_put (r); } -static void p9_req_free (struct kref *ref) -{ - struct p9_req_t *r = container_of(ref, struct p9_req_t, refcount); - -p9_fcall_fini (&r->tc); -p9_fcall_fini (&r->rc); -kmem_cache_free (p9_req_cache, r); -} -int p9_req_put (struct p9_req_t *r) { -return kref_put (&r->refcount, p9_req_free); +if (refcount_dec_and_test (&r->refcount)) { +p9_fcall_fini (&r->tc); +p9_fcall_fini (&r->rc); +kmem_cache_free (p9_req_cache, r); +return 1 ; + } +return 0 ; }EXPORT_SYMBOL (p9_req_put);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 959/1157 9p: Add client parameter to p9_req_put()
In reply to Greg Kroah-HartmanFrom: Kent Overstreet <[email protected]>
[ Upstream commit 8b11ff098af42b1fa57fc817daadd53c8b244a0c ]
This is to aid in adding mempools, in the next patch.
--- include/net/9p/client.h | 2 +- net/9p/client.c | 12 ++++++------ net/9p/trans_fd.c | 12 ++++++------ net/9p/trans_rdma.c | 2 +- net/9p/trans_virtio.c | 4 ++-- net/9p/trans_xen.c | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-)
include/net/9p/client.h +1 -1
@@ -235,7 +235,7 @@ static inline int p9_req_try_get(struct p9_req_t *r)return refcount_inc_not_zero (&r->refcount); } -int p9_req_put (struct p9_req_t *r); +int p9_req_put (struct p9_client *c,struct p9_req_t *r);void p9_client_cb (struct p9_client *c,struct p9_req_t *req,int status);
net/9p/client.c +6 -6
@@ -341,7 +341,7 @@ struct p9_req_t *p9_tag_lookup(struct p9_client *c, u16 tag)if (!p9_req_try_get (req)) goto again;if (req->tc.tag != tag) { -p9_req_put (req); +p9_req_put (c, req); goto again; } }
@@ -367,10 +367,10 @@ static int p9_tag_remove(struct p9_client *c, struct p9_req_t *r)spin_lock_irqsave (&c->lock, flags);idr_remove (&c->reqs, tag);spin_unlock_irqrestore (&c->lock, flags); -return p9_req_put (r); +return p9_req_put (c, r); } -int p9_req_put (struct p9_req_t *r) +int p9_req_put (struct p9_client *c,struct p9_req_t *r) {if (refcount_dec_and_test (&r->refcount)) {p9_fcall_fini (&r->tc);
@@ -423,7 +423,7 @@ void p9_client_cb(struct p9_client *c, struct p9_req_t *req, int status)wake_up (&req->wq);p9_debug (P9_DEBUG_MUX ,"wakeup: %d\n" , req->tc.tag); -p9_req_put (req); +p9_req_put (c, req); }EXPORT_SYMBOL (p9_client_cb);
@@ -706,7 +706,7 @@ static struct p9_req_t *p9_client_prepare_req(struct p9_client *c, reterr:p9_tag_remove (c, req);/* We have to put also the 2nd reference as it won't be used */ -p9_req_put (req); +p9_req_put (c, req);return ERR_PTR (err); }
@@ -743,7 +743,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) err = c->trans_mod->request (c, req);if (err <0 ) {/* write won't happen */ -p9_req_put (req); +p9_req_put (c, req);if (err != -ERESTARTSYS && err != -EFAULT ) c->status = Disconnected; goto recalc_sigpending;
net/9p/trans_fd.c +6 -6
@@ -378,7 +378,7 @@ static void p9_read_work(struct work_struct *work) m->rc.sdata =NULL ; m->rc.offset =0 ; m->rc.capacity =0 ; -p9_req_put (m->rreq); +p9_req_put (m->client, m->rreq); m->rreq =NULL ; }
@@ -492,7 +492,7 @@ static void p9_write_work(struct work_struct *work) m->wpos += err;if (m->wpos == m->wsize) { m->wpos = m->wsize =0 ; -p9_req_put (m->wreq); +p9_req_put (m->client, m->wreq); m->wreq =NULL ; }
@@ -695,7 +695,7 @@ static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req)if (req->status ==REQ_STATUS_UNSENT ) {list_del (&req->req_list); req->status =REQ_STATUS_FLSHD ; -p9_req_put (req); +p9_req_put (client, req); ret =0 ; }spin_unlock (&client->lock);
@@ -722,7 +722,7 @@ static int p9_fd_cancelled(struct p9_client *client, struct p9_req_t *req)list_del (&req->req_list); req->status =REQ_STATUS_FLSHD ;spin_unlock (&client->lock); -p9_req_put (req); +p9_req_put (client, req);return 0 ; }
@@ -883,12 +883,12 @@ static void p9_conn_destroy(struct p9_conn *m)p9_mux_poll_stop (m);cancel_work_sync (&m->rq);if (m->rreq) { -p9_req_put (m->rreq); +p9_req_put (m->client, m->rreq); m->rreq =NULL ; }cancel_work_sync (&m->wq);if (m->wreq) { -p9_req_put (m->wreq); +p9_req_put (m->client, m->wreq); m->wreq =NULL ; }
net/9p/trans_rdma.c +1 -1
@@ -350,7 +350,7 @@ send_done(struct ib_cq *cq, struct ib_wc *wc) c->busa, c->req->tc.size, DMA_TO_DEVICE);up (&rdma->sq_sem); -p9_req_put (c->req); +p9_req_put (client, c->req);kfree (c); }
net/9p/trans_virtio.c +2 -2
@@ -199,7 +199,7 @@ static int p9_virtio_cancel(struct p9_client *client, struct p9_req_t *req)/* Reply won't come, so drop req ref */ static int p9_virtio_cancelled (struct p9_client *client,struct p9_req_t *req) { -p9_req_put (req); +p9_req_put (client, req);return 0 ; }
@@ -523,7 +523,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,kvfree (out_pages);if (!kicked) {/* reply won't come */ -p9_req_put (req); +p9_req_put (client, req); }return err; }
net/9p/trans_xen.c +1 -1
@@ -163,7 +163,7 @@ static int p9_xen_request(struct p9_client *client, struct p9_req_t *p9_req) ring->intf->out_prod = prod;spin_unlock_irqrestore (&ring->lock, flags);notify_remote_via_irq (ring->irq); -p9_req_put (p9_req); +p9_req_put (client, p9_req);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 960/1157 net: 9p: fix refcount leak in p9_read_work() error handling
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
[ Upstream commit 4ac7573e1f9333073fa8d303acc941c9b7ab7f61 ]
p9_req_put need to be called when m->rreq->rc.sdata is NULL to avoid temporary refcount leak.
--- net/9p/trans_fd.c | 1 + 1 file changed, 1 insertion(+)
net/9p/trans_fd.c +1 -0
@@ -343,6 +343,7 @@ static void p9_read_work(struct work_struct *work)p9_debug (P9_DEBUG_ERROR ,"No recv fcall for tag %d (req %p), disconnecting!\n" , m->rc.tag, m->rreq); +p9_req_put (m->client, m->rreq); m->rreq =NULL ; err = -EIO ; goto error;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 961/1157 MIPS: Fixed __debug_virt_addr_valid()
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 8a2b456665d1e797123669581524cbb095fb003b ]
It is permissible for kernel code to call virt_to_phys() against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Rewrite the test condition to ensure that the kernel virtual addresses are above PAGE_OFFSET which they must be, and below KSEG2 where the non-linear mapping starts.
For EVA, there is not much that we can do given the linear address range that is offered, so just return any virtual address as being valid.
Finally, when HIGHMEM is not enabled, all virtual addresses are assumed to be valid as well.
--- arch/mips/mm/physaddr.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
arch/mips/mm/physaddr.c +4 -10
@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h>
@@ -12,15 +13,6 @@static inline bool __debug_virt_addr_valid (unsigned long x) { -/* high_memory does not get immediately defined, and there -* are early callers of __pa() against PAGE_OFFSET -*/ -if (!high_memory && x >=PAGE_OFFSET ) -return true; - -if (high_memory && x >=PAGE_OFFSET && x < (unsigned long )high_memory) -return true; -/* * MAX_DMA_ADDRESS is a virtual address that may not correspond to an * actual physical address. Enough code relies on
@@ -30,7 +22,9 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return x >=PAGE_OFFSET && (KSEGX (x) <KSEG2 || +IS_ENABLED (CONFIG_EVA ) || + !IS_ENABLED (CONFIG_HIGHMEM )); }phys_addr_t __virt_to_phys (volatile const void *x)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 962/1157 rpmsg: qcom_smd: Fix refcount leak in qcom_smd_parse_edge
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 65382585f067d4256ba087934f30f85c9b6984de ]
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when done.
--- drivers/rpmsg/qcom_smd.c | 1 + 1 file changed, 1 insertion(+)
drivers/rpmsg/qcom_smd.c +1 -0
@@ -1383,6 +1383,7 @@ static int qcom_smd_parse_edge(struct device *dev, } edge->ipc_regmap =syscon_node_to_regmap (syscon_np); +of_node_put (syscon_np);if (IS_ERR (edge->ipc_regmap)) { ret =PTR_ERR (edge->ipc_regmap); goto put_node;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 963/1157 leds: pwm-multicolor: Dont show -EPROBE_DEFER as errors
In reply to Greg Kroah-HartmanFrom: Emil Renner Berthing <[email protected]>
[ Upstream commit 399e7aa82105ea46d8998fa535b047541c48030f ]
When requesting a PWM it might return -EPROBE_DEFER if it hasn't probed yet. This is not an error, so just propagate the -EPROBE_DEFER without logging anything. There is already dev_err_probe for exactly this situation.
--- drivers/leds/rgb/leds-pwm-multicolor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/leds/rgb/leds-pwm-multicolor.c +1 -2
@@ -72,8 +72,7 @@ static int iterate_subleds(struct device *dev, struct pwm_mc_led *priv, pwmled = &priv->leds[priv->mc_cdev.num_colors]; pwmled->pwm =devm_fwnode_pwm_get (dev, fwnode,NULL );if (IS_ERR (pwmled->pwm)) { - ret =PTR_ERR (pwmled->pwm); -dev_err (dev,"unable to request PWM: %d\n" , ret); + ret =dev_err_probe (dev,PTR_ERR (pwmled->pwm),"unable to request PWM\n" ); goto release_fwnode; }pwm_init_state (pwmled->pwm, &pwmled->state);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 964/1157 kfifo: fix kfifo_to_user() return type
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 045ed31e23aea840648c290dbde04797064960db ]
The kfifo_to_user() macro is supposed to return zero for success or negative error codes. Unfortunately, there is a signedness bug so it returns unsigned int. This only affects callers which try to save the result in ssize_t and as far as I can see the only place which does that is line6_hwdep_read().
TL;DR: s/_uint/_int/.
--- include/linux/kfifo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/kfifo.h +1 -1
@@ -688,7 +688,7 @@ __kfifo_uint_must_check_helper( \* writer, you don't need extra locking to use these macro. */ #define kfifo_to_user (fifo, to, len, copied) \ -__kfifo_uint_must_check_helper( \ +__kfifo_int_must_check_helper( \ ({ \ typeof((fifo) + 1) __tmp = (fifo); \ void __user *__to = (to); \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 965/1157 lib/smp_processor_id: fix imbalanced instrumentation_end() call
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit bd27acaac24e4b252ee28dddcabaee80456d0faf ]
Currently instrumentation_end() won't be called if printk_ratelimit() returned false.
--- lib/smp_processor_id.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/smp_processor_id.c +1 -1
@@ -47,9 +47,9 @@ unsigned int check_preemption_disabled(const char *what1, const char *what2)printk ("caller is %pS\n" ,__builtin_return_address (0 ));dump_stack (); -instrumentation_end (); out_enable: +instrumentation_end ();preempt_enable_no_resched_notrace (); out:return this_cpu;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 966/1157 proc: fix a dentry lock race between release_task and lookup
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit d919a1e79bac890421537cf02ae773007bf55e6b ]
Commit 7bc3e6e55acf06 ("proc: Use a list of inodes to flush from proc") moved proc_flush_task() behind __exit_signal(). Then, process systemd can take long period high cpu usage during releasing task in following concurrent processes:
systemd pskernel_waitid stat(/proc/tgid)
do_wait filename_lookup
wait_consider_task lookup_fast
release_task
__exit_signal
__unhash_process
detach_pid
__change_pid // remove task->pid_links
d_revalidate -> pid_revalidate // 0
d_invalidate(/proc/tgid)
shrink_dcache_parent(/proc/tgid)
d_walk(/proc/tgid)
spin_lock_nested(/proc/tgid/fd)
// iterating opened fd
proc_flush_pid |
d_invalidate (/proc/tgid/fd) |
shrink_dcache_parent(/proc/tgid/fd) |
shrink_dentry_list(subdirs) ↓
shrink_lock_dentry(/proc/tgid/fd) --> race on dentry lockFunction d_invalidate() will remove dentry from hash firstly, but why does proc_flush_pid() process dentry '/proc/tgid/fd' before dentry '/proc/tgid'? That's because proc_pid_make_inode() adds proc inode in reverse order by invoking hlist_add_head_rcu(). But proc should not add any inodes under '/proc/tgid' except '/proc/tgid/task/pid', fix it by adding inode into 'pid->inodes' only if the inode is /proc/tgid or /proc/tgid/task/pid.
Performance regression:
Create 200 tasks, each task open one file for 50,000 times. Kill all tasks when opened files exceed 10,000,000 (cat /proc/sys/fs/file-nr).
Before fix:
$ time killall -wq aa real 4m40.946s # During this period, we can see 'ps' and 'systemd' taking high cpu usage.
After fix:
$ time killall -wq aa real 1m20.732s # During this period, we can see 'systemd' taking high cpu usage.
--- fs/proc/base.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-)
fs/proc/base.c +38 -8
@@ -1885,7 +1885,7 @@ void proc_pid_evict_inode(struct proc_inode *ei)put_pid (pid); } -struct inode *proc_pid_make_inode (struct super_block * sb, +struct inode *proc_pid_make_inode (struct super_block *sb,struct task_struct *task,umode_t mode) {struct inode * inode;
@@ -1914,11 +1914,6 @@ struct inode *proc_pid_make_inode(struct super_block * sb,/* Let the pid remember us for quick removal */ ei->pid = pid; -if (S_ISDIR (mode)) { -spin_lock (&pid->lock); -hlist_add_head_rcu (&ei->sibling_inodes, &pid->inodes); -spin_unlock (&pid->lock); - }task_dump_owner (task,0 , &inode->i_uid, &inode->i_gid);security_task_to_inode (task, inode);
@@ -1931,6 +1926,39 @@ struct inode *proc_pid_make_inode(struct super_block * sb,return NULL ; } +/* +* Generating an inode and adding it into @pid->inodes, so that task will +* invalidate inode's dentry before being released. +* +* This helper is used for creating dir-type entries under '/proc' and +* '/proc/<tgid>/task'. Other entries(eg. fd, stat) under '/proc/<tgid>' +* can be released by invalidating '/proc/<tgid>' dentry. +* In theory, dentries under '/proc/<tgid>/task' can also be released by +* invalidating '/proc/<tgid>' dentry, we reserve it to handle single +* thread exiting situation: Any one of threads should invalidate its +* '/proc/<tgid>/task/<pid>' dentry before released. +*/ +static struct inode *proc_pid_make_base_inode (struct super_block *sb, +struct task_struct *task,umode_t mode) +{ +struct inode *inode; +struct proc_inode *ei; +struct pid *pid; + + inode =proc_pid_make_inode (sb, task, mode); +if (!inode) +return NULL ; + +/* Let proc_flush_pid find this directory inode */ + ei =PROC_I (inode); + pid = ei->pid; +spin_lock (&pid->lock); +hlist_add_head_rcu (&ei->sibling_inodes, &pid->inodes); +spin_unlock (&pid->lock); + +return inode; +} +int pid_getattr (struct user_namespace *mnt_userns,const struct path *path,struct kstat *stat,u32 request_mask,unsigned int query_flags) {
@@ -3369,7 +3397,8 @@ static struct dentry *proc_pid_instantiate(struct dentry * dentry, {struct inode *inode; - inode =proc_pid_make_inode (dentry->d_sb, task,S_IFDIR |S_IRUGO |S_IXUGO ); + inode =proc_pid_make_base_inode (dentry->d_sb, task, +S_IFDIR |S_IRUGO |S_IXUGO );if (!inode)return ERR_PTR (-ENOENT );
@@ -3671,7 +3700,8 @@ static struct dentry *proc_task_instantiate(struct dentry *dentry, struct task_struct *task, const void *ptr) { struct inode *inode; - inode =proc_pid_make_inode (dentry->d_sb, task,S_IFDIR |S_IRUGO |S_IXUGO ); + inode =proc_pid_make_base_inode (dentry->d_sb, task, +S_IFDIR |S_IRUGO |S_IXUGO );if (!inode)return ERR_PTR (-ENOENT );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 967/1157 remoteproc: qcom: pas: Check if coredump is enabled
In reply to Greg Kroah-HartmanFrom: Siddharth Gupta <[email protected]>
[ Upstream commit 7b6ece968fca4ec9e42d34caff7e06dc84c45717 ]
Client drivers need to check if coredump is enabled for the rproc before continuing with coredump generation. This change adds a check in the PAS driver.
--- drivers/remoteproc/qcom_q6v5_pas.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/remoteproc/qcom_q6v5_pas.c +3 -0
@@ -87,6 +87,9 @@ static void adsp_minidump(struct rproc *rproc) {struct qcom_adsp *adsp = rproc->priv; +if (rproc->dump_conf ==RPROC_COREDUMP_DISABLED ) +return ; +qcom_minidump (rproc, adsp->minidump_id); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 968/1157 remoteproc: sysmon: Wait for SSCTL service to come up
In reply to Greg Kroah-HartmanFrom: Sibi Sankar <[email protected]>
[ Upstream commit 47c04e00eff86a81cd357c3feed04c86089bcb85 ]
The SSCTL service comes up after a finite time when the remote Q6 comes out of reset. Any graceful shutdowns requested during this period will be a NOP and abrupt tearing down of the glink channel might lead to pending transactions on the remote Q6 side and will ultimately lead to a fatal error. Fix this by waiting for the SSCTL service when a graceful shutdown is requested.
--- drivers/remoteproc/qcom_sysmon.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/remoteproc/qcom_sysmon.c +10 -0
@@ -41,6 +41,7 @@ struct qcom_sysmon {struct completion comp;struct completion ind_comp;struct completion shutdown_comp; +struct completion ssctl_comp;struct mutex lock;bool ssr_ack;
@@ -445,6 +446,8 @@ static int ssctl_new_server(struct qmi_handle *qmi, struct qmi_service *svc) svc->priv = sysmon; +complete (&sysmon->ssctl_comp); +return 0 ; }
@@ -501,6 +504,7 @@ static int sysmon_start(struct rproc_subdev *subdev) .ssr_event = SSCTL_SSR_EVENT_AFTER_POWERUP }; +reinit_completion (&sysmon->ssctl_comp);mutex_lock (&sysmon->state_lock); sysmon->state =SSCTL_SSR_EVENT_AFTER_POWERUP ;blocking_notifier_call_chain (&sysmon_notifiers,0 , (void *)&event);
@@ -545,6 +549,11 @@ static void sysmon_stop(struct rproc_subdev *subdev, bool crashed)if (crashed)return ; +if (sysmon->ssctl_instance) { +if (!wait_for_completion_timeout (&sysmon->ssctl_comp,HZ /2 )) +dev_err (sysmon->dev,"timeout waiting for ssctl service\n" ); + } +if (sysmon->ssctl_version) sysmon->shutdown_acked =ssctl_request_shutdown (sysmon);else if (sysmon->ept)
@@ -631,6 +640,7 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc,init_completion (&sysmon->comp);init_completion (&sysmon->ind_comp);init_completion (&sysmon->shutdown_comp); +init_completion (&sysmon->ssctl_comp);mutex_init (&sysmon->lock);mutex_init (&sysmon->state_lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 969/1157 mfd: t7l66xb: Drop platform disable callback
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 128ac294e1b437cb8a7f2ff8ede1cde9082bddbe ]
None of the in-tree instantiations of struct t7l66xb_platform_data provides a disable callback. So better don't dereference this function pointer unconditionally. As there is no user, drop it completely instead of calling it conditional.
This is a preparation for making platform remove callbacks return void.
--- drivers/mfd/t7l66xb.c | 6 +----- include/linux/mfd/t7l66xb.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-)
drivers/mfd/t7l66xb.c +1 -5
@@ -397,11 +397,8 @@ static int t7l66xb_probe(struct platform_device *dev)static int t7l66xb_remove (struct platform_device *dev) { -struct t7l66xb_platform_data *pdata =dev_get_platdata (&dev->dev);struct t7l66xb *t7l66xb =platform_get_drvdata (dev); -int ret; - ret = pdata->disable (dev);clk_disable_unprepare (t7l66xb->clk48m);clk_put (t7l66xb->clk48m);clk_disable_unprepare (t7l66xb->clk32k);
@@ -412,8 +409,7 @@ static int t7l66xb_remove(struct platform_device *dev)mfd_remove_devices (&dev->dev);kfree (t7l66xb); -return ret; - +return 0 ; }static struct platform_driver t7l66xb_platform_driver = {
include/linux/mfd/t7l66xb.h +0 -1
@@ -12,7 +12,6 @@struct t7l66xb_platform_data {int (*enable)(struct platform_device *dev); -int (*disable)(struct platform_device *dev);int (*suspend)(struct platform_device *dev);int (*resume)(struct platform_device *dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 970/1157 mfd: max77620: Fix refcount leak in max77620_initialise_fps
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 1520669c8255bd637c6b248b2be910e2688d38dd ]
of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.
--- drivers/mfd/max77620.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mfd/max77620.c +2 -0
@@ -419,9 +419,11 @@ static int max77620_initialise_fps(struct max77620_chip *chip) ret =max77620_config_fps (chip, fps_child);if (ret <0 ) {of_node_put (fps_child); +of_node_put (fps_np);return ret; } } +of_node_put (fps_np); config = chip->enable_global_lpm ?MAX77620_ONOFFCNFG2_SLP_LPM_MSK :0 ; ret = regmap_update_bits(chip->rmap, MAX77620_REG_ONOFFCNFG2,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 971/1157 ASoC: amd: yc: Decrease level of error message
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 393a40b50fe976a121b15752d2dd6151c7a92126 ]
On a number of platforms that contain acp3x controller a new ERR level message is showing up:
acp6x pci device not found
This is because ACP3x and ACP6x share same PCI ID but can be identified by PCI revision. As this is expected behavior for a system with ACP3x decrease message to debug.
--- sound/soc/amd/yc/pci-acp6x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/amd/yc/pci-acp6x.c +1 -1
@@ -159,7 +159,7 @@ static int snd_acp6x_probe(struct pci_dev *pci,case 0x6f :break ;default : -dev_err (&pci->dev,"acp6x pci device not found\n" ); +dev_dbg (&pci->dev,"acp6x pci device not found\n" );return -ENODEV ; }if (pci_enable_device (pci)) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 972/1157 iommu/arm-smmu: qcom_iommu: Add of_node_put() when breaking out of loop
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit a91eb6803c1c715738682fece095145cbd68fe0b ]
In qcom_iommu_has_secure_context(), we should call of_node_put() for the reference 'child' when breaking out of for_each_child_of_node() which will automatically increase and decrease the refcount.
--- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu/qcom_iommu.c +5 -2
@@ -750,9 +750,12 @@ static bool qcom_iommu_has_secure_context(struct qcom_iommu_dev *qcom_iommu) {struct device_node *child; -for_each_child_of_node (qcom_iommu->dev->of_node, child) -if (of_device_is_compatible (child,"qcom,msm-iommu-v1-sec" )) +for_each_child_of_node (qcom_iommu->dev->of_node, child) { +if (of_device_is_compatible (child,"qcom,msm-iommu-v1-sec" )) { +of_node_put (child);return true; + } + }return false; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 973/1157 perf tools: Fix dso_id inode generation comparison
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit 68566a7cf56bf3148797c218ed45a9de078ef47c ]
Synthesized MMAP events have zero ino_generation, so do not compare them to DSOs with a real ino_generation otherwise we end up with a DSO without a build id.
--- tools/perf/util/dsos.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
tools/perf/util/dsos.c +13 -2
@@ -23,8 +23,19 @@ static int __dso_id__cmp(struct dso_id *a, struct dso_id *b)if (a->ino > b->ino)return -1 ;if (a->ino < b->ino)return 1 ; -if (a->ino_generation > b->ino_generation)return -1 ; -if (a->ino_generation < b->ino_generation)return 1 ; +/* +* Synthesized MMAP events have zero ino_generation, avoid comparing +* them with MMAP events with actual ino_generation. +* +* I found it harmful because the mismatch resulted in a new +* dso that did not have a build ID whereas the original dso did have a +* build ID. The build ID was essential because the object was not found +* otherwise. - Adrian +*/ +if (a->ino_generation && b->ino_generation) { +if (a->ino_generation > b->ino_generation)return -1 ; +if (a->ino_generation < b->ino_generation)return 1 ; + }return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 974/1157 riscv: spinwait: Fix hartid variable type
In reply to Greg Kroah-HartmanFrom: Sunil V L <[email protected]>
[ Upstream commit c029e487e7c00e5594a4ae946952605db34e359b ]
The hartid variable is of type int but compared with ULONG_MAX(INVALID_HARTID). This issue is fixed by changing the hartid variable type to unsigned long.
--- arch/riscv/kernel/cpu_ops_spinwait.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kernel/cpu_ops_spinwait.c +2 -2
@@ -20,7 +20,7 @@ void *__cpu_spinwait_task_pointer[NR_CPUS] __section(".data");static void cpu_update_secondary_bootdata (unsigned int cpuid,struct task_struct *tidle) { -int hartid =cpuid_to_hartid_map (cpuid); +unsigned long hartid =cpuid_to_hartid_map (cpuid);/* * The hartid must be less than NR_CPUS to avoid out-of-bound access
@@ -29,7 +29,7 @@ static void cpu_update_secondary_bootdata(unsigned int cpuid,* spinwait booting is not the recommended approach for any platforms * booting Linux in S-mode and can be disabled in the future. */ -if (hartid ==INVALID_HARTID || hartid >=NR_CPUS ) +if (hartid ==INVALID_HARTID || hartid >= (unsigned long )NR_CPUS )return ;/* Make sure tidle is updated */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 975/1157 s390/crash: fix incorrect number of bytes to copy to user space
In reply to Greg Kroah-HartmanFrom: Alexander Gordeev <[email protected]>
[ Upstream commit f6749da17a34eb08c9665f072ce7c812ff68aad2 ]
The number of bytes in a chunk is correctly calculated, but instead the total number of bytes is passed to copy_to_user_real() function.
--- arch/s390/kernel/crash_dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/crash_dump.c +1 -1
@@ -199,7 +199,7 @@ static int copy_oldmem_user(void __user *dst, unsigned long src, size_t count) }else { len = count; } - rc =copy_to_user_real (dst, src, count); + rc =copy_to_user_real (dst, src, len);if (rc)return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 976/1157 s390/zcore: fix race when reading from hardware system area
In reply to Greg Kroah-HartmanFrom: Alexander Gordeev <[email protected]>
[ Upstream commit 9ffed254d938c9e99eb7761c7f739294c84e0367 ]
Memory buffer used for reading out data from hardware system area is not protected against concurrent access.
--- drivers/s390/char/zcore.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/s390/char/zcore.c +10 -1
@@ -50,6 +50,7 @@ static struct dentry *zcore_reipl_file;static struct dentry *zcore_hsa_file;static struct ipl_parameter_block *zcore_ipl_block; +static DEFINE_MUTEX (hsa_buf_mutex);static char hsa_buf[PAGE_SIZE ]__aligned(PAGE_SIZE) ;/*
@@ -66,19 +67,24 @@ int memcpy_hsa_user(void __user *dest, unsigned long src, size_t count)if (!hsa_available)return -ENODATA ; +mutex_lock (&hsa_buf_mutex);while (count) {if (sclp_sdias_copy (hsa_buf, src /PAGE_SIZE +2 ,1 )) {TRACE ("sclp_sdias_copy() failed\n" ); +mutex_unlock (&hsa_buf_mutex);return -EIO ; } offset = src %PAGE_SIZE ; bytes =min (PAGE_SIZE - offset, count); -if (copy_to_user (dest, hsa_buf + offset, bytes)) +if (copy_to_user (dest, hsa_buf + offset, bytes)) { +mutex_unlock (&hsa_buf_mutex);return -EFAULT ; + } src += bytes; dest += bytes; count -= bytes; } +mutex_unlock (&hsa_buf_mutex);return 0 ; }
@@ -96,9 +102,11 @@ int memcpy_hsa_kernel(void *dest, unsigned long src, size_t count)if (!hsa_available)return -ENODATA ; +mutex_lock (&hsa_buf_mutex);while (count) {if (sclp_sdias_copy (hsa_buf, src /PAGE_SIZE +2 ,1 )) {TRACE ("sclp_sdias_copy() failed\n" ); +mutex_unlock (&hsa_buf_mutex);return -EIO ; } offset = src %PAGE_SIZE ;
@@ -108,6 +116,7 @@ int memcpy_hsa_kernel(void *dest, unsigned long src, size_t count) dest += bytes; count -= bytes; } +mutex_unlock (&hsa_buf_mutex);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 977/1157 perf test: Fix test case 83 (perf stat CSV output linter) on s390
In reply to Greg Kroah-HartmanFrom: Thomas Richter <[email protected]>
[ Upstream commit 87abe344cd280802f431998fabfd35d2d340ca90 ]
Perf test case 83: perf stat CSV output linter might fail on s390.
The reason for this is the output of the command
./perf stat -x, -A -a --no-merge true
which depends on a .config file setting. When CONFIG_SCHED_TOPOLOGY is set, the output of above perf command is
CPU0,1.50,msec,cpu-clock,1502781,100.00,1.052,CPUs utilized
When CONFIG_SCHED_TOPOLOGY is *NOT* set the output of above perf command is
0.95,msec,cpu-clock,949800,100.00,1.060,CPUs utilized
Fix the test case to accept both output formats.
Output before:
# perf test 83 83: perf stat CSV output linter : FAILED! #
Output after:
# ./perf test 83 83: perf stat CSV output linter : Ok #
--- tools/perf/tests/shell/stat+csv_output.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/perf/tests/shell/stat+csv_output.sh +4 -3
@@ -8,7 +8,8 @@ set -e function commachecker() { - local -i cnt=0 exp=0 + local -i cnt=0 + local exp=0 case "$1" in "--no-args") exp=6
@@ -17,7 +18,7 @@ function commachecker() ;; "--interval") exp=7 ;; "--per-thread") exp=7 ;; "--system-wide-no-aggr") exp=7 - [ $(uname -m) = "s390x" ] && exp=6 + [ $(uname -m) = "s390x" ] && exp='^[6-7]$' ;; "--per-core") exp=8 ;; "--per-socket") exp=8 ;; "--per-node") exp=8
@@ -34,7 +35,7 @@ function commachecker() x=$(echo $line | tr -d -c ',') cnt="${#x}" # echo $line $cnt - [ "$cnt" -ne "$exp" ] && { + [[ ! "$cnt" =~ $exp ]] && { echo "wrong number of fields. expected $exp in $line" 1>&2 exit 1; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 978/1157 ASoC: fsl_asrc: force cast the asrc_format type
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit c49932726de24405d45516b3f8ad2735714fdf05 ]
Fix sparse warning:sound/soc/fsl/fsl_asrc.c:1177:60: sparse: warning: incorrect type in argument 3 (different base types)sound/soc/fsl/fsl_asrc.c:1177:60: sparse: expected unsigned int [usertype] *out_valuesound/soc/fsl/fsl_asrc.c:1177:60: sparse: got restricted snd_pcm_format_t *sound/soc/fsl/fsl_asrc.c:1200:47: sparse: warning: restricted snd_pcm_format_t degrades to integer
--- sound/soc/fsl/fsl_asrc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/fsl/fsl_asrc.c +4 -2
@@ -1066,6 +1066,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)struct resource *res;void __iomem *regs;int irq, ret, i; +u32 asrc_fmt =0 ;u32 map_idx;char tmp[16 ];u32 width;
@@ -1174,7 +1175,8 @@ static int fsl_asrc_probe(struct platform_device *pdev)return ret; } - ret =of_property_read_u32 (np,"fsl,asrc-format" , &asrc->asrc_format); + ret =of_property_read_u32 (np,"fsl,asrc-format" , &asrc_fmt); + asrc->asrc_format = (__force snd_pcm_format_t )asrc_fmt;if (ret) { ret =of_property_read_u32 (np,"fsl,asrc-width" , &width);if (ret) {
@@ -1197,7 +1199,7 @@ static int fsl_asrc_probe(struct platform_device *pdev) } } -if (!(FSL_ASRC_FORMATS & (1ULL << asrc->asrc_format))) { +if (!(FSL_ASRC_FORMATS &pcm_format_to_bits (asrc->asrc_format))) {dev_warn (&pdev->dev,"unsupported width, use default S24_LE\n" ); asrc->asrc_format =SNDRV_PCM_FORMAT_S24_LE ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 979/1157 ASoC: fsl-asoc-card: force cast the asrc_format type
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 6c7b077dad62178c33f9a3ae17f90d6b0bf6e2e5 ]
Fix sparse warning:sound/soc/fsl/fsl-asoc-card.c:833:45: sparse: warning: incorrect type in argument 3 (different base types)sound/soc/fsl/fsl-asoc-card.c:833:45: sparse: expected unsigned int [usertype] *out_valuesound/soc/fsl/fsl-asoc-card.c:833:45: sparse: got restricted snd_pcm_format_t *
--- sound/soc/fsl/fsl-asoc-card.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/fsl/fsl-asoc-card.c +3 -2
@@ -537,6 +537,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)struct device *codec_dev =NULL ;const char *codec_dai_name;const char *codec_dev_name; +u32 asrc_fmt =0 ;u32 width;int ret;
@@ -829,8 +830,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) goto asrc_fail; } - ret =of_property_read_u32 (asrc_np,"fsl,asrc-format" , - &priv->asrc_format); + ret =of_property_read_u32 (asrc_np,"fsl,asrc-format" , &asrc_fmt); + priv->asrc_format = (__force snd_pcm_format_t )asrc_fmt;if (ret) {/* Fallback to old binding; translate to asrc_format */ ret = of_property_read_u32(asrc_np, "fsl,asrc-width",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 980/1157 ASoC: fsl_easrc: use snd_pcm_format_t type for sample_format
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit de27216cf2d645c2fd14e513707bdcd54e5b1de4 ]
Fix sparse warning:sound/soc/fsl/fsl_easrc.c:562:33: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:563:34: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:565:38: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:566:39: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:608:33: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:609:34: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:615:40: sparse: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl_easrc.c:616:41: sparse: warning: restricted snd_pcm_format_t degrades to integer
sound/soc/fsl/fsl_easrc.c:1465:51: sparse: warning: incorrect type in assignment (different base types)sound/soc/fsl/fsl_easrc.c:1465:51: sparse: expected unsigned int sample_formatsound/soc/fsl/fsl_easrc.c:1465:51: sparse: got restricted snd_pcm_format_t [usertype] formatsound/soc/fsl/fsl_easrc.c:1467:52: sparse: warning: incorrect type in assignment (different base types)sound/soc/fsl/fsl_easrc.c:1467:52: sparse: expected unsigned int sample_formatsound/soc/fsl/fsl_easrc.c:1467:52: sparse: got restricted snd_pcm_format_t [usertype] asrc_formatsound/soc/fsl/fsl_easrc.c:1470:52: sparse: warning: incorrect type in assignment (different base types)sound/soc/fsl/fsl_easrc.c:1470:52: sparse: expected unsigned int sample_formatsound/soc/fsl/fsl_easrc.c:1470:52: sparse: got restricted snd_pcm_format_t [usertype] formatsound/soc/fsl/fsl_easrc.c:1472:51: sparse: warning: incorrect type in assignment (different base types)sound/soc/fsl/fsl_easrc.c:1472:51: sparse: expected unsigned int sample_formatsound/soc/fsl/fsl_easrc.c:1472:51: sparse: got restricted snd_pcm_format_t [usertype] asrc_formatsound/soc/fsl/fsl_easrc.c:1484:41: sparse: warning: incorrect type in argument 2 (different base types)sound/soc/fsl/fsl_easrc.c:1484:41: sparse: expected restricted snd_pcm_format_t [usertype] *in_raw_formatsound/soc/fsl/fsl_easrc.c:1484:41: sparse: got unsigned int *sound/soc/fsl/fsl_easrc.c:1485:41: sparse: warning: incorrect type in argument 3 (different base types)sound/soc/fsl/fsl_easrc.c:1485:41: sparse: expected restricted snd_pcm_format_t [usertype] *out_raw_formatsound/soc/fsl/fsl_easrc.c:1485:41: sparse: got unsigned int *sound/soc/fsl/fsl_easrc.c:1937:60: sparse: warning: incorrect type in argument 3 (different base types)sound/soc/fsl/fsl_easrc.c:1937:60: sparse: expected unsigned int [usertype] *out_valuesound/soc/fsl/fsl_easrc.c:1937:60: sparse: got restricted snd_pcm_format_t *sound/soc/fsl/fsl_easrc.c:1943:49: sparse: warning: restricted snd_pcm_format_t degrades to integer
--- sound/soc/fsl/fsl_easrc.c | 9 ++++++--- sound/soc/fsl/fsl_easrc.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-)
sound/soc/fsl/fsl_easrc.c +6 -3
@@ -476,7 +476,8 @@ static int fsl_easrc_prefilter_config(struct fsl_asrc *easrc,struct fsl_asrc_pair *ctx;struct device *dev;u32 inrate, outrate, offset =0 ; -u32 in_s_rate, out_s_rate, in_s_fmt, out_s_fmt; +u32 in_s_rate, out_s_rate; +snd_pcm_format_t in_s_fmt, out_s_fmt;int ret, i;if (!easrc)
@@ -1873,6 +1874,7 @@ static int fsl_easrc_probe(struct platform_device *pdev)struct resource *res;struct device_node *np;void __iomem *regs; +u32 asrc_fmt =0 ;int ret, irq; easrc =devm_kzalloc (dev,sizeof (*easrc),GFP_KERNEL );
@@ -1933,13 +1935,14 @@ static int fsl_easrc_probe(struct platform_device *pdev)return ret; } - ret =of_property_read_u32 (np,"fsl,asrc-format" , &easrc->asrc_format); + ret =of_property_read_u32 (np,"fsl,asrc-format" , &asrc_fmt); + easrc->asrc_format = (__force snd_pcm_format_t )asrc_fmt;if (ret) {dev_err (dev,"failed to asrc format\n" );return ret; } -if (!(FSL_EASRC_FORMATS & (1ULL << easrc->asrc_format))) { +if (!(FSL_EASRC_FORMATS & (pcm_format_to_bits (easrc->asrc_format)))) {dev_warn (dev,"unsupported format, switching to S24_LE\n" ); easrc->asrc_format =SNDRV_PCM_FORMAT_S24_LE ; }
sound/soc/fsl/fsl_easrc.h +1 -1
@@ -569,7 +569,7 @@ struct fsl_easrc_io_params {unsigned int access_len;unsigned int fifo_wtmk;unsigned int sample_rate; -unsigned int sample_format; +snd_pcm_format_t sample_format;unsigned int norm_rate; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 981/1157 ASoC: imx-card: use snd_pcm_format_t type for asrc_format
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 409a8652e909e323c715f3088e6c3133e37c8881 ]
Fix sparse warning:sound/soc/fsl/imx-card.c:653:59: sparse: warning: incorrect type in assignment (different base types)sound/soc/fsl/imx-card.c:653:59: sparse: expected unsigned int [usertype] asrc_formatsound/soc/fsl/imx-card.c:653:59: sparse: got restricted snd_pcm_format_t [usertype]sound/soc/fsl/imx-card.c:655:59: sparse: warning: incorrect type in assignment (different base types)sound/soc/fsl/imx-card.c:655:59: sparse: expected unsigned int [usertype] asrc_formatsound/soc/fsl/imx-card.c:655:59: sparse: got restricted snd_pcm_format_t [usertype]
--- sound/soc/fsl/imx-card.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/soc/fsl/imx-card.c +5 -3
@@ -118,7 +118,7 @@ struct imx_card_data {struct snd_soc_card card;int num_dapm_routes;u32 asrc_rate; -u32 asrc_format; +snd_pcm_format_t asrc_format; };static struct imx_akcodec_fs_mul ak4458_fs_mul[] = {
@@ -474,7 +474,7 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, mask =hw_param_mask (params,SNDRV_PCM_HW_PARAM_FORMAT );snd_mask_none (mask); -snd_mask_set (mask, data->asrc_format); +snd_mask_set (mask, (__force unsigned int )data->asrc_format);return 0 ; }
@@ -493,6 +493,7 @@ static int imx_card_parse_of(struct imx_card_data *data)struct dai_link_data *link_data;struct of_phandle_args args;int ret, num_links; +u32 asrc_fmt =0 ;u32 width; ret =snd_soc_of_parse_card_name (card,"model" );
@@ -639,7 +640,8 @@ static int imx_card_parse_of(struct imx_card_data *data) goto err; } - ret =of_property_read_u32 (args.np,"fsl,asrc-format" , &data->asrc_format); + ret =of_property_read_u32 (args.np,"fsl,asrc-format" , &asrc_fmt); + data->asrc_format = (__force snd_pcm_format_t )asrc_fmt;if (ret) {/* Fallback to old binding; translate to asrc_format */ ret =of_property_read_u32 (args.np,"fsl,asrc-width" , &width);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 982/1157 ASoC: qcom: q6dsp: Fix an off-by-one in q6adm_alloc_copp()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 673f58f62ca6fc98979d1cf3fe89c3ff33f29b2e ]
find_first_zero_bit() returns MAX_COPPS_PER_PORT at max here. So 'idx' should be tested with ">=" or the test can't match.
--- sound/soc/qcom/qdsp6/q6adm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/qcom/qdsp6/q6adm.c +1 -1
@@ -217,7 +217,7 @@ static struct q6copp *q6adm_alloc_copp(struct q6adm *adm, int port_idx) idx =find_first_zero_bit (&adm->copp_bitmap[port_idx],MAX_COPPS_PER_PORT ); -if (idx >MAX_COPPS_PER_PORT ) +if (idx >=MAX_COPPS_PER_PORT )return ERR_PTR (-EBUSY ); c =kzalloc (sizeof (*c),GFP_ATOMIC );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 983/1157 fuse: Remove the control interface for virtio-fs
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
[ Upstream commit c64797809a64c73497082aa05e401a062ec1af34 ]
The commit 15c8e72e88e0 ("fuse: allow skipping control interface and forced unmount") tries to remove the control interface for virtio-fs since it does not support aborting requests which are being processed. But it doesn't work now.
This patch fixes it by skipping creating the control interface if fuse_conn->no_control is set.
--- fs/fuse/control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/fuse/control.c +2 -2
@@ -258,7 +258,7 @@ int fuse_ctl_add_conn(struct fuse_conn *fc)struct dentry *parent;char name[32 ]; -if (!fuse_control_sb) +if (!fuse_control_sb || fc->no_control)return 0 ; parent = fuse_control_sb->s_root;
@@ -296,7 +296,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc) {int i; -if (!fuse_control_sb) +if (!fuse_control_sb || fc->no_control)return ;for (i = fc->ctl_ndents -1 ; i >=0 ; i--) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 984/1157 ASoC: audio-graph-card: Add of_node_put() in fail path
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 65fb8e2ef3531a6e950060fca6e551c923fb0f0e ]
In asoc_simple_parse_dai(), we should call of_node_put() for the reference returned by of_graph_get_port_parent() in fail path.
--- sound/soc/generic/audio-graph-card.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/generic/audio-graph-card.c +3 -1
@@ -158,8 +158,10 @@ static int asoc_simple_parse_dai(struct device_node *ep,* if he unbinded CPU or Codec. */ ret =snd_soc_get_dai_name (&args, &dlc->dai_name); -if (ret <0 ) +if (ret <0 ) { +of_node_put (node);return ret; + } dlc->of_node = node;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 985/1157 ASoC: audio-graph-card2: Add of_node_put() in fail path
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 8ebc4dd8250fd1cb5da2869c0fe6ae3686fe41e9 ]
In asoc_simple_parse_dai(), we should call of_node_put() for the reference returned by of_graph_get_port_parent() in fail path.
--- sound/soc/generic/audio-graph-card2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/generic/audio-graph-card2.c +3 -1
@@ -445,8 +445,10 @@ static int asoc_simple_parse_dai(struct device_node *ep,* if he unbinded CPU or Codec. */ ret =snd_soc_get_dai_name (&args, &dlc->dai_name); -if (ret <0 ) +if (ret <0 ) { +of_node_put (node);return ret; + } dlc->of_node = node;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 986/1157 watchdog: f71808e_wdt: Add check for platform_driver_register
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 97d5ec548150764946f38632e62e79759832b54b ]
As platform_driver_register() could fail, it should be better to deal with the return value in order to maintain the code consisitency.
https://lore.kernel.org/r/[email protected]
--- drivers/watchdog/f71808e_wdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/watchdog/f71808e_wdt.c +3 -1
@@ -634,7 +634,9 @@ static int __init fintek_wdt_init(void) pdata.type = ret; -platform_driver_register (&fintek_wdt_driver); + ret =platform_driver_register (&fintek_wdt_driver); +if (ret) +return ret; wdt_res.name ="superio port" ; wdt_res.flags =IORESOURCE_IO ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 987/1157 watchdog: sp5100_tco: Fix a memory leak of EFCH MMIO resource
In reply to Greg Kroah-HartmanFrom: Jean Delvare <[email protected]>
[ Upstream commit c6d9c0798ed366a09a9e53d71edcd2266e34a6eb ]
Unlike release_mem_region(), a call to release_resource() does not free the resource, so it has to be freed explicitly to avoid a memory leak.
--- drivers/watchdog/sp5100_tco.c | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/sp5100_tco.c +1 -0
@@ -402,6 +402,7 @@ static int sp5100_tco_setupdevice_mmio(struct device *dev,iounmap (addr);release_resource (res); +kfree (res);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 988/1157 watchdog: armada_37xx_wdt: check the return value of devm_ioremap() in armada_37xx_wdt_probe()
In reply to Greg Kroah-HartmanFrom: William Dean <[email protected]>
[ Upstream commit 2d27e52841092e5831dd41f313028c668d816eb0 ]
The function devm_ioremap() in armada_37xx_wdt_probe() can fail, so its return value should be checked.
--- drivers/watchdog/armada_37xx_wdt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/armada_37xx_wdt.c +2 -0
@@ -274,6 +274,8 @@ static int armada_37xx_wdt_probe(struct platform_device *pdev)if (!res)return -ENODEV ; dev->reg =devm_ioremap (&pdev->dev, res->start,resource_size (res)); +if (!dev->reg) +return -ENOMEM ;/* init clock */ dev->clk =devm_clk_get (&pdev->dev,NULL );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 989/1157 ASoC: Intel: sof_rt5682: Perform quirk check first in card late probe
In reply to Greg Kroah-HartmanFrom: Yong Zhi <[email protected]>
[ Upstream commit 371a3f01fc1862c23fae35cb2c98ffb2eec143f1 ]
The check of sof_rt5682_quirk should not be skipped unless the HDMI handling code exits with error, fix by moving the quirk check to the front.
--- sound/soc/intel/boards/sof_rt5682.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
sound/soc/intel/boards/sof_rt5682.c +9 -9
@@ -434,6 +434,15 @@ static int sof_card_late_probe(struct snd_soc_card *card)struct sof_hdmi_pcm *pcm;int err; +if (sof_rt5682_quirk &SOF_MAX98373_SPEAKER_AMP_PRESENT ) { +/* Disable Left and Right Spk pin after boot */ +snd_soc_dapm_disable_pin (dapm,"Left Spk" ); +snd_soc_dapm_disable_pin (dapm,"Right Spk" ); + err =snd_soc_dapm_sync (dapm); +if (err <0 ) +return err; + } +/* HDMI is not supported by SOF on Baytrail/CherryTrail */ if (is_legacy_cpu || !ctx->idisp_codec)return 0 ;
@@ -464,15 +473,6 @@ static int sof_card_late_probe(struct snd_soc_card *card)return err; } -if (sof_rt5682_quirk &SOF_MAX98373_SPEAKER_AMP_PRESENT ) { -/* Disable Left and Right Spk pin after boot */ -snd_soc_dapm_disable_pin (dapm,"Left Spk" ); -snd_soc_dapm_disable_pin (dapm,"Right Spk" ); - err =snd_soc_dapm_sync (dapm); -if (err <0 ) -return err; - } -return hdac_hdmi_jack_port_init (component, &card->dapm); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 990/1157 video: fbdev: amba-clcd: Fix refcount leak bugs
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 26c2b7d9fac42eb8317f3ceefa4c1a9a9170ca69 ]
In clcdfb_of_init_display(), we should call of_node_put() for the references returned by of_graph_get_next_endpoint() and of_graph_get_remote_port_parent() which have increased the refcount.
Besides, we should call of_node_put() both in fail path or when the references are not used anymore.
--- drivers/video/fbdev/amba-clcd.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/video/fbdev/amba-clcd.c +18 -6
@@ -698,16 +698,18 @@ static int clcdfb_of_init_display(struct clcd_fb *fb)return -ENODEV ; panel =of_graph_get_remote_port_parent (endpoint); -if (!panel) -return -ENODEV ; +if (!panel) { + err = -ENODEV ; + goto out_endpoint_put; + } err =clcdfb_of_get_backlight (&fb->dev->dev, fb->panel);if (err) -return err; + goto out_panel_put; err =clcdfb_of_get_mode (&fb->dev->dev, panel, fb->panel);if (err) -return err; + goto out_panel_put; err =of_property_read_u32 (fb->dev->dev.of_node,"max-memory-bandwidth" , &max_bandwidth);
@@ -736,11 +738,21 @@ static int clcdfb_of_init_display(struct clcd_fb *fb)if (of_property_read_u32_array (endpoint,"arm,pl11x,tft-r0g0b0-pads" , - tft_r0b0g0,ARRAY_SIZE (tft_r0b0g0)) !=0 ) -return -ENOENT ; + tft_r0b0g0,ARRAY_SIZE (tft_r0b0g0)) !=0 ) { + err = -ENOENT ; + goto out_panel_put; + } + +of_node_put (panel); +of_node_put (endpoint);return clcdfb_of_init_tft_panel (fb, tft_r0b0g0[0 ], tft_r0b0g0[1 ], tft_r0b0g0[2 ]); +out_panel_put: +of_node_put (panel); +out_endpoint_put: +of_node_put (endpoint); +return err; }static int clcdfb_of_vram_setup (struct clcd_fb *fb)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 991/1157 video: fbdev: sis: fix typos in SiS_GetModeID()
In reply to Greg Kroah-HartmanFrom: Rustam Subkhankulov <[email protected]>
[ Upstream commit 3eb8fccc244bfb41a7961969e4db280d44911226 ]
The second operand of a '&&' operator has no impact on expression result for cases 400 and 512 in SiS_GetModeID().
Judging by the logic and the names of the variables, in both cases a typo was made.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/video/fbdev/sis/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/sis/init.c +2 -2
@@ -355,12 +355,12 @@ SiS_GetModeID(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay, }break ;case 400 : -if ((!(VBFlags &CRT1_LCDA )) || ((LCDwidth >=800 ) && (LCDwidth >=600 ))) { +if ((!(VBFlags &CRT1_LCDA )) || ((LCDwidth >=800 ) && (LCDheight >=600 ))) {if (VDisplay ==300 ) ModeIndex = ModeIndex_400x300[Depth]; }break ;case 512 : -if ((!(VBFlags &CRT1_LCDA )) || ((LCDwidth >=1024 ) && (LCDwidth >=768 ))) { +if ((!(VBFlags &CRT1_LCDA )) || ((LCDwidth >=1024 ) && (LCDheight >=768 ))) {if (VDisplay ==384 ) ModeIndex = ModeIndex_512x384[Depth]; }break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 992/1157 ASoC: mchp-spdifrx: disable end of block interrupt on failures
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 768ac4f12ca0fda935f58eb8c5120e9d795bc6e3 ]
Disable end of block interrupt in case of wait for completion timeout or errors to undo previously enable operation (done in mchp_spdifrx_isr_blockend_en()). Otherwise we can end up with an unbalanced reference counter for this interrupt.
--- sound/soc/atmel/mchp-spdifrx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
sound/soc/atmel/mchp-spdifrx.c +6 -3
@@ -288,15 +288,17 @@ static void mchp_spdifrx_isr_blockend_en(struct mchp_spdifrx_dev *dev)spin_unlock_irqrestore (&dev->blockend_lock, flags); } -/* called from atomic context only */ +/* called from atomic/non-atomic context */ static void mchp_spdifrx_isr_blockend_dis (struct mchp_spdifrx_dev *dev) { -spin_lock (&dev->blockend_lock); +unsigned long flags; + +spin_lock_irqsave (&dev->blockend_lock, flags); dev->blockend_refcount--;/* don't enable BLOCKEND interrupt if it's already enabled */ if (dev->blockend_refcount ==0 )regmap_write (dev->regmap,SPDIFRX_IDR ,SPDIFRX_IR_BLOCKEND ); -spin_unlock (&dev->blockend_lock); +spin_unlock_irqrestore (&dev->blockend_lock, flags); }static irqreturn_t mchp_spdif_interrupt (int irq,void *dev_id)
@@ -575,6 +577,7 @@ static int mchp_spdifrx_subcode_ch_get(struct mchp_spdifrx_dev *dev,if (ret <=0 ) {dev_dbg (dev->dev,"user data for channel %d timeout\n" , channel); +mchp_spdifrx_isr_blockend_dis (dev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 993/1157 powerpc/32: Call mmu_mark_initmem_nx() regardless of data block mapping.
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 980bbf7ca72012d317617fcdbfabe8708e4cef29 ]
mark_initmem_nx() calls either mmu_mark_initmem_nx() or set_memory_attr() based on return from v_block_mapped() of _sinittext.
But we can now handle text and data independently, so that text may be mapped by block even when data is mapped by pages.
On the 8xx for instance, at startup 32Mbytes of memory are pinned in TLB. So the pinned entries need to go away for sinittext.
In next patch a BAT will be set to also covers sinittext on book3s/32. So it will also be needed to call mmu_mark_initmem_nx() even when data above sinittext is not mapped with BATs.
As this is highly dependent on the platform, call mmu_mark_initmem_nx() regardless of data block mapping. Then the platform will know what to do.
Modify 8xx mmu_mark_initmem_nx() so that inittext mapping is modified only when pagealloc debug and kfence are not active, otherwise inittext is mapped with standard pages. And don't do anything on kernel text which is already mapped with PAGE_KERNEL_TEXT.
--- arch/powerpc/mm/nohash/8xx.c | 4 ++-- arch/powerpc/mm/pgtable_32.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/mm/nohash/8xx.c +2 -2
@@ -179,8 +179,8 @@ void mmu_mark_initmem_nx(void)unsigned long boundary =strict_kernel_rwx_enabled () ? sinittext : etext8;unsigned long einittext8 =ALIGN (__pa (_einittext),SZ_8M ); -mmu_mapin_ram_chunk (0 , boundary,PAGE_KERNEL_TEXT , false); -mmu_mapin_ram_chunk (boundary, einittext8,PAGE_KERNEL , false); +if (!debug_pagealloc_enabled_or_kfence ()) +mmu_mapin_ram_chunk (boundary, einittext8,PAGE_KERNEL , false);mmu_pin_tlb (block_mapped_ram, false); }
arch/powerpc/mm/pgtable_32.c +3 -3
@@ -135,9 +135,9 @@ void mark_initmem_nx(void)unsigned long numpages =PFN_UP ((unsigned long )_einittext) -PFN_DOWN ((unsigned long )_sinittext); -if (v_block_mapped ((unsigned long )_sinittext)) { -mmu_mark_initmem_nx (); - }else { +mmu_mark_initmem_nx (); + +if (!v_block_mapped ((unsigned long )_sinittext)) {set_memory_nx ((unsigned long )_sinittext, numpages);set_memory_rw ((unsigned long )_sinittext, numpages); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 994/1157 powerpc/32s: Fix boot failure with KASAN + SMP + JUMP_LABEL_FEATURE_CHECK_DEBUG
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 6042a1652d643d1d34fa89bb314cb102960c0800 ]
Since commit 4291d085b0b0 ("powerpc/32s: Make pte_update() non atomic on 603 core"), pte_update() has been using mmu_has_feature(MMU_FTR_HPTE_TABLE) to avoid a useless atomic operation on 603 cores.
When kasan_early_init() sets up the early zero shadow, it uses __set_pte_at(). On book3s/32, __set_pte_at() calls pte_update() when CONFIG_SMP is selected in order to ensure the preservation of _PAGE_HASHPTE in case of concurrent update of the PTE. But that's too early for mmu_has_feature(), so when CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG is selected, mmu_has_feature() calls printk(). That's too early to call printk() because KASAN early zero shadow page is not set up yet. It leads to a deadlock.
However, when kasan_early_init() is called, there is only one CPU running and no risk of concurrent PTE update. So __set_pte_at() can be called with the 'percpu' flag. With that flag set, the PTE is written directly instead of being written via pte_update().
--- arch/powerpc/mm/kasan/init_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/kasan/init_32.c +1 -1
@@ -25,7 +25,7 @@ static void __init kasan_populate_pte(pte_t *ptep, pgprot_t prot)int i;for (i =0 ; i <PTRS_PER_PTE ; i++, ptep++) -__set_pte_at (&init_mm, va, ptep,pfn_pte (PHYS_PFN (pa), prot),0 ); +__set_pte_at (&init_mm, va, ptep,pfn_pte (PHYS_PFN (pa), prot),1 ); }int __init kasan_init_shadow_page_tables (unsigned long k_start,unsigned long k_end)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 995/1157 powerpc/32: Do not allow selection of e5500 or e6500 CPUs on PPC32
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 9be013b2a9ecb29b5168e4b9db0e48ed53acf37c ]
Commit 0e00a8c9fd92 ("powerpc: Allow CPU selection also on PPC32") enlarged the CPU selection logic to PPC32 by removing depend to PPC64, and failed to restrict that depend to E5500_CPU and E6500_CPU. Fortunately that got unnoticed because -mcpu=8540 will override the -mcpu=e500mc64 or -mpcu=e6500 as they are ealier, but that's fragile and may no be right in the future.
Add back the depend PPC64 on E5500_CPU and E6500_CPU.
--- arch/powerpc/platforms/Kconfig.cputype | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/Kconfig.cputype +2 -2
@@ -174,11 +174,11 @@ config POWER9_CPU config E5500_CPU bool "Freescale e5500" - depends on E500 + depends on PPC64 && E500 config E6500_CPU bool "Freescale e6500" - depends on E500 + depends on PPC64 && E500 config 860_CPU bool "8xx family"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 996/1157 video: fbdev: offb: Include missing linux/platform_device.h
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit ebef8abc963b9e537c0a0d619dd8faf1b8f2b183 ]
A lot of drivers were getting platform and of headers indirectly via headers like asm/pci.h or asm/prom.h
Most of them were fixed during 5.19 cycle but a newissue was introduced by commit 52b1b46c39ae ("of: Create platform devices for OF framebuffers")
Include missing platform_device.h to allow cleaning asm/pci.h
--- drivers/video/fbdev/offb.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/fbdev/offb.c +1 -0
@@ -26,6 +26,7 @@#include <linux/init.h> #include <linux/ioport.h> #include <linux/pci.h> +#include <linux/platform_device.h> #include <asm/io.h> #ifdef CONFIG_PPC32
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 997/1157 pseries/iommu/ddw: Fix kdump to work in absence of ibm,dma-window
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit b1fc44eaa9ba31e28c4125d6b9205a3582b47b5d ]
The pseries platform uses 32bit default DMA window (always 4K pages) and optional 64bit DMA window available via DDW ("Dynamic DMA Windows"), 64K or 2M pages. For ages the default one was not removed and a huge window was created in addition. Things changed with SRIOV-enabled PowerVM which creates a default-and-bigger DMA window in 64bit space (still using 4K pages) for IOV VFs so certain OSes do not need to use the DDW API in order to utilize all available TCE budget.
Linux on the other hand removes the default window and creates a bigger one (with more TCEs or/and a bigger page size - 64K/2M) in a bid to map the entire RAM, and if the new window size is smaller than that - it still uses this new bigger window. The result is that the default window is removed but the "ibm,dma-window" property is not.
When kdump is invoked, the existing code tries reusing the existing 64bit DMA window which location and parameters are stored in the device tree but this fails as the new property does not make it to the kdump device tree blob. So the code falls back to the default window which does not exist anymore although the device tree says that it does. The result of that is that PCI devices become unusable and cannot be used for kdumping.
This preserves the DMA64 and DIRECT64 properties in the device tree blob for the crash kernel. Since the crash kernel setup is done after device drivers are loaded and probed, the proper DMA config is stored at least for boot time devices.
Because DDW window is optional and the code configures the default window first, the existing code creates an IOMMU table descriptor for the non-existing default DMA window. It is harmless for kdump as it does not touch the actual window (only reads what is mapped and marks those IO pages as used) but it is bad for kexec which clears it thinking it is a smaller default window rather than a bigger DDW window.
This removes the "ibm,dma-window" property from the device tree after a bigger window is created and the crash kernel setup picks it up.
--- arch/powerpc/kexec/file_load_64.c | 54 ++++++++++++++++ arch/powerpc/platforms/pseries/iommu.c | 89 ++++++++++++++------------ 2 files changed, 102 insertions(+), 41 deletions(-)
arch/powerpc/kexec/file_load_64.c +54 -0
@@ -1038,6 +1038,48 @@ static int update_cpus_node(void *fdt)return ret; } +static int copy_property (void *fdt,int node_offset,const struct device_node *dn, +const char *propname) +{ +const void *prop, *fdtprop; +int len =0 , fdtlen =0 , ret; + + prop =of_get_property (dn, propname, &len); + fdtprop =fdt_getprop (fdt, node_offset, propname, &fdtlen); + +if (fdtprop && !prop) + ret =fdt_delprop (fdt, node_offset, propname); +else if (prop) + ret =fdt_setprop (fdt, node_offset, propname, prop, len); + +return ret; +} + +static int update_pci_dma_nodes (void *fdt,const char *dmapropname) +{ +struct device_node *dn; +int pci_offset, root_offset, ret =0 ; + +if (!firmware_has_feature (FW_FEATURE_LPAR )) +return 0 ; + + root_offset =fdt_path_offset (fdt,"/" ); +for_each_node_with_property (dn, dmapropname) { + pci_offset =fdt_subnode_offset (fdt, root_offset,of_node_full_name (dn)); +if (pci_offset <0 ) +continue ; + + ret =copy_property (fdt, pci_offset, dn,"ibm,dma-window" ); +if (ret <0 ) +break ; + ret =copy_property (fdt, pci_offset, dn, dmapropname); +if (ret <0 ) +break ; + } + +return ret; +} +/** * setup_new_fdt_ppc64 - Update the flattend device-tree of the kernel * being loaded.
@@ -1099,6 +1141,18 @@ int setup_new_fdt_ppc64(const struct kimage *image, void *fdt,if (ret <0 ) goto out; +#define DIRECT64_PROPNAME "linux,direct64-ddr-window-info" +#define DMA64_PROPNAME "linux,dma64-ddr-window-info" + ret =update_pci_dma_nodes (fdt,DIRECT64_PROPNAME ); +if (ret <0 ) + goto out; + + ret =update_pci_dma_nodes (fdt,DMA64_PROPNAME ); +if (ret <0 ) + goto out; +#undef DMA64_PROPNAME +#undef DIRECT64_PROPNAME +/* Update memory reserve map */ ret =get_reserved_memory_ranges (&rmem);if (ret)
arch/powerpc/platforms/pseries/iommu.c +48 -41
152 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 998/1157 powerpc/iommu: Fix iommu_table_in_use for a small default DMA window case
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit d80f6de9d601c30b53c17f00cb7cfe3169f2ddad ]
The existing iommu_table_in_use() helper checks if the kernel is using any of TCEs. There are some reserved TCEs:
1) the very first one if DMA window starts from 0 to avoid having a zero but still valid DMA handle;
2) it_reserved_start..it_reserved_end to exclude MMIO32 window in case the default window spans across that - this is the default for the first DMA window on PowerNV.
When 1) is the case and 2) is not the helper does not skip 1) and returns wrong status.
This only seems occurring when passing through a PCI device to a nested guest (not something we support really well) so it has not been seen before.
This fixes the bug by adding a special case for no MMIO32 reservation.
--- arch/powerpc/kernel/iommu.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/kernel/iommu.c +5 -0
@@ -775,6 +775,11 @@ bool iommu_table_in_use(struct iommu_table *tbl)/* ignore reserved bit0 */ if (tbl->it_offset ==0 ) start =1 ; + +/* Simple case with no reserved MMIO32 region */ +if (!tbl->it_reserved_start && !tbl->it_reserved_end) +return find_next_bit (tbl->it_map, tbl->it_size, start) != tbl->it_size; + end = tbl->it_reserved_start - tbl->it_offset;if (find_next_bit (tbl->it_map, end, start) != end)return true;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 999/1157 powerpc/pci: Prefer PCI domain assignment via DT linux,pci-domain and alias
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit 0fe1e96fef0a5c53b4c0d1500d356f3906000f81 ]
Other Linux architectures use DT property 'linux,pci-domain' for specifying fixed PCI domain of PCI controller specified in Device-Tree.
And lot of Freescale powerpc boards have defined numbered pci alias in Device-Tree for every PCIe controller which number specify preferred PCI domain.
So prefer usage of DT property 'linux,pci-domain' (via function of_get_pci_domain_nr()) and DT pci alias (via function of_alias_get_id()) on powerpc architecture for assigning PCI domain to PCI controller.
--- arch/powerpc/kernel/pci-common.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
arch/powerpc/kernel/pci-common.c +19 -8
@@ -74,16 +74,30 @@ void __init set_pci_dma_ops(const struct dma_map_ops *dma_ops)static int get_phb_number (struct device_node *dn) {int ret, phb_id =-1 ; -u32 prop_32;u64 prop;/* * Try fixed PHB numbering first, by checking archs and reading -* the respective device-tree properties. Firstly, try powernv by -* reading "ibm,opal-phbid", only present in OPAL environment. +* the respective device-tree properties. Firstly, try reading +* standard "linux,pci-domain", then try reading "ibm,opal-phbid" +* (only present in powernv OPAL environment), then try device-tree +* alias and as the last try to use lower bits of "reg" property. */ - ret =of_property_read_u64 (dn,"ibm,opal-phbid" , &prop); + ret =of_get_pci_domain_nr (dn); +if (ret >=0 ) { + prop = ret; + ret =0 ; + } +if (ret) + ret =of_property_read_u64 (dn,"ibm,opal-phbid" , &prop); +if (ret) + ret =of_alias_get_id (dn,"pci" ); +if (ret >=0 ) { + prop = ret; + ret =0 ; + }if (ret) { +u32 prop_32; ret =of_property_read_u32_index (dn,"reg" ,1 , &prop_32); prop = prop_32; }
@@ -95,10 +109,7 @@ static int get_phb_number(struct device_node *dn)if ((phb_id >=0 ) && !test_and_set_bit (phb_id, phb_bitmap))return phb_id; -/* -* If not pseries nor powernv, or if fixed PHB numbering tried to add -* the same PHB number twice, then fallback to dynamic PHB numbering. -*/ +/* If everything fails then fallback to dynamic PHB numbering. */ phb_id =find_first_zero_bit (phb_bitmap,MAX_PHBS );BUG_ON (phb_id >=MAX_PHBS );set_bit (phb_id, phb_bitmap);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1000/1157 selftests/powerpc: Fix matrix multiply assist test
In reply to Greg Kroah-HartmanFrom: Rashmica Gupta <[email protected]>
[ Upstream commit cd1e64935f79e31d666172c52c951ca97152b783 ]
The ISA states: "when ACC[i] contains defined data, the contents of VSRs 4×i to 4×i+3 are undefined until either a VSX Move From ACC instruction is used to copy the contents of ACC[i] to VSRs 4×i to 4×i+3 or some other instruction directly writes to one of these VSRs." We aren't doing this.
This test only works on Power10 because the hardware implementation happens to map ACC0 to VSRs 0-3, but will fail on any other implementation that doesn't do this. So add xxmfacc between writing to the accumulator and accessing the VSRs.
--- tools/testing/selftests/powerpc/math/mma.S | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/selftests/powerpc/math/mma.S +3 -0
@@ -20,6 +20,9 @@ test_mma: /* xvi16ger2s */ .long 0xec042958 + /* Deprime the accumulator - xxmfacc 0 */ + .long 0x7c000162 + /* Store result in image passed in r5 */ stxvw4x 0,0,5 addi 5,5,16
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1001/1157 serial: 8250_bcm2835aux: Add missing clk_disable_unprepare()
In reply to Greg Kroah-HartmanFrom: Guo Mengqi <[email protected]>
[ Upstream commit b9f1736e475dba0d6da48fdcb831248ab1597886 ]
The error path when get clock frequency fails in bcm2835aux_serial driver does not correctly disable the clock.
This flaw was found using a static analysis tool "Hulk Robot", which reported the following warning when analyzing linux-next/master:
drivers/tty/serial/8250/8250_bcm2835aux.c:
warning: clk_disable_unprepare_missing.cocciThe cocci script checks for the existence of clk_disable_unprepare() paired with clk_prepare_enable().
Add the missing clk_disable_unprepare() to the error path.
--- drivers/tty/serial/8250/8250_bcm2835aux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_bcm2835aux.c +4 -2
@@ -166,8 +166,10 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev) uartclk =clk_get_rate (data->clk);if (!uartclk) { ret =device_property_read_u32 (&pdev->dev,"clock-frequency" , &uartclk); -if (ret) -return dev_err_probe (&pdev->dev, ret,"could not get clk rate\n" ); +if (ret) { +dev_err_probe (&pdev->dev, ret,"could not get clk rate\n" ); + goto dis_clk; + } }/* the HW-clock divider for bcm2835aux is 8,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1002/1157 tty: serial: qcom-geni-serial: Fix get_clk_div_rate() which otherwise could return a sub-optimal clock rate.
In reply to Greg Kroah-HartmanFrom: Vijaya Krishna Nivarthi <[email protected]>
[ Upstream commit c474c775716edd46a51bf8161142bbd1545f8733 ]
In the logic around call to clk_round_rate(), for some corner conditions, get_clk_div_rate() could return an sub-optimal clock rate. Also, if an exact clock rate was not found lowest clock was being returned.
Search for suitable clock rate in 2 steps
a) exact match or within 2% tolerance
b) within 5% tolerance
This also takes care of corner conditions.
--- drivers/tty/serial/qcom_geni_serial.c | 88 ++++++++++++++++----------- 1 file changed, 53 insertions(+), 35 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +53 -35
@@ -940,52 +940,63 @@ static int qcom_geni_serial_startup(struct uart_port *uport)return 0 ; } -static unsigned long get_clk_div_rate (struct clk *clk,unsigned int baud, -unsigned int sampling_rate,unsigned int *clk_div) +static unsigned long find_clk_rate_in_tol (struct clk *clk,unsigned int desired_clk, +unsigned int *clk_div,unsigned int percent_tol) { -unsigned long ser_clk; -unsigned long desired_clk; -unsigned long freq, prev; +unsigned long freq;unsigned long div, maxdiv; -int64_t mult; - - desired_clk = baud * sampling_rate; -if (!desired_clk) { -pr_err ("%s: Invalid frequency\n" , __func__); -return 0 ; - } +u64 mult; +unsigned long offset, abs_tol, achieved; + abs_tol =div_u64 ((u64 )desired_clk * percent_tol,100 ); maxdiv =CLK_DIV_MSK >>CLK_DIV_SHFT ; - prev =0 ; - -for (div =1 ; div <= maxdiv; div++) { - mult = div * desired_clk; -if (mult >ULONG_MAX ) + div =1 ; +while (div <= maxdiv) { + mult = (u64 )div * desired_clk; +if (mult != (unsigned long )mult)break ; - freq =clk_round_rate (clk, (unsigned long )mult); -if (!(freq % desired_clk)) { - ser_clk = freq; -break ; - } + offset = div * abs_tol; + freq =clk_round_rate (clk, mult - offset); -if (!prev) - ser_clk = freq; -else if (prev == freq) +/* Can only get lower if we're done */ +if (freq < mult - offset)break ; - prev = freq; - } +/* +* Re-calculate div in case rounding skipped rates but we +* ended up at a good one, then check for a match. +*/ + div =DIV_ROUND_CLOSEST (freq, desired_clk); + achieved =DIV_ROUND_CLOSEST (freq, div); +if (achieved <= desired_clk + abs_tol && + achieved >= desired_clk - abs_tol) { + *clk_div = div; +return freq; + } -if (!ser_clk) { -pr_err ("%s: Can't find matching DFS entry for baud %d\n" , - __func__, baud); -return ser_clk; + div =DIV_ROUND_UP (freq, desired_clk); } - *clk_div = ser_clk / desired_clk; -if (!(*clk_div)) - *clk_div =1 ; +return 0 ; +} + +static unsigned long get_clk_div_rate (struct clk *clk,unsigned int baud, +unsigned int sampling_rate,unsigned int *clk_div) +{ +unsigned long ser_clk; +unsigned long desired_clk; + + desired_clk = baud * sampling_rate; +if (!desired_clk) +return 0 ; + +/* +* try to find a clock rate within 2% tolerance, then within 5% +*/ + ser_clk =find_clk_rate_in_tol (clk, desired_clk, clk_div,2 ); +if (!ser_clk) + ser_clk =find_clk_rate_in_tol (clk, desired_clk, clk_div,5 );return ser_clk; }
@@ -1020,8 +1031,15 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, clk_rate =get_clk_div_rate (port->se.clk, baud, sampling_rate, &clk_div); -if (!clk_rate) +if (!clk_rate) { +dev_err (port->se.dev, +"Couldn't find suitable clock rate for %lu\n" , + baud * sampling_rate); goto out_restart_rx; + } + +dev_dbg (port->se.dev,"desired_rate-%lu, clk_rate-%lu, clk_div-%u\n" , + baud * sampling_rate, clk_rate, clk_div); uport->uartclk = clk_rate;dev_pm_opp_set_rate (uport->dev, clk_rate);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1003/1157 tty: serial: fsl_lpuart: correct the count of break characters
In reply to Greg Kroah-HartmanFrom: Sherry Sun <[email protected]>
[ Upstream commit 707f816f25590c20e056b3bd4a17ce69b03fe856 ]
The LPUART can't distinguish between a break signal and a framing error, so need to count the break characters if there is a framing error and received data is zero instead of the parity error.
--- drivers/tty/serial/fsl_lpuart.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/tty/serial/fsl_lpuart.c +6 -6
@@ -990,12 +990,12 @@ static void lpuart32_rxint(struct lpuart_port *sport)if (sr & (UARTSTAT_PE |UARTSTAT_OR |UARTSTAT_FE )) {if (sr &UARTSTAT_PE ) { + sport->port.icount.parity++; + }else if (sr &UARTSTAT_FE ) {if (is_break) sport->port.icount.brk++;else - sport->port.icount.parity++; - }else if (sr &UARTSTAT_FE ) { - sport->port.icount.frame++; + sport->port.icount.frame++; }if (sr &UARTSTAT_OR )
@@ -1010,12 +1010,12 @@ static void lpuart32_rxint(struct lpuart_port *sport) sr &= sport->port.read_status_mask;if (sr &UARTSTAT_PE ) { + flg =TTY_PARITY ; + }else if (sr &UARTSTAT_FE ) {if (is_break) flg =TTY_BREAK ;else - flg =TTY_PARITY ; - }else if (sr &UARTSTAT_FE ) { - flg =TTY_FRAME ; + flg =TTY_FRAME ; }if (sr &UARTSTAT_OR )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1004/1157 s390/smp: enforce lowcore protection on CPU restart
In reply to Greg Kroah-HartmanFrom: Alexander Gordeev <[email protected]>
[ Upstream commit 6f5c672d17f583b081e283927f5040f726c54598 ]
As result of commit 915fea04f932 ("s390/smp: enable DAT before CPU restart callback is called") the low-address protection bit gets mistakenly unset in control register 0 save area of the absolute zero memory. That area is used when manual PSW restart happened to hit an offline CPU. In this case the low-address protection for that CPU will be dropped.
--- arch/s390/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/setup.c +1 -1
@@ -508,8 +508,8 @@ static void __init setup_lowcore_dat_on(void) S390_lowcore.svc_new_psw.mask |=PSW_MASK_DAT ; S390_lowcore.program_new_psw.mask |=PSW_MASK_DAT ; S390_lowcore.io_new_psw.mask |=PSW_MASK_DAT ; -__ctl_store (S390_lowcore.cregs_save_area,0 ,15 );__ctl_set_bit (0 ,28 ); +__ctl_store (S390_lowcore.cregs_save_area,0 ,15 );put_abs_lowcore (restart_flags,RESTART_FLAG_CTLREGS );put_abs_lowcore (program_new_psw, lc->program_new_psw);for (cr =0 ; cr <ARRAY_SIZE (lc->cregs_save_area); cr++)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1005/1157 perf stat: Revert "perf stat: Add default hybrid events"
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
[ Upstream commit ace3e31e653e79cae9b047e85f567e6b44c98532 ]
This reverts commit Fixes: ac2dc29edd21f9ec ("perf stat: Add default hybrid events")
Between this patch and the reverted patch, the commit 6c1912898ed21bef ("perf parse-events: Rename parse_events_error functions") and the commit 07eafd4e053a41d7 ("perf parse-event: Add init and exit to parse_event_error") clean up the parse_events_error_*() codes. The related change is also reverted.
The reverted patch is hard to be extended to support new default events, e.g., Topdown events, and the existing "--detailed" option on a hybrid platform.
A new solution will be proposed in the following patch to enable the perf stat default on a hybrid platform.
--- tools/perf/builtin-stat.c | 30 ------------------------------ 1 file changed, 30 deletions(-)
tools/perf/builtin-stat.c +0 -30
@@ -1685,12 +1685,6 @@ static int add_default_attributes(void) { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_BRANCH_INSTRUCTIONS }, { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_BRANCH_MISSES }, -}; -struct perf_event_attr default_sw_attrs[] = { - { .type =PERF_TYPE_SOFTWARE , .config =PERF_COUNT_SW_TASK_CLOCK }, - { .type =PERF_TYPE_SOFTWARE , .config =PERF_COUNT_SW_CONTEXT_SWITCHES }, - { .type =PERF_TYPE_SOFTWARE , .config =PERF_COUNT_SW_CPU_MIGRATIONS }, - { .type =PERF_TYPE_SOFTWARE , .config =PERF_COUNT_SW_PAGE_FAULTS }, };/*
@@ -1947,30 +1941,6 @@ static int add_default_attributes(void) }if (!evsel_list->core.nr_entries) { -if (perf_pmu__has_hybrid ()) { -struct parse_events_error errinfo; -const char *hybrid_str ="cycles,instructions,branches,branch-misses" ; - -if (target__has_cpu (&target)) - default_sw_attrs[0 ].config =PERF_COUNT_SW_CPU_CLOCK ; - -if (evlist__add_default_attrs (evsel_list, - default_sw_attrs) <0 ) { -return -1 ; - } - -parse_events_error__init (&errinfo); - err =parse_events (evsel_list, hybrid_str, &errinfo); -if (err) { -fprintf (stderr, -"Cannot set up hybrid events %s: %d\n" , - hybrid_str, err); -parse_events_error__print (&errinfo, hybrid_str); - } -parse_events_error__exit (&errinfo); -return err ?-1 :0 ; - } -if (target__has_cpu (&target)) default_attrs0[0 ].config =PERF_COUNT_SW_CPU_CLOCK ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1006/1157 f2fs: fix to invalidate META_MAPPING before DIO write
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 67ca06872eb02944b4c6f92cffa9242e92c63109 ]
Quoted from commit e3b49ea36802 ("f2fs: invalidate META_MAPPING before IPU/DIO write")
"
Encrypted pages during GC are read and cached in META_MAPPING. However, due to cached pages in META_MAPPING, there is an issue where newly written pages are lost by IPU or DIO writes.
Thread A - f2fs_gc() Thread B
/* phase 3 */down_write(i_gc_rwsem)ra_data_block() ---- (a)up_write(i_gc_rwsem)
f2fs_direct_IO() :
- down_read(i_gc_rwsem)
- __blockdev_direct_io()
- get_data_block_dio_write()
- f2fs_dio_submit_bio() ---- (b)
- up_read(i_gc_rwsem)
/* phase 4 */down_write(i_gc_rwsem)move_data_block() ---- (c)up_write(i_gc_rwsem)
(a) In phase 3 of f2fs_gc(), up-to-date page is read from storage and cached in META_MAPPING.
(b) In thread B, writing new data by IPU or DIO write on same blkaddr as read in (a). cached page in META_MAPPING become out-dated.
(c) In phase 4 of f2fs_gc(), out-dated page in META_MAPPING is copied to new blkaddr. In conclusion, the newly written data in (b) is lost.
To address this issue, invalidating pages in META_MAPPING before IPU or DIO write.
"
In previous commit, we missed to cover extent cache hit case, and passed wrong value for parameter @end of invalidate_mapping_pages(), fix both issues.
--- fs/f2fs/data.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/f2fs/data.c +5 -2
@@ -1463,9 +1463,12 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, *map->m_next_extent = pgofs + map->m_len;/* for hardware encryption, but to avoid potential issue in future */ -if (flag ==F2FS_GET_BLOCK_DIO ) +if (flag ==F2FS_GET_BLOCK_DIO ) {f2fs_wait_on_block_writeback_range (inode, map->m_pblk, map->m_len); +invalidate_mapping_pages (META_MAPPING (sbi), + map->m_pblk, map->m_pblk + map->m_len -1 ); + }if (map->m_multidev_dio) {block_t blk_addr = map->m_pblk;
@@ -1682,7 +1685,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,f2fs_wait_on_block_writeback_range (inode, map->m_pblk, map->m_len);invalidate_mapping_pages (META_MAPPING (sbi), - map->m_pblk, map->m_pblk); + map->m_pblk, map->m_pblk + map->m_len -1 );if (map->m_multidev_dio) {block_t blk_addr = map->m_pblk;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1007/1157 f2fs: fix to check inline_data during compressed inode conversion
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 7165841d578e0592848e09dc9d131aa30be44e1b ]
When converting inode to compressed one via ioctl, it needs to check inline_data, since inline_data flag and compressed flag are incompatible.
--- fs/f2fs/f2fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/f2fs.h +1 -1
@@ -4401,7 +4401,7 @@ static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)static inline bool f2fs_may_compress (struct inode *inode) {if (IS_SWAPFILE (inode) ||f2fs_is_pinned_file (inode) || -f2fs_is_atomic_file (inode)) +f2fs_is_atomic_file (inode) ||f2fs_has_inline_data (inode))return false;return S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1008/1157 f2fs: fix to remove F2FS_COMPR_FL and tag F2FS_NOCOMP_FL at the same time
In reply to Greg Kroah-HartmanFrom: Chao Liu <[email protected]>
[ Upstream commit 8ee236dcaa690d09ca612622e8bc8d09c302021d ]
If the inode has the compress flag, it will fail to use 'chattr -c +m' to remove its compress flag and tag no compress flag. However, the same command will be successful when executed again, as shown below:
$ touch foo.txt $ chattr +c foo.txt $ chattr -c +m foo.txt chattr: Invalid argument while setting flags on foo.txt $ chattr -c +m foo.txt $ f2fs_io getflags foo.txt get a flag on foo.txt ret=0, flags=nocompression,inline_data
Fix this by removing some checks in f2fs_setflags_common() that do not affect the original logic. I go through all the possible scenarios, and the results are as follows. Bold is the only thing that has changed.
+---------------+-----------+-----------+----------+ | | file flags | + command +-----------+-----------+----------+ | | no flag | compr | nocompr | +---------------+-----------+-----------+----------+ | chattr +c | compr | compr | -EINVAL | | chattr -c | no flag | no flag | nocompr | | chattr +m | nocompr | -EINVAL | nocompr | | chattr -m | no flag | compr | no flag | | chattr +c +m | -EINVAL | -EINVAL | -EINVAL | | chattr +c -m | compr | compr | compr | | chattr -c +m | nocompr | *nocompr* | nocompr | | chattr -c -m | no flag | no flag | no flag | +---------------+-----------+-----------+----------+
--- fs/f2fs/file.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
fs/f2fs/file.c +1 -8
@@ -1873,10 +1873,7 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)if (masked_flags &F2FS_COMPR_FL ) {if (!f2fs_disable_compressed_file (inode))return -EINVAL ; - } -if (iflags &F2FS_NOCOMP_FL ) -return -EINVAL ; -if (iflags &F2FS_COMPR_FL ) { + }else {if (!f2fs_may_compress (inode))return -EINVAL ;if (S_ISREG (inode->i_mode) && inode->i_size)
@@ -1885,10 +1882,6 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)set_compress_context (inode); } } -if ((iflags ^ masked_flags) &F2FS_NOCOMP_FL ) { -if (masked_flags &F2FS_COMPR_FL ) -return -EINVAL ; - } fi->i_flags = iflags | (fi->i_flags & ~mask); f2fs_bug_on(F2FS_I_SB(inode), (fi->i_flags & F2FS_COMPR_FL) &&
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1009/1157 cifs: Fix memory leak when using fscache
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit c6f62f81b488d00afaa86bae26c6ce9ab12c709e ]
If we hit the 'index == next_cached' case, we leak a refcount on the struct page. Fix this by using readahead_folio() which takes care of the refcount for you.
--- fs/cifs/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/cifs/file.c +4 -4
@@ -4459,10 +4459,10 @@ static void cifs_readahead(struct readahead_control *ractl)* TODO: Send a whole batch of pages to be read * by the cache. */ - page =readahead_page (ractl); - last_batch_size =1 <<thp_order (page); +struct folio *folio =readahead_folio (ractl); + last_batch_size =folio_nr_pages (folio);if (cifs_readpage_from_fscache (ractl->mapping->host, - page) <0 ) { + &folio->page) <0 ) {/* * TODO: Deal with cache read failure * here, but for the moment, delegate
@@ -4470,7 +4470,7 @@ static void cifs_readahead(struct readahead_control *ractl)*/ caching = false; } -unlock_page (page); +folio_unlock (folio); next_cached++; cache_nr_pages--;if (cache_nr_pages ==0 )
Signature · 1 line
2.35.1