[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 v3 08/15] xilinx_spips: Implement automatic
From: |
peter . crosthwaite |
Subject: |
[Qemu-devel] [PATCH for-1.5 v3 08/15] xilinx_spips: Implement automatic CS |
Date: |
Mon, 22 Apr 2013 15:16:30 +1000 |
From: Peter Crosthwaite <address@hidden>
Implement the automatic CS control feature. If the MANUAL_CS bit is
cleared then the chip select stay de-asserted as long as the tx FIFO
is empty.
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
changed from v1:
Refresh CS on entry and exit from flush routine as needed.
hw/ssi/xilinx_spips.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index 5580e67..3f31a32 100644
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -190,6 +190,12 @@ static inline int num_effective_busses(XilinxSPIPS *s)
s->regs[R_LQSPI_CFG] & LQSPI_CFG_TWO_MEM) ? s->num_busses : 1;
}
+static inline bool xilinx_spips_cs_is_set(XilinxSPIPS *s, int i, int field)
+{
+ return ~field & (1 << i) && (s->regs[R_CONFIG] & MANUAL_CS
+ || !fifo8_is_empty(&s->tx_fifo));
+}
+
static void xilinx_spips_update_cs_lines(XilinxSPIPS *s)
{
int i, j;
@@ -202,14 +208,15 @@ static void xilinx_spips_update_cs_lines(XilinxSPIPS *s)
int cs_to_set = (j * s->num_cs + i + upage) %
(s->num_cs * s->num_busses);
- if (~field & (1 << i) && !found) {
+ if (xilinx_spips_cs_is_set(s, i, field) && !found) {
DB_PRINT("selecting slave %d\n", i);
qemu_set_irq(s->cs_lines[cs_to_set], 0);
} else {
+ DB_PRINT_L(0, "deselecting slave %d\n", i);
qemu_set_irq(s->cs_lines[cs_to_set], 1);
}
}
- if (~field & (1 << i)) {
+ if (xilinx_spips_cs_is_set(s, i, field)) {
found = true;
}
}
@@ -451,12 +458,13 @@ static void xilinx_spips_write(void *opaque, hwaddr addr,
}
s->regs[addr] = (s->regs[addr] & ~mask) | (value & mask);
no_reg_update:
+ xilinx_spips_update_cs_lines(s);
if ((man_start_com && s->regs[R_CONFIG] & MAN_START_EN) ||
(fifo8_is_empty(&s->tx_fifo) && s->regs[R_CONFIG] & MAN_START_EN))
{
xilinx_spips_flush_txfifo(s);
}
- xilinx_spips_update_ixr(s);
xilinx_spips_update_cs_lines(s);
+ xilinx_spips_update_ixr(s);
}
static const MemoryRegionOps spips_ops = {
@@ -510,7 +518,7 @@ lqspi_read(void *opaque, hwaddr addr, unsigned int size)
fifo8_reset(&s->rx_fifo);
s->regs[R_CONFIG] &= ~CS;
- s->regs[R_CONFIG] |= (~(1 << slave) << CS_SHIFT) & CS;
+ s->regs[R_CONFIG] |= ((~(1 << slave) << CS_SHIFT) & CS) | MANUAL_CS;
xilinx_spips_update_cs_lines(s);
/* instruction */
@@ -534,6 +542,7 @@ lqspi_read(void *opaque, hwaddr addr, unsigned int size)
DB_PRINT("pushing dummy byte\n");
fifo8_push(&s->tx_fifo, 0);
}
+ xilinx_spips_update_cs_lines(s);
xilinx_spips_flush_txfifo(s);
fifo8_reset(&s->rx_fifo);
@@ -545,6 +554,7 @@ lqspi_read(void *opaque, hwaddr addr, unsigned int size)
rx_data_bytes(s, &q->lqspi_buf[cache_entry], 4);
cache_entry++;
}
+ xilinx_spips_update_cs_lines(s);
s->regs[R_CONFIG] |= CS;
xilinx_spips_update_cs_lines(s);
--
1.7.0.4
- [Qemu-devel] [PATCH for-1.5 v3 00/15] Xilinx SPIPS fixes round 2, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 01/15] xilinx_spips: seperate SPI and QSPI as two classes, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 02/15] xilinx_spips: Make interrupts clear on read, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 03/15] xilinx_spips: Inhibit interrupts in LQSPI mode, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 04/15] xilinx_spips: Add verbose LQSPI debug output, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 05/15] xilinx_spips: Fix QSPI FIFO size, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 06/15] xilinx_spips: Trash LQ page cache on mode change, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 07/15] xilinx_spips: Add automatic start support, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 08/15] xilinx_spips: Implement automatic CS,
peter . crosthwaite <=
- [Qemu-devel] [PATCH for-1.5 v3 09/15] xilinx_spips: lqspi: Dont touch config register, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 11/15] xilinx_spips: Fix striping behaviour, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 12/15] xilinx_spips: Debug msgs for Snoop state, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 13/15] xilinx_spips: Multiple debug verbosity levels, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 14/15] xilinx_spips: lqspi: Push more data to tx-fifo, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 15/15] xilinx_spips: lqspi: Fix byte/misaligned access, peter . crosthwaite, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 10/15] xilinx_spips: Fix CTRL register RW bits, peter . crosthwaite, 2013/04/22
- Re: [Qemu-devel] [PATCH for-1.5 v3 00/15] Xilinx SPIPS fixes round 2, Edgar E. Iglesias, 2013/04/30