public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

FSI updates and sbefifo driver

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJbH6SnAAoJEHM62YSLdExedR8QAJv3sgmXFgBzOjFG+hYthoMP
 g6oID+ro0jegh+XcPfxsUS/cRO5EpLnl3x1HhPmt1JU3m/RXh18InjZM4nzMKaeQ
 WiHgEGI9iMMEscnGelm8QsBQtoTvMJfzoaCoBXvY4EzONqmQqD/2IsJUwroojrnJ
 +RxVBlLNb+GkAkfkXY+ZgEQUwcKaSTCnLhYuy4d1ICJJPlXZKOfB1YjiS8/v6zLd
 pWPHK8D4JDjsEbwT5VFyuirNQJU1kax3cFE5RrlYQCrCa55tGyjpZhTeysQdQkbu
 KQrTNh/wiOTaZ/vVUjquGUCjcInemCnOcm4SiLGu5UXMOtNM2nrRwzWOuKMV0QHO
 TgiTzTflIE1q/JzHIGQjQLD5BHMI2ZNEhyfuFXHoQ858AlhVqoWIgmGCaZuIFFhu
 HtGE19u5q5V70HaqOyWhWMu7sfpKheBVNuhNuuWJmErOIGJnTGrZHJ3cfotIi5It
 5yCpWSQjZfs0M+Hp7OzaC7vNf0yQbmrEF2hSBobeZxvEcyWic/Sn/An5Ba3aJP+L
 FNtg3uUKZY6SXF7ISe6J2d71DeedC2815VLM9rocxJdQcDCT9zgHpfYlaIsB/aZc
 KwctVb8kdtqlsyD546X6ig2xBxd4Dm3wfcE3q4+mVmdznDOEjlrHyD0ztsrorP6T
 8FA1RAja/2zUrp+JTSip
 =vCVu
 -----END PGP SIGNATURE-----

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

Ben writes:

FSI updates and sbefifo driver
This commit is contained in:
Greg Kroah-Hartman 2018-07-07 17:02:35 +02:00
commit 5c74f27bf6
10 changed files with 1365 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
View file

@ -52,6 +52,7 @@
compatible = "fsi-master-gpio", "fsi-master"; compatible = "fsi-master-gpio", "fsi-master";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
no-gpio-delays;
clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>; data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;

1
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
View file

@ -153,6 +153,7 @@
compatible = "fsi-master-gpio", "fsi-master"; compatible = "fsi-master-gpio", "fsi-master";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
no-gpio-delays;
clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
data-gpios = <&gpio ASPEED_GPIO(E, 0) GPIO_ACTIVE_HIGH>; data-gpios = <&gpio ASPEED_GPIO(E, 0) GPIO_ACTIVE_HIGH>;

1
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
View file

@ -91,6 +91,7 @@
compatible = "fsi-master-gpio", "fsi-master"; compatible = "fsi-master-gpio", "fsi-master";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
no-gpio-delays;
trans-gpios = <&gpio ASPEED_GPIO(O, 6) GPIO_ACTIVE_HIGH>; trans-gpios = <&gpio ASPEED_GPIO(O, 6) GPIO_ACTIVE_HIGH>;
enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>;

7
drivers/fsi/Kconfig
View file

@ -32,4 +32,11 @@ config FSI_SCOM
---help--- ---help---
This option enables an FSI based SCOM device driver. This option enables an FSI based SCOM device driver.
config FSI_SBEFIFO
tristate "SBEFIFO FSI client device driver"
---help---
This option enables an FSI based SBEFIFO device driver. The SBEFIFO is
a pipe-like FSI device for communicating with the self boot engine
(SBE) on POWER processors.
endif endif

1
drivers/fsi/Makefile
View file

@ -3,3 +3,4 @@ obj-$(CONFIG_FSI) += fsi-core.o
obj-$(CONFIG_FSI_MASTER_HUB) += fsi-master-hub.o obj-$(CONFIG_FSI_MASTER_HUB) += fsi-master-hub.o
obj-$(CONFIG_FSI_MASTER_GPIO) += fsi-master-gpio.o obj-$(CONFIG_FSI_MASTER_GPIO) += fsi-master-gpio.o
obj-$(CONFIG_FSI_SCOM) += fsi-scom.o obj-$(CONFIG_FSI_SCOM) += fsi-scom.o
obj-$(CONFIG_FSI_SBEFIFO) += fsi-sbefifo.o

355
drivers/fsi/fsi-master-gpio.c
View file

