scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-28 02:35:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

stm32: Fix up SPI driver to use host_command interface

Browse Source 
This driver was not refactored when the host_command changes were made,
although i2c was. Tidy this up.

SPI requests the command response immediately rather than going through
the task queue, since otherwise a response may take long enough that the
SPI master misses it altogether.

BUG=chrome-os-partner:10533
TEST=manual:
build and boot on snow; In U-Boot:
> sspi 4:0 240 20
See that it gets key messages back now

Change-Id: Ia2c24d4c8876fefedad4c02802f77e50d7159d03
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/25982
This commit is contained in:
Simon Glass
2012-05-26 17:39:47 -07:00
committed by Gerrit
parent 34bba87577
commit f492f04a9d
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
chip/stm32/spi.c
View File

@@ -11,7 +11,7 @@
#include "dma.h"
#include "gpio.h"
#include "hooks.h"
#include "message.h"
#include "host_command.h"
#include "registers.h"
#include "spi.h"
#include "task.h"
@@ -55,8 +55,8 @@ enum {
* Our input and output buffers. These must be large enough for our largest
* message, including protocol overhead.
*/
static char out_msg[32 + MSG_PROTO_BYTES];
static char in_msg[32 + MSG_PROTO_BYTES];
static char out_msg[32];
static char in_msg[32];
/**
* Monitor the SPI bus
@@ -68,7 +68,7 @@ static char in_msg[32 + MSG_PROTO_BYTES];
* TODO(sjg): Use an interrupt on NSS to triggler this function.
*
*/
void spi_work_task(void)
void spi_task(void)
{
int port = STM32_SPI1_PORT;
@@ -121,22 +121,19 @@ void spi_work_task(void)
*/
static void reply(int port, char *msg, int msg_len)
{
int sum, i;
int dmac;
int sum;
/* Get the old checksumsum */
sum = msg[msg_len - 1 + SPI_MSG_HEADER_BYTES];
/* Add our header bytes */
msg_len += SPI_MSG_HEADER_BYTES + SPI_MSG_TRAILER_BYTES -
MSG_TRAILER_BYTES;
msg_len += SPI_MSG_HEADER_BYTES + SPI_MSG_TRAILER_BYTES;
msg[0] = SPI_MSG_HEADER;
msg[1] = msg_len & 0xff;
msg[2] = (msg_len >> 8) & 0xff;
/* Update the checksum */
sum += msg[0] + msg[1] + msg[2];
msg[msg_len - 2] = sum;
/* Calculate the checksum */
for (i = sum = 0; i < msg_len - 2; i++)
sum += msg[i];
msg[msg_len - 2] = sum & 0xff;
msg[msg_len - 1] = SPI_MSG_PREAMBLE;
/*
@@ -163,6 +160,7 @@ static void reply(int port, char *msg, int msg_len)
*/
static void spi_interrupt(int port)
{
enum ec_status status;
int msg_len;
int dmac;
int cmd;
@@ -180,13 +178,13 @@ static void spi_interrupt(int port)
in_msg);
/* Process the command and send the reply */
msg_len = message_process_cmd(cmd, out_msg + SPI_MSG_HEADER_BYTES,
sizeof(out_msg) - SPI_MSG_PROTO_BYTES);
if (msg_len >= 0)
reply(port, out_msg, msg_len);
status = host_command_process(0, cmd,
out_msg + SPI_MSG_HEADER_BYTES + 1, &msg_len);
out_msg[SPI_MSG_HEADER_BYTES] = status;
reply(port, out_msg, msg_len);
/* Wake up the task that watches for end of the incoming message */
task_wake(TASK_ID_SPI_WORK);
task_wake(TASK_ID_SPI);
}
/* The interrupt code cannot pass a parameters, so handle this here */