Skip to content

h2: restore DEVICE_PAGE_SIZE to SIZE_4M for correct subsystem register mapping #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Brian Cain (androm3da) wants to merge 1 commit into
base: master
Choose a base branch
from
Open

h2: restore DEVICE_PAGE_SIZE to SIZE_4M for correct subsystem register mapping #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kernel/init/boot/boot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#define SBIT_SIZE 0
#else
#define BOOT_TLBLO ((1 << BOOT_TLB_PGSIZE) | (BOOT_CACHE_ATTR << TLB_ENTRY_C_BITS) | (BOOT_TLB_PERM << 28))
#define BOOT_TLBLO_DEV ((1 << SIZE_1M) | (DEVICE_TYPE << TLB_ENTRY_C_BITS) | (BOOT_TLB_PERM << 28))
#define BOOT_TLBLO_DEV ((1 << SIZE_4M) | (DEVICE_TYPE << TLB_ENTRY_C_BITS) | (BOOT_TLB_PERM << 28))
#define BOOT_TLBLO_ANGEL ((1 << SIZE_4K) | (DEVICE_TYPE << TLB_ENTRY_C_BITS) | (BOOT_TLB_PERM << 28))
#define SBIT_SIZE 1
#endif
Expand Down
6 changes: 3 additions & 3 deletions kernel/init/boot/boot.ref.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#define MAKE_TLBLO_DEV(DST,SRCVAL,TMPREG) \
SETCONST(DST,BOOT_TLBLO_DEV) ; \
TMPREG = lsr(SRCVAL, # BOOT_TLB_OFFSET_BITS_1M); \
DST |= asl(TMPREG, # BOOT_TLB_SHIFT_1M + SBIT_SIZE);
TMPREG = lsr(SRCVAL, # BOOT_TLB_OFFSET_BITS_4M); \
DST |= asl(TMPREG, # BOOT_TLB_SHIFT_4M + SBIT_SIZE);

#define MAKE_TLBLO_ANGEL(DST,SRCVAL,TMPREG) \
SETCONST(DST,BOOT_TLBLO_ANGEL) ; \
Expand Down Expand Up @@ -427,7 +427,7 @@ boot_continuation:
if (!p0) jump:t .Ltlb_init

// entry for L2 interrupt controller
MAKE_TLBHI(TLB_HI, Q6_SS_BASE_VA, BOOT_TLB_OFFSET_BITS_1M, BOOT_TLB_SHIFT_1M)
MAKE_TLBHI(TLB_HI, Q6_SS_BASE_VA, BOOT_TLB_OFFSET_BITS_4M, BOOT_TLB_SHIFT_4M)
// SS_BASE == SSBASE (PRIV_BASE)
// apply offet to get PUB_BASE
SS_BASE = add(SS_BASE, ##-QDSP6SS_PUB_PRIV_OFFSET)
Expand Down
2 changes: 1 addition & 1 deletion kernel/util/max/max.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
map QDSP6SS_PUB_BASE to Q6_SS_BASE_VA so we can get at the public registers.
FIXME? Is the QDSP6SS_PUB_PRIV_OFFSET the same for all subsystems? */

#define DEVICE_PAGE_SIZE SIZE_1M
#define DEVICE_PAGE_SIZE SIZE_4M

#define Q6_SS_BASE_VA 0xffc00000 // leaves at most 4M for tmpmap at 0xff800000
#define QDSP6SS_PUB_PRIV_OFFSET 0x80000
Expand Down
Loading