155 lines
4.3 KiB
Diff
155 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tomas Winkler <tomas.winkler@intel.com>
|
|
Date: Thu, 14 May 2015 00:00:59 +0300
|
|
Subject: [PATCH] scsi: ufs: store device serial number.
|
|
|
|
Retrieve device serial number and store it for RPMB subsystem use.
|
|
|
|
V9: rebase
|
|
v10: Fix Kdoc
|
|
|
|
Change-Id: Ieee7f85696f6614cd2f3c81403124159ea85b77e
|
|
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
|
|
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
|
|
---
|
|
drivers/scsi/ufs/ufs.h | 4 ++++
|
|
drivers/scsi/ufs/ufshcd.c | 35 +++++++++++++++++++++++++++++------
|
|
2 files changed, 33 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h
|
|
index 348471f55bf9..febed206a1a7 100644
|
|
--- a/drivers/scsi/ufs/ufs.h
|
|
+++ b/drivers/scsi/ufs/ufs.h
|
|
@@ -614,10 +614,14 @@ struct ufs_dev_info {
|
|
*
|
|
* @wmanufacturerid: card details
|
|
* @model: card model
|
|
+ * @serial_no: serial number
|
|
+ * @serial_no_len: serial number string length
|
|
*/
|
|
struct ufs_dev_desc {
|
|
u16 wmanufacturerid;
|
|
char *model;
|
|
+ char *serial_no;
|
|
+ size_t serial_no_len;
|
|
};
|
|
|
|
/**
|
|
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
|
|
index b1c7dd8afccf..79d21a653f25 100644
|
|
--- a/drivers/scsi/ufs/ufshcd.c
|
|
+++ b/drivers/scsi/ufs/ufshcd.c
|
|
@@ -43,6 +43,7 @@
|
|
#include <linux/nls.h>
|
|
#include <linux/of.h>
|
|
#include <linux/bitfield.h>
|
|
+#include <linux/string.h>
|
|
#include <linux/rpmb.h>
|
|
|
|
#include "ufshcd.h"
|
|
@@ -6427,12 +6428,19 @@ static struct rpmb_ops ufshcd_rpmb_dev_ops = {
|
|
|
|
};
|
|
|
|
-static inline void ufshcd_rpmb_add(struct ufs_hba *hba)
|
|
+static inline void ufshcd_rpmb_add(struct ufs_hba *hba,
|
|
+ struct ufs_dev_desc *dev_desc)
|
|
{
|
|
struct rpmb_dev *rdev;
|
|
u8 rpmb_rw_size = 1;
|
|
int ret;
|
|
|
|
+ ufshcd_rpmb_dev_ops.dev_id = kmemdup(dev_desc->serial_no,
|
|
+ dev_desc->serial_no_len,
|
|
+ GFP_KERNEL);
|
|
+ if (ufshcd_rpmb_dev_ops.dev_id)
|
|
+ ufshcd_rpmb_dev_ops.dev_id_len = dev_desc->serial_no_len;
|
|
+
|
|
ret = scsi_device_get(hba->sdev_ufs_rpmb);
|
|
if (ret)
|
|
goto out_put_dev;
|
|
@@ -6476,6 +6484,9 @@ static inline void ufshcd_rpmb_remove(struct ufs_hba *hba)
|
|
scsi_device_put(hba->sdev_ufs_rpmb);
|
|
hba->sdev_ufs_rpmb = NULL;
|
|
|
|
+ kfree(ufshcd_rpmb_dev_ops.dev_id);
|
|
+ ufshcd_rpmb_dev_ops.dev_id = NULL;
|
|
+
|
|
spin_unlock_irqrestore(hba->host->host_lock, flags);
|
|
}
|
|
|
|
@@ -6549,7 +6560,7 @@ static int ufs_get_device_desc(struct ufs_hba *hba,
|
|
{
|
|
int err;
|
|
size_t buff_len;
|
|
- u8 model_index;
|
|
+ u8 index;
|
|
u8 *desc_buf;
|
|
|
|
if (!dev_desc)
|
|
@@ -6577,8 +6588,8 @@ static int ufs_get_device_desc(struct ufs_hba *hba,
|
|
dev_desc->wmanufacturerid = desc_buf[DEVICE_DESC_PARAM_MANF_ID] << 8 |
|
|
desc_buf[DEVICE_DESC_PARAM_MANF_ID + 1];
|
|
|
|
- model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME];
|
|
- err = ufshcd_read_string_desc(hba, model_index,
|
|
+ index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME];
|
|
+ err = ufshcd_read_string_desc(hba, index,
|
|
&dev_desc->model, SD_ASCII_STD);
|
|
if (err < 0) {
|
|
dev_err(hba->dev, "%s: Failed reading Product Name. err = %d\n",
|
|
@@ -6586,6 +6597,14 @@ static int ufs_get_device_desc(struct ufs_hba *hba,
|
|
goto out;
|
|
}
|
|
|
|
+ index = desc_buf[DEVICE_DESC_PARAM_SN];
|
|
+ err = ufshcd_read_string_desc(hba, index, &dev_desc->serial_no, SD_RAW);
|
|
+ if (err < 0) {
|
|
+ dev_err(hba->dev, "%s: Failed reading Serial No. err = %d\n",
|
|
+ __func__, err);
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
/*
|
|
* ufshcd_read_string_desc returns size of the string
|
|
* reset the error value
|
|
@@ -6601,6 +6620,9 @@ static void ufs_put_device_desc(struct ufs_dev_desc *dev_desc)
|
|
{
|
|
kfree(dev_desc->model);
|
|
dev_desc->model = NULL;
|
|
+
|
|
+ kfree(dev_desc->serial_no);
|
|
+ dev_desc->serial_no = NULL;
|
|
}
|
|
|
|
static void ufs_fixup_device_setup(struct ufs_hba *hba,
|
|
@@ -6896,7 +6918,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
|
|
}
|
|
|
|
ufs_fixup_device_setup(hba, &card);
|
|
- ufs_put_device_desc(&card);
|
|
|
|
ufshcd_tune_unipro_params(hba);
|
|
|
|
@@ -6947,7 +6968,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
|
|
if (ret)
|
|
goto out;
|
|
|
|
- ufshcd_rpmb_add(hba);
|
|
+ ufshcd_rpmb_add(hba, &card);
|
|
|
|
/* Initialize devfreq after UFS device is detected */
|
|
if (ufshcd_is_clkscaling_supported(hba)) {
|
|
@@ -6971,6 +6992,8 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
|
|
hba->is_init_prefetch = true;
|
|
|
|
out:
|
|
+
|
|
+ ufs_put_device_desc(&card);
|
|
/*
|
|
* If we failed to initialize the device or the device is not
|
|
* present, turn off the power/clocks etc.
|
|
--
|
|
https://clearlinux.org
|
|
|