vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Another round of macrofication

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-12 14:08:26 +01:00
parent f9ef05770a
commit 5dbb0fc055
4 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/grub/cs5536.h
View file

@ -46,8 +46,15 @@
#define GRUB_CS5536_SMB_REG_CTRL2_ENABLE 0x1 #define GRUB_CS5536_SMB_REG_CTRL2_ENABLE 0x1
#define GRUB_CS5536_SMB_REG_CTRL3 0x6 #define GRUB_CS5536_SMB_REG_CTRL3 0x6
#define GRUB_CS5536_LBAR_ADDR_MASK 0x000000000000fff8ULL #ifdef ASM_FILE
#define GRUB_CS5536_LBAR_ENABLE 0x0000000100000000ULL #define GRUB_ULL(x) x
#else
#define GRUB_ULL(x) x ## ULL
#endif
#define GRUB_CS5536_LBAR_ADDR_MASK GRUB_ULL (0x000000000000fff8)
#define GRUB_CS5536_LBAR_ENABLE GRUB_ULL (0x0000000100000000)
#define GRUB_CS5536_LBAR_MASK_MASK GRUB_ULL (0x0000f00000000000)
/* PMON-compatible LBARs. */ /* PMON-compatible LBARs. */
#define GRUB_CS5536_LBAR_GPIO 0x0b000 #define GRUB_CS5536_LBAR_GPIO 0x0b000

2
include/grub/mips/yeeloong/boot.h
View file

@ -26,5 +26,7 @@
#define GRUB_MACHINE_DDR2_BASE 0xaffffe00 #define GRUB_MACHINE_DDR2_BASE 0xaffffe00
#define GRUB_MACHINE_DDR2_REG1_HI_8BANKS 0x00000001 #define GRUB_MACHINE_DDR2_REG1_HI_8BANKS 0x00000001
#define GRUB_MACHINE_DDR2_REG_SIZE 0x8
#define GRUB_MACHINE_DDR2_REG_STEP 0x10
#endif #endif

8
include/grub/mips/yeeloong/pci.h
View file

@ -30,12 +30,12 @@
#define GRUB_MACHINE_PCI_IO_BASE 0xbfd00000 #define GRUB_MACHINE_PCI_IO_BASE 0xbfd00000
#define GRUB_MACHINE_PCI_CONFSPACE 0xbfe80000 #define GRUB_MACHINE_PCI_CONFSPACE 0xbfe80000
#define GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR 0xbfe00118
#ifndef ASM_FILE #ifndef ASM_FILE
#define GRUB_MACHINE_PCI_CONF_CTRL_REG (*(volatile grub_uint32_t *) 0xbfe00118) #define GRUB_MACHINE_PCI_CONF_CTRL_REG (*(volatile grub_uint32_t *) \
GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
#define GRUB_MACHINE_PCI_IO_CTRL_REG (*(volatile grub_uint32_t *) 0xbfe00110) #define GRUB_MACHINE_PCI_IO_CTRL_REG (*(volatile grub_uint32_t *) 0xbfe00110)
#else
#define GRUB_MACHINE_PCI_CONF_CTRL_REG_HI 0xbfe0
#define GRUB_MACHINE_PCI_CONF_CTRL_REG_LO 0x0118
#endif #endif
#define GRUB_MACHINE_PCI_WIN_MASK_SIZE 6 #define GRUB_MACHINE_PCI_WIN_MASK_SIZE 6
#define GRUB_MACHINE_PCI_WIN_MASK ((1 << GRUB_MACHINE_PCI_WIN_MASK_SIZE) - 1) #define GRUB_MACHINE_PCI_WIN_MASK ((1 << GRUB_MACHINE_PCI_WIN_MASK_SIZE) - 1)

22
kern/mips/yeeloong/fwstart.S
View file

