Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp4920798imm; Tue, 21 Aug 2018 03:21:40 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyQhXnE9kYivHZtaVv0m5hqu5ipsfe30hdmv0VRTc0yPAnI6RuJrLZ0C79ehDPihjO8Pan6 X-Received: by 2002:a17:902:530a:: with SMTP id b10-v6mr50308829pli.101.1534846900824; Tue, 21 Aug 2018 03:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534846900; cv=none; d=google.com; s=arc-20160816; b=iNjYkLlp7PcbLp5QaRWiYJH8e3uNkx+oZ1wGX7Z3KexCJC7H9Wln8Tma8yOhI8xC1U AYPtW4frSmPhEzBdOrkQzVHECUAD8I5EssNS4UPcD6XF4dSnW2VGJRrcRYFHFCOjqg+r CpVyzrY69y5sPZCzYrj9HSy1OTN2nQ6XxNOP/1m4Jhyu60NOU7mk/lIo71khPnXPPhza n57If7+4zMIo4Lm4t9DB/CSqEeMAQBLKPtQsoL7BR0ydA6++ZmlLxMn3ZGp7JTiV5XxD xpc5pP5z8B2d42jPCZh4mARvehK0qigyivSoBMuJObqUsF1a50lLcP78oY56QwlIooKm Xggw== 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=Vi9cuIfIHuwsRGkYf+MuxuUNhn9LyfLRHsoWQeXlG0c=; b=KLUrhZeNxHB6mhbGd73jUXCDICoM3b5o7NHjDUekVxjIOx6hrSJ+D5yXbzFLQ3Zb9R Y3WfOxgCWapWtFuMkqWUprGKAb2aLrW1fm/5IJ6hmSDfqnHjtKGM1FK7uS1aGPWCtTa9 Rd7mwjGbb42FGYJabQKM+x0RNAn/pDsOB/Ib7rlJRdjgs/mFdVXwAYcMG4MrKljPYzw0 N/7AnAvy2dbsXgTs3UVBDO8ezzgLu16n3evcsuO4I3rz3eSnEKxX4yZpFypO+lHKdrTc AhY2zO3bzz2f6BxAQBlVzPPE0CNpkkFZAe81r7+KD0y6qB6EP+3T07R49WuP4Gan8LiQ vGIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=hE8rue7L; dkim=pass header.i=@codeaurora.org header.s=default header.b=iEMPm4k1; 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 f91-v6si12657101plf.376.2018.08.21.03.21.25; Tue, 21 Aug 2018 03:21:40 -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=hE8rue7L; dkim=pass header.i=@codeaurora.org header.s=default header.b=iEMPm4k1; 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 S1727045AbeHUNjD (ORCPT + 99 others); Tue, 21 Aug 2018 09:39:03 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:49122 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726651AbeHUNjD (ORCPT ); Tue, 21 Aug 2018 09:39:03 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1C24E6101A; Tue, 21 Aug 2018 10:19:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1534846768; bh=Gf8WAFA5eaJX+cOw/5/t5HuJRIPrpwqTBDGoMn2FsNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hE8rue7LM4mpJUc5d/whgImJHHmRRWn4FJtPmLLD6sQWzNL6mRwWCVFSAK7vC5jfn nwAE26+8PB/S7JoK4ppjclTM5k1CPi1F84lvShjcYlzx0Bg4zqU9xe6v8CkFn/zSRd KoWaamYf7N0sUUDyeyTGY9FEbbsvqqg8HPjSxEro= 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 8BB1460FA8; Tue, 21 Aug 2018 10:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1534846766; bh=Gf8WAFA5eaJX+cOw/5/t5HuJRIPrpwqTBDGoMn2FsNU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iEMPm4k1Mwrlk1KnXKDWhPzn5QmygQQwYb0b9xPlw6O8Ywe9wJiIgTmnTdhTNa2ff NJzum3xX6oiEvnXfSKFnA9S02hJMgFbSla6SAANKPcPHxIRxTrj2WVKSTq4WnYB4bs JRklsybs4CyY5czPeOYwKZtzEyYF3Tt+kXmGnoyg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8BB1460FA8 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 V9 2/2] scsi: ufs: Add configfs support for UFS provisioning Date: Tue, 21 Aug 2018 15:47:29 +0530 Message-Id: <1534846649-2456-3-git-send-email-sayalil@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1534846649-2456-1-git-send-email-sayalil@codeaurora.org> References: <1534846649-2456-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 | 157 ++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.c | 3 +- drivers/scsi/ufs/ufshcd.h | 18 +++ 6 files changed, 206 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..09607e5 --- /dev/null +++ b/drivers/scsi/ufs/ufs-configfs.c @@ -0,0 +1,157 @@ +// 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 buff_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, &buff_len); + + if (ret) + return 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 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, &buff_len); + + if (!ret) + dev_err(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, + }, + }, +}; + +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 e946844..11b28bf 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7713,6 +7713,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); @@ -7967,7 +7968,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..c5956b2 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,20 @@ 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 int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) +{ + return 0; +} +static inline void ufshcd_configfs_exit(void) +{ +} +#else +int 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