From: Eddie James <eajames@linux.vnet.ibm.com>
To: openbmc@lists.ozlabs.org
Cc: joel@jms.id.au, andrew@aj.id.au, "Edward A. James" <eajames@us.ibm.com>
Subject: [PATCH linux dev-4.10 v4 25/31] drivers: fsi: occ: Add comments for clarity
Date: Thu, 5 Oct 2017 21:05:47 -0500 [thread overview]
Message-ID: <1507255553-13301-26-git-send-email-eajames@linux.vnet.ibm.com> (raw)
In-Reply-To: <1507255553-13301-1-git-send-email-eajames@linux.vnet.ibm.com>
From: "Edward A. James" <eajames@us.ibm.com>
Fixup some existing comments as well.
Signed-off-by: Edward A. James <eajames@us.ibm.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
---
drivers/fsi/occ.c | 55 +++++++++++++++++++++++++++++++++++++------------------
1 file changed, 37 insertions(+), 18 deletions(-)
diff --git a/drivers/fsi/occ.c b/drivers/fsi/occ.c
index 5590a72..3e27307 100644
--- a/drivers/fsi/occ.c
+++ b/drivers/fsi/occ.c
@@ -39,8 +39,8 @@ struct occ {
int idx;
struct miscdevice mdev;
struct list_head xfrs;
- spinlock_t list_lock;
- struct mutex occ_lock;
+ spinlock_t list_lock; /* lock access to the xfrs list */
+ struct mutex occ_lock; /* lock access to the hardware */
struct work_struct work;
};
@@ -57,17 +57,17 @@ struct occ_response {
/*
* transfer flags are NOT mutually exclusive
- *
+ *
* Initial flags are none; transfer is created and queued from write(). All
- * flags are cleared when the transfer is completed by closing the file or
- * reading all of the available response data.
+ * flags are cleared when the transfer is completed by closing the file or
+ * reading all of the available response data.
* XFR_IN_PROGRESS is set when a transfer is started from occ_worker_putsram,
- * and cleared if the transfer fails or occ_worker_getsram completes.
+ * and cleared if the transfer fails or occ_worker_getsram completes.
* XFR_COMPLETE is set when a transfer fails or finishes occ_worker_getsram.
* XFR_CANCELED is set when the transfer's client is released.
* XFR_WAITING is set from read() if the transfer isn't complete and
- * NONBLOCKING wasn't specified. Cleared in read() when transfer completes
- * or fails.
+ * O_NONBLOCK wasn't specified. Cleared in read() when transfer completes or
+ * fails.
*/
enum {
XFR_IN_PROGRESS,
@@ -89,9 +89,9 @@ struct occ_xfr {
* client flags
*
* CLIENT_NONBLOCKING is set during open() if the file was opened with the
- * O_NONBLOCKING flag.
+ * O_NONBLOCK flag.
* CLIENT_XFR_PENDING is set during write() and cleared when all data has been
- * read.
+ * read.
*/
enum {
CLIENT_NONBLOCKING,
@@ -101,7 +101,7 @@ enum {
struct occ_client {
struct occ *occ;
struct occ_xfr xfr;
- spinlock_t lock;
+ spinlock_t lock; /* lock access to the client state */
wait_queue_head_t wait;
size_t read_offset;
unsigned long flags;
@@ -286,10 +286,15 @@ static ssize_t occ_write_common(struct occ_client *client,
goto done;
}
- /* clear out the transfer */
- memset(xfr, 0, sizeof(*xfr));
- xfr->buf[0] = 1;
+ memset(xfr, 0, sizeof(*xfr)); /* clear out the transfer */
+ xfr->buf[0] = 1; /* occ sequence number */
+ /*
+ * Assume user data follows the occ command format.
+ * byte 0: command type
+ * bytes 1-2: data length (msb first)
+ * bytes 3-n: data
+ */
if (ubuf) {
if (copy_from_user(&xfr->buf[1], ubuf, len)) {
rc = -EFAULT;
@@ -373,7 +378,7 @@ static int occ_release_common(struct occ_client *client)
return 0;
}
- /* operation is in progress; let worker clean up*/
+ /* operation is in progress; let worker clean up */
spin_unlock_irq(&occ->list_lock);
spin_unlock_irq(&client->lock);
return 0;
@@ -438,9 +443,13 @@ static int occ_getsram(struct device *sbefifo, u32 address, u8 *data,
int rc;
u8 *resp;
__be32 buf[5];
- u32 data_len = ((len + 7) / 8) * 8;
+ u32 data_len = ((len + 7) / 8) * 8; /* must be multiples of 8 B */
struct sbefifo_client *client;
+ /*
+ * Magic sequence to do SBE getsram command. SBE will fetch data from
+ * specified SRAM address.
+ */
buf[0] = cpu_to_be32(0x5);
buf[1] = cpu_to_be32(0xa403);
buf[2] = cpu_to_be32(1);
@@ -489,7 +498,7 @@ static int occ_putsram(struct device *sbefifo, u32 address, u8 *data,
{
int rc;
__be32 *buf;
- u32 data_len = ((len + 7) / 8) * 8;
+ u32 data_len = ((len + 7) / 8) * 8; /* must be multiples of 8 B */
size_t cmd_len = data_len + 20;
struct sbefifo_client *client;
@@ -497,6 +506,10 @@ static int occ_putsram(struct device *sbefifo, u32 address, u8 *data,
if (!buf)
return -ENOMEM;
+ /*
+ * Magic sequence to do SBE putsram command. SBE will transfer
+ * data to specified SRAM address.
+ */
buf[0] = cpu_to_be32(0x5 + (data_len / 4));
buf[1] = cpu_to_be32(0xa404);
buf[2] = cpu_to_be32(1);
@@ -537,11 +550,15 @@ static int occ_trigger_attn(struct device *sbefifo)
__be32 buf[6];
struct sbefifo_client *client;
+ /*
+ * Magic sequence to do SBE putscom command. SBE will write 8 bytes to
+ * specified SCOM address.
+ */
buf[0] = cpu_to_be32(0x6);
buf[1] = cpu_to_be32(0xa202);
buf[2] = 0;
buf[3] = cpu_to_be32(0x6D035);
- buf[4] = cpu_to_be32(0x20010000);
+ buf[4] = cpu_to_be32(0x20010000); /* trigger occ attention */
buf[5] = 0;
client = sbefifo_drv_open(sbefifo, 0);
@@ -592,6 +609,7 @@ static void occ_worker(struct work_struct *work)
spin_unlock_irq(&occ->list_lock);
mutex_lock(&occ->occ_lock);
+ /* write occ command */
rc = occ_putsram(sbefifo, 0xFFFBE000, xfr->buf,
xfr->cmd_data_length);
if (rc)
@@ -601,6 +619,7 @@ static void occ_worker(struct work_struct *work)
if (rc)
goto done;
+ /* read occ response */
rc = occ_getsram(sbefifo, 0xFFFBF000, xfr->buf, 8);
if (rc)
goto done;
--
1.8.3.1
next prev parent reply other threads:[~2017-10-06 2:07 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-06 2:05 [PATCH linux dev-4.10 v4 00/31] drivers: fsi: client fixes and refactor Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 01/31] drivers: fsi: sbefifo: Fix includes Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 02/31] drivers: fsi: sbefifo: Use a defined reschedule length Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 03/31] drivers: fsi: sbefifo: Use __be32 for big endian values Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 04/31] drivers: fsi: sbefifo: white space fixes Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 05/31] drivers: fsi: sbefifo: replace awkward wait_event expression Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 06/31] drivers: fsi: sbefifo: remove redundant function Eddie James
2017-10-06 2:09 ` Andrew Jeffery
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 07/31] drivers: fsi: sbefifo: Use goto to reduce put statements Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 08/31] drivers: fsi: sbefifo: Do an earlier get_client call Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 09/31] drivers: fsi: sbefifo: Remove warning and user data access check Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 10/31] drivers: fsi: sbefifo: destroy the ida list on exit Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 11/31] drivers: fsi: sbefifo: Fix module authors and comments Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 12/31] drivers: fsi: sbefifo: Fix include guards in header file Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 13/31] drivers: fsi: SBEFIFO: Fix probe() and remove() Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 14/31] drivers: fsi: SBEFIFO: check for xfr complete in read wait_event Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 15/31] drivers: fsi: occ: Fix includes Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 16/31] drivers: fsi: occ: Fix errant kfree calls Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 17/31] drivers: fsi: occ: remove unused occ_command structure Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 18/31] drivers: fsi: occ: Use big-endian values Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 19/31] drivers: fsi: occ: Return ENODEV if client is NULL Eddie James
2017-10-06 2:12 ` Andrew Jeffery
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 20/31] drivers: fsi: occ: Remove early user buffer checking Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 21/31] drivers: fsi: occ: Switch to more logical errnos Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 22/31] drivers: fsi: occ: fix white space and bracket problems Eddie James
2017-10-06 2:14 ` Andrew Jeffery
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 23/31] drivers: fsi: occ: Destroy the ida list on exit Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 24/31] drivers: fsi: occ: Remove unnecessary platform_set_drvdata call Eddie James
2017-10-06 2:05 ` Eddie James [this message]
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 26/31] drivers: fsi: occ: Add OCC response definitions to header Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 27/31] drivers: fsi: occ: Poll while receiving "command in progress" Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 28/31] drivers: fsi: occ: Add cancel to remove() and fix probe() Eddie James
2017-10-06 2:16 ` Andrew Jeffery
2017-10-09 1:05 ` Brad Bishop
2017-10-09 1:53 ` Joel Stanley
2017-10-09 14:58 ` Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 29/31] drivers: fsi: occ: Fix client memory management Eddie James
2017-10-06 2:20 ` Andrew Jeffery
2017-10-09 15:38 ` Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 30/31] drivers/hwmon/occ: Remove repeated ops for OCC command in progress Eddie James
2017-10-06 2:05 ` [PATCH linux dev-4.10 v4 31/31] drivers: hwmon: occ: Cancel occ operations in remove() Eddie James
2017-10-06 2:26 ` Andrew Jeffery
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507255553-13301-26-git-send-email-eajames@linux.vnet.ibm.com \
--to=eajames@linux.vnet.ibm.com \
--cc=andrew@aj.id.au \
--cc=eajames@us.ibm.com \
--cc=joel@jms.id.au \
--cc=openbmc@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.