From cb1badb173b24a3fb8b8e53059fa219120a0889b Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Fri, 30 Oct 2020 15:38:17 +0100
Subject: [PATCH] software/liblitesata: add sata_write and update #ifdefs.

---
 litex/soc/software/liblitesata/sata.c | 45 ++++++++++++++++++++++-----
 litex/soc/software/liblitesata/sata.h | 17 ++++++++--
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/litex/soc/software/liblitesata/sata.c b/litex/soc/software/liblitesata/sata.c
index e57052389..43ff0b22c 100644
--- a/litex/soc/software/liblitesata/sata.c
+++ b/litex/soc/software/liblitesata/sata.c
@@ -13,12 +13,12 @@
 #include <libfatfs/diskio.h>
 #include "sata.h"
 
-#ifdef CSR_SATA_SECTOR2MEM_BASE
-
 /*-----------------------------------------------------------------------*/
 /* SATA user functions                                                   */
 /*-----------------------------------------------------------------------*/
 
+#ifdef CSR_SATA_PHY_BASE
+
 int sata_init(void) {
 	uint16_t timeout;
 
@@ -38,16 +38,20 @@ int sata_init(void) {
 	return 0;
 }
 
-void sata_read(uint32_t block, uint32_t count, uint8_t* buf)
+#endif
+
+#ifdef CSR_SATA_SECTOR2MEM_BASE
+
+void sata_read(uint32_t sector, uint32_t count, uint8_t* buf)
 {
 	uint32_t i;
 
-	/* Read blocks */
+	/* Write sectors */
 	for (i=0; i<count; i++) {
 		uint8_t done = 0;
 		while (done == 0) {
 			sata_sector2mem_base_write((uint64_t) buf);
-			sata_sector2mem_sector_write(block + i);
+			sata_sector2mem_sector_write(sector + i);
 			sata_sector2mem_start_write(1);
 			while ((sata_sector2mem_done_read() & 0x1) == 0);
 			done = ((sata_sector2mem_error_read() & 0x1) == 0);
@@ -65,10 +69,37 @@ void sata_read(uint32_t block, uint32_t count, uint8_t* buf)
 #endif
 }
 
+#endif
+
+#ifdef CSR_SATA_MEM2SECTOR_BASE
+
+void sata_write(uint32_t sector, uint32_t count, uint8_t* buf)
+{
+	uint32_t i;
+
+	/* Write sectors */
+	for (i=0; i<count; i++) {
+		uint8_t done = 0;
+		while (done == 0) {
+			sata_mem2sector_base_write((uint64_t) buf);
+			sata_mem2sector_sector_write(sector + i);
+			sata_mem2sector_start_write(1);
+			while ((sata_sector2mem_done_read() & 0x1) == 0);
+			done = ((sata_sector2mem_error_read() & 0x1) == 0);
+			busy_wait_us(10);
+		}
+		buf += 512;
+	}
+}
+
+#endif
+
 /*-----------------------------------------------------------------------*/
 /* SATA FatFs disk functions                                             */
 /*-----------------------------------------------------------------------*/
 
+#ifdef CSR_SATA_SECTOR2MEM_BASE
+
 static DSTATUS satastatus = STA_NOINIT;
 
 DSTATUS disk_status(uint8_t drv) {
@@ -83,8 +114,8 @@ DSTATUS disk_initialize(uint8_t drv) {
 	return satastatus;
 }
 
-DRESULT disk_read(uint8_t drv, uint8_t *buf, uint32_t block, uint32_t count) {
-	sata_read(block, count, buf);
+DRESULT disk_read(uint8_t drv, uint8_t *buf, uint32_t sector, uint32_t count) {
+	sata_read(sector, count, buf);
 	return RES_OK;
 }
 
diff --git a/litex/soc/software/liblitesata/sata.h b/litex/soc/software/liblitesata/sata.h
index 3f0024137..7d45c408c 100644
--- a/litex/soc/software/liblitesata/sata.h
+++ b/litex/soc/software/liblitesata/sata.h
@@ -6,15 +6,26 @@
 
 #include <generated/csr.h>
 
-#ifdef CSR_SATA_SECTOR2MEM_BASE
-
 /*-----------------------------------------------------------------------*/
 /* SATA user functions                                                   */
 /*-----------------------------------------------------------------------*/
 
+#ifdef CSR_SATA_PHY_BASE
+
 int sata_init(void);
+
+#endif
+
+#ifdef CSR_SATA_SECTOR2MEM_BASE
+
 void sata_read(uint32_t sector, uint32_t count, uint8_t* buf);
 
-#endif /* CSR_SATA_BASE */
+#endif
+
+#ifdef CSR_SATA_MEM2SECTOR_BASE
+
+void sata_write(uint32_t sector, uint32_t count, uint8_t* buf);
+
+#endif
 
 #endif /* __SATA_H */