4.14.123-stable review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 165/193 media: wl128x: prevent two potential buffer overflows
In reply to Greg Kroah-Hartman[ Upstream commit 9c2ccc324b3a6cbc865ab8b3e1a09e93d3c8ade9 ]
Smatch marks skb->data as untrusted so it warns that "evt_hdr->dlen" can copy up to 255 bytes and we only have room for two bytes. Even if this comes from the firmware and we trust it, the new policy generally is just to fix it as kernel hardenning.
I can't test this code so I tried to be very conservative. I considered not allowing "evt_hdr->dlen == 1" because it doesn't initialize the whole variable but in the end I decided to allow it and manually initialized "asic_id" and "asic_ver" to zero.
--- drivers/media/radio/wl128x/fmdrv_common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/radio/wl128x/fmdrv_common.c +5 -2
@@ -489,7 +489,8 @@ int fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,return -EIO ; }/* Send response data to caller */ -if (response !=NULL && response_len !=NULL && evt_hdr->dlen) { +if (response !=NULL && response_len !=NULL && evt_hdr->dlen && + evt_hdr->dlen <= payload_len) {/* Skip header info and copy only response data */ skb_pull (skb,sizeof (struct fm_event_msg_hdr ));memcpy (response, skb->data, evt_hdr->dlen);
@@ -583,6 +584,8 @@ static void fm_irq_handle_flag_getcmd_resp(struct fmdev *fmdev)return ; fm_evt_hdr = (void *)skb->data; +if (fm_evt_hdr->dlen >sizeof (fmdev->irq_info.flag)) +return ;/* Skip header info and copy only response data */ skb_pull (skb,sizeof (struct fm_event_msg_hdr ));
@@ -1308,7 +1311,7 @@ static int load_default_rx_configuration(struct fmdev *fmdev)static int fm_power_up (struct fmdev *fmdev,u8 mode) {u16 payload; -__be16 asic_id, asic_ver; +__be16 asic_id =0 , asic_ver =0 ;int resp_len, ret;u8 fw_name[50 ];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/193 scsi: qedf: Add missing return in qedf_post_io_req() in the fcport offload check
In reply to Greg Kroah-Hartman[ Upstream commit c5e06ba2f76809ad1492fdad312e81335df46bc5 ]
Fixes the following crash as the return was missing from the check if an fcport is offloaded. If we hit this code we continue to try to post an invalid task which can lead to the crash:
[30259.616411] [0000:61:00.3]:[qedf_post_io_req:989]:3: Session not offloaded yet. [30259.616413] [0000:61:00.3]:[qedf_upload_connection:1340]:3: Uploading connection port_id=490020. [30259.623769] BUG: unable to handle kernel NULL pointer dereference at 0000000000000198 [30259.631645] IP: [<ffffffffc035b1ed>] qedf_init_task.isra.16+0x3d/0x450 [qedf] [30259.638816] PGD 0 [30259.640841] Oops: 0000 [#1] SMP [30259.644098] Modules linked in: fuse xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ipt_REJECT nf_reject_ipv4 tun bridge stp llc ebtable_filter ebtables devlink ip6table_filter ip6_tables iptable_filter vfat fat ib_isert iscsi_target_mod ib_srpt target_core_mod ib_srp scsi_transport_srp ib_ipoib ib_ucm ib_umad dm_service_time skx_edac intel_powerclamp coretemp intel_rapl iosf_mbi kvm_intel kvm irqbypass crc32_pclmul ghash_clmulni_intel aesni_intel rpcrdma sunrpc rdma_ucm ib_uverbs lrw gf128mul ib_iser rdma_cm iw_cm ib_cm libiscsi scsi_transport_iscsi qedr(OE) glue_helper ablk_helper cryptd ib_core dm_round_robin joydev pcspkr ipmi_ssif ses enclosure ipmi_si ipmi_devintf ipmi_msghandler mei_me [30259.715529] mei sg hpilo hpwdt shpchp wmi lpc_ich acpi_power_meter dm_multipath ip_tables xfs libcrc32c sd_mod crc_t10dif crct10dif_generic uas usb_storage mgag200 qedf(OE) i2c_algo_bit libfcoe drm_kms_helper libfc syscopyarea sysfillrect scsi_transport_fc qede(OE) sysimgblt fb_sys_fops ptp ttm pps_core drm qed(OE) smartpqi crct10dif_pclmul crct10dif_common crc32c_intel i2c_core scsi_transport_sas scsi_tgt dm_mirror dm_region_hash dm_log dm_mod [30259.754237] CPU: 9 PID: 977 Comm: kdmwork-253:7 Kdump: loaded Tainted: G W OE ------------ 3.10.0-862.el7.x86_64 #1 [30259.765664] Hardware name: HPE Synergy 480 Gen10/Synergy 480 Gen10 Compute Module, BIOS I42 04/04/2018 [30259.775000] task: ffff8c801efd0000 ti: ffff8c801efd8000 task.ti: ffff8c801efd8000 [30259.782505] RIP: 0010:[<ffffffffc035b1ed>] [<ffffffffc035b1ed>] qedf_init_task.isra.16+0x3d/0x450 [qedf] [30259.792116] RSP: 0018:ffff8c801efdbbb0 EFLAGS: 00010046 [30259.797444] RAX: 0000000000000000 RBX: ffffa7f1450948d8 RCX: ffff8c7fe5bc40c8 [30259.804600] RDX: ffff8c800715b300 RSI: ffffa7f1450948d8 RDI: ffff8c80169c2480 [30259.811755] RBP: ffff8c801efdbc30 R08: 00000000000000ae R09: ffff8c800a314540 [30259.818911] R10: ffff8c7fe5bc40c8 R11: ffff8c801efdb8ae R12: 0000000000000000 [30259.826068] R13: ffff8c800715b300 R14: ffff8c80169c2480 R15: ffff8c8005da28e0 [30259.833223] FS: 0000000000000000(0000) GS:ffff8c803f840000(0000) knlGS:0000000000000000 [30259.841338] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [30259.847100] CR2: 0000000000000198 CR3: 000000081242e000 CR4: 00000000007607e0 [30259.854256] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [30259.861412] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [30259.868568] PKRU: 00000000 [30259.871278] Call Trace: [30259.873737] [<ffffffffc035c948>] qedf_post_io_req+0x148/0x680 [qedf] [30259.880201] [<ffffffffc035d070>] qedf_queuecommand+0x1f0/0x240 [qedf] [30259.886749] [<ffffffffa329b050>] scsi_dispatch_cmd+0xb0/0x240 [30259.892600] [<ffffffffa32a45bc>] scsi_request_fn+0x4cc/0x680 [30259.898364] [<ffffffffa3118ad9>] __blk_run_queue+0x39/0x50 [30259.903954] [<ffffffffa3114393>] __elv_add_request+0xd3/0x260 [30259.909805] [<ffffffffa311baf0>] blk_insert_cloned_request+0xf0/0x1b0 [30259.916358] [<ffffffffc010b622>] map_request+0x142/0x220 [dm_mod] [30259.922560] [<ffffffffc010b716>] map_tio_request+0x16/0x40 [dm_mod] [30259.928932] [<ffffffffa2ebb1f5>] kthread_worker_fn+0x85/0x180 [30259.934782] [<ffffffffa2ebb170>] ? kthread_stop+0xf0/0xf0 [30259.940284] [<ffffffffa2ebae31>] kthread+0xd1/0xe0 [30259.945176] [<ffffffffa2ebad60>] ? insert_kthread_work+0x40/0x40 [30259.951290] [<ffffffffa351f61d>] ret_from_fork_nospec_begin+0x7/0x21 [30259.957750] [<ffffffffa2ebad60>] ? insert_kthread_work+0x40/0x40 [30259.963860] Code: fe 41 55 49 89 d5 41 54 53 48 89 f3 48 83 ec 58 4c 8b 67 28 4c 8b 4e 18 65 48 8b 04 25 28 00 00 00 48 89 45 d0 31 c0 4c 8b 7e 58 <49> 8b 84 24 98 01 00 00 48 8b 00 f6 80 31 01 00 00 10 0f 85 0b [30259.983372] RIP [<ffffffffc035b1ed>] qedf_init_task.isra.16+0x3d/0x450 [qedf] [30259.990630] RSP <ffff8c801efdbbb0> [30259.994127] CR2: 0000000000000198
--- drivers/scsi/qedf/qedf_io.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qedf/qedf_io.c +1 -0
@@ -883,6 +883,7 @@ int qedf_post_io_req(struct qedf_rport *fcport, struct qedf_ioreq *io_req)if (!test_bit (QEDF_RPORT_SESSION_READY , &fcport->flags)) {QEDF_ERR (&(qedf->dbg_ctx),"Session not offloaded yet.\n" );kref_put (&io_req->refcount, qedf_release_cmd); +return -EINVAL ; }/* Obtain free SQE */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 167/193 virtio_console: initialize vtermno value for ports
In reply to Greg Kroah-Hartman[ Upstream commit 4b0a2c5ff7215206ea6135a405f17c5f6fca7d00 ]
For regular serial ports we do not initialize value of vtermno variable. A garbage value is assigned for non console ports. The value can be observed as a random integer with [1].
[1] vim /sys/kernel/debug/virtio-ports/vport*p*
This patch initialize the value of vtermno for console serial ports to '1' and regular serial ports are initiaized to '0'.
--- drivers/char/virtio_console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/virtio_console.c +2 -1
@@ -75,7 +75,7 @@ struct ports_driver_data {/* All the console devices handled by this driver */ struct list_head consoles; }; -static struct ports_driver_data pdrvdata; +static struct ports_driver_data pdrvdata = { .next_vtermno =1 };static DEFINE_SPINLOCK (pdrvdata_lock);static DECLARE_COMPLETION (early_console_added);
@@ -1422,6 +1422,7 @@ static int add_port(struct ports_device *portdev, u32 id) port->async_queue =NULL ; port->cons.ws.ws_row = port->cons.ws.ws_col =0 ; + port->cons.vtermno =0 ; port->host_connected = port->guest_connected = false; port->stats = (struct port_stats ) {0 };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 168/193 tty: ipwireless: fix missing checks for ioremap
In reply to Greg Kroah-Hartman[ Upstream commit 1bbb1c318cd8a3a39e8c3e2e83d5e90542d6c3e3 ]
ipw->attr_memory and ipw->common_memory are assigned with the return value of ioremap. ioremap may fail, but no checks are enforced. The fix inserts the checks to avoid potential NULL pointer dereferences.
--- drivers/tty/ipwireless/main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/tty/ipwireless/main.c +8 -0
@@ -113,6 +113,10 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, void *priv_data) ipw->common_memory =ioremap (p_dev->resource[2 ]->start,resource_size (p_dev->resource[2 ])); +if (!ipw->common_memory) { + ret = -ENOMEM ; + goto exit1; + }if (!request_mem_region (p_dev->resource[2 ]->start,resource_size (p_dev->resource[2 ]),IPWIRELESS_PCCARD_NAME )) {
@@ -133,6 +137,10 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, void *priv_data) ipw->attr_memory =ioremap (p_dev->resource[3 ]->start,resource_size (p_dev->resource[3 ])); +if (!ipw->attr_memory) { + ret = -ENOMEM ; + goto exit3; + }if (!request_mem_region (p_dev->resource[3 ]->start,resource_size (p_dev->resource[3 ]),IPWIRELESS_PCCARD_NAME )) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 169/193 x86/mce: Fix machine_check_poll() tests for error types
In reply to Greg Kroah-Hartman[ Upstream commit f19501aa07f18268ab14f458b51c1c6b7f72a134 ]
There has been a lurking "TBD" in the machine check poll routine ever since it was first split out from the machine check handler. The potential issue is that the poll routine may have just begun a read from the STATUS register in a machine check bank when the hardware logs an error in that bank and signals a machine check.
That race used to be pretty small back when machine checks were broadcast, but the addition of local machine check means that the poll code could continue running and clear the error from the bank before the local machine check handler on another CPU gets around to reading it.
Fix the code to be sure to only process errors that need to be processed in the poll code, leaving other logged errors alone for the machine check handler to find and process.
[ bp: Massage a bit and flip the "== 0" check to the usual !(..) test. ]
--- arch/x86/kernel/cpu/mcheck/mce.c | 44 +++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +37 -7
@@ -701,19 +701,49 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b)barrier (); m.status =mce_rdmsrl (msr_ops.status (i)); + +/* If this entry is not valid, ignore it */ if (!(m.status &MCI_STATUS_VAL ))continue ;/* -* Uncorrected or signalled events are handled by the exception -* handler when it is enabled, so don't process those here. -* -* TBD do the same check for MCI_STATUS_EN here? +* If we are logging everything (at CPU online) or this +* is a corrected error, then we must log it. */ -if (!(flags &MCP_UC ) && - (m.status & (mca_cfg.ser ?MCI_STATUS_S :MCI_STATUS_UC ))) -continue ; +if ((flags &MCP_UC ) || !(m.status &MCI_STATUS_UC )) + goto log_it; + +/* +* Newer Intel systems that support software error +* recovery need to make additional checks. Other +* CPUs should skip over uncorrected errors, but log +* everything else. +*/ +if (!mca_cfg.ser) { +if (m.status &MCI_STATUS_UC ) +continue ; + goto log_it; + } + +/* Log "not enabled" (speculative) errors */ +if (!(m.status &MCI_STATUS_EN )) + goto log_it; + +/* +* Log UCNA (SDM: 15.6.3 "UCR Error Classification") +* UC == 1 && PCC == 0 && S == 0 +*/ +if (!(m.status &MCI_STATUS_PCC ) && !(m.status &MCI_STATUS_S )) + goto log_it; + +/* +* Skip anything else. Presumption is that our read of this +* bank is racing with a machine check. Leave the log alone +* for do_machine_check() to deal with it. +*/ +continue ; +log_it: error_seen = true;mce_read_aux (&m, i);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 170/193 rcutorture: Fix cleanup path for invalid torture_type strings
In reply to Greg Kroah-Hartman[ Upstream commit b813afae7ab6a5e91b4e16cc567331d9c2ae1f04 ]
If the specified rcutorture.torture_type is not in the rcu_torture_init() function's torture_ops[] array, rcutorture prints some console messages and then invokes rcu_torture_cleanup() to set state so that a future torture test can run. However, rcu_torture_cleanup() also attempts to end the test that didn't actually start, and in doing so relies on the value of cur_ops, a value that is not particularly relevant in this case. This can result in confusing output or even follow-on failures due to attempts to use facilities that have not been properly initialized.
This commit therefore sets the value of cur_ops to NULL in this case and inserts a check near the beginning of rcu_torture_cleanup(), thus avoiding relying on an irrelevant cur_ops value.
--- kernel/rcu/rcutorture.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/rcu/rcutorture.c +5 -0
@@ -1599,6 +1599,10 @@ rcu_torture_cleanup(void) cur_ops->cb_barrier ();return ; } +if (!cur_ops) { +torture_cleanup_end (); +return ; + }rcu_torture_barrier_cleanup ();torture_stop_kthread (rcu_torture_stall, stall_task);
@@ -1734,6 +1738,7 @@ rcu_torture_init(void)pr_alert (" %s" , torture_ops[i]->name);pr_alert ("\n" ); firsterr = -EINVAL ; + cur_ops =NULL ; goto unwind; }if (cur_ops->fqs ==NULL && fqs_duration !=0 ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 171/193 rcuperf: Fix cleanup path for invalid perf_type strings
In reply to Greg Kroah-Hartman[ Upstream commit ad092c027713a68a34168942a5ef422e42e039f4 ]
If the specified rcuperf.perf_type is not in the rcu_perf_init() function's perf_ops[] array, rcuperf prints some console messages and then invokes rcu_perf_cleanup() to set state so that a future torture test can run. However, rcu_perf_cleanup() also attempts to end the test that didn't actually start, and in doing so relies on the value of cur_ops, a value that is not particularly relevant in this case. This can result in confusing output or even follow-on failures due to attempts to use facilities that have not been properly initialized.
This commit therefore sets the value of cur_ops to NULL in this case and inserts a check near the beginning of rcu_perf_cleanup(), thus avoiding relying on an irrelevant cur_ops value.
--- kernel/rcu/rcuperf.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/rcu/rcuperf.c +5 -0
@@ -542,6 +542,10 @@ rcu_perf_cleanup(void)if (torture_cleanup_begin ())return ; +if (!cur_ops) { +torture_cleanup_end (); +return ; + }if (reader_tasks) {for (i =0 ; i < nrealreaders; i++)
@@ -663,6 +667,7 @@ rcu_perf_init(void)pr_alert (" %s" , perf_ops[i]->name);pr_alert ("\n" ); firsterr = -EINVAL ; + cur_ops =NULL ; goto unwind; }if (cur_ops->init)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 172/193 usb: core: Add PM runtime calls to usb_hcd_platform_shutdown
In reply to Greg Kroah-Hartman[ Upstream commit 8ead7e817224d7832fe51a19783cb8fcadc79467 ]
If ohci-platform is runtime suspended, we can currently get an "imprecise external abort" on reboot with ohci-platform loaded when PM runtime is implemented for the SoC.
Let's fix this by adding PM runtime support to usb_hcd_platform_shutdown.
--- drivers/usb/core/hcd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/hcd.c +3 -0
@@ -3053,6 +3053,9 @@ usb_hcd_platform_shutdown(struct platform_device *dev) {struct usb_hcd *hcd =platform_get_drvdata (dev); +/* No need for pm_runtime_put(), we're shutting down */ +pm_runtime_get_sync (&dev->dev); +if (hcd->driver->shutdown) hcd->driver->shutdown (hcd); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 173/193 scsi: qla4xxx: avoid freeing unallocated dma memory
In reply to Greg Kroah-Hartman[ Upstream commit 608f729c31d4caf52216ea00d20092a80959256d ]
Clang -Wuninitialized notices that on is_qla40XX we never allocate any DMA memory in get_fw_boot_info() but attempt to free it anyway:
drivers/scsi/qla4xxx/ql4_os.c:5915:7: error: variable 'buf_dma' is used uninitialized whenever 'if' condition is false
[-Werror,-Wsometimes-uninitialized]
if (!(val & 0x07)) {
^~~~~~~~~~~~~
drivers/scsi/qla4xxx/ql4_os.c:5985:47: note: uninitialized use occurs here
dma_free_coherent(&ha->pdev->dev, size, buf, buf_dma);
^~~~~~~
drivers/scsi/qla4xxx/ql4_os.c:5915:3: note: remove the 'if' if its condition is always true
if (!(val & 0x07)) {
^~~~~~~~~~~~~~~~~~~
drivers/scsi/qla4xxx/ql4_os.c:5885:20: note: initialize the variable 'buf_dma' to silence this warning
dma_addr_t buf_dma;
^
= 0Skip the call to dma_free_coherent() here.
--- drivers/scsi/qla4xxx/ql4_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla4xxx/ql4_os.c +1 -1
@@ -5939,7 +5939,7 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[]) val =rd_nvram_byte (ha, sec_addr);if (val &BIT_7 ) ddb_index[1 ] = (val &0x7f ); - + goto exit_boot_info; }else if (is_qla80XX (ha)) { buf =dma_alloc_coherent (&ha->pdev->dev, size, &buf_dma,GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 174/193 batman-adv: allow updating DAT entry timeouts on incoming ARP Replies
In reply to Greg Kroah-Hartman[ Upstream commit 099e6cc1582dc2903fecb898bbeae8f7cf4262c7 ]
Currently incoming ARP Replies, for example via a DHT-PUT message, do not update the timeout for an already existing DAT entry. These ARP Replies are dropped instead.
This however defeats the purpose of the DHCPACK snooping, for instance. Right now, a DAT entry in the DHT will be purged every five minutes, likely leading to a mesh-wide ARP Request broadcast after this timeout. Which then recreates the entry. The idea of the DHCPACK snooping is to be able to update an entry before a timeout happens, to avoid ARP Request flooding.
This patch fixes this issue by updating a DAT entry on incoming ARP Replies even if a matching DAT entry already exists. While still filtering the ARP Reply towards the soft-interface, to avoid duplicate messages on the client device side.
--- net/batman-adv/distributed-arp-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/batman-adv/distributed-arp-table.c +3 -1
@@ -1240,7 +1240,6 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, hw_src, &ip_src, hw_dst, &ip_dst, dat_entry->mac_addr, &dat_entry->ip); dropped = true; - goto out; }/* Update our internal cache with both the IP addresses the node got
@@ -1249,6 +1248,9 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,batadv_dat_entry_add (bat_priv, ip_src, hw_src, vid);batadv_dat_entry_add (bat_priv, ip_dst, hw_dst, vid); +if (dropped) + goto out; +/* If BLA is enabled, only forward ARP replies if we have claimed the * source of the ARP reply or if no one else of the same backbone has * already claimed that client. This prevents that different gateways
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 175/193 dmaengine: tegra210-adma: use devm_clk_*() helpers
In reply to Greg Kroah-Hartman[ Upstream commit f6ed6491d565c336a360471e0c29228e34f4380e ]
adma driver is using pm_clk_*() interface for managing clock resources. With this it is observed that clocks remain ON always. This happens on Tegra devices which use BPMP co-processor to manage clock resources, where clocks are enabled during prepare phase. This is necessary because clocks to BPMP are always blocking. When pm_clk_*() interface is used on such Tegra devices, clock prepare count is not balanced till remove call happens for the driver and hence clocks are seen ON always. Thus this patch replaces pm_clk_*() with devm_clk_*() framework.
--- drivers/dma/tegra210-adma.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
drivers/dma/tegra210-adma.c +12 -15
@@ -22,7 +22,6 @@#include <linux/of_device.h> #include <linux/of_dma.h> #include <linux/of_irq.h> -#include <linux/pm_clock.h> #include <linux/pm_runtime.h> #include <linux/slab.h>
@@ -141,6 +140,7 @@ struct tegra_adma {struct dma_device dma_dev;struct device *dev;void __iomem *base_addr; +struct clk *ahub_clk;unsigned int nr_channels;unsigned long rx_requests_reserved;unsigned long tx_requests_reserved;
@@ -637,8 +637,9 @@ static int tegra_adma_runtime_suspend(struct device *dev)struct tegra_adma *tdma =dev_get_drvdata (dev); tdma->global_cmd =tdma_read (tdma,ADMA_GLOBAL_CMD ); +clk_disable_unprepare (tdma->ahub_clk); -return pm_clk_suspend (dev); +return 0 ; }static int tegra_adma_runtime_resume (struct device *dev)
@@ -646,10 +647,11 @@ static int tegra_adma_runtime_resume(struct device *dev)struct tegra_adma *tdma =dev_get_drvdata (dev);int ret; - ret =pm_clk_resume (dev); -if (ret) + ret =clk_prepare_enable (tdma->ahub_clk); +if (ret) { +dev_err (dev,"ahub clk_enable failed: %d\n" , ret);return ret; - + }tdma_write (tdma,ADMA_GLOBAL_CMD , tdma->global_cmd);return 0 ;
@@ -692,13 +694,11 @@ static int tegra_adma_probe(struct platform_device *pdev)if (IS_ERR (tdma->base_addr))return PTR_ERR (tdma->base_addr); - ret =pm_clk_create (&pdev->dev); -if (ret) -return ret; - - ret =of_pm_clk_add_clk (&pdev->dev,"d_audio" ); -if (ret) - goto clk_destroy; + tdma->ahub_clk =devm_clk_get (&pdev->dev,"d_audio" ); +if (IS_ERR (tdma->ahub_clk)) { +dev_err (&pdev->dev,"Error: Missing ahub controller clock\n" ); +return PTR_ERR (tdma->ahub_clk); + }pm_runtime_enable (&pdev->dev);
@@ -775,8 +775,6 @@ static int tegra_adma_probe(struct platform_device *pdev)pm_runtime_put_sync (&pdev->dev); rpm_disable:pm_runtime_disable (&pdev->dev); -clk_destroy: -pm_clk_destroy (&pdev->dev);return ret; }
@@ -794,7 +792,6 @@ static int tegra_adma_remove(struct platform_device *pdev)pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev); -pm_clk_destroy (&pdev->dev);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 176/193 hwrng: omap - Set default quality
In reply to Greg Kroah-Hartman[ Upstream commit 62f95ae805fa9e1e84d47d3219adddd97b2654b7 ]
Newer combinations of the glibc, kernel and openssh can result in long initial startup times on OMAP devices:
[ 6.671425] systemd-rc-once[102]: Creating ED25519 key; this may take some time ... [ 142.652491] systemd-rc-once[102]: Creating ED25519 key; done.
due to the blocking getrandom(2) system call:
[ 142.610335] random: crng init done
Set the quality level for the omap hwrng driver allowing the kernel to use the hwrng as an entropy source at boot.
--- drivers/char/hw_random/omap-rng.c | 1 + 1 file changed, 1 insertion(+)
drivers/char/hw_random/omap-rng.c +1 -0
@@ -442,6 +442,7 @@ static int omap_rng_probe(struct platform_device *pdev) priv->rng.read = omap_rng_do_read; priv->rng.init = omap_rng_init; priv->rng.cleanup = omap_rng_cleanup; + priv->rng.quality =900 ; priv->rng.priv = (unsigned long )priv;platform_set_drvdata (pdev, priv);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 177/193 thunderbolt: Fix to check for kmemdup failure
In reply to Greg Kroah-Hartman[ Upstream commit 2cc12751cf464a722ff57b54d17d30c84553f9c0 ]
Memory allocated via kmemdup might fail and return a NULL pointer. This patch adds a check on the return value of kmemdup and passes the error upstream.
--- drivers/thunderbolt/switch.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/thunderbolt/switch.c +16 -6
@@ -1206,13 +1206,14 @@ int tb_switch_configure(struct tb_switch *sw)return tb_plug_events_active (sw, true); } -static void tb_switch_set_uuid (struct tb_switch *sw) +static int tb_switch_set_uuid (struct tb_switch *sw) {u32 uuid[4 ]; -int cap; +int cap, ret; + ret =0 ;if (sw->uuid) -return ; +return ret;/* * The newer controllers include fused UUID as part of link
@@ -1220,7 +1221,9 @@ static void tb_switch_set_uuid(struct tb_switch *sw)*/ cap =tb_switch_find_vse_cap (sw,TB_VSE_CAP_LINK_CONTROLLER );if (cap >0 ) { -tb_sw_read (sw, uuid,TB_CFG_SWITCH , cap +3 ,4 ); + ret =tb_sw_read (sw, uuid,TB_CFG_SWITCH , cap +3 ,4 ); +if (ret) +return ret; }else {/* * ICM generates UUID based on UID and fills the upper
@@ -1235,6 +1238,9 @@ static void tb_switch_set_uuid(struct tb_switch *sw) } sw->uuid =kmemdup (uuid,sizeof (uuid),GFP_KERNEL ); +if (!sw->uuid) + ret = -ENOMEM ; +return ret; }static int tb_switch_add_dma_port (struct tb_switch *sw)
@@ -1280,7 +1286,9 @@ static int tb_switch_add_dma_port(struct tb_switch *sw)if (status) {tb_sw_info (sw,"switch flash authentication failed\n" ); -tb_switch_set_uuid (sw); + ret =tb_switch_set_uuid (sw); +if (ret) +return ret;nvm_set_auth_status (sw, status); }
@@ -1330,7 +1338,9 @@ int tb_switch_add(struct tb_switch *sw) }tb_sw_info (sw,"uid: %#llx\n" , sw->uid); -tb_switch_set_uuid (sw); + ret =tb_switch_set_uuid (sw); +if (ret) +return ret;for (i =0 ; i <= sw->config.max_port_number; i++) {if (sw->ports[i].disabled) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 178/193 media: m88ds3103: serialize reset messages in m88ds3103_set_frontend
In reply to Greg Kroah-Hartman[ Upstream commit 981fbe3da20a6f35f17977453bce7dfc1664d74f ]
Ref: https://bugzilla.kernel.org/show_bug.cgi?id=199323
Users are experiencing problems with the DVBSky S960/S960C USB devices since the following commit:
9d659ae: ("locking/mutex: Add lock handoff to avoid starvation")
The device malfunctions after running for an indeterminable period of time, and the problem can only be cleared by rebooting the machine.
It is possible to encourage the problem to surface by blocking the signal to the LNB.
Further debugging revealed the cause of the problem.
In the following capture:
- thread #1325 is running m88ds3103_set_frontend
- thread #42 is running ts2020_stat_work
a> [1325] usb 1-1: dvb_usb_v2_generic_io: >>> 08 68 02 07 80
[1325] usb 1-1: dvb_usb_v2_generic_io: <<< 08
[42] usb 1-1: dvb_usb_v2_generic_io: >>> 09 01 01 68 3f
[42] usb 1-1: dvb_usb_v2_generic_io: <<< 08 ff
[42] usb 1-1: dvb_usb_v2_generic_io: >>> 08 68 02 03 11
[42] usb 1-1: dvb_usb_v2_generic_io: <<< 07
[42] usb 1-1: dvb_usb_v2_generic_io: >>> 09 01 01 60 3d
[42] usb 1-1: dvb_usb_v2_generic_io: <<< 07 ff
b> [1325] usb 1-1: dvb_usb_v2_generic_io: >>> 08 68 02 07 00
[1325] usb 1-1: dvb_usb_v2_generic_io: <<< 07
[42] usb 1-1: dvb_usb_v2_generic_io: >>> 08 68 02 03 11
[42] usb 1-1: dvb_usb_v2_generic_io: <<< 07
[42] usb 1-1: dvb_usb_v2_generic_io: >>> 09 01 01 60 21
[42] usb 1-1: dvb_usb_v2_generic_io: <<< 07 ff
[42] usb 1-1: dvb_usb_v2_generic_io: >>> 08 68 02 03 11
[42] usb 1-1: dvb_usb_v2_generic_io: <<< 07
[42] usb 1-1: dvb_usb_v2_generic_io: >>> 09 01 01 60 66
[42] usb 1-1: dvb_usb_v2_generic_io: <<< 07 ff [1325] usb 1-1: dvb_usb_v2_generic_io: >>> 08 68 02 03 11 [1325] usb 1-1: dvb_usb_v2_generic_io: <<< 07 [1325] usb 1-1: dvb_usb_v2_generic_io: >>> 08 60 02 10 0b [1325] usb 1-1: dvb_usb_v2_generic_io: <<< 07
Two i2c messages are sent to perform a reset in m88ds3103_set_frontend:
a. 0x07, 0x80
b. 0x07, 0x00
However, as shown in the capture, the regmap mutex is being handed over to another thread (ts2020_stat_work) in between these two messages.
Quoted 1 line
From here, the device responds to every i2c message with an 07 message,
and will only return to normal operation following a power cycle.
Use regmap_multi_reg_write to group the two reset messages, ensuring both are processed before the regmap mutex is unlocked.
--- drivers/media/dvb-frontends/m88ds3103.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/media/dvb-frontends/m88ds3103.c +4 -5
@@ -309,6 +309,9 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)u16 u16tmp;u32 tuner_frequency_khz, target_mclk;s32 s32tmp; +static const struct reg_sequence reset_buf[] = { + {0x07 ,0x80 }, {0x07 ,0x00 } + }; dev_dbg(&client->dev, "delivery_system=%d modulation=%d frequency=%u symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n",
@@ -321,11 +324,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) }/* reset */ - ret =regmap_write (dev->regmap,0x07 ,0x80 ); -if (ret) - goto err; - - ret =regmap_write (dev->regmap,0x07 ,0x00 ); + ret =regmap_multi_reg_write (dev->regmap, reset_buf,2 );if (ret) goto err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 179/193 media: vimc: stream: fix thread state before sleep
In reply to Greg Kroah-Hartman[ Upstream commit 2978a505aaa981b279ef359f74ba93d25098e0a0 ]
The state TASK_UNINTERRUPTIBLE should be set just before schedule_timeout() call, so it knows the sleep mode it should enter. There is no point in setting TASK_UNINTERRUPTIBLE at the initialization of the thread as schedule_timeout() will set the state back to TASK_RUNNING.
This fixes a warning in __might_sleep() call, as it's expecting the task to be in TASK_RUNNING state just before changing the state to a sleeping state.
--- drivers/media/platform/vimc/vimc-streamer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/vimc/vimc-streamer.c +1 -1
@@ -120,7 +120,6 @@ static int vimc_streamer_thread(void *data)int i;set_freezable (); -set_current_state (TASK_UNINTERRUPTIBLE );for (;;) {try_to_freeze ();
@@ -137,6 +136,7 @@ static int vimc_streamer_thread(void *data)break ; }//wait for 60hz +set_current_state (TASK_UNINTERRUPTIBLE );schedule_timeout (HZ /60 ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 180/193 media: go7007: avoid clang frame overflow warning with KASAN
In reply to Greg Kroah-Hartman[ Upstream commit ed713a4a1367aca5c0f2f329579465db00c17995 ]
clang-8 warns about one function here when KASAN is enabled, even without the 'asan-stack' option:
drivers/media/usb/go7007/go7007-fw.c:1551:5: warning: stack frame size of 2656 bytes in function
I have reported this issue in the llvm bugzilla, but to make it work with the clang-8 release, a small annotation is still needed.
--- drivers/media/usb/go7007/go7007-fw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/usb/go7007/go7007-fw.c +2 -2
@@ -1499,8 +1499,8 @@ static int modet_to_package(struct go7007 *go, __le16 *code, int space)return cnt; } -static int do_special (struct go7007 *go,u16 type,__le16 *code,int space, -int *framelen) +static noinline_for_stack int do_special(struct go7007 *go, u16 type, +__le16 *code,int space,int *framelen) {switch (type) {case SPECIAL_FRM_HEAD :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 181/193 media: vimc: zero the media_device on probe
In reply to Greg Kroah-Hartman[ Upstream commit f74267b51cb36321f777807b2e04ca02167ecc08 ]
The media_device is part of a static global vimc_device struct. The media framework expects this to be zeroed before it is used, however, since this is a global this is not the case if vimc is unbound and then bound again.
So call memset to ensure any left-over values are cleared.
--- drivers/media/platform/vimc/vimc-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/vimc/vimc-core.c +2 -0
@@ -302,6 +302,8 @@ static int vimc_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"probe" ); +memset (&vimc->mdev,0 ,sizeof (vimc->mdev)); +/* Create platform_device for each entity in the topology*/ vimc->subdevs =devm_kcalloc (&vimc->pdev.dev, vimc->pipe_cfg->num_ents,sizeof (*vimc->subdevs),GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 182/193 scsi: lpfc: Fix FDMI manufacturer attribute value
In reply to Greg Kroah-Hartman[ Upstream commit d67f935b79a76ac9d86dde1a27bdd413feb5d987 ]
The FDMI manufacturer value being reported on Linux is inconsistent with other OS's.
Set the value to "Emulex Corporation" for consistency.
--- drivers/scsi/lpfc/lpfc_ct.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/lpfc/lpfc_ct.c +3 -0
@@ -1734,6 +1734,9 @@ lpfc_fdmi_hba_attr_manufacturer(struct lpfc_vport *vport, ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;memset (ae,0 ,256 ); +/* This string MUST be consistent with other FC platforms +* supported by Broadcom. +*/ strncpy (ae->un.AttrString,"Emulex Corporation" ,sizeof (ae->un.AttrString));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 183/193 scsi: lpfc: Fix fc4type information for FDMI
In reply to Greg Kroah-Hartman[ Upstream commit 32a80c093b524a0682f1c6166c910387b116ffce ]
The driver is reporting support for NVME even when not configured for NVME operation.
Fix (and make more readable) when NVME protocol support is indicated.
--- drivers/scsi/lpfc/lpfc_ct.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +10 -7
@@ -2092,10 +2092,11 @@ lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport, ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;memset (ae,0 ,32 ); - ae->un.AttrTypes[3 ] =0x02 ;/* Type 1 - ELS */ - ae->un.AttrTypes[2 ] =0x01 ;/* Type 8 - FCP */ - ae->un.AttrTypes[6 ] =0x01 ;/* Type 40 - NVME */ - ae->un.AttrTypes[7 ] =0x01 ;/* Type 32 - CT */ + ae->un.AttrTypes[3 ] =0x02 ;/* Type 0x1 - ELS */ + ae->un.AttrTypes[2 ] =0x01 ;/* Type 0x8 - FCP */ +if (vport->nvmei_support || vport->phba->nvmet_support) + ae->un.AttrTypes[6 ] =0x01 ;/* Type 0x28 - NVME */ + ae->un.AttrTypes[7 ] =0x01 ;/* Type 0x20 - CT */ size =FOURBYTES +32 ; ad->AttrLen =cpu_to_be16 (size); ad->AttrType =cpu_to_be16 (RPRT_SUPPORTED_FC4_TYPES );
@@ -2395,9 +2396,11 @@ lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport, ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;memset (ae,0 ,32 ); - ae->un.AttrTypes[3 ] =0x02 ;/* Type 1 - ELS */ - ae->un.AttrTypes[2 ] =0x01 ;/* Type 8 - FCP */ - ae->un.AttrTypes[7 ] =0x01 ;/* Type 32 - CT */ + ae->un.AttrTypes[3 ] =0x02 ;/* Type 0x1 - ELS */ + ae->un.AttrTypes[2 ] =0x01 ;/* Type 0x8 - FCP */ +if (vport->phba->cfg_enable_fc4_type &LPFC_ENABLE_NVME ) + ae->un.AttrTypes[6 ] =0x1 ;/* Type 0x28 - NVME */ + ae->un.AttrTypes[7 ] =0x01 ;/* Type 0x20 - CT */ size =FOURBYTES +32 ; ad->AttrLen =cpu_to_be16 (size); ad->AttrType =cpu_to_be16 (RPRT_ACTIVE_FC4_TYPES );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 184/193 media: saa7146: avoid high stack usage with clang
In reply to Greg Kroah-Hartman[ Upstream commit 03aa4f191a36f33fce015387f84efa0eee94408e ]
Two saa7146/hexium files contain a construct that causes a warning when built with clang:
drivers/media/pci/saa7146/hexium_orion.c:210:12: error: stack frame size of 2272 bytes in function 'hexium_probe'
[-Werror,-Wframe-larger-than=]
static int hexium_probe(struct saa7146_dev *dev)
^
drivers/media/pci/saa7146/hexium_gemini.c:257:12: error: stack frame size of 2304 bytes in function 'hexium_attach'
[-Werror,-Wframe-larger-than=]
static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info)
^This one happens regardless of KASAN, and the problem is that a constructor to initialize a dynamically allocated structure leads to a copy of that structure on the stack, whereas gcc initializes it in place.
--- drivers/media/pci/saa7146/hexium_gemini.c | 5 ++--- drivers/media/pci/saa7146/hexium_orion.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/media/pci/saa7146/hexium_gemini.c +2 -3
@@ -270,9 +270,8 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d/* enable i2c-port pins */ saa7146_write (dev,MC1 , (MASK_08 |MASK_24 |MASK_10 |MASK_26 )); - hexium->i2c_adapter = (struct i2c_adapter ) { - .name ="hexium gemini" , - }; +strscpy (hexium->i2c_adapter.name,"hexium gemini" , +sizeof (hexium->i2c_adapter.name));saa7146_i2c_adapter_prepare (dev, &hexium->i2c_adapter,SAA7146_I2C_BUS_BIT_RATE_480 );if (i2c_add_adapter (&hexium->i2c_adapter) <0 ) {DEB_S ("cannot register i2c-device. skipping.\n" );
drivers/media/pci/saa7146/hexium_orion.c +2 -3
@@ -232,9 +232,8 @@ static int hexium_probe(struct saa7146_dev *dev)saa7146_write (dev,DD1_STREAM_B ,0x00000000 );saa7146_write (dev,MC2 , (MASK_09 |MASK_25 |MASK_10 |MASK_26 )); - hexium->i2c_adapter = (struct i2c_adapter ) { - .name ="hexium orion" , - }; +strscpy (hexium->i2c_adapter.name,"hexium orion" , +sizeof (hexium->i2c_adapter.name));saa7146_i2c_adapter_prepare (dev, &hexium->i2c_adapter,SAA7146_I2C_BUS_BIT_RATE_480 );if (i2c_add_adapter (&hexium->i2c_adapter) <0 ) {DEB_S ("cannot register i2c-device. skipping.\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 185/193 scsi: lpfc: Fix SLI3 commands being issued on SLI4 devices
In reply to Greg Kroah-Hartman[ Upstream commit c95a3b4b0fb8d351e2329a96f87c4fc96a149505 ]
During debug, it was seen that the driver is issuing commands specific to SLI3 on SLI4 devices. Although the adapter correctly rejected the command, this should not be done.
Revise the code to stop sending these commands on a SLI4 adapter.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +10 -1
@@ -924,7 +924,11 @@ lpfc_linkdown(struct lpfc_hba *phba) } }lpfc_destroy_vport_work_array (phba, vports); -/* Clean up any firmware default rpi's */ + +/* Clean up any SLI3 firmware default rpi's */ +if (phba->sli_rev >LPFC_SLI_REV3 ) + goto skip_unreg_did; + mb =mempool_alloc (phba->mbox_mem_pool,GFP_KERNEL );if (mb) {lpfc_unreg_did (phba,0xffff ,LPFC_UNREG_ALL_DFLT_RPIS , mb);
@@ -936,6 +940,7 @@ lpfc_linkdown(struct lpfc_hba *phba) } } + skip_unreg_did:/* Setup myDID for link up if we are in pt2pt mode */ if (phba->pport->fc_flag &FC_PT2PT ) { mb =mempool_alloc (phba->mbox_mem_pool,GFP_KERNEL );
@@ -4853,6 +4858,10 @@ lpfc_unreg_default_rpis(struct lpfc_vport *vport)LPFC_MBOXQ_t *mbox;int rc; +/* Unreg DID is an SLI3 operation. */ +if (phba->sli_rev >LPFC_SLI_REV3 ) +return ; + mbox =mempool_alloc (phba->mbox_mem_pool,GFP_KERNEL );if (mbox) { lpfc_unreg_did(phba, vport->vpi, LPFC_UNREG_ALL_DFLT_RPIS,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 186/193 spi : spi-topcliff-pch: Fix to handle empty DMA buffers
In reply to Greg Kroah-Hartman[ Upstream commit f37d8e67f39e6d3eaf4cc5471e8a3d21209843c6 ]
pch_alloc_dma_buf allocated tx, rx DMA buffers which can fail. Further, these buffers are used without a check. The patch checks for these failures and sends the error upstream.
--- drivers/spi/spi-topcliff-pch.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/spi/spi-topcliff-pch.c +13 -2
@@ -1294,18 +1294,27 @@ static void pch_free_dma_buf(struct pch_spi_board_data *board_dat, dma->rx_buf_virt, dma->rx_buf_dma); } -static void pch_alloc_dma_buf (struct pch_spi_board_data *board_dat, +static int pch_alloc_dma_buf (struct pch_spi_board_data *board_dat,struct pch_spi_data *data) {struct pch_spi_dma_ctrl *dma; +int ret; dma = &data->dma; + ret =0 ;/* Get Consistent memory for Tx DMA */ dma->tx_buf_virt =dma_alloc_coherent (&board_dat->pdev->dev,PCH_BUF_SIZE , &dma->tx_buf_dma,GFP_KERNEL ); +if (!dma->tx_buf_virt) + ret = -ENOMEM ; +/* Get Consistent memory for Rx DMA */ dma->rx_buf_virt =dma_alloc_coherent (&board_dat->pdev->dev,PCH_BUF_SIZE , &dma->rx_buf_dma,GFP_KERNEL ); +if (!dma->rx_buf_virt) + ret = -ENOMEM ; + +return ret; }static int pch_spi_pd_probe (struct platform_device *plat_dev)
@@ -1382,7 +1391,9 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev)if (use_dma) {dev_info (&plat_dev->dev,"Use DMA for data transfers\n" ); -pch_alloc_dma_buf (board_dat, data); + ret =pch_alloc_dma_buf (board_dat, data); +if (ret) + goto err_spi_register_master; } ret =spi_register_master (master);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 187/193 spi: rspi: Fix sequencer reset during initialization
In reply to Greg Kroah-Hartman[ Upstream commit 26843bb128590edd7eba1ad7ce22e4b9f1066ce3 ]
While the sequencer is reset after each SPI message since commit 880c6d114fd79a69 ("spi: rspi: Add support for Quad and Dual SPI Transfers on QSPI"), it was never reset for the first message, thus relying on reset state or bootloader settings.
Fix this by initializing it explicitly during configuration.
--- drivers/spi/spi-rspi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/spi/spi-rspi.c +6 -3
@@ -279,7 +279,8 @@ static int rspi_set_config_register(struct rspi_data *rspi, int access_size)/* Sets parity, interrupt mask */ rspi_write8 (rspi,0x00 ,RSPI_SPCR2 ); -/* Sets SPCMD */ +/* Resets sequencer */ +rspi_write8 (rspi,0 ,RSPI_SPSCR ); rspi->spcmd |=SPCMD_SPB_8_TO_16 (access_size);rspi_write16 (rspi, rspi->spcmd,RSPI_SPCMD0 );
@@ -323,7 +324,8 @@ static int rspi_rz_set_config_register(struct rspi_data *rspi, int access_size)rspi_write8 (rspi,0x00 ,RSPI_SSLND );rspi_write8 (rspi,0x00 ,RSPI_SPND ); -/* Sets SPCMD */ +/* Resets sequencer */ +rspi_write8 (rspi,0 ,RSPI_SPSCR ); rspi->spcmd |=SPCMD_SPB_8_TO_16 (access_size);rspi_write16 (rspi, rspi->spcmd,RSPI_SPCMD0 );
@@ -374,7 +376,8 @@ static int qspi_set_config_register(struct rspi_data *rspi, int access_size)/* Sets buffer to allow normal operation */ rspi_write8 (rspi,0x00 ,QSPI_SPBFCR ); -/* Sets SPCMD */ +/* Resets sequencer */ +rspi_write8 (rspi,0 ,RSPI_SPSCR );rspi_write16 (rspi, rspi->spcmd,RSPI_SPCMD0 );/* Enables SPI function in master mode */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 188/193 spi: Fix zero length xfer bug
In reply to Greg Kroah-Hartman[ Upstream commit 5442dcaa0d90fc376bdfc179a018931a8f43dea4 ]
This fixes a bug for messages containing both zero length and unidirectional xfers.
The function spi_map_msg will allocate dummy tx and/or rx buffers for use with unidirectional transfers when the hardware can only do a bidirectional transfer. That dummy buffer will be used in place of a NULL buffer even when the xfer length is 0.
Then in the function __spi_map_msg, if he hardware can dma, the zero length xfer will have spi_map_buf called on the dummy buffer.
Eventually, __sg_alloc_table is called and returns -EINVAL because nents == 0.
This fix prevents the error by not using the dummy buffer when the xfer length is zero.
--- drivers/spi/spi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi.c +2 -0
@@ -991,6 +991,8 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)if (max_tx || max_rx) {list_for_each_entry (xfer, &msg->transfers, transfer_list) { +if (!xfer->len) +continue ;if (!xfer->tx_buf) xfer->tx_buf = ctlr->dummy_tx;if (!xfer->rx_buf)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 189/193 ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM
In reply to Greg Kroah-Hartman[ Upstream commit 8ca5104715cfd14254ea5aecc390ae583b707607 ]
Building with clang shows a variable that is only used by the suspend/resume functions but defined outside of their #ifdef block:
sound/soc/ti/davinci-mcasp.c:48:12: error: variable 'context_regs' is not needed and will not be emitted
We commonly fix these by marking the PM functions as __maybe_unused, but here that would grow the davinci_mcasp structure, so instead add another #ifdef here.
--- sound/soc/davinci/davinci-mcasp.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/davinci/davinci-mcasp.c +2 -0
@@ -43,6 +43,7 @@#define MCASP_MAX_AFIFO_DEPTH 64 +#ifdef CONFIG_PM static u32 context_regs[] = {DAVINCI_MCASP_TXFMCTL_REG , DAVINCI_MCASP_RXFMCTL_REG,
@@ -65,6 +66,7 @@ struct davinci_mcasp_context {u32 *xrsr_regs;/* for serializer configuration */ bool pm_state; }; +#endif struct davinci_mcasp_ruledata {struct davinci_mcasp *mcasp;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/193 drm/drv: Hold ref on parent device during drm_device lifetime
In reply to Greg Kroah-Hartman[ Upstream commit 56be6503aab2bc3a30beae408071b9be5e1bae51 ]
This makes it safe to access drm_device->dev after the parent device has been removed/unplugged.
--- drivers/gpu/drm/drm_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_drv.c +4 -1
@@ -505,7 +505,7 @@ int drm_dev_init(struct drm_device *dev, }kref_init (&dev->ref); - dev->dev = parent; + dev->dev =get_device (parent); dev->driver = driver;INIT_LIST_HEAD (&dev->filelist);
@@ -572,6 +572,7 @@ int drm_dev_init(struct drm_device *dev,drm_minor_free (dev,DRM_MINOR_CONTROL );drm_fs_inode_free (dev->anon_inode); err_free: +put_device (dev->dev);mutex_destroy (&dev->master_mutex);mutex_destroy (&dev->ctxlist_mutex);mutex_destroy (&dev->filelist_mutex);
@@ -607,6 +608,8 @@ void drm_dev_fini(struct drm_device *dev)drm_minor_free (dev,DRM_MINOR_RENDER );drm_minor_free (dev,DRM_MINOR_CONTROL ); +put_device (dev->dev); +mutex_destroy (&dev->master_mutex);mutex_destroy (&dev->ctxlist_mutex);mutex_destroy (&dev->filelist_mutex);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 191/193 drm: Wake up next in drm_read() chain if we are forced to putback the event
In reply to Greg Kroah-Hartman[ Upstream commit 60b801999c48b6c1dd04e653a38e2e613664264e ]
After an event is sent, we try to copy it into the user buffer of the first waiter in drm_read() and if the user buffer doesn't have enough room we put it back onto the list. However, we didn't wake up any subsequent waiter, so that event may sit on the list until either a new vblank event is sent or a new waiter appears. Rare, but in the worst case may lead to a stuck process.
Testcase: igt/drm_read/short-buffer-wakeup
--- drivers/gpu/drm/drm_file.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_file.c +1 -0
@@ -525,6 +525,7 @@ ssize_t drm_read(struct file *filp, char __user *buffer, file_priv->event_space -= length;list_add (&e->link, &file_priv->event_list);spin_unlock_irq (&dev->event_lock); +wake_up_interruptible (&file_priv->event_wait);break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 192/193 vfio-ccw: Prevent quiesce function going into an infinite loop
In reply to Greg Kroah-Hartman[ Upstream commit d1ffa760d22aa1d8190478e5ef555c59a771db27 ]
The quiesce function calls cio_cancel_halt_clear() and if we get an -EBUSY we go into a loop where we:
- wait for any interrupts
- flush all I/O in the workqueue
- retry cio_cancel_halt_clear
During the period where we are waiting for interrupts or flushing all I/O, the channel subsystem could have completed a halt/clear action and turned off the corresponding activity control bits in the subchannel status word. This means the next time we call cio_cancel_halt_clear(), we will again start by calling cancel subchannel and so we can be stuck between calling cancel and halt forever.
Rather than calling cio_cancel_halt_clear() immediately after waiting, let's try to disable the subchannel. If we succeed in disabling the subchannel then we know nothing else can happen with the device.
Message-Id: <4d5a4b98ab1b41ac6131b5c36de18b76c5d66898.1555449329.git.alifm@linux.ibm.com>
--- drivers/s390/cio/vfio_ccw_drv.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
drivers/s390/cio/vfio_ccw_drv.c +18 -14
@@ -38,26 +38,30 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)if (ret != -EBUSY ) goto out_unlock; + iretry =255 ;do { - iretry =255 ; ret =cio_cancel_halt_clear (sch, &iretry); -while (ret == -EBUSY ) { -/* -* Flush all I/O and wait for -* cancel/halt/clear completion. -*/ - private->completion = &completion; -spin_unlock_irq (sch->lock); -wait_for_completion_timeout (&completion,3 *HZ ); +if (ret == -EIO ) { +pr_err ("vfio_ccw: could not quiesce subchannel 0.%x.%04x!\n" , + sch->schid.ssid, sch->schid.sch_no); +break ; + } + +/* +* Flush all I/O and wait for +* cancel/halt/clear completion. +*/ + private->completion = &completion; +spin_unlock_irq (sch->lock); - private->completion =NULL ; -flush_workqueue (vfio_ccw_work_q); -spin_lock_irq (sch->lock); - ret =cio_cancel_halt_clear (sch, &iretry); - }; +if (ret == -EBUSY ) +wait_for_completion_timeout (&completion,3 *HZ ); + private->completion =NULL ; +flush_workqueue (vfio_ccw_work_q); +spin_lock_irq (sch->lock); ret =cio_disable_subchannel (sch); }while (ret == -EBUSY ); out_unlock:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 193/193 NFS: Fix a double unlock from nfs_match,get_client
In reply to Greg Kroah-Hartman[ Upstream commit c260121a97a3e4df6536edbc2f26e166eff370ce ]
Now that nfs_match_client drops the nfs_client_lock, we should be careful
to always return it in the same condition: locked.
--- fs/nfs/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/client.c +1 -1
@@ -305,9 +305,9 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *datspin_unlock (&nn->nfs_client_lock); error =nfs_wait_client_init_complete (clp);nfs_put_client (clp); +spin_lock (&nn->nfs_client_lock);if (error <0 )return ERR_PTR (error); -spin_lock (&nn->nfs_client_lock); goto again; }
Signature · 1 line
2.20.1
stable-rc/linux-4.14.y boot: 115 boots: 0 failed, 115 passed (v4.14.122-194-g0352fa2fdaa6)
stable-rc/linux-4.14.y boot: 115 boots: 0 failed, 115 passed (v4.14.122-194-g0352fa2fdaa6)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.14.y/kernel/v4.14.122-194-g0352fa2fdaa6/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.14.y/kernel/v4.14.122-194-g0352fa2fdaa6/
Tree: stable-rc
Branch: linux-4.14.y
Git Describe: v4.14.122-194-g0352fa2fdaa6
Git Commit: 0352fa2fdaa68f3e27866e6f6a5125aa9efcefe4
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 59 unique boards, 22 SoC families, 14 builds out of 201
---
For more info write to <[email protected]>
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.123 release. There are 193 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 Sat 01 Jun 2019 03:02:04 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.123-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.14:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 failLinux version: 4.14.123-rc1-g0352fa2
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.123 release. There are 193 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 Sat 01 Jun 2019 03:02:04 AM UTC. Anything received after that time might be too late.
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 333 pass: 333 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.123 release. There are 193 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 Sat 01 Jun 2019 03:02:04 AM UTC. 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/v4.x/stable-review/patch-4.14.123-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Complied and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.123 release. There are 193 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 Sat 01 Jun 2019 03:02:04 AM UTC. 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/v4.x/stable-review/patch-4.14.123-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.14.123-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.14.y
git commit: 0352fa2fdaa68f3e27866e6f6a5125aa9efcefe4
git describe: v4.14.122-194-g0352fa2fdaa6
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.14-oe/build/v4.14.122-194-g0352fa2fdaa6
No regressions (compared to build v4.14.122)
No fixes (compared to build v4.14.122)
Ran 22398 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* libhugetlbfs
* ltp-commands-tests
* ltp-containers-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-sched-tests
* ltp-timers-tests
* spectre-meltdown-checker-test
* kselftest
* ltp-cap_bounds-tests
* ltp-cpuhotplug-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* network-basic-tests
* perf
* v4l2-compliance
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org