[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 v3 09/15] xilinx_spips: lqspi: Dont touch co
From: |
peter . crosthwaite |
Subject: |
[Qemu-devel] [PATCH for-1.5 v3 09/15] xilinx_spips: lqspi: Dont touch config register |
Date: |
Mon, 22 Apr 2013 15:17:09 +1000 |
From: Peter Crosthwaite <address@hidden>
The LQSPI mode is supposed to work via the automatic CS mode feature
rather than manipulate CS lines itself. Now that auto CS is implemented
remove LQSPIs CS mode override logic. There is still a need to
manipulate the U_PAGE bit in LQSPI config register to implement
dual-stack mode however.
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
This patch in new as of v2
hw/ssi/xilinx_spips.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index 3f31a32..2ee3958 100644
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -511,16 +511,16 @@ lqspi_read(void *opaque, hwaddr addr, unsigned int size)
int flash_addr = (addr / num_effective_busses(s));
int slave = flash_addr >> LQSPI_ADDRESS_BITS;
int cache_entry = 0;
+ uint32_t u_page_save = s->regs[R_LQSPI_STS] & ~LQSPI_CFG_U_PAGE;
+
+ s->regs[R_LQSPI_STS] &= ~LQSPI_CFG_U_PAGE;
+ s->regs[R_LQSPI_STS] |= slave ? LQSPI_CFG_U_PAGE : 0;
DB_PRINT("config reg status: %08x\n", s->regs[R_LQSPI_CFG]);
fifo8_reset(&s->tx_fifo);
fifo8_reset(&s->rx_fifo);
- s->regs[R_CONFIG] &= ~CS;
- s->regs[R_CONFIG] |= ((~(1 << slave) << CS_SHIFT) & CS) | MANUAL_CS;
- xilinx_spips_update_cs_lines(s);
-
/* instruction */
DB_PRINT("pushing read instruction: %02x\n",
(uint8_t)(s->regs[R_LQSPI_CFG] & LQSPI_CFG_INST_CODE));
@@ -554,9 +554,9 @@ 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;
+ s->regs[R_LQSPI_STS] &= ~LQSPI_CFG_U_PAGE;
+ s->regs[R_LQSPI_STS] |= u_page_save;
xilinx_spips_update_cs_lines(s);
q->lqspi_cached_addr = addr;
--
1.7.0.4
- [Qemu-devel] [PATCH for-1.5 v3 02/15] xilinx_spips: Make interrupts clear on read, (continued)
- [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, 2013/04/22
- [Qemu-devel] [PATCH for-1.5 v3 09/15] xilinx_spips: lqspi: Dont touch config register,
peter . crosthwaite <=
- [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