[PATCH linux v5 13/18] drivers/fsi: Set up links for slave communication
christopher.lee.bostic at gmail.com
christopher.lee.bostic at gmail.com
Thu Oct 20 10:09:41 AEDT 2016
From: Chris Bostic <cbostic at us.ibm.com>
Enable each link and send a break command in preparation
for scanning each link for slaves.
V3 - Remove definition of BREAK command from fsi-master.h
- Remove definitions of fsi_master_fake for set_smode
and break
- Remove master->set_smode master dependent function and
moved to a generic base master set_smode.
- Add fsi_master_link_enable with master type dependencies
V4 - Remove all references to set smode
- Remove file fsi-slave.h
- Move link break and enable up into master scan
- Change rc = func(); return rc; coding to return func();
Note this is still in place in fsi_master_send_break in
anticipation of changes coming up in next patch of this
series.
- Fix comment spelling error
- Use dev_dbg instead of dev_info when link enable or break
fails
- Remove explicit set of master->break and
master->link_enable to NULL due to kzalloc
Signed-off-by: Chris Bostic <cbostic at us.ibm.com>
---
drivers/fsi/fsi-core.c | 42 ++++++++++++++++++++++++++++++++++++++++--
drivers/fsi/fsi-master.h | 2 ++
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 565c7e3..81ed444 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -287,13 +287,51 @@ static int fsi_slave_init(struct fsi_master *master,
/* FSI master support */
+static int fsi_master_link_enable(struct fsi_master *master, int link)
+{
+ if (master->link_enable)
+ return master->link_enable(master, link);
+
+ return -EINVAL;
+}
+
+/*
+ * Issue a break command on this link
+ */
+static int fsi_master_break(struct fsi_master *master, int link)
+{
+ int rc;
+
+ if (!master->send_break)
+ return -EINVAL;
+
+ rc = master->send_break(master, link);
+ if (rc)
+ dev_info(master->dev, "break failed with:%d\n", rc);
+
+ return rc;
+}
+
static int fsi_master_scan(struct fsi_master *master)
{
- int link, slave_id;
+ int link, slave_id, rc;
- for (link = 0; link < master->n_links; link++)
+ for (link = 0; link < master->n_links; link++) {
+ rc = fsi_master_link_enable(master, link);
+ if (rc) {
+ dev_dbg(master->dev,
+ "Enable link:%d failed with:%d\n", link, rc);
+ continue;
+ }
+ rc = fsi_master_break(master, link);
+ if (rc) {
+ dev_dbg(master->dev,
+ "Break to link:%d failed with:%d\n", link, rc);
+ continue;
+ }
for (slave_id = 0; slave_id < FSI_N_SLAVES; slave_id++)
fsi_slave_init(master, link, slave_id);
+ }
return 0;
diff --git a/drivers/fsi/fsi-master.h b/drivers/fsi/fsi-master.h
index cafb433..56aad0e 100644
--- a/drivers/fsi/fsi-master.h
+++ b/drivers/fsi/fsi-master.h
@@ -29,6 +29,8 @@ struct fsi_master {
int (*write)(struct fsi_master *, int link,
uint8_t slave, uint32_t addr,
const void *val, size_t size);
+ int (*send_break)(struct fsi_master *, int link);
+ int (*link_enable)(struct fsi_master *, int link);
};
extern int fsi_master_register(struct fsi_master *master);
--
1.8.2.2
More information about the openbmc
mailing list