Commit c82705c5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'fsi-updates-2018-07-12' of...

Merge tag 'fsi-updates-2018-07-12' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi into char-misc-next

Ben writes:

FSI fixes and updates:

 - Reported build fixes
 - Add configuration of send/echo delayus
 - Object lifetime fix
 - Re-arrange some definitions in preparation for adding the CF master
parents c9c159b2 fea9cf32
...@@ -34,6 +34,7 @@ config FSI_SCOM ...@@ -34,6 +34,7 @@ config FSI_SCOM
config FSI_SBEFIFO config FSI_SBEFIFO
tristate "SBEFIFO FSI client device driver" tristate "SBEFIFO FSI client device driver"
depends on OF_ADDRESS
---help--- ---help---
This option enables an FSI based SBEFIFO device driver. The SBEFIFO is This option enables an FSI based SBEFIFO device driver. The SBEFIFO is
a pipe-like FSI device for communicating with the self boot engine a pipe-like FSI device for communicating with the self boot engine
......
...@@ -81,6 +81,8 @@ struct fsi_slave { ...@@ -81,6 +81,8 @@ struct fsi_slave {
int id; int id;
int link; int link;
uint32_t size; /* size of slave address space */ uint32_t size; /* size of slave address space */
u8 t_send_delay;
u8 t_echo_delay;
}; };
#define to_fsi_master(d) container_of(d, struct fsi_master, dev) #define to_fsi_master(d) container_of(d, struct fsi_master, dev)
...@@ -190,7 +192,7 @@ static int fsi_slave_calc_addr(struct fsi_slave *slave, uint32_t *addrp, ...@@ -190,7 +192,7 @@ static int fsi_slave_calc_addr(struct fsi_slave *slave, uint32_t *addrp,
static int fsi_slave_report_and_clear_errors(struct fsi_slave *slave) static int fsi_slave_report_and_clear_errors(struct fsi_slave *slave)
{ {
struct fsi_master *master = slave->master; struct fsi_master *master = slave->master;
uint32_t irq, stat; __be32 irq, stat;
int rc, link; int rc, link;
uint8_t id; uint8_t id;
...@@ -215,7 +217,53 @@ static int fsi_slave_report_and_clear_errors(struct fsi_slave *slave) ...@@ -215,7 +217,53 @@ static int fsi_slave_report_and_clear_errors(struct fsi_slave *slave)
&irq, sizeof(irq)); &irq, sizeof(irq));
} }
static int fsi_slave_set_smode(struct fsi_master *master, int link, int id); /* Encode slave local bus echo delay */
static inline uint32_t fsi_smode_echodly(int x)
{
return (x & FSI_SMODE_ED_MASK) << FSI_SMODE_ED_SHIFT;
}
/* Encode slave local bus send delay */
static inline uint32_t fsi_smode_senddly(int x)
{
return (x & FSI_SMODE_SD_MASK) << FSI_SMODE_SD_SHIFT;
}
/* Encode slave local bus clock rate ratio */
static inline uint32_t fsi_smode_lbcrr(int x)
{
return (x & FSI_SMODE_LBCRR_MASK) << FSI_SMODE_LBCRR_SHIFT;
}
/* Encode slave ID */
static inline uint32_t fsi_smode_sid(int x)
{
return (x & FSI_SMODE_SID_MASK) << FSI_SMODE_SID_SHIFT;
}
static uint32_t fsi_slave_smode(int id, u8 t_senddly, u8 t_echodly)
{
return FSI_SMODE_WSC | FSI_SMODE_ECRC
| fsi_smode_sid(id)
| fsi_smode_echodly(t_echodly - 1) | fsi_smode_senddly(t_senddly - 1)
| fsi_smode_lbcrr(0x8);
}
static int fsi_slave_set_smode(struct fsi_slave *slave)
{
uint32_t smode;
__be32 data;
/* set our smode register with the slave ID field to 0; this enables
* extended slave addressing
*/
smode = fsi_slave_smode(slave->id, slave->t_send_delay, slave->t_echo_delay);
data = cpu_to_be32(smode);
return fsi_master_write(slave->master, slave->link, slave->id,
FSI_SLAVE_BASE + FSI_SMODE,
&data, sizeof(data));
}
static int fsi_slave_handle_error(struct fsi_slave *slave, bool write, static int fsi_slave_handle_error(struct fsi_slave *slave, bool write,
uint32_t addr, size_t size) uint32_t addr, size_t size)
...@@ -223,7 +271,7 @@ static int fsi_slave_handle_error(struct fsi_slave *slave, bool write, ...@@ -223,7 +271,7 @@ static int fsi_slave_handle_error(struct fsi_slave *slave, bool write,
struct fsi_master *master = slave->master; struct fsi_master *master = slave->master;
int rc, link; int rc, link;
uint32_t reg; uint32_t reg;
uint8_t id; uint8_t id, send_delay, echo_delay;
if (discard_errors) if (discard_errors)
return -1; return -1;
...@@ -254,15 +302,26 @@ static int fsi_slave_handle_error(struct fsi_slave *slave, bool write, ...@@ -254,15 +302,26 @@ static int fsi_slave_handle_error(struct fsi_slave *slave, bool write,
} }
} }
send_delay = slave->t_send_delay;
echo_delay = slave->t_echo_delay;
/* getting serious, reset the slave via BREAK */ /* getting serious, reset the slave via BREAK */
rc = fsi_master_break(master, link); rc = fsi_master_break(master, link);
if (rc) if (rc)
return rc; return rc;
rc = fsi_slave_set_smode(master, link, id); slave->t_send_delay = send_delay;
slave->t_echo_delay = echo_delay;
rc = fsi_slave_set_smode(slave);
if (rc) if (rc)
return rc; return rc;
if (master->link_config)
master->link_config(master, link,
slave->t_send_delay,
slave->t_echo_delay);
return fsi_slave_report_and_clear_errors(slave); return fsi_slave_report_and_clear_errors(slave);
} }
...@@ -390,7 +449,6 @@ static struct device_node *fsi_device_find_of_node(struct fsi_device *dev) ...@@ -390,7 +449,6 @@ static struct device_node *fsi_device_find_of_node(struct fsi_device *dev)
static int fsi_slave_scan(struct fsi_slave *slave) static int fsi_slave_scan(struct fsi_slave *slave)
{ {
uint32_t engine_addr; uint32_t engine_addr;
uint32_t conf;
int rc, i; int rc, i;
/* /*
...@@ -404,15 +462,17 @@ static int fsi_slave_scan(struct fsi_slave *slave) ...@@ -404,15 +462,17 @@ static int fsi_slave_scan(struct fsi_slave *slave)
for (i = 2; i < engine_page_size / sizeof(uint32_t); i++) { for (i = 2; i < engine_page_size / sizeof(uint32_t); i++) {
uint8_t slots, version, type, crc; uint8_t slots, version, type, crc;
struct fsi_device *dev; struct fsi_device *dev;
uint32_t conf;
__be32 data;
rc = fsi_slave_read(slave, (i + 1) * sizeof(conf), rc = fsi_slave_read(slave, (i + 1) * sizeof(data),
&conf, sizeof(conf)); &data, sizeof(data));
if (rc) { if (rc) {
dev_warn(&slave->dev, dev_warn(&slave->dev,
"error reading slave registers\n"); "error reading slave registers\n");
return -1; return -1;
} }
conf = be32_to_cpu(conf); conf = be32_to_cpu(data);
crc = crc4(0, conf, 32); crc = crc4(0, conf, 32);
if (crc) { if (crc) {
...@@ -562,52 +622,6 @@ static const struct bin_attribute fsi_slave_term_attr = { ...@@ -562,52 +622,6 @@ static const struct bin_attribute fsi_slave_term_attr = {
.write = fsi_slave_sysfs_term_write, .write = fsi_slave_sysfs_term_write,
}; };
/* Encode slave local bus echo delay */
static inline uint32_t fsi_smode_echodly(int x)
{
return (x & FSI_SMODE_ED_MASK) << FSI_SMODE_ED_SHIFT;
}
/* Encode slave local bus send delay */
static inline uint32_t fsi_smode_senddly(int x)
{
return (x & FSI_SMODE_SD_MASK) << FSI_SMODE_SD_SHIFT;
}
/* Encode slave local bus clock rate ratio */
static inline uint32_t fsi_smode_lbcrr(int x)
{
return (x & FSI_SMODE_LBCRR_MASK) << FSI_SMODE_LBCRR_SHIFT;
}
/* Encode slave ID */
static inline uint32_t fsi_smode_sid(int x)
{
return (x & FSI_SMODE_SID_MASK) << FSI_SMODE_SID_SHIFT;
}
static uint32_t fsi_slave_smode(int id)
{
return FSI_SMODE_WSC | FSI_SMODE_ECRC
| fsi_smode_sid(id)
| fsi_smode_echodly(0xf) | fsi_smode_senddly(0xf)
| fsi_smode_lbcrr(0x8);
}
static int fsi_slave_set_smode(struct fsi_master *master, int link, int id)
{
uint32_t smode;
/* set our smode register with the slave ID field to 0; this enables
* extended slave addressing
*/
smode = fsi_slave_smode(id);
smode = cpu_to_be32(smode);
return fsi_master_write(master, link, id, FSI_SLAVE_BASE + FSI_SMODE,
&smode, sizeof(smode));
}
static void fsi_slave_release(struct device *dev) static void fsi_slave_release(struct device *dev)
{ {
struct fsi_slave *slave = to_fsi_slave(dev); struct fsi_slave *slave = to_fsi_slave(dev);
...@@ -659,11 +673,56 @@ static struct device_node *fsi_slave_find_of_node(struct fsi_master *master, ...@@ -659,11 +673,56 @@ static struct device_node *fsi_slave_find_of_node(struct fsi_master *master,
return NULL; return NULL;
} }
static ssize_t slave_send_echo_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct fsi_slave *slave = to_fsi_slave(dev);
return sprintf(buf, "%u\n", slave->t_send_delay);
}
static ssize_t slave_send_echo_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
struct fsi_slave *slave = to_fsi_slave(dev);
struct fsi_master *master = slave->master;
unsigned long val;
int rc;
if (kstrtoul(buf, 0, &val) < 0)
return -EINVAL;
if (val < 1 || val > 16)
return -EINVAL;
if (!master->link_config)
return -ENXIO;
/* Current HW mandates that send and echo delay are identical */
slave->t_send_delay = val;
slave->t_echo_delay = val;
rc = fsi_slave_set_smode(slave);
if (rc < 0)
return rc;
if (master->link_config)
master->link_config(master, slave->link,
slave->t_send_delay,
slave->t_echo_delay);
return count;
}
static DEVICE_ATTR(send_echo_delays, 0600,
slave_send_echo_show, slave_send_echo_store);
static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
{ {
uint32_t chip_id, llmode; uint32_t chip_id;
struct fsi_slave *slave; struct fsi_slave *slave;
uint8_t crc; uint8_t crc;
__be32 data, llmode;
int rc; int rc;
/* Currently, we only support single slaves on a link, and use the /* Currently, we only support single slaves on a link, and use the
...@@ -672,13 +731,13 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) ...@@ -672,13 +731,13 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
if (id != 0) if (id != 0)
return -EINVAL; return -EINVAL;
rc = fsi_master_read(master, link, id, 0, &chip_id, sizeof(chip_id)); rc = fsi_master_read(master, link, id, 0, &data, sizeof(data));
if (rc) { if (rc) {
dev_dbg(&master->dev, "can't read slave %02x:%02x %d\n", dev_dbg(&master->dev, "can't read slave %02x:%02x %d\n",
link, id, rc); link, id, rc);
return -ENODEV; return -ENODEV;
} }
chip_id = be32_to_cpu(chip_id); chip_id = be32_to_cpu(data);
crc = crc4(0, chip_id, 32); crc = crc4(0, chip_id, 32);
if (crc) { if (crc) {
...@@ -690,14 +749,6 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) ...@@ -690,14 +749,6 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
dev_dbg(&master->dev, "fsi: found chip %08x at %02x:%02x:%02x\n", dev_dbg(&master->dev, "fsi: found chip %08x at %02x:%02x:%02x\n",
chip_id, master->idx, link, id); chip_id, master->idx, link, id);
rc = fsi_slave_set_smode(master, link, id);
if (rc) {
dev_warn(&master->dev,
"can't set smode on slave:%02x:%02x %d\n",
link, id, rc);
return -ENODEV;
}
/* If we're behind a master that doesn't provide a self-running bus /* If we're behind a master that doesn't provide a self-running bus
* clock, put the slave into async mode * clock, put the slave into async mode
*/ */
...@@ -726,6 +777,21 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) ...@@ -726,6 +777,21 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
slave->link = link; slave->link = link;
slave->id = id; slave->id = id;
slave->size = FSI_SLAVE_SIZE_23b; slave->size = FSI_SLAVE_SIZE_23b;
slave->t_send_delay = 16;
slave->t_echo_delay = 16;
rc = fsi_slave_set_smode(slave);
if (rc) {
dev_warn(&master->dev,
"can't set smode on slave:%02x:%02x %d\n",
link, id, rc);
kfree(slave);
return -ENODEV;
}
if (master->link_config)
master->link_config(master, link,
slave->t_send_delay,
slave->t_echo_delay);
dev_set_name(&slave->dev, "slave@%02x:%02x", link, id); dev_set_name(&slave->dev, "slave@%02x:%02x", link, id);
rc = device_register(&slave->dev); rc = device_register(&slave->dev);
...@@ -744,6 +810,10 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) ...@@ -744,6 +810,10 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
if (rc) if (rc)
dev_warn(&slave->dev, "failed to create term attr: %d\n", rc); dev_warn(&slave->dev, "failed to create term attr: %d\n", rc);
rc = device_create_file(&slave->dev, &dev_attr_send_echo_delays);
if (rc)
dev_warn(&slave->dev, "failed to create delay attr: %d\n", rc);
rc = fsi_slave_scan(slave); rc = fsi_slave_scan(slave);
if (rc) if (rc)
dev_dbg(&master->dev, "failed during slave scan with: %d\n", dev_dbg(&master->dev, "failed during slave scan with: %d\n",
...@@ -814,12 +884,16 @@ static int fsi_master_link_enable(struct fsi_master *master, int link) ...@@ -814,12 +884,16 @@ static int fsi_master_link_enable(struct fsi_master *master, int link)
*/ */
static int fsi_master_break(struct fsi_master *master, int link) static int fsi_master_break(struct fsi_master *master, int link)
{ {
int rc = 0;
trace_fsi_master_break(master, link); trace_fsi_master_break(master, link);
if (master->send_break) if (master->send_break)
return master->send_break(master, link); rc = master->send_break(master, link);
if (master->link_config)
master->link_config(master, link, 16, 16);
return 0; return rc;
} }
static int fsi_master_scan(struct fsi_master *master) static int fsi_master_scan(struct fsi_master *master)
...@@ -903,9 +977,6 @@ int fsi_master_register(struct fsi_master *master) ...@@ -903,9 +977,6 @@ int fsi_master_register(struct fsi_master *master)
int rc; int rc;
struct device_node *np; struct device_node *np;
if (!master)
return -EINVAL;
master->idx = ida_simple_get(&master_ida, 0, INT_MAX, GFP_KERNEL); master->idx = ida_simple_get(&master_ida, 0, INT_MAX, GFP_KERNEL);
dev_set_name(&master->dev, "fsi%d", master->idx); dev_set_name(&master->dev, "fsi%d", master->idx);
...@@ -917,14 +988,14 @@ int fsi_master_register(struct fsi_master *master) ...@@ -917,14 +988,14 @@ int fsi_master_register(struct fsi_master *master)
rc = device_create_file(&master->dev, &dev_attr_rescan); rc = device_create_file(&master->dev, &dev_attr_rescan);
if (rc) { if (rc) {
device_unregister(&master->dev); device_del(&master->dev);
ida_simple_remove(&master_ida, master->idx); ida_simple_remove(&master_ida, master->idx);
return rc; return rc;
} }
rc = device_create_file(&master->dev, &dev_attr_break); rc = device_create_file(&master->dev, &dev_attr_break);
if (rc) { if (rc) {
device_unregister(&master->dev); device_del(&master->dev);
ida_simple_remove(&master_ida, master->idx); ida_simple_remove(&master_ida, master->idx);
return rc; return rc;
} }
......
This diff is collapsed.
...@@ -122,7 +122,8 @@ static int hub_master_write(struct fsi_master *master, int link, ...@@ -122,7 +122,8 @@ static int hub_master_write(struct fsi_master *master, int link,
static int hub_master_break(struct fsi_master *master, int link) static int hub_master_break(struct fsi_master *master, int link)
{ {
uint32_t addr, cmd; uint32_t addr;
__be32 cmd;
addr = 0x4; addr = 0x4;
cmd = cpu_to_be32(0xc0de0000); cmd = cpu_to_be32(0xc0de0000);
...@@ -205,7 +206,7 @@ static int hub_master_init(struct fsi_master_hub *hub) ...@@ -205,7 +206,7 @@ static int hub_master_init(struct fsi_master_hub *hub)
if (rc) if (rc)
return rc; return rc;
reg = ~0; reg = cpu_to_be32(~0);
rc = fsi_device_write(dev, FSI_MSENP0, &reg, sizeof(reg)); rc = fsi_device_write(dev, FSI_MSENP0, &reg, sizeof(reg));
if (rc) if (rc)
return rc; return rc;
......
...@@ -19,6 +19,39 @@ ...@@ -19,6 +19,39 @@
#include <linux/device.h> #include <linux/device.h>
/* Various protocol delays */
#define FSI_ECHO_DELAY_CLOCKS 16 /* Number clocks for echo delay */
#define FSI_SEND_DELAY_CLOCKS 16 /* Number clocks for send delay */
#define FSI_PRE_BREAK_CLOCKS 50 /* Number clocks to prep for break */
#define FSI_BREAK_CLOCKS 256 /* Number of clocks to issue break */
#define FSI_POST_BREAK_CLOCKS 16000 /* Number clocks to set up cfam */
#define FSI_INIT_CLOCKS 5000 /* Clock out any old data */
#define FSI_MASTER_DPOLL_CLOCKS 50 /* < 21 will cause slave to hang */
#define FSI_MASTER_EPOLL_CLOCKS 50 /* Number of clocks for E_POLL retry */
/* Various retry maximums */
#define FSI_CRC_ERR_RETRIES 10
#define FSI_MASTER_MAX_BUSY 200
#define FSI_MASTER_MTOE_COUNT 1000
/* Command encodings */
#define FSI_CMD_DPOLL 0x2
#define FSI_CMD_EPOLL 0x3
#define FSI_CMD_TERM 0x3f
#define FSI_CMD_ABS_AR 0x4
#define FSI_CMD_REL_AR 0x5
#define FSI_CMD_SAME_AR 0x3 /* but only a 2-bit opcode... */
/* Slave responses */
#define FSI_RESP_ACK 0 /* Success */
#define FSI_RESP_BUSY 1 /* Slave busy */
#define FSI_RESP_ERRA 2 /* Any (misc) Error */
#define FSI_RESP_ERRC 3 /* Slave reports master CRC error */
/* Misc */
#define FSI_CRC_SIZE 4
/* fsi-master definition and flags */
#define FSI_MASTER_FLAG_SWCLOCK 0x1 #define FSI_MASTER_FLAG_SWCLOCK 0x1
struct fsi_master { struct fsi_master {
...@@ -33,6 +66,8 @@ struct fsi_master { ...@@ -33,6 +66,8 @@ struct fsi_master {
int (*term)(struct fsi_master *, int link, uint8_t id); int (*term)(struct fsi_master *, int link, uint8_t id);
int (*send_break)(struct fsi_master *, int link); int (*send_break)(struct fsi_master *, int link);
int (*link_enable)(struct fsi_master *, int link); int (*link_enable)(struct fsi_master *, int link);
int (*link_config)(struct fsi_master *, int link,
u8 t_send_delay, u8 t_echo_delay);
}; };
#define dev_to_fsi_master(d) container_of(d, struct fsi_master, dev) #define dev_to_fsi_master(d) container_of(d, struct fsi_master, dev)
......
...@@ -194,6 +194,7 @@ static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc, ...@@ -194,6 +194,7 @@ static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
} }
dev_warn(dev, "+-------------------------------------------+\n"); dev_warn(dev, "+-------------------------------------------+\n");
} }
mutex_unlock(&sbefifo_ffdc_mutex);
} }
int sbefifo_parse_status(struct device *dev, u16 cmd, __be32 *response, int sbefifo_parse_status(struct device *dev, u16 cmd, __be32 *response,
...@@ -519,9 +520,10 @@ static int sbefifo_send_command(struct sbefifo *sbefifo, ...@@ -519,9 +520,10 @@ static int sbefifo_send_command(struct sbefifo *sbefifo,
static int sbefifo_read_response(struct sbefifo *sbefifo, struct iov_iter *response) static int sbefifo_read_response(struct sbefifo *sbefifo, struct iov_iter *response)
{ {
struct device *dev = &sbefifo->fsi_dev->dev; struct device *dev = &sbefifo->fsi_dev->dev;
u32 data, status, eot_set; u32 status, eot_set;
unsigned long timeout; unsigned long timeout;
bool overflow = false; bool overflow = false;
__be32 data;
size_t len; size_t len;
int rc; int rc;
...@@ -619,7 +621,7 @@ static void sbefifo_collect_async_ffdc(struct sbefifo *sbefifo) ...@@ -619,7 +621,7 @@ static void sbefifo_collect_async_ffdc(struct sbefifo *sbefifo)
struct kvec ffdc_iov; struct kvec ffdc_iov;
__be32 *ffdc; __be32 *ffdc;
size_t ffdc_sz; size_t ffdc_sz;
u32 cmd[2]; __be32 cmd[2];
int rc; int rc;
sbefifo->async_ffdc = false; sbefifo->async_ffdc = false;
...@@ -629,7 +631,7 @@ static void sbefifo_collect_async_ffdc(struct sbefifo *sbefifo) ...@@ -629,7 +631,7 @@ static void sbefifo_collect_async_ffdc(struct sbefifo *sbefifo)
return; return;
} }
ffdc_iov.iov_base = ffdc; ffdc_iov.iov_base = ffdc;
ffdc_iov.iov_len = SBEFIFO_MAX_FFDC_SIZE;; ffdc_iov.iov_len = SBEFIFO_MAX_FFDC_SIZE;
iov_iter_kvec(&ffdc_iter, WRITE | ITER_KVEC, &ffdc_iov, 1, SBEFIFO_MAX_FFDC_SIZE); iov_iter_kvec(&ffdc_iter, WRITE | ITER_KVEC, &ffdc_iov, 1, SBEFIFO_MAX_FFDC_SIZE);
cmd[0] = cpu_to_be32(2); cmd[0] = cpu_to_be32(2);
cmd[1] = cpu_to_be32(SBEFIFO_CMD_GET_SBE_FFDC); cmd[1] = cpu_to_be32(SBEFIFO_CMD_GET_SBE_FFDC);
...@@ -704,13 +706,16 @@ static int __sbefifo_submit(struct sbefifo *sbefifo, ...@@ -704,13 +706,16 @@ static int __sbefifo_submit(struct sbefifo *sbefifo,
int sbefifo_submit(struct device *dev, const __be32 *command, size_t cmd_len, int sbefifo_submit(struct device *dev, const __be32 *command, size_t cmd_len,
__be32 *response, size_t *resp_len) __be32 *response, size_t *resp_len)
{ {
struct sbefifo *sbefifo = dev_get_drvdata(dev); struct sbefifo *sbefifo;
struct iov_iter resp_iter; struct iov_iter resp_iter;
struct kvec resp_iov; struct kvec resp_iov;
size_t rbytes; size_t rbytes;
int rc; int rc;
if (!dev || !sbefifo) if (!dev)
return -ENODEV;
sbefifo = dev_get_drvdata(dev);
if (!sbefifo)
return -ENODEV; return -ENODEV;
if (WARN_ON_ONCE(sbefifo->magic != SBEFIFO_MAGIC)) if (WARN_ON_ONCE(sbefifo->magic != SBEFIFO_MAGIC))
return -ENODEV; return -ENODEV;
......
This diff is collapsed.
...@@ -50,6 +50,22 @@ TRACE_EVENT(fsi_master_gpio_out, ...@@ -50,6 +50,22 @@ TRACE_EVENT(fsi_master_gpio_out,
) )
); );
TRACE_EVENT(fsi_master_gpio_clock_zeros,
TP_PROTO(const struct fsi_master_gpio *master, int clocks),
TP_ARGS(master, clocks),
TP_STRUCT__entry(
__field(int, master_idx)
__field(int, clocks)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->clocks = clocks;
),
TP_printk("fsi-gpio%d clock %d zeros",
__entry->master_idx, __entry->clocks
)
);
TRACE_EVENT(fsi_master_gpio_break, TRACE_EVENT(fsi_master_gpio_break,
TP_PROTO(const struct fsi_master_gpio *master), TP_PROTO(const struct fsi_master_gpio *master),
TP_ARGS(master), TP_ARGS(master),
...@@ -107,6 +123,49 @@ TRACE_EVENT(fsi_master_gpio_poll_response_busy, ...@@ -107,6 +123,49 @@ TRACE_EVENT(fsi_master_gpio_poll_response_busy,
__entry->master_idx, __entry->busy) __entry->master_idx, __entry->busy)
); );
TRACE_EVENT(fsi_master_gpio_cmd_abs_addr,
TP_PROTO(const struct fsi_master_gpio *master, u32 addr),
TP_ARGS(master, addr),
TP_STRUCT__entry(
__field(int, master_idx)
__field(u32, addr)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->addr = addr;
),
TP_printk("fsi-gpio%d: Sending ABS_ADR %06x",
__entry->master_idx, __entry->addr)
);
TRACE_EVENT(fsi_master_gpio_cmd_rel_addr,
TP_PROTO(const struct fsi_master_gpio *master, u32 rel_addr),
TP_ARGS(master, rel_addr),
TP_STRUCT__entry(
__field(int, master_idx)
__field(u32, rel_addr)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->rel_addr = rel_addr;
),
TP_printk("fsi-gpio%d: Sending REL_ADR %03x",
__entry->master_idx, __entry->rel_addr)
);
TRACE_EVENT(fsi_master_gpio_cmd_same_addr,
TP_PROTO(const struct fsi_master_gpio *master),
TP_ARGS(master),
TP_STRUCT__entry(
__field(int, master_idx)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
),
TP_printk("fsi-gpio%d: Sending SAME_ADR",
__entry->master_idx)
);
#endif /* _TRACE_FSI_MASTER_GPIO_H */ #endif /* _TRACE_FSI_MASTER_GPIO_H */
#include <trace/define_trace.h> #include <trace/define_trace.h>
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
#ifndef _UAPI_LINUX_FSI_H
#define _UAPI_LINUX_FSI_H
#include <linux/types.h>
#include <linux/ioctl.h>
/*
* /dev/scom "raw" ioctl interface
*
* The driver supports a high level "read/write" interface which
* handles retries and converts the status to Linux error codes,
* however low level tools an debugger need to access the "raw"
* HW status information and interpret it themselves, so this
* ioctl interface is also provided for their use case.
*/
/* Structure for SCOM read/write */
struct scom_access {
__u64 addr; /* SCOM address, supports indirect */
__u64 data; /* SCOM data (in for write, out for read) */
__u64 mask; /* Data mask for writes */
__u32 intf_errors; /* Interface error flags */
#define SCOM_INTF_ERR_PARITY 0x00000001 /* Parity error */
#define SCOM_INTF_ERR_PROTECTION 0x00000002 /* Blocked by secure boot */
#define SCOM_INTF_ERR_ABORT 0x00000004 /* PIB reset during access */
#define SCOM_INTF_ERR_UNKNOWN 0x80000000 /* Unknown error */
/*
* Note: Any other bit set in intf_errors need to be considered as an
* error. Future implementations may define new error conditions. The
* pib_status below is only valid if intf_errors is 0.
*/
__u8 pib_status; /* 3-bit PIB status */
#define SCOM_PIB_SUCCESS 0 /* Access successful */
#define SCOM_PIB_BLOCKED 1 /* PIB blocked, pls retry */
#define SCOM_PIB_OFFLINE 2 /* Chiplet offline */
#define SCOM_PIB_PARTIAL 3 /* Partial good */
#define SCOM_PIB_BAD_ADDR 4 /* Invalid address */
#define SCOM_PIB_CLK_ERR 5 /* Clock error */
#define SCOM_PIB_PARITY_ERR 6 /* Parity error on the PIB bus */
#define SCOM_PIB_TIMEOUT 7 /* Bus timeout */
__u8 pad;
};
/* Flags for SCOM check */
#define SCOM_CHECK_SUPPORTED 0x00000001 /* Interface supported */
#define SCOM_CHECK_PROTECTED 0x00000002 /* Interface blocked by secure boot */
/* Flags for SCOM reset */
#define SCOM_RESET_INTF 0x00000001 /* Reset interface */
#define SCOM_RESET_PIB 0x00000002 /* Reset PIB */
#define FSI_SCOM_CHECK _IOR('s', 0x00, __u32)
#define FSI_SCOM_READ _IOWR('s', 0x01, struct scom_access)
#define FSI_SCOM_WRITE _IOWR('s', 0x02, struct scom_access)
#define FSI_SCOM_RESET _IOW('s', 0x03, __u32)
#endif /* _UAPI_LINUX_FSI_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment