Skip to content

Commit 92fd705

Browse files
committed
increase memory allocated to comms CPU
See discussion in #1612.
1 parent 8deb269 commit 92fd705

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

artiq/firmware/ksupport/glue.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ struct slice {
1414
void send_to_core_log(struct slice str);
1515
void send_to_rtio_log(struct slice data);
1616

17-
#define KERNELCPU_EXEC_ADDRESS 0x40800000
18-
#define KERNELCPU_PAYLOAD_ADDRESS 0x40860000
17+
#define KERNELCPU_EXEC_ADDRESS 0x45000000
18+
#define KERNELCPU_PAYLOAD_ADDRESS 0x45060000
1919
#define KERNELCPU_LAST_ADDRESS 0x4fffffff
2020
#define KSUPPORT_HEADER_SIZE 0x80
2121

artiq/firmware/ksupport/ksupport.ld

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ INCLUDE generated/output_format.ld
22
INCLUDE generated/regions.ld
33
ENTRY(_reset_handler)
44

5-
/* First 4M of main memory are reserved for runtime
5+
/* First 64M of main memory are reserved for runtime
66
* code/data/heap, then comes kernel memory.
7-
* Next 4M of main memory are reserved for
7+
* Next 16M of main memory are reserved for
88
* the background RPC queue.
99
* First 384K of kernel memory are for support code.
1010
* Support code is loaded at ORIGIN-0x80 so that ELF headers
1111
* are also loaded.
1212
*/
1313
MEMORY {
14-
ksupport (RWX) : ORIGIN = 0x40800000, LENGTH = 0x60000
14+
ksupport (RWX) : ORIGIN = 0x45000000, LENGTH = 0x60000
1515
}
1616

1717
/* Kernel stack is at the end of main RAM. */

artiq/firmware/libboard_artiq/rpc_queue.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use board_misoc::{mem, cache};
55
const SEND_MAILBOX: *mut usize = (mem::MAILBOX_BASE + 4) as *mut usize;
66
const RECV_MAILBOX: *mut usize = (mem::MAILBOX_BASE + 8) as *mut usize;
77

8-
const QUEUE_BEGIN: usize = 0x40400000;
9-
const QUEUE_END: usize = 0x407fff80;
8+
const QUEUE_BEGIN: usize = 0x44000000;
9+
const QUEUE_END: usize = 0x44ffff80;
1010
const QUEUE_CHUNK: usize = 0x1000;
1111

1212
pub unsafe fn init() {

artiq/firmware/libproto_artiq/kernel_proto.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use core::fmt;
22
use dyld;
33

4-
pub const KERNELCPU_EXEC_ADDRESS: usize = 0x40800000;
5-
pub const KERNELCPU_PAYLOAD_ADDRESS: usize = 0x40860000;
4+
pub const KERNELCPU_EXEC_ADDRESS: usize = 0x45000000;
5+
pub const KERNELCPU_PAYLOAD_ADDRESS: usize = 0x45060000;
66
pub const KERNELCPU_LAST_ADDRESS: usize = 0x4fffffff;
77
pub const KSUPPORT_HEADER_SIZE: usize = 0x80;
88

artiq/firmware/runtime/runtime.ld

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENTRY(_reset_handler)
66
* ld does not allow this expression here.
77
*/
88
MEMORY {
9-
runtime (RWX) : ORIGIN = 0x40000000, LENGTH = 0x400000 /* 4M */
9+
runtime (RWX) : ORIGIN = 0x40000000, LENGTH = 0x4000000 /* 64M */
1010
}
1111

1212
SECTIONS

artiq/gateware/amp/kernel_cpu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class KernelCPU(Module):
99
def __init__(self, platform,
10-
exec_address=0x40800000,
10+
exec_address=0x45000000,
1111
main_mem_origin=0x40000000,
1212
l2_size=8192):
1313
self._reset = CSRStorage(reset=1)

0 commit comments

Comments
 (0)