@ -40,7 +40,7 @@ __start:
/* Resulting value is kept in GRUB_MACHINE_PCI_CONF_CTRL_REG. /* Resulting value is kept in GRUB_MACHINE_PCI_CONF_CTRL_REG.
This way we don't need to sacrifice a register for it. */ This way we don't need to sacrifice a register for it. */
/* We have only one bus (0). Function is 0. */ /* We have only one bus (0). Function is 0. */
lui $t0, GRUB_MACHINE_PCI_CONF_CTRL_REG_HI lui $t0, %hi(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE) lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE)
lui $t3, %hi(GRUB_CS5536_PCIID) lui $t3, %hi(GRUB_CS5536_PCIID)
addiu $t3, $t3, %lo(GRUB_CS5536_PCIID) addiu $t3, $t3, %lo(GRUB_CS5536_PCIID)
@ -50,7 +50,7 @@ __start:
andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES) - 1) andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES) - 1)
beql $t4, $zero, fatal beql $t4, $zero, fatal
addiu $a0, $a0, %lo(no_cs5536) addiu $a0, $a0, %lo(no_cs5536)
sw $t4, GRUB_MACHINE_PCI_CONF_CTRL_REG_LO($t0) sw $t4, %lo(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR) ($t0)
lw $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_PCI_REG_PCI_ID) ($t1) lw $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_PCI_REG_PCI_ID) ($t1)
bnel $t2, $t3, 1b bnel $t2, $t3, 1b
sll $t4, $t4, 1 sll $t4, $t4, 1
@ -67,7 +67,8 @@ __start:
ori $a1, $zero, GRUB_CS5536_LBAR_GPIO ori $a1, $zero, GRUB_CS5536_LBAR_GPIO
/* Set mask to 0xf and enabled bit to 1. */ /* Set mask to 0xf and enabled bit to 1. */
bal wrmsr bal wrmsr
ori $a2, $zero, 0xf001 ori $a2, $zero, ((GRUB_CS5536_LBAR_MASK_MASK \
| GRUB_CS5536_LBAR_ENABLE) >> 32)
/* Set SMBUS LBAR. */ /* Set SMBUS LBAR. */
lui $a0, %hi(GRUB_CS5536_MSR_SMB_BAR) lui $a0, %hi(GRUB_CS5536_MSR_SMB_BAR)
@ -75,7 +76,8 @@ __start:
ori $a1, $zero, GRUB_CS5536_LBAR_SMBUS ori $a1, $zero, GRUB_CS5536_LBAR_SMBUS
/* Set mask to 0xf and enabled bit to 1. */ /* Set mask to 0xf and enabled bit to 1. */
bal wrmsr bal wrmsr
ori $a2, $zero, 0xf001 ori $a2, $zero, ((GRUB_CS5536_LBAR_MASK_MASK \
| GRUB_CS5536_LBAR_ENABLE) >> 32)
lui $a0, %hi(smbus_enabled) lui $a0, %hi(smbus_enabled)
bal message bal message
@ -430,7 +432,7 @@ write_dumpreg:
sd $t2, 0($t4) sd $t2, 0($t4)
addiu $t4, $t4, 0x10 addiu $t4, $t4, 0x10
jr $ra jr $ra
addiu $t6, $t6, 0x8 addiu $t6, $t6, GRUB_MACHINE_DDR2_REG_SIZE
continue: continue:
lui $t4, %hi(GRUB_MACHINE_DDR2_BASE) lui $t4, %hi(GRUB_MACHINE_DDR2_BASE)
@ -442,7 +444,7 @@ continue:
addiu $t6, $t6, %lo(regdump) addiu $t6, $t6, %lo(regdump)
/* 1 */ /* 1 */
ori $a1, $a1, 0x50 ori $a1, $a1, GRUB_SMB_RAM_START_ADDR
move $t8, $zero move $t8, $zero
lui $t5, 0x0001 lui $t5, 0x0001
bal read_spd bal read_spd
@ -455,7 +457,7 @@ continue:
dsll $t8, $t8, 32 dsll $t8, $t8, 32
or $t5, $t5, $t8 or $t5, $t5, $t8
sd $t5, 0 ($t4) sd $t5, 0 ($t4)
addiu $t4, $t4, 0x10 addiu $t4, $t4, GRUB_MACHINE_DDR2_REG_STEP
/* 2 */ /* 2 */
bal write_dumpreg bal write_dumpreg
@ -509,17 +511,17 @@ continue:
or $t5, $t5, $v0 or $t5, $t5, $v0
sd $t5, 0 ($t4) sd $t5, 0 ($t4)
addiu $t4, $t4, 0x10 addiu $t4, $t4, GRUB_MACHINE_DDR2_REG_STEP
ori $t7, $zero, 0x16 ori $t7, $zero, 0x16
1: 1:
ld $t2, 0($t6) ld $t2, 0($t6)
sd $t2, 0($t4) sd $t2, 0($t4)
addiu $t4, $t4, 0x10 addiu $t4, $t4, GRUB_MACHINE_DDR2_REG_STEP
addiu $t7, $t7, -1 addiu $t7, $t7, -1
bne $t7, $zero, 1b bne $t7, $zero, 1b
addiu $t6, $t6, 0x8 addiu $t6, $t6, GRUB_MACHINE_DDR2_REG_SIZE
lui $t4, %hi(GRUB_MACHINE_DDR2_BASE) lui $t4, %hi(GRUB_MACHINE_DDR2_BASE)
ld $t5, (%lo(GRUB_MACHINE_DDR2_BASE) + 0x30) ($t4) ld $t5, (%lo(GRUB_MACHINE_DDR2_BASE) + 0x30) ($t4)