Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2553158ybl; Mon, 20 Jan 2020 05:12:00 -0800 (PST) X-Google-Smtp-Source: APXvYqwnSO2ZccYUEQ1GcGrtKX//2Zxr1p+nylRX2ySijIwNnMAbPGeHzZJchC6iQlwlFGVl419q X-Received: by 2002:aca:f411:: with SMTP id s17mr13098729oih.177.1579525917622; Mon, 20 Jan 2020 05:11:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579525917; cv=none; d=google.com; s=arc-20160816; b=AGhynfrFOG/q2Qk7B6ugsNFk5YQXLcofG6ESaBlVjyQXItLxBdGHcjrccI3LonogDN UrFjW9Dl6qzEd9klKtbRorCHtQLeoG9fBKVSsdPlnCntXlB6XtvGtkcOG4DOLJQ3L4R7 56RK9U0ZFXl70NZ3bLNMmywttJ9nFwnbEP6Zi7jzYGtd99Y40cxib5NnU4/L6sSY3C01 LBxEyQ0PqCm03BacJvt+7rI0ob/5ubRdk723nh4djxiq7R2mU1F5Zoc5aom5UL8cUmYD QRYmeafxs3VCsWmQr2W9c6qGZ+928qxYXTGstQX4yQERDZxrRtIb11wQIKxi4GQ2ikTR XIbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=K7g3P4yjPnhMysBSNyjqYu6e8DmKZkt9WUC8TTFZsfs=; b=jdNiVZyW/e9lEzML/JWkjEsMUXVYKGjQ+k7ZyDppXcD6PPFV8hVo7UFbf+IbwmLwQv OMAW49+NVjPSpOY1Cvg6cHZFPrbvChh3LMkkArF2pnHNwm3j/ob1nFvacbTFruIIsfbo y+NdOZD80T0nKrzGz2J2BYq/zoSRAE2+iRZ6YWWXpdCTryVQ7PEitq/vc5u6zny8W/HY uchR5PUFG8Ik/YZu0f2uX6sMk6bh82uuZBUUSp62zphK+TbTBKbL9Z6zBeuKTG+Zv0nI +IjzqIy5kNXMiQjYYWgZAI7GePiHDLb6yZR4Z7he7mpo1u51yHkS+tOBOjanMzuxdvlk xzKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tS06I7iy; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j13si18308743otq.146.2020.01.20.05.11.45; Mon, 20 Jan 2020 05:11:57 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=tS06I7iy; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728931AbgATNJm (ORCPT + 99 others); Mon, 20 Jan 2020 08:09:42 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46996 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726619AbgATNJm (ORCPT ); Mon, 20 Jan 2020 08:09:42 -0500 Received: by mail-wr1-f67.google.com with SMTP id z7so29446560wrl.13; Mon, 20 Jan 2020 05:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K7g3P4yjPnhMysBSNyjqYu6e8DmKZkt9WUC8TTFZsfs=; b=tS06I7iyTauar6DBTAglZqtZljnUJsGfNM+Jb80ZNZFV7rv1LOgDwyQCHxOzMh/Ip6 qktk0Ngjb5yeFoAIgYVgfYto7NlKmykVQL9jLvCEo+NKl5Ogq98GmEhUcNDF3mr1kQtF p0JRlDfr0sZ+bIEmS/Me0lmQlncpGx02+yNO0DPmXEJMGtJ0FlMjECGLC1bKRynjqrDK APpmsn5t616xy0NkpzBVkftX2yMEHq6Lkvk6+0J1glI5rV93OfsiaRhTeY4VwyTB4HyL Gdjeb2obWCvIwEPiU0B3wVUeyB6aSygf8Xv/bNBEU8wycqz2oVxjybXNRuoh6EOTDhCR oq+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K7g3P4yjPnhMysBSNyjqYu6e8DmKZkt9WUC8TTFZsfs=; b=TeBqevcpzYWSCE0P86uSJr7ws6LCRuv3EDybjDrn/sK/CL8WFQJsdpHXZ86/pwJH0P GvNd5n3fmYKQShWR2JPbQitlH2vllhgaovmtgxYaga8BRXpP0+T0jRQs8hfXYXvOxRkj bJnfhtDzBvLMjZUzAxgc1e0AN+impE4+noPZaTtFPHr3HdvEqKdXtDf8b3AA9ly/9Qx8 q1Y8x9IuxhGIjqqAhyD4l4QeoieeL/zW3ljooyZgvnscePRApe59no5oyf/n1V0nNMxf qUlN+21ISsCRuq9DoVgm5ImnKnrVjs7o1GFOhfHDSC4x0mDjG0GcJEM8FWH/DmiI2kjT 2hCw== X-Gm-Message-State: APjAAAXqWBQf5+Bw2LRCObkeCV1sBf3B0PT5IRmFVwepIuQFyRUNQqDK gyc4/8kc+2Is7uyfEzIZOYA= X-Received: by 2002:a5d:4687:: with SMTP id u7mr17576545wrq.176.1579525778813; Mon, 20 Jan 2020 05:09:38 -0800 (PST) Received: from ubuntu-G3.micron.com ([165.225.86.138]) by smtp.gmail.com with ESMTPSA id p18sm23065386wmb.8.2020.01.20.05.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 05:09:38 -0800 (PST) From: Bean Huo To: alim.akhtar@samsung.com, avri.altman@wdc.com, asutoshd@codeaurora.org, jejb@linux.ibm.com, martin.petersen@oracle.com, stanley.chu@mediatek.com, beanhuo@micron.com, bvanassche@acm.org, tomas.winkler@intel.com, cang@codeaurora.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/8] scsi: ufs: Split ufshcd_probe_hba() based on its called flow Date: Mon, 20 Jan 2020 14:08:15 +0100 Message-Id: <20200120130820.1737-4-huobean@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120130820.1737-1-huobean@gmail.com> References: <20200120130820.1737-1-huobean@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bean Huo This patch has two major non-functionality changes: 1. Take scanning host if-statement out from ufshcd_probe_hba(), and move into a new added function ufshcd_add_lus(). In this new function ufshcd_add_lus(), the main functionalitis include: ICC initialization, add well-known LUs, devfreq initialization, UFS bsg probe and scsi host scan. The reason for this change is that these functionalities only being called during booting stage flow ufshcd_init()->ufshcd_async_scan(). In the processes of error handling and power management ufshcd_suspend(), ufshcd_resume(), ufshcd_probe_hba() being called, but these functionalitis above metioned are not hit. 2. Move context of initialization of parameters associated with the UFS device to a new added function ufshcd_device_params_init(). The reason of this change is that all of these parameters are used by driver, but only need to be initialized once when booting. Combine them into an integral function, make them easier maintain. Signed-off-by: Bean Huo --- drivers/scsi/ufs/ufshcd.c | 167 +++++++++++++++++++++++--------------- 1 file changed, 101 insertions(+), 66 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 58ef45b80cb0..935b50861864 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -246,7 +246,7 @@ static int ufshcd_reset_and_restore(struct ufs_hba *hba); static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd); static int ufshcd_clear_tm_cmd(struct ufs_hba *hba, int tag); static void ufshcd_hba_exit(struct ufs_hba *hba); -static int ufshcd_probe_hba(struct ufs_hba *hba); +static int ufshcd_probe_hba(struct ufs_hba *hba, bool async); static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, bool skip_ref_clk); static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on); @@ -6307,7 +6307,7 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba) goto out; /* Establish the link again and restore the device */ - err = ufshcd_probe_hba(hba); + err = ufshcd_probe_hba(hba, false); if (!err && (hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL)) err = -EIO; @@ -6935,13 +6935,83 @@ static int ufshcd_set_dev_ref_clk(struct ufs_hba *hba) return err; } +static int ufshcd_device_params_init(struct ufs_hba *hba) +{ + bool flag; + int ret; + + /* Init check for device descriptor sizes */ + ufshcd_init_desc_sizes(hba); + + /* Check and apply UFS device quirks */ + ret = ufs_get_device_desc(hba); + if (ret) { + dev_err(hba->dev, "%s: Failed getting device info. err = %d\n", + __func__, ret); + goto out; + } + + ufs_fixup_device_setup(hba); + + /* Clear any previous UFS device information */ + memset(&hba->dev_info, 0, sizeof(hba->dev_info)); + if (!ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_READ_FLAG, + QUERY_FLAG_IDN_PWR_ON_WPE, &flag)) + hba->dev_info.f_power_on_wp_en = flag; + +out: + return ret; +} + +/** + * ufshcd_add_lus - probe and add UFS logical units + * @hba: per-adapter instance + */ +static int ufshcd_add_lus(struct ufs_hba *hba) +{ + int ret; + + if (!hba->is_init_prefetch) + ufshcd_init_icc_levels(hba); + + /* Add required well known logical units to scsi mid layer */ + ret = ufshcd_scsi_add_wlus(hba); + if (ret) + goto out; + + /* Initialize devfreq after UFS device is detected */ + if (ufshcd_is_clkscaling_supported(hba)) { + memcpy(&hba->clk_scaling.saved_pwr_info.info, + &hba->pwr_info, + sizeof(struct ufs_pa_layer_attr)); + hba->clk_scaling.saved_pwr_info.is_valid = true; + if (!hba->devfreq) { + ret = ufshcd_devfreq_init(hba); + if (ret) + goto out; + } + + hba->clk_scaling.is_allowed = true; + } + + ufs_bsg_probe(hba); + scsi_scan_host(hba->host); + pm_runtime_put_sync(hba->dev); + + if (!hba->is_init_prefetch) + hba->is_init_prefetch = true; +out: + return ret; +} + /** * ufshcd_probe_hba - probe hba to detect device and initialize * @hba: per-adapter instance + * @async: asynchronous execution or not * * Execute link-startup and verify device initialization */ -static int ufshcd_probe_hba(struct ufs_hba *hba) +static int ufshcd_probe_hba(struct ufs_hba *hba, bool async) { int ret; ktime_t start = ktime_get(); @@ -6960,25 +7030,26 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) /* UniPro link is active now */ ufshcd_set_link_active(hba); + /* Verify device initialization by sending NOP OUT UPIU */ ret = ufshcd_verify_dev_init(hba); if (ret) goto out; + /* Initiate UFS initialization, and waiting until completion */ ret = ufshcd_complete_dev_init(hba); if (ret) goto out; - /* Init check for device descriptor sizes */ - ufshcd_init_desc_sizes(hba); - - ret = ufs_get_device_desc(hba); - if (ret) { - dev_err(hba->dev, "%s: Failed getting device info. err = %d\n", - __func__, ret); - goto out; + /* + * Initialize UFS device parameters used by driver, these + * parameters are associated with UFS descriptors. + */ + if (async) { + ret = ufshcd_device_params_init(hba); + if (ret) + goto out; } - ufs_fixup_device_setup(hba); ufshcd_tune_unipro_params(hba); /* UFS device is also active now */ @@ -7011,60 +7082,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) /* Enable Auto-Hibernate if configured */ ufshcd_auto_hibern8_enable(hba); - /* - * If we are in error handling context or in power management callbacks - * context, no need to scan the host - */ - if (!ufshcd_eh_in_progress(hba) && !hba->pm_op_in_progress) { - bool flag; - - /* clear any previous UFS device information */ - memset(&hba->dev_info, 0, sizeof(hba->dev_info)); - if (!ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_READ_FLAG, - QUERY_FLAG_IDN_PWR_ON_WPE, &flag)) - hba->dev_info.f_power_on_wp_en = flag; - - if (!hba->is_init_prefetch) - ufshcd_init_icc_levels(hba); - - /* Add required well known logical units to scsi mid layer */ - ret = ufshcd_scsi_add_wlus(hba); - if (ret) - goto out; - - /* Initialize devfreq after UFS device is detected */ - if (ufshcd_is_clkscaling_supported(hba)) { - memcpy(&hba->clk_scaling.saved_pwr_info.info, - &hba->pwr_info, - sizeof(struct ufs_pa_layer_attr)); - hba->clk_scaling.saved_pwr_info.is_valid = true; - if (!hba->devfreq) { - ret = ufshcd_devfreq_init(hba); - if (ret) - goto out; - } - hba->clk_scaling.is_allowed = true; - } - - ufs_bsg_probe(hba); - - scsi_scan_host(hba->host); - pm_runtime_put_sync(hba->dev); - } - - if (!hba->is_init_prefetch) - hba->is_init_prefetch = true; - out: - /* - * If we failed to initialize the device or the device is not - * present, turn off the power/clocks etc. - */ - if (ret && !ufshcd_eh_in_progress(hba) && !hba->pm_op_in_progress) { - pm_runtime_put_sync(hba->dev); - ufshcd_exit_clk_scaling(hba); - ufshcd_hba_exit(hba); - } trace_ufshcd_init(dev_name(hba->dev), ret, ktime_to_us(ktime_sub(ktime_get(), start)), @@ -7080,8 +7098,25 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) static void ufshcd_async_scan(void *data, async_cookie_t cookie) { struct ufs_hba *hba = (struct ufs_hba *)data; + int ret; - ufshcd_probe_hba(hba); + /* Initialize hba, detect and initialize UFS device */ + ret = ufshcd_probe_hba(hba, true); + if (ret) + goto out; + + /* Probe and add UFS logical units */ + ret = ufshcd_add_lus(hba); +out: + /* + * If we failed to initialize the device or the device is not + * present, turn off the power/clocks etc. + */ + if (ret) { + pm_runtime_put_sync(hba->dev); + ufshcd_exit_clk_scaling(hba); + ufshcd_hba_exit(hba); + } } static const struct attribute_group *ufshcd_driver_groups[] = { -- 2.17.1