Skip to contentSkip to conversation

remoteproc: pru: Fix loading of GNU Binutils ELF

PATCH Superseded Dimitar Dimitrov 2 participants 3 messages Dec 28, 2020 Remote processor (remoteproc)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remoteproc: pru: Fix loading of GNU Binutils ELF

PRU port of GNU Binutils lacks support for separate address spaces. PRU IRAM addresses are marked with artificial offset to differentiate them from DRAM addresses. Hence remoteproc must mask IRAM addresses coming from GNU ELF in order to get the true hardware address.

Patch was tested on top of latest linux-remoteproc/for-next branch:
commit 4c0943255805 ("Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next")'

PRU firmware used for testing was the example in:
https://github.com/dinuxbg/pru-gcc-examples/tree/master/blinking-led/pru

---
 drivers/remoteproc/pru_rproc.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/remoteproc/pru_rproc.c +14 -0
index 2667919d76b3..b03114bbb9ab 100644
@@ -61,6 +61,18 @@
 #define PRU_SDRAM_DA	0x2000	/* Secondary Data RAM */
 #define PRU_SHRDRAM_DA	0x10000 /* Shared Data RAM */
 
+/*
+ * GNU binutils do not support multiple address spaces. The GNU linker's
+ * default linker script places IRAM at an arbitrary high offset, in order
+ * to differentiate it from DRAM. Hence we need to strip the artificial offset
+ * in the IRAM addresses coming from the ELF file.
+ *
+ * The TI proprietary linker would never set those higher IRAM address bits
+ * anyway. PRU architecture limits the program counter to 16 bit word
+ * addresses.
+ */
+#define PRU_IRAM_DA_MASK	0xfffff
+
 #define MAX_PRU_SYS_EVENTS 160
 
 /**
@@ -450,6 +462,8 @@ static void *pru_i_da_to_va(struct pru_rproc *pru, u32 da, size_t len)
 	if (len == 0)
 		return NULL;
 
+	da &= PRU_IRAM_DA_MASK;
+
 	if (da >= PRU_IRAM_DA &&
 	    da + len <= PRU_IRAM_DA + pru->mem_regions[PRU_IOMEM_IRAM].size) {
 		offset = da - PRU_IRAM_DA;
Signature · 1 line
2.20.1
#1 lore raw
Quoted 25 lines · Dimitar Dimitrov

PRU port of GNU Binutils lacks support for separate address spaces. PRU IRAM addresses are marked with artificial offset to differentiate them from DRAM addresses. Hence remoteproc must mask IRAM addresses coming from GNU ELF in order to get the true hardware address.

Patch was tested on top of latest linux-remoteproc/for-next branch:
commit 4c0943255805 ("Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next")'

PRU firmware used for testing was the example in:
https://github.com/dinuxbg/pru-gcc-examples/tree/master/blinking-led/pru

---
 drivers/remoteproc/pru_rproc.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
drivers/remoteproc/pru_rproc.c +1 -0
index 2667919d76b3..b03114bbb9ab 100644
@@ -61,6 +61,18 @@
 #define PRU_SDRAM_DA	0x2000	/* Secondary Data RAM */
 #define PRU_SHRDRAM_DA	0x10000 /* Shared Data RAM */
 
+/*

drivers/remoteproc/pru_rproc.c line 74

Quoted 10 lines
drivers/remoteproc/pru_rproc.c +10 -0
+ * GNU binutils do not support multiple address spaces. The GNU linker's
+ * default linker script places IRAM at an arbitrary high offset, in order
+ * to differentiate it from DRAM. Hence we need to strip the artificial offset
+ * in the IRAM addresses coming from the ELF file.
+ *
+ * The TI proprietary linker would never set those higher IRAM address bits
+ * anyway. PRU architecture limits the program counter to 16 bit word
+ * addresses.
+ */
+#define PRU_IRAM_DA_MASK	0xfffff

If the limit is 16 bits, why is your mask 20 bits?

drivers/remoteproc/pru_rproc.c static void *pru_i_da_to_va(struct pru_rproc *pru, u32 da, size_t len) · line 464

Quoted 8 lines
drivers/remoteproc/pru_rproc.c +1 -0
+
 #define MAX_PRU_SYS_EVENTS 160
 
 /**
@@ -450,6 +462,8 @@ static void *pru_i_da_to_va(struct pru_rproc *pru, u32 da, size_t len)
 	if (len == 0)
 		return NULL;
 

Given that the comment explains this operation I think it would be better to place it here. And if the masking directly follows what's described in the comment you don't need a define for the mask.

Regards,
Bjorn

Quoted 8 lines
drivers/remoteproc/pru_rproc.c +2 -0
+	da &= PRU_IRAM_DA_MASK;
+
 	if (da >= PRU_IRAM_DA &&
 	    da + len <= PRU_IRAM_DA + pru->mem_regions[PRU_IOMEM_IRAM].size) {
 		offset = da - PRU_IRAM_DA;
Signature · 1 line
2.20.1
#2 lore raw
Quoted 27 lines · On Mon, 28 Dec 2020 19:45:41 EET Bjorn Andersson wrote:
Quoted 26 lines · Dimitar Dimitrov

PRU port of GNU Binutils lacks support for separate address spaces. PRU IRAM addresses are marked with artificial offset to differentiate them from DRAM addresses. Hence remoteproc must mask IRAM addresses coming from GNU ELF in order to get the true hardware address.

Patch was tested on top of latest linux-remoteproc/for-next branch:
commit 4c0943255805 ("Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next")'>
PRU firmware used for testing was the example in:
https://github.com/dinuxbg/pru-gcc-examples/tree/master/blinking-led/pru

---

 drivers/remoteproc/pru_rproc.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
(quoted diff) +0 -0

b/drivers/remoteproc/pru_rproc.c index 2667919d76b3..b03114bbb9ab 100644

drivers/remoteproc/pru_rproc.c +0 -0
@@ -61,6 +61,18 @@
 
 #define PRU_SDRAM_DA	0x2000	/* Secondary Data RAM */
 #define PRU_SHRDRAM_DA	0x10000 /* Shared Data RAM */
 
Quoted 14 lines
Quoted 4 lines
drivers/remoteproc/pru_rproc.c +3 -0
+/*
+ * GNU binutils do not support multiple address spaces. The GNU linker's
+ * default linker script places IRAM at an arbitrary high offset, in

order

Quoted 8 lines

+ * to differentiate it from DRAM. Hence we need to strip the artificial offset + * in the IRAM addresses coming from the ELF file.
+ *
+ * The TI proprietary linker would never set those higher IRAM address bits + * anyway. PRU architecture limits the program counter to 16 bit word + * addresses.
+ */
+#define PRU_IRAM_DA_MASK 0xfffff

If the limit is 16 bits, why is your mask 20 bits?

The 16-bit word-address range specified by PRU architecture corresponds to 18- bit byte-address range in ELF.

I added two more bits just in case TI decides to implement banking to expand the IRAM in future SoCs.

I'll put this clarification in the comment.

Quoted 11 lines
Quoted 11 lines
drivers/remoteproc/pru_rproc.c +1 -0
+
 
 #define MAX_PRU_SYS_EVENTS 160
 
 /**
@@ -450,6 +462,8 @@ static void *pru_i_da_to_va(struct pru_rproc *pru, u32

da, size_t len)>
if (len == 0)

Quoted 5 lines
Quoted 1 line

return NULL;

Given that the comment explains this operation I think it would be better to place it here. And if the masking directly follows what's described in the comment you don't need a define for the mask.

Will do.

Thanks,
Dimitar