Lab_NHMFL
/
upsilon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first pass at making correct memory accesses

This commit is contained in:
Peter McGoron 2023-04-08 16:05:52 +00:00
parent dd15bef2e9
commit 27ada0d708
2 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/generate_csr_locations.py
View File

@ -13,15 +13,15 @@ class CSRGenerator:
regname = f"base_{name}" regname = f"base_{name}"
else: else:
regname = f"base_{name}_{num}" regname = f"base_{name}_{num}"
return f'(csr_t) {self.j["csr_registers"][regname]["addr"]}' return f'{self.j["csr_registers"][regname]["addr"]}'
def print(self, *args): def print(self, *args):
print(*args, end='', file=self.file) print(*args, end='', file=self.file)
def print_array(self, name, num): def print_array(self, name, num):
if num == 1: if num == 1:
self.print(f'csr_t {name} = {self.get_reg(name, None)};\n') self.print(f'uintptr_t {name} = {self.get_reg(name, None)};\n')
else: else:
self.print(f'csr_t {name}[{num}] = {{', self.get_reg(name, 0)) self.print(f'uintptr_t {name}[{num}] = {{', self.get_reg(name, 0))
for i in range(1,num): for i in range(1,num):
self.print(',', self.get_reg(name, i)) self.print(',', self.get_reg(name, i))
self.print('};\n\n') self.print('};\n\n')
@ -31,7 +31,6 @@ class CSRGenerator:
self.print_array(name, num) self.print_array(name, num)
def print_file(self): def print_file(self):
self.print(f'''#pragma once self.print(f'''#pragma once
typedef volatile uint32_t *csr_t;
#define ADC_MAX {adc_num} #define ADC_MAX {adc_num}
#define DAC_MAX {dac_num} #define DAC_MAX {dac_num}
''') ''')

74
software/src/access.c
View File

