mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2026-01-06 23:51:28 +00:00
The USB stream should check that there are bytes in the rx fifo to read before trying to read them. This should have been in here already. Checking if rx is valid in usb-stream makes the rx_valid call in usb_spi unnecessary so that is removed. BUG=none BRANCH=none TEST=manual Test CCD functionality still works on gru and reef AP/EC consoles sudo flashrom -p raiden_debug_spi:[AP|EC] -r img.bin usb updater Change-Id: Ieb77e35cc471b1f97d540ea4560591f0f40dd600 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/397858 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
196 lines
6.1 KiB
C
196 lines
6.1 KiB
C
/* Copyright 2015 The Chromium OS Authors. All rights reserved.
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "registers.h"
|
|
#include "usb-stream.h"
|
|
|
|
/* Let the USB HW IN-to-host FIFO transmit some bytes */
|
|
static void usb_enable_tx(struct usb_stream_config const *config, int len)
|
|
{
|
|
config->in_desc->flags = DIEPDMA_LAST | DIEPDMA_BS_HOST_RDY |
|
|
DIEPDMA_IOC | DIEPDMA_TXBYTES(len);
|
|
GR_USB_DIEPCTL(config->endpoint) |= DXEPCTL_CNAK | DXEPCTL_EPENA;
|
|
}
|
|
|
|
/* Let the USB HW OUT-from-host FIFO receive some bytes */
|
|
static void usb_enable_rx(struct usb_stream_config const *config, int len)
|
|
{
|
|
config->out_desc->flags = DOEPDMA_RXBYTES(len) | DOEPDMA_LAST |
|
|
DOEPDMA_BS_HOST_RDY | DOEPDMA_IOC;
|
|
GR_USB_DOEPCTL(config->endpoint) |= DXEPCTL_CNAK | DXEPCTL_EPENA;
|
|
}
|
|
|
|
/* True if the HW Rx/OUT FIFO has bytes for us. */
|
|
static inline int rx_fifo_is_ready(struct usb_stream_config const *config)
|
|
{
|
|
return (config->out_desc->flags & DOEPDMA_BS_MASK) ==
|
|
DOEPDMA_BS_DMA_DONE;
|
|
}
|
|
|
|
/*
|
|
* This function tries to shove new bytes from the USB host into the queue for
|
|
* consumption elsewhere. It is invoked either by a HW interrupt (telling us we
|
|
* have new bytes from the USB host), or by whoever is reading bytes out of the
|
|
* other end of the queue (telling us that there's now more room in the queue
|
|
* if we still have bytes to shove in there).
|
|
*/
|
|
int rx_stream_handler(struct usb_stream_config const *config)
|
|
{
|
|
/*
|
|
* The HW FIFO buffer (rx_ram) is always filled from [0] by the
|
|
* hardware. The rx_in_fifo variable counts how many bytes of that
|
|
* buffer are actually valid, and is calculated from the HW DMA
|
|
* descriptor table. The descriptor is updated by the hardware, and it
|
|
* and rx_ram remains valid and unchanged until software tells the
|
|
* the hardware engine to accept more input.
|
|
*/
|
|
int rx_in_fifo, rx_left;
|
|
|
|
/*
|
|
* The rx_handled variable tracks how many of the bytes in the HW FIFO
|
|
* we've copied into the incoming queue. The queue may not accept all
|
|
* of them at once, so we have to keep track of where we are so that
|
|
* the next time this function is called we can try to shove the rest
|
|
* of the HW FIFO bytes into the queue.
|
|
*/
|
|
static int rx_handled;
|
|
|
|
/* If the HW FIFO isn't ready, then we're waiting for more bytes */
|
|
if (!rx_fifo_is_ready(config))
|
|
return 0;
|
|
|
|
/*
|
|
* How many of the HW FIFO bytes have we not yet handled? We need to
|
|
* know both where we are in the buffer and how many bytes we haven't
|
|
* yet enqueued. One can be calculated from the other as long as we
|
|
* know rx_in_fifo, but we need at least one static variable.
|
|
*/
|
|
rx_in_fifo = config->rx_size
|
|
- (config->out_desc->flags & DOEPDMA_RXBYTES_MASK);
|
|
rx_left = rx_in_fifo - rx_handled;
|
|
|
|
/* If we have some, try to shove them into the queue */
|
|
if (rx_left) {
|
|
size_t added = QUEUE_ADD_UNITS(
|
|
config->producer.queue, config->rx_ram + rx_handled,
|
|
rx_left);
|
|
rx_handled += added;
|
|
rx_left -= added;
|
|
}
|
|
|
|
/*
|
|
* When we've handled all the bytes in the queue ("rx_in_fifo ==
|
|
* rx_handled" and "rx_left == 0" indicate the same thing), we can
|
|
* reenable the USB HW to go fetch more.
|
|
*/
|
|
if (!rx_left) {
|
|
rx_handled = 0;
|
|
usb_enable_rx(config, config->rx_size);
|
|
}
|
|
return rx_handled;
|
|
}
|
|
|
|
/* Rx/OUT interrupt handler */
|
|
void usb_stream_rx(struct usb_stream_config const *config)
|
|
{
|
|
/* Wake up the Rx FIFO handler */
|
|
hook_call_deferred(config->deferred_rx, 0);
|
|
|
|
GR_USB_DOEPINT(config->endpoint) = 0xffffffff;
|
|
}
|
|
|
|
/* True if the Tx/IN FIFO can take some bytes from us. */
|
|
static inline int tx_fifo_is_ready(struct usb_stream_config const *config)
|
|
{
|
|
uint32_t status = config->in_desc->flags & DIEPDMA_BS_MASK;
|
|
return status == DIEPDMA_BS_DMA_DONE || status == DIEPDMA_BS_HOST_BSY;
|
|
}
|
|
|
|
/* Try to send some bytes to the host */
|
|
int tx_stream_handler(struct usb_stream_config const *config)
|
|
{
|
|
size_t count;
|
|
|
|
if (!*config->is_reset)
|
|
return 0;
|
|
|
|
count = QUEUE_REMOVE_UNITS(config->consumer.queue, config->tx_ram,
|
|
config->tx_size);
|
|
if (count)
|
|
usb_enable_tx(config, count);
|
|
return count;
|
|
}
|
|
|
|
/* Tx/IN interrupt handler */
|
|
void usb_stream_tx(struct usb_stream_config const *config)
|
|
{
|
|
/* Wake up the Tx FIFO handler */
|
|
hook_call_deferred(config->deferred_tx, 0);
|
|
|
|
/* clear the Tx/IN interrupts */
|
|
GR_USB_DIEPINT(config->endpoint) = 0xffffffff;
|
|
}
|
|
|
|
void usb_stream_reset(struct usb_stream_config const *config)
|
|
{
|
|
config->out_desc->flags = DOEPDMA_RXBYTES(config->tx_size) |
|
|
DOEPDMA_LAST | DOEPDMA_BS_HOST_RDY |
|
|
DOEPDMA_IOC;
|
|
config->out_desc->addr = config->rx_ram;
|
|
GR_USB_DOEPDMA(config->endpoint) = (uint32_t)config->out_desc;
|
|
config->in_desc->flags = DIEPDMA_LAST | DIEPDMA_BS_HOST_BSY |
|
|
DIEPDMA_IOC;
|
|
config->in_desc->addr = config->tx_ram;
|
|
GR_USB_DIEPDMA(config->endpoint) = (uint32_t)config->in_desc;
|
|
GR_USB_DOEPCTL(config->endpoint) = DXEPCTL_MPS(64) | DXEPCTL_USBACTEP |
|
|
DXEPCTL_EPTYPE_BULK |
|
|
DXEPCTL_CNAK | DXEPCTL_EPENA;
|
|
GR_USB_DIEPCTL(config->endpoint) = DXEPCTL_MPS(64) | DXEPCTL_USBACTEP |
|
|
DXEPCTL_EPTYPE_BULK |
|
|
DXEPCTL_TXFNUM(config->endpoint);
|
|
GR_USB_DAINTMSK |= DAINT_INEP(config->endpoint) |
|
|
DAINT_OUTEP(config->endpoint);
|
|
|
|
*config->is_reset = 1;
|
|
|
|
/* Flush any queued data */
|
|
hook_call_deferred(config->deferred_tx, 0);
|
|
hook_call_deferred(config->deferred_rx, 0);
|
|
}
|
|
|
|
static void usb_read(struct producer const *producer, size_t count)
|
|
{
|
|
struct usb_stream_config const *config =
|
|
DOWNCAST(producer, struct usb_stream_config, producer);
|
|
|
|
hook_call_deferred(config->deferred_rx, 0);
|
|
}
|
|
|
|
static void usb_written(struct consumer const *consumer, size_t count)
|
|
{
|
|
struct usb_stream_config const *config =
|
|
DOWNCAST(consumer, struct usb_stream_config, consumer);
|
|
|
|
hook_call_deferred(config->deferred_tx, 0);
|
|
}
|
|
|
|
static void usb_flush(struct consumer const *consumer)
|
|
{
|
|
struct usb_stream_config const *config =
|
|
DOWNCAST(consumer, struct usb_stream_config, consumer);
|
|
|
|
while (tx_fifo_is_ready(config) && queue_count(consumer->queue))
|
|
;
|
|
}
|
|
|
|
struct producer_ops const usb_stream_producer_ops = {
|
|
.read = usb_read,
|
|
};
|
|
|
|
struct consumer_ops const usb_stream_consumer_ops = {
|
|
.written = usb_written,
|
|
.flush = usb_flush,
|
|
};
|