Commit 670d198b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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

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

Ben writes:

This adds support for offloading the FSI low level bitbanging to the
ColdFire coprocessor of the Aspeed SoCs. All the pre-requisites have
already been merged, this is the final piece in the puzzle.

This branch also pull gpio/ib-aspeed which is a topic branch already
in gpio/for-next (and thus in next) whic contains pre-requisites.

Finally, there's also a bug fix to the sbefifo driver for some
inconsistent use of a mutex in the error handling code.
parents bce5c2ea 0a213777
Device-tree bindings for ColdFire offloaded gpio-based FSI master driver
------------------------------------------------------------------------
Required properties:
- compatible =
"aspeed,ast2400-cf-fsi-master" for an AST2400 based system
or
"aspeed,ast2500-cf-fsi-master" for an AST2500 based system
- clock-gpios = <gpio-descriptor>; : GPIO for FSI clock
- data-gpios = <gpio-descriptor>; : GPIO for FSI data signal
- enable-gpios = <gpio-descriptor>; : GPIO for enable signal
- trans-gpios = <gpio-descriptor>; : GPIO for voltage translator enable
- mux-gpios = <gpio-descriptor>; : GPIO for pin multiplexing with other
functions (eg, external FSI masters)
- memory-region = <phandle>; : Reference to the reserved memory for
the ColdFire. Must be 2M aligned on
AST2400 and 1M aligned on AST2500
- aspeed,sram = <phandle>; : Reference to the SRAM node.
- aspeed,cvic = <phandle>; : Reference to the CVIC node.
Examples:
fsi-master {
compatible = "aspeed,ast2500-cf-fsi-master", "fsi-master";
clock-gpios = <&gpio 0>;
data-gpios = <&gpio 1>;
enable-gpios = <&gpio 2>;
trans-gpios = <&gpio 3>;
mux-gpios = <&gpio 4>;
memory-region = <&coldfire_memory>;
aspeed,sram = <&sram>;
aspeed,cvic = <&cvic>;
}
...@@ -83,6 +83,10 @@ addresses and sizes in the slave address space: ...@@ -83,6 +83,10 @@ addresses and sizes in the slave address space:
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
Optionally, a slave can provide a global unique chip ID which is used to
identify the physical location of the chip in a system specific way
chip-id = <0>;
FSI engines (devices) FSI engines (devices)
--------------------- ---------------------
...@@ -125,6 +129,7 @@ device tree if no extra platform information is required. ...@@ -125,6 +129,7 @@ device tree if no extra platform information is required.
reg = <0 0>; reg = <0 0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chip-id = <0>;
/* FSI engine at 0xc00, using a single page. In this example, /* FSI engine at 0xc00, using a single page. In this example,
* it's an I2C master controller, so subnodes describe the * it's an I2C master controller, so subnodes describe the
......
...@@ -27,6 +27,15 @@ config FSI_MASTER_HUB ...@@ -27,6 +27,15 @@ config FSI_MASTER_HUB
allow chaining of FSI links to an arbitrary depth. This allows for allow chaining of FSI links to an arbitrary depth. This allows for
a high target device fanout. a high target device fanout.
config FSI_MASTER_AST_CF
tristate "FSI master based on Aspeed ColdFire coprocessor"
depends on GPIOLIB
depends on GPIO_ASPEED
---help---
This option enables a FSI master using the AST2400 and AST2500 GPIO
lines driven by the internal ColdFire coprocessor. This requires
the corresponding machine specific ColdFire firmware to be available.
config FSI_SCOM config FSI_SCOM
tristate "SCOM FSI client device driver" tristate "SCOM FSI client device driver"
---help--- ---help---
......
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
obj-$(CONFIG_FSI) += fsi-core.o 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_MASTER_AST_CF) += fsi-master-ast-cf.o
obj-$(CONFIG_FSI_SCOM) += fsi-scom.o obj-$(CONFIG_FSI_SCOM) += fsi-scom.o
obj-$(CONFIG_FSI_SBEFIFO) += fsi-sbefifo.o obj-$(CONFIG_FSI_SBEFIFO) += fsi-sbefifo.o
// SPDX-License-Identifier: GPL-2.0+
#ifndef __CF_FSI_FW_H
#define __CF_FSI_FW_H
/*
* uCode file layout
*
* 0000...03ff : m68k exception vectors
* 0400...04ff : Header info & boot config block
* 0500....... : Code & stack
*/
/*
* Header info & boot config area
*
* The Header info is built into the ucode and provide version and
* platform information.
*
* the Boot config needs to be adjusted by the ARM prior to starting
* the ucode if the Command/Status area isn't at 0x320000 in CF space
* (ie. beginning of SRAM).
*/
#define HDR_OFFSET 0x400
/* Info: Signature & version */
#define HDR_SYS_SIG 0x00 /* 2 bytes system signature */
#define SYS_SIG_SHARED 0x5348
#define SYS_SIG_SPLIT 0x5350
#define HDR_FW_VERS 0x02 /* 2 bytes Major.Minor */
#define HDR_API_VERS 0x04 /* 2 bytes Major.Minor */
#define API_VERSION_MAJ 2 /* Current version */
#define API_VERSION_MIN 1
#define HDR_FW_OPTIONS 0x08 /* 4 bytes option flags */
#define FW_OPTION_TRACE_EN 0x00000001 /* FW tracing enabled */
#define FW_OPTION_CONT_CLOCK 0x00000002 /* Continuous clocking supported */
#define HDR_FW_SIZE 0x10 /* 4 bytes size for combo image */
/* Boot Config: Address of Command/Status area */
#define HDR_CMD_STAT_AREA 0x80 /* 4 bytes CF address */
#define HDR_FW_CONTROL 0x84 /* 4 bytes control flags */
#define FW_CONTROL_CONT_CLOCK 0x00000002 /* Continuous clocking enabled */
#define FW_CONTROL_DUMMY_RD 0x00000004 /* Extra dummy read (AST2400) */
#define FW_CONTROL_USE_STOP 0x00000008 /* Use STOP instructions */
#define HDR_CLOCK_GPIO_VADDR 0x90 /* 2 bytes offset from GPIO base */
#define HDR_CLOCK_GPIO_DADDR 0x92 /* 2 bytes offset from GPIO base */
#define HDR_DATA_GPIO_VADDR 0x94 /* 2 bytes offset from GPIO base */
#define HDR_DATA_GPIO_DADDR 0x96 /* 2 bytes offset from GPIO base */
#define HDR_TRANS_GPIO_VADDR 0x98 /* 2 bytes offset from GPIO base */
#define HDR_TRANS_GPIO_DADDR 0x9a /* 2 bytes offset from GPIO base */
#define HDR_CLOCK_GPIO_BIT 0x9c /* 1 byte bit number */
#define HDR_DATA_GPIO_BIT 0x9d /* 1 byte bit number */
#define HDR_TRANS_GPIO_BIT 0x9e /* 1 byte bit number */
/*
* Command/Status area layout: Main part
*/
/* Command/Status register:
*
* +---------------------------+
* | STAT | RLEN | CLEN | CMD |
* | 8 | 8 | 8 | 8 |
* +---------------------------+
* | | | |
* status | | |
* Response len | |
* (in bits) | |
* | |
* Command len |
* (in bits) |
* |
* Command code
*
* Due to the big endian layout, that means that a byte read will
* return the status byte
*/
#define CMD_STAT_REG 0x00
#define CMD_REG_CMD_MASK 0x000000ff
#define CMD_REG_CMD_SHIFT 0
#define CMD_NONE 0x00
#define CMD_COMMAND 0x01
#define CMD_BREAK 0x02
#define CMD_IDLE_CLOCKS 0x03 /* clen = #clocks */
#define CMD_INVALID 0xff
#define CMD_REG_CLEN_MASK 0x0000ff00
#define CMD_REG_CLEN_SHIFT 8
#define CMD_REG_RLEN_MASK 0x00ff0000
#define CMD_REG_RLEN_SHIFT 16
#define CMD_REG_STAT_MASK 0xff000000
#define CMD_REG_STAT_SHIFT 24
#define STAT_WORKING 0x00
#define STAT_COMPLETE 0x01
#define STAT_ERR_INVAL_CMD 0x80
#define STAT_ERR_INVAL_IRQ 0x81
#define STAT_ERR_MTOE 0x82
/* Response tag & CRC */
#define STAT_RTAG 0x04
/* Response CRC */
#define STAT_RCRC 0x05
/* Echo and Send delay */
#define ECHO_DLY_REG 0x08
#define SEND_DLY_REG 0x09
/* Command data area
*
* Last byte of message must be left aligned
*/
#define CMD_DATA 0x10 /* 64 bit of data */
/* Response data area, right aligned, unused top bits are 1 */
#define RSP_DATA 0x20 /* 32 bit of data */
/* Misc */
#define INT_CNT 0x30 /* 32-bit interrupt count */
#define BAD_INT_VEC 0x34 /* 32-bit bad interrupt vector # */
#define CF_STARTED 0x38 /* byte, set to -1 when copro started */
#define CLK_CNT 0x3c /* 32-bit, clock count (debug only) */
/*
* SRAM layout: GPIO arbitration part
*/
#define ARB_REG 0x40
#define ARB_ARM_REQ 0x01
#define ARB_ARM_ACK 0x02
/* Misc2 */
#define CF_RESET_D0 0x50
#define CF_RESET_D1 0x54
#define BAD_INT_S0 0x58
#define BAD_INT_S1 0x5c
#define STOP_CNT 0x60
/* Internal */
/*
* SRAM layout: Trace buffer (debug builds only)
*/
#define TRACEBUF 0x100
#define TR_CLKOBIT0 0xc0
#define TR_CLKOBIT1 0xc1
#define TR_CLKOSTART 0x82
#define TR_OLEN 0x83 /* + len */
#define TR_CLKZ 0x84 /* + count */
#define TR_CLKWSTART 0x85
#define TR_CLKTAG 0x86 /* + tag */
#define TR_CLKDATA 0x87 /* + len */
#define TR_CLKCRC 0x88 /* + raw crc */
#define TR_CLKIBIT0 0x90
#define TR_CLKIBIT1 0x91
#define TR_END 0xff
#endif /* __CF_FSI_FW_H */
...@@ -80,6 +80,7 @@ struct fsi_slave { ...@@ -80,6 +80,7 @@ struct fsi_slave {
struct fsi_master *master; struct fsi_master *master;
int id; int id;
int link; int link;
int chip_id;
uint32_t size; /* size of slave address space */ uint32_t size; /* size of slave address space */
u8 t_send_delay; u8 t_send_delay;
u8 t_echo_delay; u8 t_echo_delay;
...@@ -717,6 +718,17 @@ static ssize_t slave_send_echo_store(struct device *dev, ...@@ -717,6 +718,17 @@ static ssize_t slave_send_echo_store(struct device *dev,
static DEVICE_ATTR(send_echo_delays, 0600, static DEVICE_ATTR(send_echo_delays, 0600,
slave_send_echo_show, slave_send_echo_store); slave_send_echo_show, slave_send_echo_store);
static ssize_t chip_id_show(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct fsi_slave *slave = to_fsi_slave(dev);
return sprintf(buf, "%d\n", slave->chip_id);
}
static DEVICE_ATTR_RO(chip_id);
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; uint32_t chip_id;
...@@ -780,6 +792,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) ...@@ -780,6 +792,14 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
slave->t_send_delay = 16; slave->t_send_delay = 16;
slave->t_echo_delay = 16; slave->t_echo_delay = 16;
/* Get chip ID if any */
slave->chip_id = -1;
if (slave->dev.of_node) {
uint32_t prop;
if (!of_property_read_u32(slave->dev.of_node, "chip-id", &prop))
slave->chip_id = prop;
}
rc = fsi_slave_set_smode(slave); rc = fsi_slave_set_smode(slave);
if (rc) { if (rc) {
dev_warn(&master->dev, dev_warn(&master->dev,
...@@ -814,6 +834,10 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id) ...@@ -814,6 +834,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 delay attr: %d\n", rc); dev_warn(&slave->dev, "failed to create delay attr: %d\n", rc);
rc = device_create_file(&slave->dev, &dev_attr_chip_id);
if (rc)
dev_warn(&slave->dev, "failed to create chip id: %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",
......
This diff is collapsed.
...@@ -136,8 +136,7 @@ struct sbefifo_user { ...@@ -136,8 +136,7 @@ struct sbefifo_user {
static DEFINE_IDA(sbefifo_ida); static DEFINE_IDA(sbefifo_ida);
static DEFINE_MUTEX(sbefifo_ffdc_mutex); static DEFINE_MUTEX(sbefifo_ffdc_mutex);
static void __sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
size_t ffdc_sz, bool internal) size_t ffdc_sz, bool internal)
{ {
int pack = 0; int pack = 0;
...@@ -145,7 +144,6 @@ static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc, ...@@ -145,7 +144,6 @@ static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
static char ffdc_line[FFDC_LSIZE]; static char ffdc_line[FFDC_LSIZE];
char *p = ffdc_line; char *p = ffdc_line;
mutex_lock(&sbefifo_ffdc_mutex);
while (ffdc_sz) { while (ffdc_sz) {
u32 w0, w1, w2, i; u32 w0, w1, w2, i;
if (ffdc_sz < 3) { if (ffdc_sz < 3) {
...@@ -194,6 +192,13 @@ static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc, ...@@ -194,6 +192,13 @@ static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
} }
dev_warn(dev, "+-------------------------------------------+\n"); dev_warn(dev, "+-------------------------------------------+\n");
} }
}
static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
size_t ffdc_sz, bool internal)
{
mutex_lock(&sbefifo_ffdc_mutex);
__sbefifo_dump_ffdc(dev, ffdc, ffdc_sz, internal);
mutex_unlock(&sbefifo_ffdc_mutex); mutex_unlock(&sbefifo_ffdc_mutex);
} }
......
This diff is collapsed.
...@@ -696,6 +696,10 @@ extern void devm_free_pages(struct device *dev, unsigned long addr); ...@@ -696,6 +696,10 @@ extern void devm_free_pages(struct device *dev, unsigned long addr);
void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res); void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
void __iomem *devm_of_iomap(struct device *dev,
struct device_node *node, int index,
resource_size_t *size);
/* allows to add/remove a custom action to devres stack */ /* allows to add/remove a custom action to devres stack */
int devm_add_action(struct device *dev, void (*action)(void *), void *data); int devm_add_action(struct device *dev, void (*action)(void *), void *data);
void devm_remove_action(struct device *dev, void (*action)(void *), void *data); void devm_remove_action(struct device *dev, void (*action)(void *), void *data);
......
#ifndef __GPIO_ASPEED_H
#define __GPIO_ASPEED_H
struct aspeed_gpio_copro_ops {
int (*request_access)(void *data);
int (*release_access)(void *data);
};
int aspeed_gpio_copro_grab_gpio(struct gpio_desc *desc,
u16 *vreg_offset, u16 *dreg_offset, u8 *bit);
int aspeed_gpio_copro_release_gpio(struct gpio_desc *desc);
int aspeed_gpio_copro_set_ops(const struct aspeed_gpio_copro_ops *ops, void *data);
#endif /* __GPIO_ASPEED_H */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM fsi_master_ast_cf
#if !defined(_TRACE_FSI_MASTER_ACF_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_FSI_MASTER_ACF_H
#include <linux/tracepoint.h>
TRACE_EVENT(fsi_master_acf_copro_command,
TP_PROTO(const struct fsi_master_acf *master, uint32_t op),
TP_ARGS(master, op),
TP_STRUCT__entry(
__field(int, master_idx)
__field(uint32_t, op)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->op = op;
),
TP_printk("fsi-acf%d command %08x",
__entry->master_idx, __entry->op
)
);
TRACE_EVENT(fsi_master_acf_send_request,
TP_PROTO(const struct fsi_master_acf *master, const struct fsi_msg *cmd, u8 rbits),
TP_ARGS(master, cmd, rbits),
TP_STRUCT__entry(
__field(int, master_idx)
__field(uint64_t, msg)
__field(u8, bits)
__field(u8, rbits)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->msg = cmd->msg;
__entry->bits = cmd->bits;
__entry->rbits = rbits;
),
TP_printk("fsi-acf%d cmd: %016llx/%d/%d",
__entry->master_idx, (unsigned long long)__entry->msg,
__entry->bits, __entry->rbits
)
);
TRACE_EVENT(fsi_master_acf_copro_response,
TP_PROTO(const struct fsi_master_acf *master, u8 rtag, u8 rcrc, __be32 rdata, bool crc_ok),
TP_ARGS(master, rtag, rcrc, rdata, crc_ok),
TP_STRUCT__entry(
__field(int, master_idx)
__field(u8, rtag)
__field(u8, rcrc)
__field(u32, rdata)
__field(bool, crc_ok)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->rtag = rtag;
__entry->rcrc = rcrc;
__entry->rdata = be32_to_cpu(rdata);
__entry->crc_ok = crc_ok;
),
TP_printk("fsi-acf%d rsp: tag=%04x crc=%04x data=%08x %c\n",
__entry->master_idx, __entry->rtag, __entry->rcrc,
__entry->rdata, __entry->crc_ok ? ' ' : '!'
)
);
TRACE_EVENT(fsi_master_acf_crc_rsp_error,
TP_PROTO(const struct fsi_master_acf *master, int retries),
TP_ARGS(master, retries),
TP_STRUCT__entry(
__field(int, master_idx)
__field(int, retries)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->retries = retries;
),
TP_printk("fsi-acf%d CRC error in response retry %d",
__entry->master_idx, __entry->retries
)
);
TRACE_EVENT(fsi_master_acf_poll_response_busy,
TP_PROTO(const struct fsi_master_acf *master, int busy_count),
TP_ARGS(master, busy_count),
TP_STRUCT__entry(
__field(int, master_idx)
__field(int, busy_count)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
__entry->busy_count = busy_count;
),
TP_printk("fsi-acf%d: device reported busy %d times",
__entry->master_idx, __entry->busy_count
)
);
TRACE_EVENT(fsi_master_acf_cmd_abs_addr,
TP_PROTO(const struct fsi_master_acf *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-acf%d: Sending ABS_ADR %06x",
__entry->master_idx, __entry->addr
)
);
TRACE_EVENT(fsi_master_acf_cmd_rel_addr,
TP_PROTO(const struct fsi_master_acf *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-acf%d: Sending REL_ADR %03x",
__entry->master_idx, __entry->rel_addr
)
);
TRACE_EVENT(fsi_master_acf_cmd_same_addr,
TP_PROTO(const struct fsi_master_acf *master),
TP_ARGS(master),
TP_STRUCT__entry(
__field(int, master_idx)
),
TP_fast_assign(
__entry->master_idx = master->master.idx;
),
TP_printk("fsi-acf%d: Sending SAME_ADR",
__entry->master_idx
)
);
#endif /* _TRACE_FSI_MASTER_ACF_H */
#include <trace/define_trace.h>
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/of_address.h>
enum devm_ioremap_type { enum devm_ioremap_type {
DEVM_IOREMAP = 0, DEVM_IOREMAP = 0,
...@@ -162,6 +163,41 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res) ...@@ -162,6 +163,41 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
} }
EXPORT_SYMBOL(devm_ioremap_resource); EXPORT_SYMBOL(devm_ioremap_resource);
/*
* devm_of_iomap - Requests a resource and maps the memory mapped IO
* for a given device_node managed by a given device
*
* Checks that a resource is a valid memory region, requests the memory
* region and ioremaps it. All operations are managed and will be undone
* on driver detach of the device.
*
* This is to be used when a device requests/maps resources described
* by other device tree nodes (children or otherwise).
*
* @dev: The device "managing" the resource
* @node: The device-tree node where the resource resides
* @index: index of the MMIO range in the "reg" property
* @size: Returns the size of the resource (pass NULL if not needed)
* Returns a pointer to the requested and mapped memory or an ERR_PTR() encoded
* error code on failure. Usage example:
*
* base = devm_of_iomap(&pdev->dev, node, 0, NULL);
* if (IS_ERR(base))
* return PTR_ERR(base);
*/
void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int index,
resource_size_t *size)
{
struct resource res;
if (of_address_to_resource(node, index, &res))
return IOMEM_ERR_PTR(-EINVAL);
if (size)
*size = resource_size(&res);
return devm_ioremap_resource(dev, &res);
}
EXPORT_SYMBOL(devm_of_iomap);
#ifdef CONFIG_HAS_IOPORT_MAP #ifdef CONFIG_HAS_IOPORT_MAP
/* /*
* Generic iomap devres * Generic iomap devres
......
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