@ -10,6 +10,7 @@
*/ */
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
#include <soc.h>
#include <zephyr/logging/log.h> #include <zephyr/logging/log.h>
#include "upsilon.h" #include "upsilon.h"
#include "access.h" #include "access.h"
@ -80,8 +81,8 @@ dac_read_write(int dac, creole_word send, k_timeout_t timeout,
return e; return e;
dac_switch(dac, DAC_SPI_PORT, K_NO_WAIT); dac_switch(dac, DAC_SPI_PORT, K_NO_WAIT);
*to_dac[dac] = send; litex_write32(send, to_dac[dac]);
*dac_arm[dac] = 1; litex_write8(1, dac_arm[dac]);
/* Recursive locks should busy wait. */ /* Recursive locks should busy wait. */
/* 10ns * (2 * 10 cycles per half DAC cycle) /* 10ns * (2 * 10 cycles per half DAC cycle)
@ -89,11 +90,11 @@ dac_read_write(int dac, creole_word send, k_timeout_t timeout,
*/ */
if (dac_locked[dac] > 1) if (dac_locked[dac] > 1)
k_sleep(K_NSEC(10*2*10*24)); k_sleep(K_NSEC(10*2*10*24));
while (!*dac_finished[dac]); while (!litex_read8(dac_finished[dac]));
if (recv) if (recv)
*recv = sign_extend(*from_dac[dac], 20); *recv = sign_extend(litex_read32(from_dac[dac]), 20);
*dac_arm[dac] = 0; litex_write8(0, dac_arm[dac]);
dac_release(dac); dac_release(dac);
return 0; return 0;
@ -106,7 +107,7 @@ dac_switch(int dac, int setting, k_timeout_t timeout)
if (e != 0) if (e != 0)
return e; return e;
*dac_sel[dac] = setting; litex_write8(setting, dac_sel[dac]);
dac_release(dac); dac_release(dac);
return 0; return 0;
@ -163,7 +164,7 @@ adc_switch(int adc, int setting, k_timeout_t timeout)
if (e != 0) if (e != 0)
return e; return e;
*adc_sel_0 = setting; litex_write8(setting, adc_sel_0);
adc_release(adc); adc_release(adc);
return 0; return 0;
@ -177,15 +178,15 @@ adc_read(int adc, k_timeout_t timeout, creole_word *wrd)
return e; return e;
adc_switch(adc, ADC_SPI_PORT, K_NO_WAIT); adc_switch(adc, ADC_SPI_PORT, K_NO_WAIT);
*adc_arm[adc] = 1; litex_write8(1, adc_arm[adc]);
/* Recursive locks should busy wait. */ /* Recursive locks should busy wait. */
if (adc_locked[adc] > 1) if (adc_locked[adc] > 1)
k_sleep(K_NSEC(550 + 24*2*10*10)); k_sleep(K_NSEC(550 + 24*2*10*10));
while (!*adc_finished[adc]); while (!litex_read8(adc_finished[adc]));
*wrd = sign_extend(*from_adc[adc], 20); *wrd = sign_extend(litex_read32(from_adc[adc]), 20);
*adc_arm[adc] = 0; litex_write8(0, adc_arm[adc]);
adc_release(adc); adc_release(adc);
return 0; return 0;
@ -226,15 +227,18 @@ int
cloop_read(int code, uint32_t *high_reg, uint32_t *low_reg, cloop_read(int code, uint32_t *high_reg, uint32_t *low_reg,
k_timeout_t timeout) k_timeout_t timeout)
{ {
uint64_t v = 0;
if (cloop_take(timeout) != 0) if (cloop_take(timeout) != 0)
return 0; return 0;
*cl_cmd = code; litex_write8(code, cl_cmd);
*cl_start_cmd = 1; litex_write8(1, cl_start_cmd);
while (!*cl_finish_cmd); while (!litex_read8(cl_finish_cmd));
*high_reg = cl_word_out[0]; v = litex_read64(cl_word_out);
*low_reg = cl_word_out[1]; litex_write8(0, cl_start_cmd);
*cl_start_cmd = 0;
*high_reg = v >> 32;
*low_reg = v & 0xFFFFFFFF;
cloop_release(); cloop_release();
return 1; return 1;
@ -247,13 +251,11 @@ cloop_write(int code, uint32_t high_val, uint32_t low_val,
if (cloop_take(timeout) != 0) if (cloop_take(timeout) != 0)
return 0; return 0;
*cl_cmd = code; litex_write8(code, cl_cmd);
cl_word_in[0] = high_val; litex_write64((uint64_t) high_val << 32 | low_val, cl_word_in);
cl_word_in[1] = low_val; litex_write8(1, cl_start_cmd);
while (!litex_read8(cl_finish_cmd));
*cl_start_cmd = 1; litex_write8(0, cl_start_cmd);
while (!*cl_finish_cmd);
*cl_start_cmd = 0;
cloop_release(); cloop_release();
return 1; return 1;
@ -282,10 +284,10 @@ waveform_take(int waveform, k_timeout_t timeout)
static void static void
waveform_disarm_wait(int wf) waveform_disarm_wait(int wf)
{ {
*wf_arm[wf] = 0; litex_write8(0, wf_arm[wf]);
if (*wf_running[wf]) { if (*wf_running[wf]) {
k_sleep(K_NSEC(10* *wf_time_to_wait[wf])); // k_sleep(K_NSEC(10* *wf_time_to_wait[wf]));
while (*wf_running[wf]); while (litex_read8(wf_running[wf]));
} }
} }
@ -326,10 +328,10 @@ waveform_load(uint32_t buf[MAX_WL_SIZE], int slot, k_timeout_t timeout)
if (waveform_take(slot, timeout) != 0) if (waveform_take(slot, timeout) != 0)
return 0; return 0;
*wf_start_addr[slot] = (uint32_t) buf; litex_write32((uint32_t) buf, wf_start_addr[slot]);
*wf_refresh_start[slot] = 1; litex_write8(1, wf_refresh_start[slot]);
while (!*wf_refresh_finished[slot]); while (!litex_read8(wf_refresh_finished[slot]));
*wf_refresh_start[slot] = 0; litex_write8(0, wf_refresh_start[slot]);
waveform_release(slot); waveform_release(slot);
return 1; return 1;
@ -338,8 +340,8 @@ waveform_load(uint32_t buf[MAX_WL_SIZE], int slot, k_timeout_t timeout)
int int
waveform_halt_until_finished(int slot) waveform_halt_until_finished(int slot)
{ {
*wf_halt_on_finish[slot] = 1; litex_write8(1, wf_halt_on_finish[slot]);
while (!*wf_finished[slot]); while (!litex_read(wf_finished[slot]));
return 1; return 1;
} }
@ -355,9 +357,9 @@ waveform_arm(int slot, bool halt_on_finish, uint32_t wait, k_timeout_t timeout)
dac_switch(slot, DAC_WF_PORT, K_NO_WAIT); dac_switch(slot, DAC_WF_PORT, K_NO_WAIT);
*wf_halt_on_finish[slot] = halt_on_finish; litex_write8(halt_on_finish, wf_halt_on_finish[slot]);
*wf_time_to_wait[slot] = wait; litex_write16(wait, wf_time_to_wait[slot]);
*wf_arm[slot] = 1; litex_write8(1, wf_arm[slot]);
return 1; return 1;
} }