From patchwork Thu May 23 19:05:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 165050 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2602612ili; Thu, 23 May 2019 12:12:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4utGPbvJYKutLq2MWD04OM/PYAxnZfd7YRtojaGVhcT9RCYEhk73PouTtkvUqcMnDAyGV X-Received: by 2002:a62:7793:: with SMTP id s141mr40579613pfc.21.1558638731505; Thu, 23 May 2019 12:12:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558638731; cv=none; d=google.com; s=arc-20160816; b=t4uO5B/K/0yi3cw5bDALtglqzVzZbeHxqhZ79s0YYzxsOyXf9s/L3k5XBxG13mnSDH 4a1mw0+XJcaGqVA22ce5OMZ57czuW+ogUWzxrcTgFD9VilsT3uarcE2PRr044KALVp8D DoXfK7gceBQXtq7YCEbGtEH9N92crvzuiEzAUCjb7hFJZJ8kTovdh1s5F62RpZSd0OEq qEYoDivYtzfOnHDnXZVSVTp6EFdf/jzZ18gDThGvcXmCSAWOljCAKtwxZ9/2he5l1u8i ezYgQ9CjQ+LDQWCdkR/cEdP6EMVI9mzg3mzdvmhOb+HmjobMhypGOzSQ8vXL1k5ELWho TkCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KEVtfQ2jsJB44mlpJnX7tOxN1Z5OXLllYNaE7aqT4pU=; b=XEP6SdJJDK+VOaGrpMJo6yc63rWXNJTvcAk98AE6QG9jUCkZEFJ6uloneTgtuCnh0/ enzdujyLKfyhndA65Fj/d2lD5JIQnu8nvww5KLbXyUSS1RqoqkflJJ9A5b0iTa0F5HKG 0W0TkCXE70ksByh3NqmvDbc4j2Vi6G/N7xl3LiThXZf/UYh8Fgtvjr+vK2d91ZoKEBuj +IPtg9OifY8LV/HEqdSkd7UQhtUlB362yCqfB9zsWZahkA9ruk6ExNlA4z3N/tTxF5he dh73NFs94IXzGmEtsYZkT2l6dIdA3wd5a7ZdnFPDKGhrgwgkFpqbxQzhGFu8VVjXsUwH rOGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Fol+1QhS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id go3si485759plb.423.2019.05.23.12.12.11; Thu, 23 May 2019 12:12:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Fol+1QhS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388388AbfEWTMK (ORCPT + 30 others); Thu, 23 May 2019 15:12:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:45780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388365AbfEWTMH (ORCPT ); Thu, 23 May 2019 15:12:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0D69A21841; Thu, 23 May 2019 19:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638726; bh=HiFtAIKrl+Yj/b7btEiQx9X+/cf8POcNBsL9C668gKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fol+1QhSVa7Czbpo14M2e3oaAz6B0OFHoYU98VXvHQsQ9nWkm31Qi1WZabGey4BFc c+Hm4GZrTvWGIaRDhXTDplVWfeXLMbrSQqoT5iq/rI6zE8+iQi+vx0M71tLSETug2X U9sHJHXz+uItoaLzGhDUD2v5VcPC7r5dTAonpBxQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhong Kaihua , John Stultz , Zhangfei Gao , Dong Zhang , Leo Yan , Stephen Boyd Subject: [PATCH 4.14 25/77] clk: hi3660: Mark clk_gate_ufs_subsys as critical Date: Thu, 23 May 2019 21:05:43 +0200 Message-Id: <20190523181723.783646372@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181719.982121681@linuxfoundation.org> References: <20190523181719.982121681@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan commit 9f77a60669d13ed4ddfa6cd7374c9d88da378ffa upstream. clk_gate_ufs_subsys is a system bus clock, turning off it will introduce lockup issue during system suspend flow. Let's mark clk_gate_ufs_subsys as critical clock, thus keeps it on during system suspend and resume. Fixes: d374e6fd5088 ("clk: hisilicon: Add clock driver for hi3660 SoC") Cc: stable@vger.kernel.org Cc: Zhong Kaihua Cc: John Stultz Cc: Zhangfei Gao Suggested-by: Dong Zhang Signed-off-by: Leo Yan Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman --- drivers/clk/hisilicon/clk-hi3660.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/clk/hisilicon/clk-hi3660.c +++ b/drivers/clk/hisilicon/clk-hi3660.c @@ -163,8 +163,12 @@ static const struct hisi_gate_clock hi36 "clk_isp_snclk_mux", CLK_SET_RATE_PARENT, 0x50, 17, 0, }, { HI3660_CLK_GATE_ISP_SNCLK2, "clk_gate_isp_snclk2", "clk_isp_snclk_mux", CLK_SET_RATE_PARENT, 0x50, 18, 0, }, + /* + * clk_gate_ufs_subsys is a system bus clock, mark it as critical + * clock and keep it on for system suspend and resume. + */ { HI3660_CLK_GATE_UFS_SUBSYS, "clk_gate_ufs_subsys", "clk_div_sysbus", - CLK_SET_RATE_PARENT, 0x50, 21, 0, }, + CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, 0x50, 21, 0, }, { HI3660_PCLK_GATE_DSI0, "pclk_gate_dsi0", "clk_div_cfgbus", CLK_SET_RATE_PARENT, 0x50, 28, 0, }, { HI3660_PCLK_GATE_DSI1, "pclk_gate_dsi1", "clk_div_cfgbus", From patchwork Thu May 23 19:06:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 165051 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2604994ili; Thu, 23 May 2019 12:14:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqwFOcImBHqKiKI4uGSDcjyAq03+4wERlD0q9ZxzNb6591YIg5+m4rQBtFmyR4er2n2ZPx+K X-Received: by 2002:a17:902:758b:: with SMTP id j11mr42785936pll.191.1558638848396; Thu, 23 May 2019 12:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558638848; cv=none; d=google.com; s=arc-20160816; b=CLLbzGwVFQlOQE57yfkunsmf/RAyHcheO1KzdccTdfxf/oYk/2HhXqDVS497YxALCj JCHmhpVQ823JQbjtoZkhWeYTpThQKVtcBxdzigBOyvVafx5sCnFKWfAvRGM+7NH+tTEz ddb9Wd3/uy1FStvaQDI0ilFC64/xTPxuAbH8P3CwvK6ax0MfT/lrRV+jO3dOQgr8972r bRa1DPanG1lu0PM9Pfoip7wyGdUtvpAQrQZ7asvWXfvRO9H+N8cTsmT56PnyHLjezXJp cRT0z6VqPihODY9SIR8TjvGKB/5HhboPlABo1E1MrXrx1Y6ATMQjtemE8l3b8BhZL6Lw pZHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VnSZ71HnpFpEOs/jasZAt9hUhywQThrpbrpRzGAuhrI=; b=s3OXe3piLluY2k9zaKtB5plON512lHJzB5tJjBIhlv81Lyekb5e5CU+s5PR5wc2SGi d5qk+2qcWGnO5HSwLPVSHX1lN02TMUOgnebQKpKsAS5gyBRZsgfmnGk4ZBM1+br0pjh8 qYUJ5RriRPISYRh0sHingChRXfBwRYlHZcU23DBQpL3lVumGjq3/pmitspZhlPzSVKrH cGZvPmTaTcfD3jzZBvA3tdV707XZus65ypZFFBKbCPPs4QVg3cney7f1DA1ocNsAwTEV aPvNqfAhtc3ZYYRaYqvUHA9FpuVer88pc4mkVqatDwbl+Te3jwDLvPNfbHMARO+0R1WQ NZ7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MseedxOd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g137si299308pfb.244.2019.05.23.12.14.08; Thu, 23 May 2019 12:14:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MseedxOd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387736AbfEWTOG (ORCPT + 30 others); Thu, 23 May 2019 15:14:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:48034 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388430AbfEWTOE (ORCPT ); Thu, 23 May 2019 15:14:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 940C52133D; Thu, 23 May 2019 19:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638844; bh=3OfAKRejem44lhiav6rHoDnBgWyuGlQs1vMZTZo1psQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MseedxOdaRWg7ssyzWzpF0jRz+O+bw6NwE/HVMlofYoZOYUEkvPIESRPdVZyu8/47 gU5PhOuCQGmZoQo6ok5jxnHr+BhBk9iYXgMrvXnqIeS+l4h1jMQWWqw2HUNQl0cB/d oopw8y2Emn2CZ2pDXiDVm7XqVgapNmYAzOfVBwuQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiang Chen , John Garry , Robin Murphy Subject: [PATCH 4.14 74/77] driver core: Postpone DMA tear-down until after devres release for probe failure Date: Thu, 23 May 2019 21:06:32 +0200 Message-Id: <20190523181730.183006273@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181719.982121681@linuxfoundation.org> References: <20190523181719.982121681@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Garry commit 0b777eee88d712256ba8232a9429edb17c4f9ceb upstream. In commit 376991db4b64 ("driver core: Postpone DMA tear-down until after devres release"), we changed the ordering of tearing down the device DMA ops and releasing all the device's resources; this was because the DMA ops should be maintained until we release the device's managed DMA memories. However, we have seen another crash on an arm64 system when a device driver probe fails: hisi_sas_v3_hw 0000:74:02.0: Adding to iommu group 2 scsi host1: hisi_sas_v3_hw BUG: Bad page state in process swapper/0 pfn:313f5 page:ffff7e0000c4fd40 count:1 mapcount:0 mapping:0000000000000000 index:0x0 flags: 0xfffe00000001000(reserved) raw: 0fffe00000001000 ffff7e0000c4fd48 ffff7e0000c4fd48 0000000000000000 raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 page dumped because: PAGE_FLAGS_CHECK_AT_FREE flag(s) set bad because of flags: 0x1000(reserved) Modules linked in: CPU: 49 PID: 1 Comm: swapper/0 Not tainted 5.1.0-rc1-43081-g22d97fd-dirty #1433 Hardware name: Huawei D06/D06, BIOS Hisilicon D06 UEFI RC0 - V1.12.01 01/29/2019 Call trace: dump_backtrace+0x0/0x118 show_stack+0x14/0x1c dump_stack+0xa4/0xc8 bad_page+0xe4/0x13c free_pages_check_bad+0x4c/0xc0 __free_pages_ok+0x30c/0x340 __free_pages+0x30/0x44 __dma_direct_free_pages+0x30/0x38 dma_direct_free+0x24/0x38 dma_free_attrs+0x9c/0xd8 dmam_release+0x20/0x28 release_nodes+0x17c/0x220 devres_release_all+0x34/0x54 really_probe+0xc4/0x2c8 driver_probe_device+0x58/0xfc device_driver_attach+0x68/0x70 __driver_attach+0x94/0xdc bus_for_each_dev+0x5c/0xb4 driver_attach+0x20/0x28 bus_add_driver+0x14c/0x200 driver_register+0x6c/0x124 __pci_register_driver+0x48/0x50 sas_v3_pci_driver_init+0x20/0x28 do_one_initcall+0x40/0x25c kernel_init_freeable+0x2b8/0x3c0 kernel_init+0x10/0x100 ret_from_fork+0x10/0x18 Disabling lock debugging due to kernel taint BUG: Bad page state in process swapper/0 pfn:313f6 page:ffff7e0000c4fd80 count:1 mapcount:0 mapping:0000000000000000 index:0x0 [ 89.322983] flags: 0xfffe00000001000(reserved) raw: 0fffe00000001000 ffff7e0000c4fd88 ffff7e0000c4fd88 0000000000000000 raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 The crash occurs for the same reason. In this case, on the really_probe() failure path, we are still clearing the DMA ops prior to releasing the device's managed memories. This patch fixes this issue by reordering the DMA ops teardown and the call to devres_release_all() on the failure path. Reported-by: Xiang Chen Tested-by: Xiang Chen Signed-off-by: John Garry Reviewed-by: Robin Murphy [jpg: backport to 4.19.x and earlier] Signed-off-by: John Garry Signed-off-by: Greg Kroah-Hartman --- drivers/base/dd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -387,7 +387,7 @@ re_probe: ret = dma_configure(dev); if (ret) - goto dma_failed; + goto probe_failed; if (driver_sysfs_add(dev)) { printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n", @@ -442,14 +442,13 @@ re_probe: goto done; probe_failed: - dma_deconfigure(dev); -dma_failed: if (dev->bus) blocking_notifier_call_chain(&dev->bus->p->bus_notifier, BUS_NOTIFY_DRIVER_NOT_BOUND, dev); pinctrl_bind_failed: device_links_no_driver(dev); devres_release_all(dev); + dma_deconfigure(dev); driver_sysfs_remove(dev); dev->driver = NULL; dev_set_drvdata(dev, NULL);