Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp2445736imm; Thu, 23 Aug 2018 22:36:21 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbqGdLf1/u9NuJ4z+EdJxPtiFGcgNfHmWOsIU/ezXfXyt3Di/cPkqMoWIq7vjh7xBPF6/BP X-Received: by 2002:a17:902:a413:: with SMTP id p19-v6mr182972plq.220.1535088981007; Thu, 23 Aug 2018 22:36:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535088980; cv=none; d=google.com; s=arc-20160816; b=vc1WmsCNH4fQzirNLhZwg0I2dw03KR0uLiJx6srDBO0bIVKE92y/eWfsTXkgomquO5 kOrRT0/irPplxrKvCQwAL479Ok+pd7UpZxgBjA5CdKK0TAlMu3M1y/KYB4DTQMchn/Mv JEoWiaJiBTIqrETTOk1dezq94GTo5695HDr4EYsLgzczGn66L3kMuRToxCwyDXFesWv0 8qxbwRSlmkZbseGoxv8ozoBwu6dVFpKuEMnwJh6w9dWGkJlQiLUJI6GqCFTDyiIJE7Sx F8UA+jFWpDxISUt5vF20rmmwFwI2LyAdOA/1v5XH5811nn/JUvXG15oo2FRw8PjfPP5n c/Ug== 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=obtmXPmgGJEABn14F7As3C9L6N4N0Uq6DCfvQA3E8j4=; b=v/5GmqBYOQoCMK0RNYHYXbPJ1AIWjDjRItWKOUxZjuegxEJHdtARsLHn47dsIgg/BA 1WrnrVhyuk76ziJMpxVxnHkkN3oYHuu7vCOvXTuji7jGT4z+qAA+SaEK3KA9EBJw3dRG tFhsbX7CI7+SYm5shICRECPKLGsE8krD/9v0/wMSj587m0kHDgxlg6tH4sXVg3Z7v27t 2dC0RyXreo36RP6HvmjzcOfSURlJjlJvUTT50ybIyjPAHbHWZsQ6Qr+ItBxTHvgorvgb FhHO8lZ3imDkrsAdN4g2eVl1bwT/W9C9tPB5zHS4lu99gdCWZndaE33V741JFPJLJQ5K w0Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=Z+6stw6z; dkim=pass header.i=@codeaurora.org header.s=default header.b=Cszx4c8M; 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 u13-v6si5923231plq.320.2018.08.23.22.36.04; Thu, 23 Aug 2018 22:36:20 -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=Z+6stw6z; dkim=pass header.i=@codeaurora.org header.s=default header.b=Cszx4c8M; 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 S1727551AbeHXJHP (ORCPT + 99 others); Fri, 24 Aug 2018 05:07:15 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:34892 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726519AbeHXJHO (ORCPT ); Fri, 24 Aug 2018 05:07:14 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 2C7AA60559; Fri, 24 Aug 2018 05:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1535088853; bh=a6cou9VNt/O8AiJ6r4hpbhsoLh+TeLR0n6MDTAeFDts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z+6stw6zLObx9nqF7VhSxO3rwM4qRLz2lrIq4Ifkw7mIcbWR+qsCapFsgx2WV8qLK B60O2JCgEqug/ynAgSvoxDxDuGiJCpDHp85wL4UP7uSn9PZAOPQcRkXd7R3JQhDUqn OBXOXZ68ViAdEojbPKiVRWDLaq8E3sGT5YFahJx8= 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 4512560227; Fri, 24 Aug 2018 05:34:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1535088851; bh=a6cou9VNt/O8AiJ6r4hpbhsoLh+TeLR0n6MDTAeFDts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cszx4c8MkqYUOkJ3km9ORzdUS/LaN0X26r9NnjNapq2ykGZau4ON03O3nbODssMwr bERl838aiYddghzUoF3Tf1c/84RcHNlJiwDq8BM4xzpOihSC5+ZNgft6N8xEKM3Jbb UAGeV/p8SL6ZvO4L6zwM5qzKF97whzjvqgNic8D8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4512560227 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: adrian.hunter@intel.com, linux-scsi@vger.kernel.org, Sayali Lokhande , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V10 2/2] scsi: ufs: Add configfs support for UFS provisioning Date: Fri, 24 Aug 2018 11:03:29 +0530 Message-Id: <1535088810-20989-3-git-send-email-sayalil@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1535088810-20989-1-git-send-email-sayalil@codeaurora.org> References: <1535088810-20989-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 This patch adds configfs support to provision UFS device at runtime. This feature can be primarily useful in factory or assembly line as some devices may be required to be configured multiple times during initial system development phase. Configuration Descriptors can be written multiple times until bConfigDescrLock attribute is zero. Configuration descriptor buffer consists of Device and Unit descriptor configurable parameters which are parsed from vendor specific provisioning file and then passed via configfs node at runtime to provision ufs device. CONFIG_CONFIGFS_FS needs to be enabled for using this feature. Usage: 1) To read current configuration descriptor : cat /config/XXXX.ufshc/ufs_provision 2) To provision ufs device: echo > /config/XXXX.ufshc/ufs_provision Signed-off-by: Sayali Lokhande --- Documentation/ABI/testing/configfs-driver-ufs | 18 +++ drivers/scsi/ufs/Kconfig | 10 ++ drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufs-configfs.c | 155 ++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.c | 3 +- drivers/scsi/ufs/ufshcd.h | 17 +++ 6 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/configfs-driver-ufs create mode 100644 drivers/scsi/ufs/ufs-configfs.c diff --git a/Documentation/ABI/testing/configfs-driver-ufs b/Documentation/ABI/testing/configfs-driver-ufs new file mode 100644 index 0000000..eeee499c --- /dev/null +++ b/Documentation/ABI/testing/configfs-driver-ufs @@ -0,0 +1,18 @@ +What: /config/ufshcd/ufs_provision +Date: Jun 2018 +KernelVersion: 4.14 +Description: + This file shows the current ufs configuration descriptor set in device. + This can be used to provision ufs device if bConfigDescrLock is 0. + For more details, refer 14.1.6.3 Configuration Descriptor and + Table 14-12 - Unit Descriptor configurable parameters from specs for + description of each configuration descriptor parameter. + Configuration descriptor buffer needs to be passed in space separated + format specificied as below: + echo + + + <0Bh:0Fh_ReservedAs_0> + + <0Dh:0Fh_ReservedAs_0> + > /config/XXXX.ufshc/ufs_provision diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig index e27b4d4..a9a0a58 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -100,3 +100,13 @@ config SCSI_UFS_QCOM Select this if you have UFS controller on QCOM chipset. If unsure, say N. + +config UFS_PROVISION + tristate "Runtime UFS Provisioning support" + depends on SCSI_UFSHCD && CONFIGFS_FS + help + This enables runtime UFS provisioning support. This can be used + primarily during assembly line as some devices may be required to + be configured multiple times during initial development phase. + + If unsure, say N. diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile index 918f579..00110ea 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -5,5 +5,6 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd-core.o ufshcd-core-objs := ufshcd.o ufs-sysfs.o +obj-$(CONFIG_UFS_PROVISION) += ufs-configfs.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o diff --git a/drivers/scsi/ufs/ufs-configfs.c b/drivers/scsi/ufs/ufs-configfs.c new file mode 100644 index 0000000..74563a4 --- /dev/null +++ b/drivers/scsi/ufs/ufs-configfs.c @@ -0,0 +1,155 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright (c) 2018, Linux Foundation. + +#include +#include +#include + +#include "ufs.h" +#include "ufshcd.h" + +static inline struct ufs_hba *config_item_to_hba(struct config_item *item) +{ + struct config_group *group = to_config_group(item); + struct configfs_subsystem *subsys = to_configfs_subsystem(group); + struct ufs_hba *hba = container_of(subsys, struct ufs_hba, subsys); + + return subsys ? hba : NULL; +} + +static ssize_t ufs_provision_show(struct config_item *item, char *buf) +{ + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; + int desc_buf_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + int i, ret, curr_len = 0; + struct ufs_hba *hba = config_item_to_hba(item); + + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC, + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &desc_buf_len); + + if (ret) + return ret; + + for (i = 0; i < desc_buf_len; i++) + curr_len += snprintf((buf + curr_len), (PAGE_SIZE - curr_len), + "0x%x ", desc_buf[i]); + + return curr_len; +} + +ssize_t ufshcd_desc_configfs_store(struct ufs_hba *hba, + const char *buf, size_t count) +{ + char *strbuf; + char *strbuf_copy; + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; + int desc_buf_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + char *token; + int i, ret, value; + u32 config_desc_lock = 0; + + /* reserve one byte for null termination */ + strbuf = kmalloc(count + 1, GFP_KERNEL); + if (!strbuf) + return -ENOMEM; + + strbuf_copy = strbuf; + strlcpy(strbuf, buf, count + 1); + + /* Just return if bConfigDescrLock is already set */ + ret = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR, + QUERY_ATTR_IDN_CONF_DESC_LOCK, 0, 0, &config_desc_lock); + if (ret) + goto out; + + if (config_desc_lock) { + dev_err(hba->dev, "%s: bConfigDescrLock already set to %u, cannot re-provision device!\n", + __func__, config_desc_lock); + ret = -EINVAL; + goto out; + } + + for (i = 0; i < QUERY_DESC_CONFIGURATION_DEF_SIZE; i++) { + token = strsep(&strbuf, " "); + if (!token && i) + break; + + ret = kstrtoint(token, 0, &value); + if (ret) { + dev_err(hba->dev, "%s: kstrtoint failed %d %s\n", + __func__, ret, token); + ret = -EINVAL; + goto out; + } + desc_buf[i] = (u8)value; + } + + /* Write configuration descriptor to provision ufs */ + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_WRITE_DESC, + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &desc_buf_len); + + if (!ret) + dev_info(hba->dev, "%s: UFS Provisioning done, reboot now!\n", + __func__); + +out: + kfree(strbuf_copy); + if (ret) + return ret; + return count; +} + +static ssize_t ufs_provision_store(struct config_item *item, + const char *buf, size_t count) +{ + struct ufs_hba *hba = config_item_to_hba(item); + + return ufshcd_desc_configfs_store(hba, buf, count); +} + +static struct configfs_attribute ufshcd_attr_provision = { + .ca_name = "ufs_provision", + .ca_mode = 0644, + .ca_owner = THIS_MODULE, + .show = ufs_provision_show, + .store = ufs_provision_store, +}; + +static struct configfs_attribute *ufshcd_attrs[] = { + &ufshcd_attr_provision, + NULL, +}; + +static struct config_item_type ufscfg_type = { + .ct_attrs = ufshcd_attrs, + .ct_owner = THIS_MODULE, +}; + +static struct configfs_subsystem ufscfg_subsys = { + .su_group = { + .cg_item = { + .ci_type = &ufscfg_type, + }, + }, +}; + +void ufshcd_configfs_init(struct ufs_hba *hba, const char *name) +{ + int ret; + struct configfs_subsystem *subsys = &hba->subsys; + + strncpy(ufscfg_subsys.su_group.cg_item.ci_namebuf, name, strlen(name)); + subsys->su_group = ufscfg_subsys.su_group; + config_group_init(&subsys->su_group); + mutex_init(&subsys->su_mutex); + ret = configfs_register_subsystem(subsys); + if (ret) + pr_err("Error %d while registering subsystem %s\n", + ret, + subsys->su_group.cg_item.ci_namebuf); +} + +void ufshcd_configfs_exit(void) +{ + configfs_unregister_subsystem(&ufscfg_subsys); +} diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e01cdc0..32a67b0 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7711,6 +7711,7 @@ int ufshcd_shutdown(struct ufs_hba *hba) void ufshcd_remove(struct ufs_hba *hba) { ufs_sysfs_remove_nodes(hba->dev); + ufshcd_configfs_exit(); scsi_remove_host(hba->host); /* disable interrupts */ ufshcd_disable_intr(hba, hba->intr_mask); @@ -7965,7 +7966,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) async_schedule(ufshcd_async_scan, hba); ufs_sysfs_add_nodes(hba->dev); - + ufshcd_configfs_init(hba, dev_name(hba->dev)); return 0; out_remove_scsi_host: diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 45013b6..2275032 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -37,6 +37,7 @@ #ifndef _UFSHCD_H #define _UFSHCD_H +#include #include #include #include @@ -515,6 +516,9 @@ struct ufs_hba { struct Scsi_Host *host; struct device *dev; +#ifdef CONFIG_UFS_PROVISION + struct configfs_subsystem subsys; +#endif /* * This field is to keep a reference to "scsi_device" corresponding to * "UFS device" W-LU. @@ -868,6 +872,19 @@ 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); +/* Expose UFS configfs API's */ +#ifndef CONFIG_UFS_PROVISION +static inline void ufshcd_configfs_init(struct ufs_hba *hba, const char *name) +{ +} +static inline void ufshcd_configfs_exit(void) +{ +} +#else +void ufshcd_configfs_init(struct ufs_hba *hba, const char *name); +void ufshcd_configfs_exit(void); +#endif + 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