Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp4649412imm; Mon, 25 Jun 2018 21:05:26 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLo/35uYMMgQVLaVPT/faziHWL+hJ9ULCc39xyFIk5p5gyZGLnIen34lkJMEK48ydLFg4ug X-Received: by 2002:a65:52c3:: with SMTP id z3-v6mr13103942pgp.69.1529985925967; Mon, 25 Jun 2018 21:05:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529985925; cv=none; d=google.com; s=arc-20160816; b=fuCmjF40cPbJC80JxPvSBKtXp7aPRcoAzSldL6Y/0Lv5diGaq9CPgKnzU4cy7YissA hz/qNhdAAAyBpencDT3XX3JwlLMOsUVUMKApKHRDUj0O1AxjzGRTM1oqdftx3VF+se0n TGp2qQHo+IOVVeDOacTeZZMyrmO6XN/ND/uXDuTXLgGie7H4rZCbxDrrFWeuESXzZ9F0 uaestZWt/JwFP7S3zhlsM7k9Jf61460UBQOzXtfETBEGDxYd0Fjy9Ultw/PV/aSFJacZ zcSAWj2dhWoVHoC+IHdEB9uJ2IWH1Of9lTqtBWN2Ztz+ol9Tlqc5YVoLF8obHVASk3+t 5Qzw== 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:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=ElKUYY1FxLN+Becj1eMNYqP5KwKXLtLvsawZa71+jiY=; b=m8JsaPz3DZ0KFO4qgoRbZh1CqSH8xNPCIRg3YNlm6K2wg9T7mOlvXN/JF+karZ4S60 ThrGKAfZQGZ6FQIQxGRj2p8OIP+AkRmeC+qKTKSCWS05e27rs68tZF11l9urZHavHsOi a/aNXIGTjKRJWeEbQTSEorC8BIUHGRppvUjK5aGTLVM/YpVHKoZN4dlhzNXe6aghMW+I 5W8WUXHYCw505vZKBEkHL5IK+iWcGT/NNWu4VMBm+0xCk+bRJxGkAFE6TkWm/OBCvgJg 2k8hIHgti3NjxZA3DxuUL3MfJ/3N+RKR7VtqvZ8HhBfaEQbjFkyV7N906p9ZRSHgUjt1 PT5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=Qo2kAoAi; dkim=pass header.i=@codeaurora.org header.s=default header.b=Rw7CPsds; 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 9-v6si712337ple.104.2018.06.25.21.05.11; Mon, 25 Jun 2018 21:05:25 -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=@codeaurora.org header.s=default header.b=Qo2kAoAi; dkim=pass header.i=@codeaurora.org header.s=default header.b=Rw7CPsds; 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 S1751055AbeFZEEX (ORCPT + 99 others); Tue, 26 Jun 2018 00:04:23 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:47496 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750960AbeFZEEU (ORCPT ); Tue, 26 Jun 2018 00:04:20 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1A0F4606FC; Tue, 26 Jun 2018 04:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1529985860; bh=/cfM2veC2cNkxuTHrKsDXsatYzYCVMjapgEezDVqVQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qo2kAoAiGNc1Nu0m3puwLJTFTolOzMKv72TzR2dzkFMZvEggfkgN3u+UdDKiyQOQf Mn92VJtfOmR9QrO0kMH2BtNP8W5XDVN8dNo36FyBzZpl2zQ6KArO1toMpKJm6fD+0O tFaeys/fOZ8qDUtMEjQdg2Xb7VmgR+tEMOviG6mI= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from sayalil-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sayalil@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D8FF26021C; Tue, 26 Jun 2018 04:04:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1529985859; bh=/cfM2veC2cNkxuTHrKsDXsatYzYCVMjapgEezDVqVQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rw7CPsdsuLMBW7PDi8/5IQBcc6cb8EbgBjOmb+yF6vSOpPPrLwG0NOfWw/M+cCghV p0J2ItfVpxrHYcbQS6Ebei6UsOcUOALEKaxJVi8swGdHOdLAIR/l2ZMwB40wHT+T4f sB3hlFTy/+NRg8fXcDnzl8x0csaMKTLjbx3IgXS0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D8FF26021C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sayalil@codeaurora.org From: Sayali Lokhande To: subhashj@codeaurora.org, cang@codeaurora.org, vivek.gautam@codeaurora.org, rnayak@codeaurora.org, vinholikatti@gmail.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, asutoshd@codeaurora.org, evgreen@chromium.org, riteshh@codeaurora.org Cc: linux-scsi@vger.kernel.org, Sayali Lokhande , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 2/3] scsi: ufs: Add ufs provisioning support Date: Tue, 26 Jun 2018 09:33:48 +0530 Message-Id: <1529985829-18689-3-git-send-email-sayalil@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1529985829-18689-1-git-send-email-sayalil@codeaurora.org> References: <1529985829-18689-1-git-send-email-sayalil@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A new api ufshcd_do_config_device() is added in driver to support UFS provisioning at runtime. Configfs support is added to trigger provisioning. Device and Unit descriptor configurable parameters are parsed from vendor specific provisioning data or file and passed via configfs node at runtime to provision ufs device. Signed-off-by: Sayali Lokhande --- drivers/scsi/ufs/ufs.h | 28 +++++++ drivers/scsi/ufs/ufshcd.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.h | 2 + 3 files changed, 228 insertions(+) diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h index e15deb0..1f99904 100644 --- a/drivers/scsi/ufs/ufs.h +++ b/drivers/scsi/ufs/ufs.h @@ -333,6 +333,7 @@ enum { UFSHCD_AMP = 3, }; +#define UFS_BLOCK_SIZE 4096 #define POWER_DESC_MAX_SIZE 0x62 #define POWER_DESC_MAX_ACTV_ICC_LVLS 16 @@ -425,6 +426,33 @@ enum { MASK_TM_SERVICE_RESP = 0xFF, }; +struct ufs_unit_desc { + u8 bLUEnable; /* 1 for enabled LU */ + u8 bBootLunID; /* 0 for using this LU for boot */ + u8 bLUWriteProtect; /* 1 = power on WP, 2 = permanent WP */ + u8 bMemoryType; /* 0 for enhanced memory type */ + u32 dNumAllocUnits; /* Number of alloc unit for this LU */ + u8 bDataReliability; /* 0 for reliable write support */ + u8 bLogicalBlockSize; /* See section 13.2.3 of UFS standard */ + u8 bProvisioningType; /* 0 for thin provisioning */ + u16 wContextCapabilities; /* refer Unit Descriptor Description */ +}; + +struct ufs_config_descr { + u8 bNumberLU; /* Total number of active LUs */ + u8 bBootEnable; /* enabling device for partial init */ + u8 bDescrAccessEn; /* desc access during partial init */ + u8 bInitPowerMode; /* Initial device power mode */ + u8 bHighPriorityLUN; /* LUN of the high priority LU */ + u8 bSecureRemovalType; /* Erase config for data removal */ + u8 bInitActiveICCLevel; /* ICC level after reset */ + u16 wPeriodicRTCUpdate; /* 0 to set a priodic RTC update rate */ + u32 bConfigDescrLock; /* 1 to lock Configation Descriptor */ + u32 qVendorConfigCode; /* Vendor specific configuration code */ + struct ufs_unit_desc unit[8]; + u8 lun_to_grow; +}; + /* Task management service response */ enum { UPIU_TASK_MANAGEMENT_FUNC_COMPL = 0x00, diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 351f874..370a7c6 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "ufshcd.h" #include "ufs_quirks.h" #include "unipro.h" @@ -3063,6 +3064,14 @@ static inline int ufshcd_read_power_desc(struct ufs_hba *hba, return ufshcd_read_desc(hba, QUERY_DESC_IDN_POWER, 0, buf, size); } +static inline int ufshcd_read_geometry_desc(struct ufs_hba *hba, + u8 *buf, + u32 size) +{ + return ufshcd_read_desc(hba, QUERY_DESC_IDN_GEOMETRY, 0, buf, size); +} + + static int ufshcd_read_device_desc(struct ufs_hba *hba, u8 *buf, u32 size) { return ufshcd_read_desc(hba, QUERY_DESC_IDN_DEVICE, 0, buf, size); @@ -6363,6 +6372,195 @@ static int ufshcd_set_dev_ref_clk(struct ufs_hba *hba) } /** + * ufshcd_do_config_device - API function for UFS provisioning + * hba: per-adapter instance + * Returns 0 for success, non-zero in case of failure. + */ +int ufshcd_do_config_device(struct ufs_hba *hba) +{ + struct ufs_config_descr *cfg = &hba->cfgs; + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; + int i, ret = 0; + int lun_to_grow = -1; + u64 qTotalRawDeviceCapacity; + u16 wEnhanced1CapAdjFac, wEnhanced2CapAdjFac; + u32 dEnhanced1MaxNAllocU, dEnhanced2MaxNAllocU; + size_t alloc_units, units_to_create = 0; + size_t capacity_to_alloc_factor; + size_t enhanced1_units = 0, enhanced2_units = 0; + size_t conversion_ratio = 1; + u8 *pt; + u32 blocks_per_alloc_unit = 1024; + int geo_len = hba->desc_size.geom_desc; + u8 geo_buf[hba->desc_size.geom_desc]; + unsigned int max_partitions = 8; + + WARN_ON(!hba || !cfg); + + pm_runtime_get_sync(hba->dev); + scsi_block_requests(hba->host); + if (ufshcd_wait_for_doorbell_clr(hba, U64_MAX)) { + dev_err(hba->dev, "%s: Timed out waitig for DB to clear\n", + __func__); + ret = -EBUSY; + goto out; + } + + ret = ufshcd_read_geometry_desc(hba, geo_buf, geo_len); + if (ret) { + dev_err(hba->dev, "%s: Failed getting geometry_desc %d\n", + __func__, ret); + goto out; + } + + /* + * Get Geomtric parameters like total configurable memory + * quantity (Offset 0x04 to 0x0b), Capacity Adjustment + * Factors (Offset 0x30, 0x31, 0x36, 0x37), Max allocation + * units (Offset 0x2c to 0x2f, 0x32 to 0x35) used to configure + * the device logical units. + */ + qTotalRawDeviceCapacity = get_unaligned_be64(&geo_buf[0x04]); + wEnhanced1CapAdjFac = get_unaligned_be16(&geo_buf[0x30]); + wEnhanced2CapAdjFac = get_unaligned_be16(&geo_buf[0x36]); + dEnhanced1MaxNAllocU = get_unaligned_be32(&geo_buf[0x2c]); + dEnhanced2MaxNAllocU = get_unaligned_be32(&geo_buf[0x32]); + + capacity_to_alloc_factor = + (blocks_per_alloc_unit * UFS_BLOCK_SIZE) / 512; + + if (qTotalRawDeviceCapacity % capacity_to_alloc_factor != 0) { + dev_err(hba->dev, + "%s: Raw capacity(%llu) not multiple of alloc factor(%zu)\n", + __func__, qTotalRawDeviceCapacity, + capacity_to_alloc_factor); + ret = -EINVAL; + goto out; + } + alloc_units = (qTotalRawDeviceCapacity / capacity_to_alloc_factor); + units_to_create = 0; + enhanced1_units = enhanced2_units = 0; + + /* + * Calculate number of allocation units to be assigned to a logical unit + * considering the capacity adjustment factor of respective memory type. + */ + for (i = 0; i < (max_partitions - 1) && + units_to_create <= alloc_units; i++) { + if ((cfg->unit[i].dNumAllocUnits % blocks_per_alloc_unit) == 0) + cfg->unit[i].dNumAllocUnits /= blocks_per_alloc_unit; + else + cfg->unit[i].dNumAllocUnits = + cfg->unit[i].dNumAllocUnits / blocks_per_alloc_unit + 1; + + if (cfg->unit[i].bMemoryType == 0) + units_to_create += cfg->unit[i].dNumAllocUnits; + else if (cfg->unit[i].bMemoryType == 3) { + enhanced1_units += cfg->unit[i].dNumAllocUnits; + cfg->unit[i].dNumAllocUnits *= + (wEnhanced1CapAdjFac / 0x100); + units_to_create += cfg->unit[i].dNumAllocUnits; + } else if (cfg->unit[i].bMemoryType == 4) { + enhanced2_units += cfg->unit[i].dNumAllocUnits; + cfg->unit[i].dNumAllocUnits *= + (wEnhanced1CapAdjFac / 0x100); + units_to_create += cfg->unit[i].dNumAllocUnits; + } else { + dev_err(hba->dev, "%s: Unsupported memory type %d\n", + __func__, cfg->unit[i].bMemoryType); + ret = -EINVAL; + goto out; + } + } + if (enhanced1_units > dEnhanced1MaxNAllocU) { + dev_err(hba->dev, "%s: size %zu exceeds max enhanced1 area size %u\n", + __func__, enhanced1_units, dEnhanced1MaxNAllocU); + ret = -ERANGE; + goto out; + } + if (enhanced2_units > dEnhanced2MaxNAllocU) { + dev_err(hba->dev, "%s: size %zu exceeds max enhanced2 area size %u\n", + __func__, enhanced2_units, dEnhanced2MaxNAllocU); + ret = -ERANGE; + goto out; + } + if (units_to_create > alloc_units) { + dev_err(hba->dev, "%s: Specified size %zu exceeds device size %zu\n", + __func__, units_to_create, alloc_units); + ret = -ERANGE; + goto out; + } + lun_to_grow = cfg->lun_to_grow; + if (lun_to_grow != -1) { + if (cfg->unit[i].bMemoryType == 0) + conversion_ratio = 1; + else if (cfg->unit[i].bMemoryType == 3) + conversion_ratio = (wEnhanced1CapAdjFac / 0x100); + else if (cfg->unit[i].bMemoryType == 4) + conversion_ratio = (wEnhanced2CapAdjFac / 0x100); + + cfg->unit[lun_to_grow].dNumAllocUnits += + ((alloc_units - units_to_create) / conversion_ratio); + dev_dbg(hba->dev, "%s: conversion_ratio %zu for lun %d\n", + __func__, conversion_ratio, i); + } + + /* Fill in the buffer with configuration data */ + pt = desc_buf; + *pt++ = 0x90; // bLength + *pt++ = 0x01; // bDescriptorType + *pt++ = 0; // Reserved in UFS2.0 and onward + *pt++ = cfg->bBootEnable; + *pt++ = cfg->bDescrAccessEn; + *pt++ = cfg->bInitPowerMode; + *pt++ = cfg->bHighPriorityLUN; + *pt++ = cfg->bSecureRemovalType; + *pt++ = cfg->bInitActiveICCLevel; + put_unaligned_be16(cfg->wPeriodicRTCUpdate, pt); + pt = pt + 7; // Reserved fields set to 0 + + /* Fill in the buffer with per logical unit data */ + for (i = 0; i < UFS_UPIU_MAX_GENERAL_LUN; i++) { + *pt++ = cfg->unit[i].bLUEnable; + *pt++ = cfg->unit[i].bBootLunID; + *pt++ = cfg->unit[i].bLUWriteProtect; + *pt++ = cfg->unit[i].bMemoryType; + put_unaligned_be32(cfg->unit[i].dNumAllocUnits, pt); + pt = pt + 4; + *pt++ = cfg->unit[i].bDataReliability; + *pt++ = cfg->unit[i].bLogicalBlockSize; + *pt++ = cfg->unit[i].bProvisioningType; + put_unaligned_be16(cfg->unit[i].wContextCapabilities, pt); + pt = pt + 5; // Reserved fields set to 0 + } + + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_WRITE_DESC, + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); + + if (ret) { + dev_err(hba->dev, "%s: Failed writing descriptor. desc_idn %d, opcode %x ret %d\n", + __func__, QUERY_DESC_IDN_CONFIGURATION, + UPIU_QUERY_OPCODE_WRITE_DESC, ret); + goto out; + } + + if (cfg->bConfigDescrLock == 1) { + ret = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, + QUERY_ATTR_IDN_CONF_DESC_LOCK, 0, 0, &cfg->bConfigDescrLock); + if (ret) + dev_err(hba->dev, "%s: Failed writing bConfigDescrLock %d\n", + __func__, ret); + } + +out: + scsi_unblock_requests(hba->host); + pm_runtime_put_sync(hba->dev); + + return ret; +} + +/** * ufshcd_probe_hba - probe hba to detect device and initialize * @hba: per-adapter instance * diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 101a75c..0e6bf30 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -549,6 +549,7 @@ struct ufs_hba { unsigned int irq; bool is_irq_enabled; u32 dev_ref_clk_freq; + struct ufs_config_descr cfgs; /* Interrupt aggregation support is broken */ #define UFSHCD_QUIRK_BROKEN_INTR_AGGR 0x1 @@ -867,6 +868,7 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, int ufshcd_hold(struct ufs_hba *hba, bool async); void ufshcd_release(struct ufs_hba *hba); +int ufshcd_do_config_device(struct ufs_hba *hba); int ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id, int *desc_length); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project