intel: mailbox: Driver now handles larger response
This patch factorizes mailbox read response from SDM into a function.
Also fix the logic to support reading larger than 16 words response from
SDM.
Signed-off-by: Abdul Halim, Muhammad Hadi Asyrafi <muhammad.hadi.asyrafi.abdul.halim@intel.com>
Change-Id: Ie035ecffbbc42e12dd68061c403904c28c3b70e5
diff --git a/plat/intel/soc/common/include/socfpga_mailbox.h b/plat/intel/soc/common/include/socfpga_mailbox.h
index 75323fd..59714fd 100644
--- a/plat/intel/soc/common/include/socfpga_mailbox.h
+++ b/plat/intel/soc/common/include/socfpga_mailbox.h
@@ -145,6 +145,7 @@
int mailbox_send_cmd_async(uint32_t *job_id, unsigned int cmd, uint32_t *args,
int len, int indirect);
int mailbox_read_response(uint32_t *job_id, uint32_t *response, int resp_len);
+int iterate_resp(int mbox_resp_len, uint32_t *resp_buf, int resp_len);
void mailbox_reset_cold(void);
void mailbox_clear_response(void);
diff --git a/plat/intel/soc/common/soc/socfpga_mailbox.c b/plat/intel/soc/common/soc/socfpga_mailbox.c
index 5935777..3bb2561 100644
--- a/plat/intel/soc/common/soc/socfpga_mailbox.c
+++ b/plat/intel/soc/common/soc/socfpga_mailbox.c
@@ -45,10 +45,7 @@
{
int rin = 0;
int rout = 0;
- int mbox_resp_len = 0;
int resp_data = 0;
- int total_resp_len = 0;
- uint32_t *resp_buf = response;
if (mmio_read_32(MBOX_OFFSET + MBOX_DOORBELL_FROM_SDM))
mmio_write_32(MBOX_OFFSET + MBOX_DOORBELL_FROM_SDM, 0);
@@ -74,26 +71,10 @@
INFO("Error in response: %x\n", resp_data);
return -resp_data;
}
- mbox_resp_len = MBOX_RESP_LEN(resp_data);
- while (mbox_resp_len > 0) {
-
- mbox_resp_len--;
- resp_data = mmio_read_32(MBOX_OFFSET +
- MBOX_RESP_BUFFER +
- (rout)*4);
- if (resp_buf && resp_len) {
- *(resp_buf + total_resp_len) = resp_data;
- resp_len--;
- total_resp_len++;
- }
- rout++;
- rout %= MBOX_RESP_BUFFER_SIZE;
- mmio_write_32(MBOX_OFFSET + MBOX_ROUT, rout);
- }
- return total_resp_len;
+ return iterate_resp(MBOX_RESP_LEN(resp_data),
+ response, resp_len);
}
-
return MBOX_NO_RESPONSE;
}
@@ -104,10 +85,7 @@
int timeout = 0xFFFFFF;
int rin = 0;
int rout = 0;
- int mbox_resp_len = 0;
int resp_data = 0;
- int total_resp_len = 0;
- uint32_t *resp_buf = response;
while (1) {
@@ -118,7 +96,7 @@
}
if (!timeout) {
- INFO("Timed out waiting for SDM");
+ INFO("Timed out waiting for SDM\n");
return MBOX_TIMEOUT;
}
@@ -156,26 +134,47 @@
INFO("Error in response: %x\n", resp_data);
return -MBOX_RESP_ERR(resp_data);
}
- mbox_resp_len = MBOX_RESP_LEN(resp_data);
- while (mbox_resp_len > 0) {
- mbox_resp_len--;
- resp_data = mmio_read_32(MBOX_OFFSET +
- MBOX_RESP_BUFFER +
- (rout)*4);
- if (resp_buf && resp_len) {
- *(resp_buf + total_resp_len)
- = resp_data;
- resp_len--;
- total_resp_len++;
- }
- rout++;
- rout %= MBOX_RESP_BUFFER_SIZE;
- mmio_write_32(MBOX_OFFSET + MBOX_ROUT, rout);
- }
- return total_resp_len;
+ return iterate_resp(MBOX_RESP_LEN(resp_data),
+ response, resp_len);
+ }
+ }
+}
+
+int iterate_resp(int mbox_resp_len, uint32_t *resp_buf, int resp_len)
+{
+ uint32_t timeout;
+ int resp_data = 0, total_resp_len = 0;
+ int rin = mmio_read_32(MBOX_OFFSET + MBOX_RIN);
+ int rout = mmio_read_32(MBOX_OFFSET + MBOX_ROUT);
+
+ while (mbox_resp_len > 0) {
+ timeout = 0xFFFFFF;
+ mbox_resp_len--;
+ resp_data = mmio_read_32(MBOX_OFFSET +
+ MBOX_RESP_BUFFER +
+ (rout)*4);
+ if (resp_buf && resp_len) {
+ *(resp_buf + total_resp_len)
+ = resp_data;
+ resp_len--;
+ total_resp_len++;
+ }
+ rout++;
+ rout %= MBOX_RESP_BUFFER_SIZE;
+ mmio_write_32(MBOX_OFFSET + MBOX_ROUT, rout);
+
+ do {
+ timeout--;
+ rin = mmio_read_32(MBOX_OFFSET + MBOX_RIN);
+ } while ((rout == rin) && (mbox_resp_len > 0) && (timeout > 0));
+
+ if (timeout == 0) {
+ INFO("Timed out waiting for SDM\n");
+ return MBOX_TIMEOUT;
}
}
+ return total_resp_len;
}
int mailbox_send_cmd_async(uint32_t *job_id, unsigned int cmd, uint32_t *args,