@ -8,11 +8,11 @@
#include <linux/fsi.h> #include <linux/fsi.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqflags.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h>
#include "fsi-master.h" #include "fsi-master.h"
@ -22,45 +22,48 @@
#define FSI_BREAK_CLOCKS 256 /* Number of clocks to issue 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_POST_BREAK_CLOCKS 16000 /* Number clocks to set up cfam */
#define FSI_INIT_CLOCKS 5000 /* Clock out any old data */ #define FSI_INIT_CLOCKS 5000 /* Clock out any old data */
#define FSI_GPIO_DPOLL_CLOCKS 50 /* < 21 will cause slave to hang */
#define FSI_GPIO_EPOLL_CLOCKS 50 /* Number of clocks for E_POLL retry */
#define FSI_GPIO_STD_DELAY 10 /* Standard GPIO delay in nS */ #define FSI_GPIO_STD_DELAY 10 /* Standard GPIO delay in nS */
/* todo: adjust down as low as */ /* todo: adjust down as low as */
/* possible or eliminate */ /* possible or eliminate */
#define FSI_CRC_ERR_RETRIES 10
#define FSI_GPIO_CMD_DPOLL 0x2 #define FSI_GPIO_CMD_DPOLL 0x2
#define FSI_GPIO_CMD_EPOLL 0x3
#define FSI_GPIO_CMD_TERM 0x3f #define FSI_GPIO_CMD_TERM 0x3f
#define FSI_GPIO_CMD_ABS_AR 0x4 #define FSI_GPIO_CMD_ABS_AR 0x4
#define FSI_GPIO_CMD_REL_AR 0x5
#define FSI_GPIO_CMD_SAME_AR 0x3 /* but only a 2-bit opcode... */
#define FSI_GPIO_DPOLL_CLOCKS 100 /* < 21 will cause slave to hang */ /* Slave responses */
#define FSI_GPIO_RESP_ACK 0 /* Success */
/* Bus errors */ #define FSI_GPIO_RESP_BUSY 1 /* Slave busy */
#define FSI_GPIO_ERR_BUSY 1 /* Slave stuck in busy state */
#define FSI_GPIO_RESP_ERRA 2 /* Any (misc) Error */ #define FSI_GPIO_RESP_ERRA 2 /* Any (misc) Error */
#define FSI_GPIO_RESP_ERRC 3 /* Slave reports master CRC error */ #define FSI_GPIO_RESP_ERRC 3 /* Slave reports master CRC error */
#define FSI_GPIO_MTOE 4 /* Master time out error */
#define FSI_GPIO_CRC_INVAL 5 /* Master reports slave CRC error */
/* Normal slave responses */ #define FSI_GPIO_MAX_BUSY 200
#define FSI_GPIO_RESP_BUSY 1
#define FSI_GPIO_RESP_ACK 0
#define FSI_GPIO_RESP_ACKD 4
#define FSI_GPIO_MAX_BUSY 100
#define FSI_GPIO_MTOE_COUNT 1000 #define FSI_GPIO_MTOE_COUNT 1000
#define FSI_GPIO_DRAIN_BITS 20 #define FSI_GPIO_DRAIN_BITS 20
#define FSI_GPIO_CRC_SIZE 4 #define FSI_GPIO_CRC_SIZE 4
#define FSI_GPIO_MSG_ID_SIZE 2 #define FSI_GPIO_MSG_ID_SIZE 2
#define FSI_GPIO_MSG_RESPID_SIZE 2 #define FSI_GPIO_MSG_RESPID_SIZE 2
#define FSI_GPIO_PRIME_SLAVE_CLOCKS 100 #define FSI_GPIO_PRIME_SLAVE_CLOCKS 20
#define LAST_ADDR_INVALID 0x1
struct fsi_master_gpio { struct fsi_master_gpio {
struct fsi_master master; struct fsi_master master;
struct device *dev; struct device *dev;
spinlock_t cmd_lock; /* Lock for commands */ struct mutex cmd_lock; /* mutex for command ordering */
struct gpio_desc *gpio_clk; struct gpio_desc *gpio_clk;
struct gpio_desc *gpio_data; struct gpio_desc *gpio_data;
struct gpio_desc *gpio_trans; /* Voltage translator */ struct gpio_desc *gpio_trans; /* Voltage translator */
struct gpio_desc *gpio_enable; /* FSI enable */ struct gpio_desc *gpio_enable; /* FSI enable */
struct gpio_desc *gpio_mux; /* Mux control */ struct gpio_desc *gpio_mux; /* Mux control */
bool external_mode; bool external_mode;
bool no_delays;
uint32_t last_addr;
}; };
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
@ -78,19 +81,31 @@ static void clock_toggle(struct fsi_master_gpio *master, int count)
int i; int i;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
ndelay(FSI_GPIO_STD_DLY); if (!master->no_delays)
ndelay(FSI_GPIO_STD_DLY);
gpiod_set_value(master->gpio_clk, 0); gpiod_set_value(master->gpio_clk, 0);
ndelay(FSI_GPIO_STD_DLY); if (!master->no_delays)
ndelay(FSI_GPIO_STD_DLY);
gpiod_set_value(master->gpio_clk, 1); gpiod_set_value(master->gpio_clk, 1);
} }
} }
static int sda_in(struct fsi_master_gpio *master) static int sda_clock_in(struct fsi_master_gpio *master)
{ {
int in; int in;
ndelay(FSI_GPIO_STD_DLY); if (!master->no_delays)
ndelay(FSI_GPIO_STD_DLY);
gpiod_set_value(master->gpio_clk, 0);
/* Dummy read to feed the synchronizers */
gpiod_get_value(master->gpio_data);
/* Actual data read */
in = gpiod_get_value(master->gpio_data); in = gpiod_get_value(master->gpio_data);
if (!master->no_delays)
ndelay(FSI_GPIO_STD_DLY);
gpiod_set_value(master->gpio_clk, 1);
return in ? 1 : 0; return in ? 1 : 0;
} }
@ -125,8 +140,7 @@ static void serial_in(struct fsi_master_gpio *master, struct fsi_gpio_msg *msg,
set_sda_input(master); set_sda_input(master);
for (bit = 0; bit < num_bits; bit++) { for (bit = 0; bit < num_bits; bit++) {
clock_toggle(master, 1); in_bit = sda_clock_in(master);
in_bit = sda_in(master);
msg->msg <<= 1; msg->msg <<= 1;
msg->msg |= ~in_bit & 0x1; /* Data is active low */ msg->msg |= ~in_bit & 0x1; /* Data is active low */
} }
@ -191,22 +205,89 @@ static void msg_push_crc(struct fsi_gpio_msg *msg)
msg_push_bits(msg, crc, 4); msg_push_bits(msg, crc, 4);
} }
/* static bool check_same_address(struct fsi_master_gpio *master, int id,
* Encode an Absolute Address command uint32_t addr)
*/
static void build_abs_ar_command(struct fsi_gpio_msg *cmd,
uint8_t id, uint32_t addr, size_t size, const void *data)
{ {
/* this will also handle LAST_ADDR_INVALID */
return master->last_addr == (((id & 0x3) << 21) | (addr & ~0x3));
}
static bool check_relative_address(struct fsi_master_gpio *master, int id,
uint32_t addr, uint32_t *rel_addrp)
{
uint32_t last_addr = master->last_addr;
int32_t rel_addr;
if (last_addr == LAST_ADDR_INVALID)
return false;
/* We may be in 23-bit addressing mode, which uses the id as the
* top two address bits. So, if we're referencing a different ID,
* use absolute addresses.
*/
if (((last_addr >> 21) & 0x3) != id)
return false;
/* remove the top two bits from any 23-bit addressing */
last_addr &= (1 << 21) - 1;
/* We know that the addresses are limited to 21 bits, so this won't
* overflow the signed rel_addr */
rel_addr = addr - last_addr;
if (rel_addr > 255 || rel_addr < -256)
return false;
*rel_addrp = (uint32_t)rel_addr;
return true;
}
static void last_address_update(struct fsi_master_gpio *master,
int id, bool valid, uint32_t addr)
{
if (!valid)
master->last_addr = LAST_ADDR_INVALID;
else
master->last_addr = ((id & 0x3) << 21) | (addr & ~0x3);
}
/*
* Encode an Absolute/Relative/Same Address command
*/
static void build_ar_command(struct fsi_master_gpio *master,
struct fsi_gpio_msg *cmd, uint8_t id,
uint32_t addr, size_t size, const void *data)
{
int i, addr_bits, opcode_bits;
bool write = !!data; bool write = !!data;
uint8_t ds; uint8_t ds, opcode;
int i; uint32_t rel_addr;
cmd->bits = 0; cmd->bits = 0;
cmd->msg = 0; cmd->msg = 0;
msg_push_bits(cmd, id, 2); /* we have 21 bits of address max */
msg_push_bits(cmd, FSI_GPIO_CMD_ABS_AR, 3); addr &= ((1 << 21) - 1);
msg_push_bits(cmd, write ? 0 : 1, 1);
/* cmd opcodes are variable length - SAME_AR is only two bits */
opcode_bits = 3;
if (check_same_address(master, id, addr)) {
/* we still address the byte offset within the word */
addr_bits = 2;
opcode_bits = 2;
opcode = FSI_GPIO_CMD_SAME_AR;
} else if (check_relative_address(master, id, addr, &rel_addr)) {
/* 8 bits plus sign */
addr_bits = 9;
addr = rel_addr;
opcode = FSI_GPIO_CMD_REL_AR;
} else {
addr_bits = 21;
opcode = FSI_GPIO_CMD_ABS_AR;
}
/* /*
* The read/write size is encoded in the lower bits of the address * The read/write size is encoded in the lower bits of the address
@ -223,7 +304,10 @@ static void build_abs_ar_command(struct fsi_gpio_msg *cmd,
if (size == 4) if (size == 4)
addr |= 1; addr |= 1;
msg_push_bits(cmd, addr & ((1 << 21) - 1), 21); msg_push_bits(cmd, id, 2);
msg_push_bits(cmd, opcode, opcode_bits);
msg_push_bits(cmd, write ? 0 : 1, 1);
msg_push_bits(cmd, addr, addr_bits);
msg_push_bits(cmd, ds, 1); msg_push_bits(cmd, ds, 1);
for (i = 0; write && i < size; i++) for (i = 0; write && i < size; i++)
msg_push_bits(cmd, ((uint8_t *)data)[i], 8); msg_push_bits(cmd, ((uint8_t *)data)[i], 8);
@ -241,6 +325,16 @@ static void build_dpoll_command(struct fsi_gpio_msg *cmd, uint8_t slave_id)
msg_push_crc(cmd); msg_push_crc(cmd);
} }
static void build_epoll_command(struct fsi_gpio_msg *cmd, uint8_t slave_id)
{
cmd->bits = 0;
cmd->msg = 0;
msg_push_bits(cmd, slave_id, 2);
msg_push_bits(cmd, FSI_GPIO_CMD_EPOLL, 3);
msg_push_crc(cmd);
}
static void echo_delay(struct fsi_master_gpio *master) static void echo_delay(struct fsi_master_gpio *master)
{ {
set_sda_output(master, 1); set_sda_output(master, 1);
@ -258,22 +352,22 @@ static void build_term_command(struct fsi_gpio_msg *cmd, uint8_t slave_id)
} }
/* /*
* Store information on master errors so handler can detect and clean * Note: callers rely specifically on this returning -EAGAIN for
* up the bus * a CRC error detected in the response. Use other error code
* for other situations. It will be converted to something else
* higher up the stack before it reaches userspace.
*/ */
static void fsi_master_gpio_error(struct fsi_master_gpio *master, int error)
{
}
static int read_one_response(struct fsi_master_gpio *master, static int read_one_response(struct fsi_master_gpio *master,
uint8_t data_size, struct fsi_gpio_msg *msgp, uint8_t *tagp) uint8_t data_size, struct fsi_gpio_msg *msgp, uint8_t *tagp)
{ {
struct fsi_gpio_msg msg; struct fsi_gpio_msg msg;
uint8_t id, tag; unsigned long flags;
uint32_t crc; uint32_t crc;
uint8_t tag;
int i; int i;
local_irq_save(flags);
/* wait for the start bit */ /* wait for the start bit */
for (i = 0; i < FSI_GPIO_MTOE_COUNT; i++) { for (i = 0; i < FSI_GPIO_MTOE_COUNT; i++) {
msg.bits = 0; msg.bits = 0;
@ -285,8 +379,8 @@ static int read_one_response(struct fsi_master_gpio *master,
if (i == FSI_GPIO_MTOE_COUNT) { if (i == FSI_GPIO_MTOE_COUNT) {
dev_dbg(master->dev, dev_dbg(master->dev,
"Master time out waiting for response\n"); "Master time out waiting for response\n");
fsi_master_gpio_error(master, FSI_GPIO_MTOE); local_irq_restore(flags);
return -EIO; return -ETIMEDOUT;
} }
msg.bits = 0; msg.bits = 0;
@ -295,7 +389,6 @@ static int read_one_response(struct fsi_master_gpio *master,
/* Read slave ID & response tag */ /* Read slave ID & response tag */
serial_in(master, &msg, 4); serial_in(master, &msg, 4);
id = (msg.msg >> FSI_GPIO_MSG_RESPID_SIZE) & 0x3;
tag = msg.msg & 0x3; tag = msg.msg & 0x3;
/* If we have an ACK and we're expecting data, clock the data in too */ /* If we have an ACK and we're expecting data, clock the data in too */
@ -305,13 +398,18 @@ static int read_one_response(struct fsi_master_gpio *master,
/* read CRC */ /* read CRC */
serial_in(master, &msg, FSI_GPIO_CRC_SIZE); serial_in(master, &msg, FSI_GPIO_CRC_SIZE);
local_irq_restore(flags);
/* we have a whole message now; check CRC */ /* we have a whole message now; check CRC */
crc = crc4(0, 1, 1); crc = crc4(0, 1, 1);
crc = crc4(crc, msg.msg, msg.bits); crc = crc4(crc, msg.msg, msg.bits);
if (crc) { if (crc) {
dev_dbg(master->dev, "ERR response CRC\n"); /* Check if it's all 1's, that probably means the host is off */
fsi_master_gpio_error(master, FSI_GPIO_CRC_INVAL); if (((~msg.msg) & ((1ull << msg.bits) - 1)) == 0)
return -EIO; return -ENODEV;
dev_dbg(master->dev, "ERR response CRC msg: 0x%016llx (%d bits)\n",
msg.msg, msg.bits);
return -EAGAIN;
} }
if (msgp) if (msgp)
@ -325,12 +423,16 @@ static int read_one_response(struct fsi_master_gpio *master,
static int issue_term(struct fsi_master_gpio *master, uint8_t slave) static int issue_term(struct fsi_master_gpio *master, uint8_t slave)
{ {
struct fsi_gpio_msg cmd; struct fsi_gpio_msg cmd;
unsigned long flags;
uint8_t tag; uint8_t tag;
int rc; int rc;
build_term_command(&cmd, slave); build_term_command(&cmd, slave);
local_irq_save(flags);
serial_out(master, &cmd); serial_out(master, &cmd);
echo_delay(master); echo_delay(master);
local_irq_restore(flags);
rc = read_one_response(master, 0, NULL, &tag); rc = read_one_response(master, 0, NULL, &tag);
if (rc < 0) { if (rc < 0) {
@ -350,13 +452,36 @@ static int poll_for_response(struct fsi_master_gpio *master,
{ {
struct fsi_gpio_msg response, cmd; struct fsi_gpio_msg response, cmd;
int busy_count = 0, rc, i; int busy_count = 0, rc, i;
unsigned long flags;
uint8_t tag; uint8_t tag;
uint8_t *data_byte = data; uint8_t *data_byte = data;
int crc_err_retries = 0;
retry: retry:
rc = read_one_response(master, size, &response, &tag); rc = read_one_response(master, size, &response, &tag);
if (rc)
return rc; /* Handle retries on CRC errors */
if (rc == -EAGAIN) {
/* Too many retries ? */
if (crc_err_retries++ > FSI_CRC_ERR_RETRIES) {
/*
* Pass it up as a -EIO otherwise upper level will retry
* the whole command which isn't what we want here.
*/
rc = -EIO;
goto fail;
}
dev_dbg(master->dev,
"CRC error retry %d\n", crc_err_retries);
trace_fsi_master_gpio_crc_rsp_error(master);
build_epoll_command(&cmd, slave);
local_irq_save(flags);
clock_zeros(master, FSI_GPIO_EPOLL_CLOCKS);
serial_out(master, &cmd);
echo_delay(master);
local_irq_restore(flags);
goto retry;
} else if (rc)
goto fail;
switch (tag) { switch (tag) {
case FSI_GPIO_RESP_ACK: case FSI_GPIO_RESP_ACK:
@ -378,52 +503,81 @@ retry:
* d-poll, not indicated in the hardware protocol * d-poll, not indicated in the hardware protocol
* spec. < 20 clocks causes slave to hang, 21 ok. * spec. < 20 clocks causes slave to hang, 21 ok.
*/ */
clock_zeros(master, FSI_GPIO_DPOLL_CLOCKS);
if (busy_count++ < FSI_GPIO_MAX_BUSY) { if (busy_count++ < FSI_GPIO_MAX_BUSY) {
build_dpoll_command(&cmd, slave); build_dpoll_command(&cmd, slave);
local_irq_save(flags);
clock_zeros(master, FSI_GPIO_DPOLL_CLOCKS);
serial_out(master, &cmd); serial_out(master, &cmd);
echo_delay(master); echo_delay(master);
local_irq_restore(flags);
goto retry; goto retry;
} }
dev_warn(master->dev, dev_warn(master->dev,
"ERR slave is stuck in busy state, issuing TERM\n"); "ERR slave is stuck in busy state, issuing TERM\n");
local_irq_save(flags);
clock_zeros(master, FSI_GPIO_DPOLL_CLOCKS);
local_irq_restore(flags);
issue_term(master, slave); issue_term(master, slave);
rc = -EIO; rc = -EIO;
break; break;
case FSI_GPIO_RESP_ERRA: case FSI_GPIO_RESP_ERRA:
case FSI_GPIO_RESP_ERRC: dev_dbg(master->dev, "ERRA received: 0x%x\n", (int)response.msg);
dev_dbg(master->dev, "ERR%c received: 0x%x\n",
tag == FSI_GPIO_RESP_ERRA ? 'A' : 'C',
(int)response.msg);
fsi_master_gpio_error(master, response.msg);
rc = -EIO; rc = -EIO;
break; break;
case FSI_GPIO_RESP_ERRC:
dev_dbg(master->dev, "ERRC received: 0x%x\n", (int)response.msg);
trace_fsi_master_gpio_crc_cmd_error(master);
rc = -EAGAIN;
break;
} }
if (busy_count > 0)
trace_fsi_master_gpio_poll_response_busy(master, busy_count);
fail:
/* Clock the slave enough to be ready for next operation */ /* Clock the slave enough to be ready for next operation */
local_irq_save(flags);
clock_zeros(master, FSI_GPIO_PRIME_SLAVE_CLOCKS); clock_zeros(master, FSI_GPIO_PRIME_SLAVE_CLOCKS);
local_irq_restore(flags);
return rc; return rc;
} }
static int send_request(struct fsi_master_gpio *master,
struct fsi_gpio_msg *cmd)
{
unsigned long flags;
if (master->external_mode)
return -EBUSY;
local_irq_save(flags);
serial_out(master, cmd);
echo_delay(master);
local_irq_restore(flags);
return 0;
}
static int fsi_master_gpio_xfer(struct fsi_master_gpio *master, uint8_t slave, static int fsi_master_gpio_xfer(struct fsi_master_gpio *master, uint8_t slave,
struct fsi_gpio_msg *cmd, size_t resp_len, void *resp) struct fsi_gpio_msg *cmd, size_t resp_len, void *resp)
{ {
unsigned long flags; int rc = -EAGAIN, retries = 0;
int rc;
spin_lock_irqsave(&master->cmd_lock, flags); while ((retries++) < FSI_CRC_ERR_RETRIES) {
rc = send_request(master, cmd);
if (rc)
break;
rc = poll_for_response(master, slave, resp_len, resp);
if (rc != -EAGAIN)
break;
rc = -EIO;
dev_warn(master->dev, "ECRC retry %d\n", retries);
if (master->external_mode) { /* Pace it a bit before retry */
spin_unlock_irqrestore(&master->cmd_lock, flags); msleep(1);
return -EBUSY;
} }
serial_out(master, cmd);
echo_delay(master);
rc = poll_for_response(master, slave, resp_len, resp);
spin_unlock_irqrestore(&master->cmd_lock, flags);
return rc; return rc;
} }
@ -432,12 +586,18 @@ static int fsi_master_gpio_read(struct fsi_master *_master, int link,
{ {
struct fsi_master_gpio *master = to_fsi_master_gpio(_master); struct fsi_master_gpio *master = to_fsi_master_gpio(_master);
struct fsi_gpio_msg cmd; struct fsi_gpio_msg cmd;
int rc;
if (link != 0) if (link != 0)
return -ENODEV; return -ENODEV;
build_abs_ar_command(&cmd, id, addr, size, NULL); mutex_lock(&master->cmd_lock);
return fsi_master_gpio_xfer(master, id, &cmd, size, val); build_ar_command(master, &cmd, id, addr, size, NULL);
rc = fsi_master_gpio_xfer(master, id, &cmd, size, val);
last_address_update(master, id, rc == 0, addr);
mutex_unlock(&master->cmd_lock);
return rc;
} }
static int fsi_master_gpio_write(struct fsi_master *_master, int link, static int fsi_master_gpio_write(struct fsi_master *_master, int link,
@ -445,12 +605,18 @@ static int fsi_master_gpio_write(struct fsi_master *_master, int link,
{ {
struct fsi_master_gpio *master = to_fsi_master_gpio(_master); struct fsi_master_gpio *master = to_fsi_master_gpio(_master);
struct fsi_gpio_msg cmd; struct fsi_gpio_msg cmd;
int rc;
if (link != 0) if (link != 0)
return -ENODEV; return -ENODEV;
build_abs_ar_command(&cmd, id, addr, size, val); mutex_lock(&master->cmd_lock);
return fsi_master_gpio_xfer(master, id, &cmd, 0, NULL); build_ar_command(master, &cmd, id, addr, size, val);
rc = fsi_master_gpio_xfer(master, id, &cmd, 0, NULL);
last_address_update(master, id, rc == 0, addr);
mutex_unlock(&master->cmd_lock);
return rc;
} }
static int fsi_master_gpio_term(struct fsi_master *_master, static int fsi_master_gpio_term(struct fsi_master *_master,
@ -458,12 +624,18 @@ static int fsi_master_gpio_term(struct fsi_master *_master,
{ {
struct fsi_master_gpio *master = to_fsi_master_gpio(_master); struct fsi_master_gpio *master = to_fsi_master_gpio(_master);
struct fsi_gpio_msg cmd; struct fsi_gpio_msg cmd;
int rc;
if (link != 0) if (link != 0)
return -ENODEV; return -ENODEV;
mutex_lock(&master->cmd_lock);
build_term_command(&cmd, id); build_term_command(&cmd, id);
return fsi_master_gpio_xfer(master, id, &cmd, 0, NULL); rc = fsi_master_gpio_xfer(master, id, &cmd, 0, NULL);
last_address_update(master, id, false, 0);
mutex_unlock(&master->cmd_lock);
return rc;
} }
static int fsi_master_gpio_break(struct fsi_master *_master, int link) static int fsi_master_gpio_break(struct fsi_master *_master, int link)
@ -476,11 +648,14 @@ static int fsi_master_gpio_break(struct fsi_master *_master, int link)
trace_fsi_master_gpio_break(master); trace_fsi_master_gpio_break(master);
spin_lock_irqsave(&master->cmd_lock, flags); mutex_lock(&master->cmd_lock);
if (master->external_mode) { if (master->external_mode) {
spin_unlock_irqrestore(&master->cmd_lock, flags); mutex_unlock(&master->cmd_lock);
return -EBUSY; return -EBUSY;
} }
local_irq_save(flags);
set_sda_output(master, 1); set_sda_output(master, 1);
sda_out(master, 1); sda_out(master, 1);
clock_toggle(master, FSI_PRE_BREAK_CLOCKS); clock_toggle(master, FSI_PRE_BREAK_CLOCKS);
@ -489,7 +664,11 @@ static int fsi_master_gpio_break(struct fsi_master *_master, int link)
echo_delay(master); echo_delay(master);
sda_out(master, 1); sda_out(master, 1);
clock_toggle(master, FSI_POST_BREAK_CLOCKS); clock_toggle(master, FSI_POST_BREAK_CLOCKS);
spin_unlock_irqrestore(&master->cmd_lock, flags);
local_irq_restore(flags);
last_address_update(master, 0, false, 0);
mutex_unlock(&master->cmd_lock);
/* Wait for logic reset to take effect */ /* Wait for logic reset to take effect */
udelay(200); udelay(200);
@ -499,6 +678,8 @@ static int fsi_master_gpio_break(struct fsi_master *_master, int link)
static void fsi_master_gpio_init(struct fsi_master_gpio *master) static void fsi_master_gpio_init(struct fsi_master_gpio *master)
{ {
unsigned long flags;
gpiod_direction_output(master->gpio_mux, 1); gpiod_direction_output(master->gpio_mux, 1);
gpiod_direction_output(master->gpio_trans, 1); gpiod_direction_output(master->gpio_trans, 1);
gpiod_direction_output(master->gpio_enable, 1); gpiod_direction_output(master->gpio_enable, 1);
@ -506,7 +687,9 @@ static void fsi_master_gpio_init(struct fsi_master_gpio *master)
gpiod_direction_output(master->gpio_data, 1); gpiod_direction_output(master->gpio_data, 1);
/* todo: evaluate if clocks can be reduced */ /* todo: evaluate if clocks can be reduced */
local_irq_save(flags);
clock_zeros(master, FSI_INIT_CLOCKS); clock_zeros(master, FSI_INIT_CLOCKS);
local_irq_restore(flags);
} }
static void fsi_master_gpio_init_external(struct fsi_master_gpio *master) static void fsi_master_gpio_init_external(struct fsi_master_gpio *master)
@ -521,18 +704,17 @@ static void fsi_master_gpio_init_external(struct fsi_master_gpio *master)
static int fsi_master_gpio_link_enable(struct fsi_master *_master, int link) static int fsi_master_gpio_link_enable(struct fsi_master *_master, int link)
{ {
struct fsi_master_gpio *master = to_fsi_master_gpio(_master); struct fsi_master_gpio *master = to_fsi_master_gpio(_master);
unsigned long flags;
int rc = -EBUSY; int rc = -EBUSY;
if (link != 0) if (link != 0)
return -ENODEV; return -ENODEV;
spin_lock_irqsave(&master->cmd_lock, flags); mutex_lock(&master->cmd_lock);
if (!master->external_mode) { if (!master->external_mode) {
gpiod_set_value(master->gpio_enable, 1); gpiod_set_value(master->gpio_enable, 1);
rc = 0; rc = 0;
} }
spin_unlock_irqrestore(&master->cmd_lock, flags); mutex_unlock(&master->cmd_lock);
return rc; return rc;
} }
@ -550,7 +732,7 @@ static ssize_t external_mode_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr, const char *buf, size_t count)
{ {
struct fsi_master_gpio *master = dev_get_drvdata(dev); struct fsi_master_gpio *master = dev_get_drvdata(dev);
unsigned long flags, val; unsigned long val;
bool external_mode; bool external_mode;
int err; int err;
@ -560,10 +742,10 @@ static ssize_t external_mode_store(struct device *dev,
external_mode = !!val; external_mode = !!val;
spin_lock_irqsave(&master->cmd_lock, flags); mutex_lock(&master->cmd_lock);
if (external_mode == master->external_mode) { if (external_mode == master->external_mode) {
spin_unlock_irqrestore(&master->cmd_lock, flags); mutex_unlock(&master->cmd_lock);
return count; return count;
} }
@ -572,7 +754,8 @@ static ssize_t external_mode_store(struct device *dev,
fsi_master_gpio_init_external(master); fsi_master_gpio_init_external(master);
else else
fsi_master_gpio_init(master); fsi_master_gpio_init(master);
spin_unlock_irqrestore(&master->cmd_lock, flags);
mutex_unlock(&master->cmd_lock);
fsi_master_rescan(&master->master); fsi_master_rescan(&master->master);
@ -595,6 +778,7 @@ static int fsi_master_gpio_probe(struct platform_device *pdev)
master->dev = &pdev->dev; master->dev = &pdev->dev;
master->master.dev.parent = master->dev; master->master.dev.parent = master->dev;
master->master.dev.of_node = of_node_get(dev_of_node(master->dev)); master->master.dev.of_node = of_node_get(dev_of_node(master->dev));
master->last_addr = LAST_ADDR_INVALID;
gpio = devm_gpiod_get(&pdev->dev, "clock", 0); gpio = devm_gpiod_get(&pdev->dev, "clock", 0);
if (IS_ERR(gpio)) { if (IS_ERR(gpio)) {
@ -632,6 +816,13 @@ static int fsi_master_gpio_probe(struct platform_device *pdev)
} }
master->gpio_mux = gpio; master->gpio_mux = gpio;
/*
* Check if GPIO block is slow enought that no extra delays
* are necessary. This improves performance on ast2500 by
* an order of magnitude.
*/
master->no_delays = device_property_present(&pdev->dev, "no-gpio-delays");
master->master.n_links = 1; master->master.n_links = 1;
master->master.flags = FSI_MASTER_FLAG_SWCLOCK; master->master.flags = FSI_MASTER_FLAG_SWCLOCK;
master->master.read = fsi_master_gpio_read; master->master.read = fsi_master_gpio_read;
@ -640,7 +831,7 @@ static int fsi_master_gpio_probe(struct platform_device *pdev)
master->master.send_break = fsi_master_gpio_break; master->master.send_break = fsi_master_gpio_break;
master->master.link_enable = fsi_master_gpio_link_enable; master->master.link_enable = fsi_master_gpio_link_enable;
platform_set_drvdata(pdev, master); platform_set_drvdata(pdev, master);
spin_lock_init(&master->cmd_lock); mutex_init(&master->cmd_lock);
fsi_master_gpio_init(master); fsi_master_gpio_init(master);

1005
drivers/fsi/fsi-sbefifo.c Normal file
View file

File diff suppressed because it is too large Load diff

8
drivers/fsi/fsi-scom.c
View file

@ -26,15 +26,11 @@
#define FSI_ENGID_SCOM 0x5 #define FSI_ENGID_SCOM 0x5
#define SCOM_FSI2PIB_DELAY 50
/* SCOM engine register set */ /* SCOM engine register set */
#define SCOM_DATA0_REG 0x00 #define SCOM_DATA0_REG 0x00
#define SCOM_DATA1_REG 0x04 #define SCOM_DATA1_REG 0x04
#define SCOM_CMD_REG 0x08 #define SCOM_CMD_REG 0x08
#define SCOM_RESET_REG 0x1C
#define SCOM_RESET_CMD 0x80000000
#define SCOM_WRITE_CMD 0x80000000 #define SCOM_WRITE_CMD 0x80000000
struct scom_device { struct scom_device {
@ -180,7 +176,6 @@ static const struct file_operations scom_fops = {
static int scom_probe(struct device *dev) static int scom_probe(struct device *dev)
{ {
uint32_t data;
struct fsi_device *fsi_dev = to_fsi_dev(dev); struct fsi_device *fsi_dev = to_fsi_dev(dev);
struct scom_device *scom; struct scom_device *scom;
@ -197,9 +192,6 @@ static int scom_probe(struct device *dev)
scom->mdev.parent = dev; scom->mdev.parent = dev;
list_add(&scom->link, &scom_devices); list_add(&scom->link, &scom_devices);
data = cpu_to_be32(SCOM_RESET_CMD);
fsi_device_write(fsi_dev, SCOM_RESET_REG, &data, sizeof(uint32_t));
return misc_register(&scom->mdev); return misc_register(&scom->mdev);
} }

33
include/linux/fsi-sbefifo.h Normal file
View file

@ -0,0 +1,33 @@
/*
* SBEFIFO FSI Client device driver
*
* Copyright (C) IBM Corporation 2017
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERGCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#ifndef LINUX_FSI_SBEFIFO_H
#define LINUX_FSI_SBEFIFO_H
#define SBEFIFO_CMD_PUT_OCC_SRAM 0xa404
#define SBEFIFO_CMD_GET_OCC_SRAM 0xa403
#define SBEFIFO_CMD_GET_SBE_FFDC 0xa801
#define SBEFIFO_MAX_FFDC_SIZE 0x2000
struct device;
int sbefifo_submit(struct device *dev, const __be32 *command, size_t cmd_len,
__be32 *response, size_t *resp_len);
int sbefifo_parse_status(struct device *dev, u16 cmd, __be32 *response,
size_t resp_len, size_t *data_len);
#endif /* LINUX_FSI_SBEFIFO_H */

43
include/trace/events/fsi_master_gpio.h
View file

@ -64,6 +64,49 @@ TRACE_EVENT(fsi_master_gpio_break,
) )
); );
TRACE_EVENT(fsi_master_gpio_crc_cmd_error,
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 ----CRC command retry---",
__entry->master_idx
)
);
TRACE_EVENT(fsi_master_gpio_crc_rsp_error,
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 ----CRC response---",
__entry->master_idx
)
);
TRACE_EVENT(fsi_master_gpio_poll_response_busy,
TP_PROTO(const struct fsi_master_gpio *master, int busy),
TP_ARGS(master, busy),
TP_STRUCT__entry(
__field(int, master_idx)
__field(int, busy)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->busy = busy;
),
TP_printk("fsi-gpio%d: device reported busy %d times",
__entry->master_idx, __entry->busy)
);
#endif /* _TRACE_FSI_MASTER_GPIO_H */ #endif /* _TRACE_FSI_MASTER_GPIO_H */
#include <trace/define_trace.h> #include <trace/define_trace.h>