@@ -8,3 +8,4 @@ ufshcd-core-objs := ufshcd.o ufs-sysfs.o
obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o
obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o
obj-$(CONFIG_SCSI_UFS_HISI) += ufs-hisi.o
+obj-$(CONFIG_SCSI_UFS_ATTRS) += ufs_bsg.o
new file mode 100644
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * SCSI transport companion for UFS HBA
+ *
+ * Copyright (C) 2018 Western Digital Corporation
+ */
+#include "ufs_bsg.h"
+
+struct ufs_bsg {
+ struct ufs_hba *hba;
+ struct ufs_port *port;
+};
+static struct ufs_bsg *bsg_host;
+
+static int ufs_bsg_request(struct bsg_job *job);
+
+static struct scsi_transport_template *ufs_transport_template;
+static struct ufs_function_template ufs_transport_functions = {
+ .bsg_request = ufs_bsg_request,
+};
+
+static int ufs_bsg_request(struct bsg_job *job)
+{
+ struct ufs_bsg_request *bsg_request = job->request;
+ struct ufs_bsg_reply *bsg_reply = job->reply;
+ int ret = -ENOTSUPP;
+
+ bsg_reply->reply_payload_rcv_len = 0;
+
+ /* Do Nothing for now */
+ dev_err(job->dev, "unsupported message_code 0x%x\n",
+ bsg_request->msgcode);
+
+ bsg_reply->result = ret;
+ if (ret)
+ job->reply_len = sizeof(uint32_t);
+ else
+ job->reply_len = sizeof(struct ufs_bsg_reply) +
+ bsg_reply->reply_payload_rcv_len;
+
+ bsg_job_done(job, bsg_reply->result, bsg_reply->reply_payload_rcv_len);
+
+ return ret;
+}
+
+/**
+ * ufs_bsg_attach_transport - instantiate UFS transport template
+ * @hba: hba to attach the transport template to
+ *
+ * Call this before scsi_add_host() publishes it to the scsi midlayer
+ */
+void ufs_bsg_attach_transport(struct ufs_hba *hba)
+{
+ ufs_transport_template =
+ ufs_attach_transport(&ufs_transport_functions);
+ if (!ufs_transport_template)
+ return;
+
+ hba->host->transportt = ufs_transport_template;
+}
+
+/**
+ * ufs_bsg_remove - detach and remove the added ufs-ports
+ * @shost: scsi host that is parenting the ufs-ports
+ *
+ * Should be called when unloading the driver.
+ */
+void ufs_bsg_remove(struct Scsi_Host *shost)
+{
+ if (!bsg_host)
+ return;
+
+ ufs_remove_host(shost);
+
+ if (ufs_transport_template) {
+ ufs_release_transport(ufs_transport_template);
+ ufs_transport_template = NULL;
+ }
+
+ kfree(bsg_host);
+}
+
+/**
+ * ufs_bsg_probe - Add and report ufs device to ufs transport
+ * @hba: per adapter object
+ *
+ * Called during initial loading of the driver, and before scsi_scan_host.
+ * Should be called only if the attach phase was successful
+ */
+
+int ufs_bsg_probe(struct ufs_hba *hba)
+{
+ struct ufs_port *port;
+ int ret;
+
+ if (WARN_ON(!ufs_transport_template))
+ return -ENODEV;
+
+ bsg_host = kzalloc(sizeof(*bsg_host), GFP_KERNEL);
+ if (!bsg_host) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ port = ufs_port_alloc(hba->host);
+ if (!port) {
+ ret = -ENOMEM;
+ goto out_free_bsg_host;
+ }
+
+ ret = ufs_port_add(port);
+ if (ret)
+ goto out_free_port;
+
+ bsg_host->port = port;
+ bsg_host->hba = hba;
+
+ return 0;
+
+out_free_port:
+ ufs_port_free(port);
+out_free_bsg_host:
+ kfree(bsg_host);
+out:
+ ufs_transport_template = NULL;
+ return ret;
+}
new file mode 100644
@@ -0,0 +1,72 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2018 Western Digital Corporation
+ */
+#ifndef UFS_BSG_H
+#define UFS_BSG_H
+
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_transport_ufs.h>
+
+#include <uapi/scsi/scsi_bsg_ufs.h>
+#include "ufshcd.h"
+#include "ufs.h"
+
+#define UPIU_TRANSACTION_UIC_CMD 0x1F
+
+enum {
+ REQ_UPIU_SIZE_DWORDS = 8,
+ RSP_UPIU_SIZE_DWORDS = 8,
+};
+
+struct ufs_bsg_request {
+ uint32_t msgcode;
+ struct utp_upiu_header header;
+ union {
+ struct utp_upiu_query qr;
+ struct utp_upiu_task_req tr;
+ /* use utp_upiu_query to host the 4 dwords of uic command */
+ struct utp_upiu_query uc;
+ } tsf;
+};
+
+
+struct ufs_bsg_reply {
+ /*
+ * The completion result. Result exists in two forms:
+ * if negative, it is an -Exxx system errno value. There will
+ * be no further reply information supplied.
+ * else, it's the 4-byte scsi error result, with driver, host,
+ * msg and status fields. The per-msgcode reply structure
+ * will contain valid data.
+ */
+ uint32_t result;
+
+ /* If there was reply_payload, how much was received? */
+ uint32_t reply_payload_rcv_len;
+
+ struct utp_upiu_header header;
+ union {
+ struct utp_upiu_query qr;
+ struct utp_upiu_task_rsp tr;
+ struct utp_upiu_query uc;
+ } tsf;
+};
+
+struct ufs_bsg_raw_upiu {
+ struct ufs_bsg_upiu request;
+ struct ufs_bsg_upiu reply;
+};
+
+#ifdef CONFIG_SCSI_UFS_ATTRS
+void ufs_bsg_attach_transport(struct ufs_hba *hba);
+void ufs_bsg_remove(struct Scsi_Host *shost);
+int ufs_bsg_probe(struct ufs_hba *hba);
+#else
+static inline void ufs_bsg_attach_transport(struct ufs_hba *hba) {}
+static inline void ufs_bsg_remove(struct Scsi_Host *shost) {}
+static inline int ufs_bsg_probe(struct ufs_hba *hba) {return 0; }
+#endif
+
+#endif /* UFS_BSG_H */
new file mode 100644
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * UFS Transport SGIO v4 BSG Message Support
+ *
+ * Copyright (C) 2018 Western Digital Corporation
+ */
+#ifndef SCSI_BSG_UFS_H
+#define SCSI_BSG_UFS_H
+
+/*
+ * This file intended to be included by both kernel and user space
+ */
+
+
+/**
+ * struct ufs_bsg_upiu - upiu transaction structure
+ *
+ * @header: upiu header
+ * @tsf: Transaction Specific Fields
+ * @data: payload pointer
+ *
+ * This structure supports all ufs transaction types per JEDEC UFSv2.1
+ * paragraph 10.7
+ */
+struct ufs_bsg_upiu {
+ uint32_t header[3];
+ uint32_t tsf[5];
+ uint8_t data[0];
+};
+
+/* request (CDB) structure of the sg_io_v4 */
+struct ufs_bsg_upiu_request {
+ uint32_t msgcode;
+ struct ufs_bsg_upiu upiu;
+} __packed;
+
+/* response (request sense data) structure of the sg_io_v4 */
+struct ufs_bsg_upiu_reply {
+ /*
+ * The completion result. Result exists in two forms:
+ * if negative, it is an -Exxx system errno value. There will
+ * be no further reply information supplied.
+ * else, it's the 4-byte scsi error result, with driver, host,
+ * msg and status fields. The per-msgcode reply structure
+ * will contain valid data.
+ */
+ uint32_t result;
+
+ /* If there was reply_payload, how much was recevied ? */
+ uint32_t reply_payload_rcv_len;
+
+ struct ufs_bsg_upiu upiu;
+
+};
+
+#endif /* SCSI_BSG_UFS_H */
A LLD companion for the ufs scsi transport. For now, just provide an API to instantiate the ufs transport, allocating and removing ufs-ports. As we are attaching the transport template to the scsi host that was already alocated for the ufs hba, we'll need to pay extra attention on where to call the provided API from ufshcd. For the time being, implements an empty bsg_request() - will add some more functionality in coming patches. Nonetheless, we reveal here the protocol we are planning to use: UFS Transport Protocol Transactions. UFS transactions consist of packets called UFS Protocol Information Units (UPIU). There are UPIU’s defined for UFS SCSI commands, responses, data in and data out, task management, utility functions, vendor functions, transaction synchronization and control, and more. By using UPIUs, we get access to the most fine-grained internals of this protocol, and able to communicate with the device in ways, that are sometimes beyond the capacity of the ufs driver. Signed-off-by: Avri Altman <avri.altman@wdc.com> --- drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufs_bsg.c | 127 +++++++++++++++++++++++++++++++++++++++ drivers/scsi/ufs/ufs_bsg.h | 72 ++++++++++++++++++++++ include/uapi/scsi/scsi_bsg_ufs.h | 56 +++++++++++++++++ 4 files changed, 256 insertions(+) create mode 100644 drivers/scsi/ufs/ufs_bsg.c create mode 100644 drivers/scsi/ufs/ufs_bsg.h create mode 100644 include/uapi/scsi/scsi_bsg_ufs.h