Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp2129430imm; Mon, 16 Jul 2018 02:45:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdtp+dJm4xz8+fuhiAOFyPaeG9Cuh3GtGoXGr5uCVmVROy9yFEipEYv7MTxJRFPf8+vfNOO X-Received: by 2002:a17:902:8601:: with SMTP id f1-v6mr15900718plo.196.1531734321991; Mon, 16 Jul 2018 02:45:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531734321; cv=none; d=google.com; s=arc-20160816; b=pGY1yw8JmqXbmrWLXAmEN7gQmVLFX7KSxaGdP+fBipIVz2E3ej8lnoZ0jTVhUMr56P BF9d0W8SqM17W0wmYHY+zhoX5+Kf9LEdWx5HjhcDlu7w2RWVZ5t56z188B7xOWWONGcv 7ZG8t2OXsmjUhDSfXv1TpuoKxMYP9CLaVCFbLLNgBay/2pfopiTIZT9SjCxCkBl6oCtP ZDQVWcJjmoD5vcc+gGvQK3V2tE3Gt4PQr0yIbeZJoPKj7flxQkgJK1jWGTQbCEc9iBi7 LbEk2K/XB0Ed+Kea5kWS0570PfXgg4iJoDWT288nVD4kNSwXtKJr94+NM/KIACActFMz XrUQ== 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=6oMfbQGRUvlLUXMRs7Sbp7dnUiV/Qu42YicRan4O9ZQ=; b=hJPuczoxTK+CSQL3aDQQC1iPVMa1SkYCBCs10cMe0NHlu1UlenhOg7nmEEElwHemR5 TeGLia+3dpUzzXxREKGN6Fyfj4sRZIXHb1AEGwl/b6ds1kr3KLfZLBrfbaLG4gHMDqbl MUuQo53z3PNYcZblNXY1kUZVil3k4skiXqrKga4+R3MAc/7v2DVWJiH0jicGxvBZJkmo K9+QwN1hK/YlfmpFS7vm3QrpsKu+rchOJUa8yh1M4xYZyQea9EQUY13PzfvdlJWVucbT XIcT8GTZ4dNdL5mi8hw05ME9IW1Rg0iUOkxIUS85NlELScvc/yjHO37jYcd/aMy+ooQE bNMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=nbnsaGSa; dkim=pass header.i=@codeaurora.org header.s=default header.b=NZ6Ttd3l; 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 q13-v6si29261131plr.220.2018.07.16.02.45.07; Mon, 16 Jul 2018 02:45:21 -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=nbnsaGSa; dkim=pass header.i=@codeaurora.org header.s=default header.b=NZ6Ttd3l; 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 S1730552AbeGPKLD (ORCPT + 99 others); Mon, 16 Jul 2018 06:11:03 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:54502 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727044AbeGPKLC (ORCPT ); Mon, 16 Jul 2018 06:11:02 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9040A602D7; Mon, 16 Jul 2018 09:44:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1531734267; bh=/Cld40T4pIKW13WtpRN3N0VADSXYPPYfItBcGi2Mdzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbnsaGSaAJXfWP/svh0z3q0WgMgNo0zVKamto/94saiidgoOdosEnQFuAaHDq4giC kthUxwM39DlrwQko7qFqXg9Jn82HIEUm6oMX/QLVXVDGV7cgeMFOXdthzsxQVnvMST VZQcVH9kLII4ukON5H/UEViL1rCjmDMTCS6UeHfM= 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 A2769607C6; Mon, 16 Jul 2018 09:44:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1531734266; bh=/Cld40T4pIKW13WtpRN3N0VADSXYPPYfItBcGi2Mdzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NZ6Ttd3lIOYLTmAQrXgWWN6+SZzCh1QyPWVSUg/GHV0X/AN/qOlJZEKaqcVMRipFK NG58A6dMvBtaoc4Ulw8nLoZ4fxnvEW1LhAM/KGWaGL3B9tcJeBDc8g2V/ThsX9hinl WLGXVJzrgMluKQWlDS5qo64N4k2V32fdRI5iA8jI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A2769607C6 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 V6] scsi: ufs: Add configfs support for UFS provisioning Date: Mon, 16 Jul 2018 15:13:57 +0530 Message-Id: <1531734237-27421-2-git-send-email-sayalil@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1531734237-27421-1-git-send-email-sayalil@codeaurora.org> References: <1531734237-27421-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 | 162 ++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.c | 2 + drivers/scsi/ufs/ufshcd.h | 19 +++ 6 files changed, 212 insertions(+) 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..34d89c2 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_PLATFORM && 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..3e9837a --- /dev/null +++ b/drivers/scsi/ufs/ufs-configfs.c @@ -0,0 +1,162 @@ +// 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 hba ? hba : NULL; +} + +static ssize_t ufs_provision_show(struct config_item *item, char *buf) +{ + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + int i, ret, curr_len = 0; + struct ufs_hba *hba = config_item_to_hba(item); + + if (!hba) + return snprintf(buf, PAGE_SIZE, "ufs hba is NULL!\n"); + + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC, + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); + + if (ret) + return snprintf(buf, PAGE_SIZE, + "Failed reading descriptor. desc_idn %d, opcode %x ret %d\n", + QUERY_DESC_IDN_CONFIGURATION, + UPIU_QUERY_OPCODE_READ_DESC, ret); + + for (i = 0; i < buff_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 buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + char *token; + int i, ret, value; + u32 bConfigDescrLock = 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); + + if (!hba) + goto out; + + /* 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, &bConfigDescrLock); + if (ret) + goto out; + + if (bConfigDescrLock) { + dev_err(hba->dev, "%s: bConfigDescrLock already set to %u, cannot re-provision device!\n", + __func__, bConfigDescrLock); + 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); + break; + } + 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, &buff_len); + + if (!ret) + dev_err(hba->dev, "%s: UFS Provisioning done, reboot now!\n", + __func__); + +out: + kfree(strbuf_copy); + 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, + }, + }, +}; + +int 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); + + return ret; +} + +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 c5b1bf1..bfdd502 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7622,6 +7622,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); @@ -7875,6 +7876,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; diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 8110dcd..2ece88d 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. @@ -866,6 +870,21 @@ 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 */ +#ifdef CONFIG_UFS_PROVISION +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name); +void ufshcd_configfs_exit(void); +#else +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) +{ + return 0; +} + +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