coreboot-gerrit July 2013

coreboot-gerrit@coreboot.org

1 participants
1030 discussions

Patch set updated for coreboot: 4ba6d50 cpu: Fix spelling
by Stefan Reinauer 11 Jul '13

11 Jul '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3729 -gerrit commit 4ba6d501b06a07429d26fe41b8e27aab2229f51e Author: Martin Roth <martin.roth(a)se-eng.com> Date: Mon Jul 8 16:23:54 2013 -0600 cpu: Fix spelling Change-Id: I69c46648de0689e9bed84c7726906024ad65e769 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/cpu/amd/car/post_cache_as_ram.c | 4 ++-- src/cpu/amd/dualcore/amd_sibling.c | 4 ++-- src/cpu/amd/geode_gx2/cpubug.c | 6 +++--- src/cpu/amd/geode_gx2/cpureginit.c | 4 ++-- src/cpu/amd/geode_lx/cpubug.c | 2 +- src/cpu/amd/model_10xxx/defaults.h | 2 +- src/cpu/amd/model_10xxx/fidvid.c | 6 +++--- src/cpu/amd/model_10xxx/init_cpus.c | 2 +- src/cpu/amd/model_fxx/fidvid.c | 4 ++-- src/cpu/amd/model_fxx/model_fxx_init.c | 2 +- src/cpu/amd/model_fxx/powernow_acpi.c | 6 +++--- src/cpu/amd/mtrr/amd_mtrr.c | 4 ++-- src/cpu/amd/quadcore/amd_sibling.c | 4 ++-- src/cpu/intel/haswell/haswell.h | 2 +- src/cpu/intel/haswell/haswell_init.c | 10 +++++----- src/cpu/intel/haswell/mp_init.c | 8 ++++---- src/cpu/intel/haswell/smmrelocate.c | 2 +- src/cpu/intel/model_2065x/model_2065x_init.c | 4 ++-- src/cpu/intel/model_206ax/model_206ax_init.c | 4 ++-- src/cpu/intel/slot_1/l2_cache.c | 6 +++--- src/cpu/samsung/exynos5250/clk.h | 4 ++-- src/cpu/samsung/exynos5250/clock.c | 8 ++++---- src/cpu/samsung/exynos5250/cpu.c | 2 +- src/cpu/samsung/exynos5250/dmc.h | 2 +- src/cpu/samsung/exynos5250/dmc_common.c | 6 +++--- src/cpu/samsung/exynos5250/dmc_init_ddr3.c | 6 +++--- src/cpu/samsung/exynos5250/dp-core.h | 8 ++++---- src/cpu/samsung/exynos5250/dp-reg.c | 4 ++-- src/cpu/samsung/exynos5250/fimd.h | 4 ++-- src/cpu/samsung/exynos5250/pinmux.c | 2 +- src/cpu/samsung/exynos5250/setup.h | 4 ++-- src/cpu/samsung/exynos5250/spi.c | 4 ++-- src/cpu/samsung/exynos5250/tmu.c | 4 ++-- src/cpu/samsung/exynos5250/tmu.h | 2 +- src/cpu/samsung/exynos5250/uart.c | 4 ++-- src/cpu/ti/am335x/uart.c | 2 +- src/cpu/ti/am335x/uart.h | 4 ++-- src/cpu/via/nano/update_ucode.c | 4 ++-- src/cpu/via/nano/update_ucode.h | 4 ++-- src/cpu/x86/car.c | 2 +- src/cpu/x86/lapic/lapic_cpu_init.c | 2 +- src/cpu/x86/mtrr/earlymtrr.c | 4 ++-- src/cpu/x86/mtrr/mtrr.c | 18 +++++++++--------- src/cpu/x86/smm/smm_module_loader.c | 14 +++++++------- 44 files changed, 102 insertions(+), 102 deletions(-) diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c index 68e7c09..18c278e 100644 --- a/src/cpu/amd/car/post_cache_as_ram.c +++ b/src/cpu/amd/car/post_cache_as_ram.c @@ -88,7 +88,7 @@ static void post_cache_as_ram(void) #endif #if 1 { - /* Check value of esp to verify if we have enough rom for stack in Cache as RAM */ + /* Check value of esp to verify if we have enough room for stack in Cache as RAM */ unsigned v_esp; __asm__ volatile ( "movl %%esp, %0\n\t" @@ -123,7 +123,7 @@ static void post_cache_as_ram(void) /* set new esp */ /* before CONFIG_RAMBASE */ "subl %0, %%esp\n\t" ::"a"( (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE)- (CONFIG_RAMTOP) ) - /* discard all registers (eax is used for %0), so gcc redo everything + /* discard all registers (eax is used for %0), so gcc redoes everything after the stack is moved */ : "cc", "memory", "%ebx", "%ecx", "%edx", "%esi", "%edi", "%ebp" ); diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c index 13b9e37..b3df0a3 100644 --- a/src/cpu/amd/dualcore/amd_sibling.c +++ b/src/cpu/amd/dualcore/amd_sibling.c @@ -91,10 +91,10 @@ unsigned get_apicid_base(unsigned ioapic_num) } #endif - //contruct apicid_base + //Construct apicid_base if((!disable_siblings) && (siblings>0) ) { - /* for 8 way dual core, we will used up apicid 16:16, actualy 16 is not allowed by current kernel + /* for 8 way dual core, we will used up apicid 16:16, actually 16 is not allowed by current kernel and the kernel will try to get one that is small than 16 to make io apic work. I don't know when the kernel can support 256 apic id. (APIC_EXT_ID is enabled) */ diff --git a/src/cpu/amd/geode_gx2/cpubug.c b/src/cpu/amd/geode_gx2/cpubug.c index 54d7e0e..eddc924 100644 --- a/src/cpu/amd/geode_gx2/cpubug.c +++ b/src/cpu/amd/geode_gx2/cpubug.c @@ -163,7 +163,7 @@ static void eng2900(void) * clocks when CPU is snooped. Because setting XSTATE to 0 * overrides any other XSTATE action, the code will always * stall for 4 GeodeLink clocks after a snoop request goes - * away even if it occured a clock or two later than a + * away even if it occurred a clock or two later than a * different snoop; the stall signal will never 'glitch high' * for only one or two CPU clocks with this code. */ @@ -201,7 +201,7 @@ static void eng2900(void) msr.lo = 0x30000; wrmsr(MSR_GLCP + 0x0073, msr); - /* Writing action number 5: STALL_CPU_PIPE when exitting idle + /* Writing action number 5: STALL_CPU_PIPE when exiting idle state or not in idle state */ msr.hi = 0; msr.lo = 0x00430000; @@ -293,7 +293,7 @@ static void bug118339(void) * * PBZ 3659: * The MC reordered transactions incorrectly and breaks coherency. - * Disable reording and take a potential performance hit. + * Disable reordering and take a potential performance hit. * This is safe to do here and not in MC init since there is nothing * to maintain coherency with and the cache is not enabled yet. */ diff --git a/src/cpu/amd/geode_gx2/cpureginit.c b/src/cpu/amd/geode_gx2/cpureginit.c index 0fc852d..e0ecd62 100644 --- a/src/cpu/amd/geode_gx2/cpureginit.c +++ b/src/cpu/amd/geode_gx2/cpureginit.c @@ -15,7 +15,7 @@ void cpuRegInit (void) /* Set up GLCP to grab BTM data. */ msrnum = GLCP_DBGOUT; /* GLCP_DBGOUT MSR */ msr.hi = 0x0; - msr.lo = 0x08; /* reset value (SCOPE_SEL = 0) causes FIFO toshift out, */ + msr.lo = 0x08; /* reset value (SCOPE_SEL = 0) causes FIFO to shift out, */ wrmsr(msrnum, msr); /* exchange it to anything else to prevent this */ /* Turn off debug clock */ @@ -119,7 +119,7 @@ void cpuRegInit (void) wrmsr(msrnum, msr); } -/* FPU impercise exceptions bit */ +/* FPU imprecise exceptions bit */ { msrnum = CPU_FPU_MSR_MODE; msr = rdmsr(msrnum); diff --git a/src/cpu/amd/geode_lx/cpubug.c b/src/cpu/amd/geode_lx/cpubug.c index 4110454..ebadec7 100644 --- a/src/cpu/amd/geode_lx/cpubug.c +++ b/src/cpu/amd/geode_lx/cpubug.c @@ -67,7 +67,7 @@ static void pcideadlock(void) /***/ /** PBZ 3659:*/ /** The MC reordered transactions incorrectly and breaks coherency.*/ -/** Disable reording and take a potential performance hit.*/ +/** Disable reordering and take a potential performance hit.*/ /** This is safe to do here and not in MC init since there is nothing*/ /** to maintain coherency with and the cache is not enabled yet.*/ /***/ diff --git a/src/cpu/amd/model_10xxx/defaults.h b/src/cpu/amd/model_10xxx/defaults.h index f7b8b2f..3d33dda 100644 --- a/src/cpu/amd/model_10xxx/defaults.h +++ b/src/cpu/amd/model_10xxx/defaults.h @@ -54,7 +54,7 @@ static const struct { { DC_CFG, AMD_DR_Bx, AMD_PTYPE_SVR, 0x00000000, 0x00000000, - 0x00000000, 0x00000C00 }, /* Errata 326 */ + 0x00000000, 0x00000C00 }, /* Erratum 326 */ { NB_CFG, AMD_FAM10_ALL, AMD_PTYPE_DC | AMD_PTYPE_MC, 0x00000000, 1 << 22, diff --git a/src/cpu/amd/model_10xxx/fidvid.c b/src/cpu/amd/model_10xxx/fidvid.c index ebe44dd..4297c90 100644 --- a/src/cpu/amd/model_10xxx/fidvid.c +++ b/src/cpu/amd/model_10xxx/fidvid.c @@ -68,7 +68,7 @@ Fam10 Bios and Kernel Development Guide #31116, rev 3.48, April 22, 2010 9.- TODO Requires information on current delivery capability (depends on mainboard and maybe power supply ?). One might use a config - option with the maximum number of Ampers that the board can deliver to CPU. + option with the maximum number of Amperes that the board can deliver to CPU. 10.- [Multiprocessor] TODO 2.4.2.12 [Uniprocessor] FIXME ? We call setPStateMaxVal() in init_fidvid_stage2, @@ -79,7 +79,7 @@ Fam10 Bios and Kernel Development Guide #31116, rev 3.48, April 22, 2010 11.- finalPstateChange() from init_fidvid_Stage2 (BKDG says just "may", anyway) 12.- generate ACPI for p-states. FIXME - Needs more assesment. There's some kind of fixed support that + Needs more assessment. There's some kind of fixed support that does not seem to depend on CPU revision or actual MSRC001_00[68:64] as BKDG apparently requires. http://www.coreboot.org/ACPI#CPU_Power_Management @@ -935,7 +935,7 @@ static void fixPsNbVidAfterWR(u32 newNbVid, u8 NbVidUpdatedAll,u8 pviMode) static void finalPstateChange(void) { - /* Enble P0 on all cores for best performance. + /* Enable P0 on all cores for best performance. * Linux can slow them down later if need be. * It is safe since they will be in C1 halt * most of the time anyway. diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/model_10xxx/init_cpus.c index 3d5ddcf..eb047b8 100644 --- a/src/cpu/amd/model_10xxx/init_cpus.c +++ b/src/cpu/amd/model_10xxx/init_cpus.c @@ -424,7 +424,7 @@ static void start_node(u8 node) /** * static void setup_remote_node(u32 node) * - * Copy the BSP Adress Map to each AP. + * Copy the BSP Address Map to each AP. */ static void setup_remote_node(u8 node) { diff --git a/src/cpu/amd/model_fxx/fidvid.c b/src/cpu/amd/model_fxx/fidvid.c index 06ff636..e68611b 100644 --- a/src/cpu/amd/model_fxx/fidvid.c +++ b/src/cpu/amd/model_fxx/fidvid.c @@ -496,7 +496,7 @@ static void init_fidvid_bsp_stage2(unsigned ap_apicid, void *gp) continue; if ((readback & 0xff) == 2) { timeout = 0; - break; /* target ap is stage 2, it's FID has beed set */ + break; /* target ap is stage 2, its FID has been set */ } } @@ -603,7 +603,7 @@ static void init_fidvid_bsp(unsigned bsp_apicid) /* For all APs ( We know the APIC ID of all AP even the APIC ID is lifted) * send signal to the AP it could change it's fid/vid */ - /* remote read singnal from AP that AP is done */ + /* remote read signal from AP that AP is done */ fv.common_fidvid &= 0xffff00; diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index a18b982..42c6f95 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -509,7 +509,7 @@ static void model_fxx_init(device_t dev) id = get_node_core_id(read_nb_cfg_54()); // pre e0 nb_cfg_54 can not be set - /* Is this a bad location? In particular can another node prefecth + /* Is this a bad location? In particular can another node prefetch * data from this node before we have initialized it? */ if (id.coreid == 0) diff --git a/src/cpu/amd/model_fxx/powernow_acpi.c b/src/cpu/amd/model_fxx/powernow_acpi.c index 820d426..af1e24b 100644 --- a/src/cpu/amd/model_fxx/powernow_acpi.c +++ b/src/cpu/amd/model_fxx/powernow_acpi.c @@ -75,7 +75,7 @@ static int write_pstates_for_core(u8 pstate_num, u16 *pstate_feq, u8 *pstate_vid #if CONFIG_K8_REV_F_SUPPORT /* -* Details about this algorithm , refert to BDKG 10.5.1 +* Details about this algorithm , refer to BDKG 10.5.1 * Two parts are included, the another is the DSDT reconstruction process */ @@ -202,7 +202,7 @@ static int pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) goto write_pstates; } - /* Get the multipier of the fid frequency */ + /* Get the multiplier of the fid frequency */ /* * Fid multiplier is always 100 revF and revG. */ @@ -316,7 +316,7 @@ static int pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) Pstate_num++; } - /* Constuct P[Min] State */ + /* Construct P[Min] State */ if (Max_fid == 0x2A && Max_vid != 0x0) { Pstate_fid[Pstate_num] = 0x2; Pstate_feq[Pstate_num] = diff --git a/src/cpu/amd/mtrr/amd_mtrr.c b/src/cpu/amd/mtrr/amd_mtrr.c index 2f3e6e3..033ec53 100644 --- a/src/cpu/amd/mtrr/amd_mtrr.c +++ b/src/cpu/amd/mtrr/amd_mtrr.c @@ -128,10 +128,10 @@ void amd_setup_mtrrs(void) } /* Now that I have mapped what is memory and what is not - * Setup the mtrrs so we can cache the memory. + * Set up the mtrrs so we can cache the memory. */ - // Rev. F K8 supports has SYSCFG_MSR_TOM2WB and dont need + // Rev. F K8 supports has SYSCFG_MSR_TOM2WB and doesn't need // variable MTRR to span memory above 4GB // Lower revisions K8 need variable MTRR over 4GB x86_setup_var_mtrrs(address_bits, has_tom2wb ? 0 : 1); diff --git a/src/cpu/amd/quadcore/amd_sibling.c b/src/cpu/amd/quadcore/amd_sibling.c index e0d173d..d653a85 100644 --- a/src/cpu/amd/quadcore/amd_sibling.c +++ b/src/cpu/amd/quadcore/amd_sibling.c @@ -95,10 +95,10 @@ u32 get_apicid_base(u32 ioapic_num) nb_cfg_54 = read_nb_cfg_54(); - //contruct apicid_base + //Construct apicid_base if((!disable_siblings) && (siblings>0) ) { - /* for 8 way dual core, we will used up apicid 16:16, actualy + /* for 8 way dual core, we will used up apicid 16:16, actually 16 is not allowed by current kernel and the kernel will try to get one that is small than 16 to make io apic work. I don't know when the kernel can support 256 apic id. diff --git a/src/cpu/intel/haswell/haswell.h b/src/cpu/intel/haswell/haswell.h index 4a739a9..ac082b8 100644 --- a/src/cpu/intel/haswell/haswell.h +++ b/src/cpu/intel/haswell/haswell.h @@ -169,7 +169,7 @@ void smm_initiate_relocation(void); void smm_initiate_relocation_parallel(void); struct bus; void bsp_init_and_start_aps(struct bus *cpu_bus); -/* Returns 0 on succes. < 0 on failure. */ +/* Returns 0 on success. < 0 on failure. */ int setup_ap_init(struct bus *cpu_bus, int *max_cpus, const void *microcode_patch); /* Returns 0 on success, < 0 on failure. */ diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c index 056b289..85f6afd 100644 --- a/src/cpu/intel/haswell/haswell_init.c +++ b/src/cpu/intel/haswell/haswell_init.c @@ -39,7 +39,7 @@ #include "chip.h" /* - * List of suported C-states in this processor + * List of supported C-states in this processor * * Latencies are typical worst-case package exit time in uS * taken from the SandyBridge BIOS specification. @@ -324,7 +324,7 @@ static void configure_thermal_target(void) return; conf = lapic->chip_info; - /* Set TCC activaiton offset if supported */ + /* Set TCC activation offset if supported */ msr = rdmsr(MSR_PLATFORM_INFO); if ((msr.lo & (1 << 30)) && conf->tcc_offset) { msr = rdmsr(MSR_TEMPERATURE_TARGET); @@ -508,8 +508,8 @@ void bsp_init_and_start_aps(struct bus *cpu_bus) int num_aps; const void *microcode_patch; - /* Perform any necesarry BSP initialization before APs are brought up. - * This call alos allows the BSP to prepare for any secondary effects + /* Perform any necessary BSP initialization before APs are brought up. + * This call also allows the BSP to prepare for any secondary effects * from calling cpu_initialize() such as smm_init(). */ bsp_init_before_ap_bringup(cpu_bus); @@ -529,7 +529,7 @@ void bsp_init_and_start_aps(struct bus *cpu_bus) } if (smm_initialize()) { - printk(BIOS_CRIT, "SMM Initialiazation failed...\n"); + printk(BIOS_CRIT, "SMM Initialization failed...\n"); return; } diff --git a/src/cpu/intel/haswell/mp_init.c b/src/cpu/intel/haswell/mp_init.c index 1358418..51130a5 100644 --- a/src/cpu/intel/haswell/mp_init.c +++ b/src/cpu/intel/haswell/mp_init.c @@ -78,7 +78,7 @@ static device_t cpu_devs[CONFIG_MAX_CPUS]; static atomic_t num_aps; /* Number of APs that have relocated their SMM handler. */ static atomic_t num_aps_relocated_smm; -/* Barrier to stop APs from performing SMM relcoation. */ +/* Barrier to stop APs from performing SMM relocation. */ static int smm_relocation_barrier_begin __attribute__ ((aligned (64))); /* Determine if hyperthreading is disabled. */ int ht_disabled; @@ -145,7 +145,7 @@ void release_aps_for_smm_relocation(int do_parallel) /* The mtrr code sets up ROM caching on the BSP, but not the others. However, * the boot loader payload disables this. In order for Linux not to complain - * ensure the caching is disabled for tha APs before going to sleep. */ + * ensure the caching is disabled for the APs before going to sleep. */ static void cleanup_rom_caching(void) { x86_mtrr_disable_rom_caching(); @@ -178,7 +178,7 @@ static void asmlinkage ap_init(unsigned int cpu, void *microcode_ptr) ap_initiate_smm_relocation(); - /* Indicate that SMM relocation has occured on this thread. */ + /* Indicate that SMM relocation has occurred on this thread. */ atomic_inc(&num_aps_relocated_smm); /* After SMM relocation a 2nd microcode load is required. */ @@ -401,7 +401,7 @@ static int allocate_cpu_devices(struct bus *cpu_bus, int *total_hw_threads) /* Allocate the new cpu device structure */ new = alloc_find_dev(cpu_bus, &cpu_path); if (new == NULL) { - printk(BIOS_CRIT, "Could not allocte cpu device\n"); + printk(BIOS_CRIT, "Could not allocate cpu device\n"); max_cpus--; } cpu_devs[i] = new; diff --git a/src/cpu/intel/haswell/smmrelocate.c b/src/cpu/intel/haswell/smmrelocate.c index 4fe6489..3f4f45a 100644 --- a/src/cpu/intel/haswell/smmrelocate.c +++ b/src/cpu/intel/haswell/smmrelocate.c @@ -348,7 +348,7 @@ static void setup_ied_area(struct smm_relocation_params *params) memset(ied_base + (1 << 20), 0, (32 << 10)); /* According to the BWG MP init section 2MiB of memory at IEDBASE + - * 2MiB should be zeroed as well. However, I suspect what is inteneded + * 2MiB should be zeroed as well. However, I suspect what is intended * is to clear the memory covered by EMRR. TODO(adurbin): figure out if * this is really required. */ //memset(ied_base + (2 << 20), 0, (2 << 20)); } diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c index ab4db59..4c88e44 100644 --- a/src/cpu/intel/model_2065x/model_2065x_init.c +++ b/src/cpu/intel/model_2065x/model_2065x_init.c @@ -39,7 +39,7 @@ #include "chip.h" /* - * List of suported C-states in this processor + * List of supported C-states in this processor * * Latencies are typical worst-case package exit time in uS * taken from the SandyBridge BIOS specification. @@ -249,7 +249,7 @@ static void configure_thermal_target(void) return; conf = lapic->chip_info; - /* Set TCC activaiton offset if supported */ + /* Set TCC activation offset if supported */ msr = rdmsr(MSR_PLATFORM_INFO); if ((msr.lo & (1 << 30)) && conf->tcc_offset) { msr = rdmsr(MSR_TEMPERATURE_TARGET); diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index fa974e5..6028801 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -39,7 +39,7 @@ #include "chip.h" /* - * List of suported C-states in this processor + * List of supported C-states in this processor * * Latencies are typical worst-case package exit time in uS * taken from the SandyBridge BIOS specification. @@ -374,7 +374,7 @@ static void configure_thermal_target(void) return; conf = lapic->chip_info; - /* Set TCC activaiton offset if supported */ + /* Set TCC activation offset if supported */ msr = rdmsr(MSR_PLATFORM_INFO); if ((msr.lo & (1 << 30)) && conf->tcc_offset) { msr = rdmsr(MSR_TEMPERATURE_TARGET); diff --git a/src/cpu/intel/slot_1/l2_cache.c b/src/cpu/intel/slot_1/l2_cache.c index eca0c89..a974d24 100644 --- a/src/cpu/intel/slot_1/l2_cache.c +++ b/src/cpu/intel/slot_1/l2_cache.c @@ -34,7 +34,7 @@ */ /* This code is ported from coreboot v1. - * The L2 cache initalization sequence here only apply to SECC/SECC2 P6 family + * The L2 cache initialization sequence here only apply to SECC/SECC2 P6 family * CPUs with Klamath (63x), Deschutes (65x) and Katmai (67x) cores. * It is not required for Coppermine (68x) and Tualatin (6bx) cores. * It is currently not known if Celerons with Mendocino (66x) core require the @@ -295,7 +295,7 @@ int write_l2(u32 address, u32 data) // data1 = ffffffff // data2 = 000000dc // address = 00aaaaaa - // Final address signalled: + // Final address signaled: // 000fffff fff000c0 000dcaaa aaa00000 data1 = data & 0xff; data1 = data1 << 21; @@ -343,7 +343,7 @@ int test_l2_address_alias(u32 address1, u32 address2, /* Calculates the L2 cache size. * - * Reference: Intel(R) 64 and IA-32 Architectures Software Developer�s Manual + * Reference: Intel(R) 64 and IA-32 Architectures Software Developer�s Manual * Volume 3B: System Programming Guide, Part 2, Intel pub. 253669, pg. B-172. * */ diff --git a/src/cpu/samsung/exynos5250/clk.h b/src/cpu/samsung/exynos5250/clk.h index ba8d960..565cf2b 100644 --- a/src/cpu/samsung/exynos5250/clk.h +++ b/src/cpu/samsung/exynos5250/clk.h @@ -72,7 +72,7 @@ unsigned long clock_get_periph_rate(enum periph_id peripheral); #define MCT_HZ 24000000 /* - * Set mshci controller instances clock drivder + * Set mshci controller instances clock divider * * @param enum periph_id instance of the mshci controller * @@ -521,7 +521,7 @@ struct exynos5_mct_regs { }; #define EXYNOS5_EPLLCON0_LOCKED_SHIFT 29 /* EPLL Locked bit position*/ -#define EPLL_SRC_CLOCK 24000000 /*24 MHz Cristal Input */ +#define EPLL_SRC_CLOCK 24000000 /*24 MHz Crystal Input */ #define TIMEOUT_EPLL_LOCK 1000 #define AUDIO_0_RATIO_MASK 0x0f diff --git a/src/cpu/samsung/exynos5250/clock.c b/src/cpu/samsung/exynos5250/clock.c index 78f0bd4..390fae3 100644 --- a/src/cpu/samsung/exynos5250/clock.c +++ b/src/cpu/samsung/exynos5250/clock.c @@ -160,7 +160,7 @@ static struct clk_bit_info clk_bit_info[PERIPH_ID_COUNT] = { {24, 1, 20, -1}, /* PERIPH_ID_SATA */ }; -/* Epll Clock division values to achive different frequency output */ +/* Epll Clock division values to achieve different frequency output */ static struct st_epll_con_val epll_div[] = { { 192000000, 0, 48, 3, 1, 0 }, { 180000000, 0, 45, 3, 1, 0 }, @@ -405,7 +405,7 @@ void clock_ll_set_pre_ratio(enum periph_id periph_id, unsigned divisor) u32 *reg; /* - * For now we only handle a very small subset of peipherals here. + * For now we only handle a very small subset of peripherals here. * Others will need to (and do) mangle the clock registers * themselves, At some point it is hoped that this function can work * from a table or calculated register offset / mask. For now this @@ -636,7 +636,7 @@ int clock_epll_set_rate(unsigned long rate) epll_con |= epll_div[i].s_div << EPLL_CON0_SDIV_SHIFT; /* - * Required period ( in cycles) to genarate a stable clock output. + * Required period ( in cycles) to generate a stable clock output. * The maximum clock time can be up to 3000 * PDIV cycles of PLLs * frequency input (as per spec) */ @@ -675,7 +675,7 @@ int clock_set_i2s_clk_prescaler(unsigned int src_frq, unsigned int dst_frq) unsigned int div ; if ((dst_frq == 0) || (src_frq == 0)) { - printk(BIOS_DEBUG, "%s: Invalid requency input for prescaler\n", __func__); + printk(BIOS_DEBUG, "%s: Invalid frequency input for prescaler\n", __func__); printk(BIOS_DEBUG, "src frq = %d des frq = %d ", src_frq, dst_frq); return -1; } diff --git a/src/cpu/samsung/exynos5250/cpu.c b/src/cpu/samsung/exynos5250/cpu.c index 96e7dc3..61f937b 100644 --- a/src/cpu/samsung/exynos5250/cpu.c +++ b/src/cpu/samsung/exynos5250/cpu.c @@ -107,7 +107,7 @@ static void exynos_displayport_init(device_t dev) * * Note: We may want to do something clever to ensure the framebuffer * region is aligned such that we don't change dcache policy for other - * stuff inadvertantly. + * stuff inadvertently. */ uint32_t lower = ALIGN_DOWN(lcdbase, MiB); uint32_t upper = ALIGN_UP(lcdbase + fb_size, MiB); diff --git a/src/cpu/samsung/exynos5250/dmc.h b/src/cpu/samsung/exynos5250/dmc.h index d676aa7..acd0abb 100644 --- a/src/cpu/samsung/exynos5250/dmc.h +++ b/src/cpu/samsung/exynos5250/dmc.h @@ -328,7 +328,7 @@ struct mem_timings { uint8_t chips_per_channel; /* number of chips per channel */ uint8_t chips_to_configure; /* number of chips to configure */ uint8_t send_zq_init; /* 1 to send this command */ - unsigned int impedance; /* drive strength impedeance */ + unsigned int impedance; /* drive strength impedance */ uint8_t gate_leveling_enable; /* check gate leveling is enabled */ }; diff --git a/src/cpu/samsung/exynos5250/dmc_common.c b/src/cpu/samsung/exynos5250/dmc_common.c index 55388ac..b506853 100644 --- a/src/cpu/samsung/exynos5250/dmc_common.c +++ b/src/cpu/samsung/exynos5250/dmc_common.c @@ -64,7 +64,7 @@ int dmc_config_zq(struct mem_timings *mem, val &= ~ZQ_MANUAL_STR; /* - * Since we are manaully calibrating the ZQ values, + * Since we are manually calibrating the ZQ values, * we are looping for the ZQ_init to complete. */ i = ZQ_INIT_TIMEOUT; @@ -97,12 +97,12 @@ void update_reset_dll(struct exynos5_dmc *dmc, enum ddr_mode mode) writel(val, &dmc->phycontrol0); } - /* Update DLL Information: Force DLL Resyncronization */ + /* Update DLL Information: Force DLL Resynchronization */ val = readl(&dmc->phycontrol0); val |= FP_RSYNC; writel(val, &dmc->phycontrol0); - /* Reset Force DLL Resyncronization */ + /* Reset Force DLL Resynchronization */ val = readl(&dmc->phycontrol0); val &= ~FP_RSYNC; writel(val, &dmc->phycontrol0); diff --git a/src/cpu/samsung/exynos5250/dmc_init_ddr3.c b/src/cpu/samsung/exynos5250/dmc_init_ddr3.c index cb5c613..554f4c2 100644 --- a/src/cpu/samsung/exynos5250/dmc_init_ddr3.c +++ b/src/cpu/samsung/exynos5250/dmc_init_ddr3.c @@ -139,9 +139,9 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, unsigned long mem_iv_size, writel(mem->concontrol | (mem->rd_fetch << CONCONTROL_RD_FETCH_SHIFT), &dmc->concontrol); - /* Memory Channel Inteleaving Size */ + /* Memory Channel Interleaving Size */ printk(BIOS_SPEW, "ddr3_mem_ctrl_init: " - "Memory Channel Inteleaving Size\n"); + "Memory Channel Interleaving Size\n"); writel(mem->iv_size, &dmc->ivcontrol); /* Set DMC MEMCONTROL register */ @@ -161,7 +161,7 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, unsigned long mem_iv_size, /* Power Down mode Configuration */ printk(BIOS_SPEW, "ddr3_mem_ctrl_init: " - "Power Down mode Configuraation\n"); + "Power Down mode Configuration\n"); writel(mem->dpwrdn_cyc << PWRDNCONFIG_DPWRDN_CYC_SHIFT | mem->dsref_cyc << PWRDNCONFIG_DSREF_CYC_SHIFT, &dmc->pwrdnconfig); diff --git a/src/cpu/samsung/exynos5250/dp-core.h b/src/cpu/samsung/exynos5250/dp-core.h index 73f4638..ab7e7e4 100644 --- a/src/cpu/samsung/exynos5250/dp-core.h +++ b/src/cpu/samsung/exynos5250/dp-core.h @@ -29,7 +29,7 @@ #define MAX_CR_LOOP 5 #define MAX_EQ_LOOP 4 -/* Link tare type */ +/* Link rate type */ enum link_rate { LINK_RATE_1_62GBPS = 0x06, LINK_RATE_2_70GBPS = 0x0a @@ -126,7 +126,7 @@ struct s5p_dp_device { */ void s5p_dp_reset(struct s5p_dp_device *dp); /* - * Initialize DP to recieve video stream + * Initialize DP to receive video stream * * param dp pointer to main s5p-dp structure */ @@ -214,8 +214,8 @@ int s5p_dp_is_slave_video_stream_clock_on(struct s5p_dp_device *dp); * * param dp pointer to main s5p-dp structure * param type clock_recovery_m_value_type - * param m_value to caluculate m_vid value - * param n_value to caluculate n_vid value + * param m_value to calculate m_vid value + * param n_value to calculate n_vid value */ void s5p_dp_set_video_cr_mn(struct s5p_dp_device *dp, enum clock_recovery_m_value_type type, diff --git a/src/cpu/samsung/exynos5250/dp-reg.c b/src/cpu/samsung/exynos5250/dp-reg.c index eb53356..ac4208d 100644 --- a/src/cpu/samsung/exynos5250/dp-reg.c +++ b/src/cpu/samsung/exynos5250/dp-reg.c @@ -91,7 +91,7 @@ void s5p_dp_reset(struct s5p_dp_device *dp) /* Set interrupt pin assertion polarity as high */ writel(INT_POL0 | INT_POL1, &base->int_ctl); - /* Clear pending regisers */ + /* Clear pending registers */ writel(0xff, &base->common_int_sta_1); writel(0x4f, &base->common_int_sta_2); writel(0xe0, &base->common_int_sta_3); @@ -156,7 +156,7 @@ void s5p_dp_init_aux(struct s5p_dp_device *dp) u32 reg; struct exynos5_dp *base = dp->base; - /* Clear inerrupts related to AUX channel */ + /* Clear interrupts related to AUX channel */ reg = RPLY_RECEIV | AUX_ERR; writel(reg, &base->dp_int_sta); diff --git a/src/cpu/samsung/exynos5250/fimd.h b/src/cpu/samsung/exynos5250/fimd.h index 71d1785..f3dea37 100644 --- a/src/cpu/samsung/exynos5250/fimd.h +++ b/src/cpu/samsung/exynos5250/fimd.h @@ -86,11 +86,11 @@ struct exynos5_fimd_panel { unsigned int upper_margin; /* Vertical Backporch */ unsigned int lower_margin; /* Vertical frontporch */ unsigned int vsync; /* Vertical Sync Pulse Width */ - unsigned int left_margin; /* Horizantal Backporch */ + unsigned int left_margin; /* Horizontal Backporch */ unsigned int right_margin; /* Horizontal Frontporch */ unsigned int hsync; /* Horizontal Sync Pulse Width */ unsigned int xres; /* X Resolution */ - unsigned int yres; /* Y Resopultion */ + unsigned int yres; /* Y Resolution */ }; /* LCDIF Register Map */ diff --git a/src/cpu/samsung/exynos5250/pinmux.c b/src/cpu/samsung/exynos5250/pinmux.c index 1c72353..ab1b25e 100644 --- a/src/cpu/samsung/exynos5250/pinmux.c +++ b/src/cpu/samsung/exynos5250/pinmux.c @@ -94,7 +94,7 @@ void exynos_pinmux_sdmmc2(void) void exynos_pinmux_sdmmc3(void) { /* - * TODO: Need to add defintions for GPC4 before + * TODO: Need to add definitions for GPC4 before * enabling this. */ printk(BIOS_DEBUG, "SDMMC3 not supported yet"); diff --git a/src/cpu/samsung/exynos5250/setup.h b/src/cpu/samsung/exynos5250/setup.h index 942a3f1..9f10786 100644 --- a/src/cpu/samsung/exynos5250/setup.h +++ b/src/cpu/samsung/exynos5250/setup.h @@ -661,7 +661,7 @@ struct exynos5_phy_control; #define MEM_TERM_EN (1 << 31) /* Termination enable for memory */ #define PHY_TERM_EN (1 << 30) /* Termination enable for PHY */ #define DMC_CTRL_SHGATE (1 << 29) /* Duration of DQS gating signal */ -#define FP_RSYNC (1 << 3) /* Force DLL resyncronization */ +#define FP_RSYNC (1 << 3) /* Force DLL resynchronization */ /* Driver strength for CK, CKE, CS & CA */ #define IMP_OUTPUT_DRV_40_OHM 0x5 @@ -676,7 +676,7 @@ struct exynos5_phy_control; struct mem_timings; -/* Errors that we can encourter in low-level setup */ +/* Errors that we can encounter in low-level setup */ enum { SETUP_ERR_OK, SETUP_ERR_RDLV_COMPLETE_TIMEOUT = -1, diff --git a/src/cpu/samsung/exynos5250/spi.c b/src/cpu/samsung/exynos5250/spi.c index 642ae23..1c365dc 100644 --- a/src/cpu/samsung/exynos5250/spi.c +++ b/src/cpu/samsung/exynos5250/spi.c @@ -42,7 +42,7 @@ static void exynos_spi_rx_tx(struct exynos_spi *regs, int todo, unsigned int *rxp = (unsigned int *)(dinp + (i * (32 * 1024))); unsigned int out_bytes, in_bytes; - // TODO In currrent implementation, every read/write must be aligned to + // TODO In current implementation, every read/write must be aligned to // 4 bytes, otherwise you may get timeout or other unexpected results. ASSERT(todo % 4 == 0); @@ -90,7 +90,7 @@ int exynos_spi_open(struct exynos_spi *regs) SPI_MODE_CH_WIDTH_WORD | SPI_MODE_BUS_WIDTH_WORD); clrbits_le32(&regs->ch_cfg, SPI_CH_CPOL_L); /* CPOL: active high */ - /* clear rx and tx channel if set priveously */ + /* clear rx and tx channel if set previously */ clrbits_le32(&regs->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON); setbits_le32(&regs->swap_cfg, diff --git a/src/cpu/samsung/exynos5250/tmu.c b/src/cpu/samsung/exynos5250/tmu.c index 5a871fd..1b5e9c2 100644 --- a/src/cpu/samsung/exynos5250/tmu.c +++ b/src/cpu/samsung/exynos5250/tmu.c @@ -69,8 +69,8 @@ struct tmu_info exynos5250_tmu_info = { /* * After reading temperature code from register, compensating - * its value and calculating celsius temperatue, - * get current temperatue. + * its value and calculating celsius temperature, + * get current temperature. * * @return current temperature of the chip as sensed by TMU */ diff --git a/src/cpu/samsung/exynos5250/tmu.h b/src/cpu/samsung/exynos5250/tmu.h index 03eacd2..bda4bd7 100644 --- a/src/cpu/samsung/exynos5250/tmu.h +++ b/src/cpu/samsung/exynos5250/tmu.h @@ -65,7 +65,7 @@ enum tmu_status_t { TMU_STATUS_TRIPPED, }; -/* Tmeperature threshold values for various thermal events */ +/* Temperature threshold values for various thermal events */ struct temperature_params { /* minimum value in temperature code range */ unsigned int min_val; diff --git a/src/cpu/samsung/exynos5250/uart.c b/src/cpu/samsung/exynos5250/uart.c index 41dc709..dbf7202 100644 --- a/src/cpu/samsung/exynos5250/uart.c +++ b/src/cpu/samsung/exynos5250/uart.c @@ -37,7 +37,7 @@ static uint32_t base_port = CONFIG_CONSOLE_SERIAL_UART_ADDRESS; * The coefficient, used to calculate the baudrate on S5P UARTs is * calculated as * C = UBRDIV * 16 + number_of_set_bits_in_UDIVSLOT - * however, section 31.6.11 of the datasheet doesn't recomment using 1 for 1, + * however, section 31.6.11 of the datasheet doesn't recommend using 1 for 1, * 3 for 2, ... (2^n - 1) for n, instead, they suggest using these constants: */ static const int udivslot[] = { @@ -129,7 +129,7 @@ static int exynos5_uart_err_check(int op) /* * Read a single byte from the serial port. Returns 1 on success, 0 - * otherwise. When the function is succesfull, the character read is + * otherwise. When the function is successful, the character read is * written into its argument c. */ static unsigned char exynos5_uart_rx_byte(void) diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c index 395ed86..bd2ff44 100644 --- a/src/cpu/ti/am335x/uart.c +++ b/src/cpu/ti/am335x/uart.c @@ -147,7 +147,7 @@ static void am335x_uart_init_dev(void) /* * Read a single byte from the serial port. Returns 1 on success, 0 - * otherwise. When the function is succesfull, the character read is + * otherwise. When the function is successful, the character read is * written into its argument c. */ static unsigned char am335x_uart_rx_byte(void) diff --git a/src/cpu/ti/am335x/uart.h b/src/cpu/ti/am335x/uart.h index 56d4c51..645cd43 100644 --- a/src/cpu/ti/am335x/uart.h +++ b/src/cpu/ti/am335x/uart.h @@ -130,7 +130,7 @@ struct am335x_uart { uint8_t rsvd_0x36[2]; uint16_t blr; /* BOF control */ uint8_t rsvd_0x3a[2]; - uint16_t acreg; /* auxilliary control */ + uint16_t acreg; /* auxiliary control */ uint8_t rsvd_0x3e[2]; /* 0x40 */ @@ -139,7 +139,7 @@ struct am335x_uart { uint16_t ssr; /* supplementary status */ uint8_t rsvd_0x46[2]; - uint16_t eblr; /* BOF length (operatoinal mode only) */ + uint16_t eblr; /* BOF length (operational mode only) */ uint8_t rsvd_0x4a[6]; /* 0x50 */ diff --git a/src/cpu/via/nano/update_ucode.c b/src/cpu/via/nano/update_ucode.c index d5757f8..7471928 100644 --- a/src/cpu/via/nano/update_ucode.c +++ b/src/cpu/via/nano/update_ucode.c @@ -37,7 +37,7 @@ static ucode_update_status nano_apply_ucode(const nano_ucode_header *ucode) msr.hi = 0; wrmsr(MSR_IA32_BIOS_UPDT_TRIG, msr); - /* Let's see if we updated succesfully */ + /* Let's see if we updated successfully */ msr = rdmsr(MSR_UCODE_UPDATE_STATUS); return msr.lo & 0x07; @@ -80,7 +80,7 @@ static void nano_print_ucode_status(ucode_update_status stat) switch(stat) { case UCODE_UPDATE_SUCCESS: - printk(BIOS_INFO, "Microcode update succesful.\n"); + printk(BIOS_INFO, "Microcode update successful.\n"); break; case UCODE_UPDATE_FAIL: printk(BIOS_ALERT, "Microcode update failed, bad environment." diff --git a/src/cpu/via/nano/update_ucode.h b/src/cpu/via/nano/update_ucode.h index 6a22d18..ae58fb2 100644 --- a/src/cpu/via/nano/update_ucode.h +++ b/src/cpu/via/nano/update_ucode.h @@ -56,11 +56,11 @@ typedef struct { u32 applicable_fms; /* Fam/model/stepping to which ucode applies */ u32 checksum; /* Two's complement checksum of ucode+header */ u32 loader_revision; /* Revision of hardware ucode update loader*/ - u32 rfu_1; /* Reservod for future use */ + u32 rfu_1; /* Reserved for future use */ u32 payload_size; /* Size of the ucode payload only */ u32 total_size; /* Size of the ucode, including header */ char name[8]; /* ASCII string of ucode filename */ - u32 rfu_2; /* Reservod for future use */ + u32 rfu_2; /* Reserved for future use */ /* First double-word of the ucode payload * Its address represents the beginning of the ucode update we need to * send to the CPU */ diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index 88f2807..87fa98b 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -33,7 +33,7 @@ extern char _car_data_end[]; /* * The car_migrated global variable determines if the cache-as-ram space has - * been migrated to real RAM. It does this by asumming the following things: + * been migrated to real RAM. It does this by assuming the following things: * 1. cache-as-ram space is zero'd out once it is set up. * 2. Either the cache-as-ram space is memory-backed after getting torn down * or the space returns 0xff's for each byte read. diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index fbc8aa4..a3bab46 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -40,7 +40,7 @@ * will return 0, meaning no CPU. * * We actually handling that case by noting which cpus startup - * and not telling anyone about the ones that dont. + * and not telling anyone about the ones that don't. */ /* Start-UP IPI vector must be 4kB aligned and below 1MB. */ diff --git a/src/cpu/x86/mtrr/earlymtrr.c b/src/cpu/x86/mtrr/earlymtrr.c index 55dbd2f..f16da27 100644 --- a/src/cpu/x86/mtrr/earlymtrr.c +++ b/src/cpu/x86/mtrr/earlymtrr.c @@ -32,7 +32,7 @@ static void cache_ramstage(void) const int addr_det = 0; /* the fixed and variable MTTRs are power-up with random values, - * clear them to MTRR_TYPE_UNCACHEABLE for safty. + * clear them to MTRR_TYPE_UNCACHEABLE for safety. */ static void do_early_mtrr_init(const unsigned long *mtrr_msrs) { @@ -43,7 +43,7 @@ static void do_early_mtrr_init(const unsigned long *mtrr_msrs) msr_t msr; const unsigned long *msr_addr; - /* Inialize all of the relevant msrs to 0 */ + /* Initialize all of the relevant msrs to 0 */ msr.lo = 0; msr.hi = 0; unsigned long msr_nr; diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c index b69787b..8f1c35e 100644 --- a/src/cpu/x86/mtrr/mtrr.c +++ b/src/cpu/x86/mtrr/mtrr.c @@ -94,7 +94,7 @@ static inline unsigned int fms(unsigned int x) return r; } -/* fls: find least sigificant bit set */ +/* fls: find least significant bit set */ static inline unsigned int fls(unsigned int x) { int r; @@ -160,8 +160,8 @@ static struct memranges *get_physical_address_space(void) static struct memranges addr_space_storage; /* In order to handle some chipsets not being able to pre-determine - * uncacheable ranges, such as graphics memory, at resource inseration - * time remove unacheable regions from the cacheable ones. */ + * uncacheable ranges, such as graphics memory, at resource insertion + * time remove uncacheable regions from the cacheable ones. */ if (addr_space == NULL) { struct range_entry *r; unsigned long mask; @@ -216,7 +216,7 @@ static struct memranges *get_physical_address_space(void) } /* Fixed MTRR descriptor. This structure defines the step size and begin - * and end (exclusive) address covered by a set of fixe MTRR MSRs. + * and end (exclusive) address covered by a set of fixed MTRR MSRs. * It also describes the offset in byte intervals to store the calculated MTRR * type in an array. */ struct fixed_mtrr_desc { @@ -533,7 +533,7 @@ static void calc_var_mtrrs_with_hole(struct var_mtrr_state *var_state, struct range_entry *next; /* - * Determine MTRRs based on the following algoirthm for the given entry: + * Determine MTRRs based on the following algorithm for the given entry: * +------------------+ b2 = ALIGN_UP(end) * | 0 or more bytes | <-- hole is carved out between b1 and b2 * +------------------+ a2 = b1 = end @@ -571,7 +571,7 @@ static void calc_var_mtrrs_with_hole(struct var_mtrr_state *var_state, b1 = a2; - /* First check if a1 is >= 4GiB and the current etnry is the last + /* First check if a1 is >= 4GiB and the current entry is the last * entry. If so perform an optimization of covering a larger range * defined by the base address' alignment. */ if (a1 >= RANGE_4GB && next == NULL) { @@ -686,10 +686,10 @@ static int calc_var_mtrrs(struct memranges *addr_space, * 1. UC as default type with no holes at top of range. * 2. UC as default using holes at top of range. * 3. WB as default. - * The lowest count is then used as default after totalling all - * MTRRs. Note that the optimal algoirthm for UC default is marked in + * The lowest count is then used as default after totaling all + * MTRRs. Note that the optimal algorithm for UC default is marked in * the tag of each range regardless of final decision. UC takes - * precedence in the MTRR archiecture. Therefore, only holes can be + * precedence in the MTRR architecture. Therefore, only holes can be * used when the type of the region is MTRR_TYPE_WRBACK with * MTRR_TYPE_UNCACHEABLE as the default type. */ diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c index 5eb4c5a..478ae8c 100644 --- a/src/cpu/x86/smm/smm_module_loader.c +++ b/src/cpu/x86/smm/smm_module_loader.c @@ -24,16 +24,16 @@ #include <console/console.h> /* - * Compoments that make up the SMRAM: + * Components that make up the SMRAM: * 1. Save state - the total save state memory used * 2. Stack - stacks for the CPUs in the SMM handler * 3. Stub - SMM stub code for calling into handler * 4. Handler - C-based SMM handler. * - * The compoents are assumed to consist of one consecutive region. + * The components are assumed to consist of one consecutive region. */ -/* These paramters are used by the SMM stub code. A pointer to the params +/* These parameters are used by the SMM stub code. A pointer to the params * is also passed to the C-base handler. */ struct smm_stub_params { u32 stack_size; @@ -80,7 +80,7 @@ static void smm_place_jmp_instructions(void *entry_start, int stride, int num, /* Each entry point has an IP value of 0x8000. The SMBASE for each * cpu is different so the effective address of the entry instruction - * is different. Therefore, the relative displacment for each entry + * is different. Therefore, the relative displacement for each entry * instruction needs to be updated to reflect the current effective * IP. Additionally, the IP result from the jmp instruction is * calculated using the next instruction's address so the size of @@ -140,7 +140,7 @@ static void smm_stub_place_staggered_entry_points(char *base, stub_entry_offset = rmodule_entry_offset(smm_stub); /* If there are staggered entry points or the stub is not located - * at the SMM entry point then jmp instructionss need to be placed. */ + * at the SMM entry point then jmp instructions need to be placed. */ if (params->num_concurrent_save_states > 1 || stub_entry_offset != 0) { int num_entries; @@ -297,7 +297,7 @@ int smm_setup_relocation_handler(struct smm_loader_params *params) return -1; /* Since the relocation handler always uses stack, adjust the number - * of conccurent stack users to be CONFIG_MAX_CPUS. */ + * of concurrent stack users to be CONFIG_MAX_CPUS. */ if (params->num_concurrent_stacks == 0) params->num_concurrent_stacks = CONFIG_MAX_CPUS; @@ -318,7 +318,7 @@ int smm_setup_relocation_handler(struct smm_loader_params *params) * * It should be noted that this algorithm will not work for * SMM_DEFAULT_SIZE SMRAM regions such as the A segment. This algorithm - * expectes a region large enough to encompass the handler and stacks + * expects a region large enough to encompass the handler and stacks * as well as the SMM_DEFAULT_SIZE. */ int smm_load_module(void *smram, int size, struct smm_loader_params *params)

1 0

Patch merged into coreboot/master: cbe2ede usbdebug: Cleanup dbgp_ehci_info call
by gerrit＠coreboot.org 11 Jul '13

11 Jul '13

the following patch was just integrated into master: commit cbe2edefb93ed3ba0a4b08f72a9b208429920675 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Jul 11 07:49:46 2013 +0300 usbdebug: Cleanup dbgp_ehci_info call Change-Id: I9cad64796fcfb7a50d9ed9ec95c56ab855c872e3 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/3766 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/3766 for details. -gerrit

1 0

Patch merged into coreboot/master: 2c516ed usbdebug: Drop old includes
by gerrit＠coreboot.org 11 Jul '13

11 Jul '13

the following patch was just integrated into master: commit 2c516ed3f3074588182b00dce4cfbe02206519dd Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Jul 11 06:43:43 2013 +0300 usbdebug: Drop old includes Change-Id: I4786bff41fef924c72087c354e394bdc1996cadc Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/3764 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/3764 for details. -gerrit

1 0

Patch set updated for coreboot: 57ea4a9 src/southbridge/intel/{lynxpoint, bd82x6x}/spi.c: correct spelling of attempted
by Ronald G. Minnich 11 Jul '13

11 Jul '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3572 -gerrit commit 57ea4a966e71385639ddf370bde0bf4562fe5feb Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sat Jun 29 11:41:27 2013 +0200 src/southbridge/intel/{lynxpoint,bd82x6x}/spi.c: correct spelling of attempted Change-Id: Ic6f6af6298fed2f41f140a7aa62dccf98bf60927 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/southbridge/intel/bd82x6x/spi.c | 2 +- src/southbridge/intel/lynxpoint/spi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/southbridge/intel/bd82x6x/spi.c b/src/southbridge/intel/bd82x6x/spi.c index 09169b1..0c1f51c 100644 --- a/src/southbridge/intel/bd82x6x/spi.c +++ b/src/southbridge/intel/bd82x6x/spi.c @@ -677,7 +677,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout, } /* - * Check if this is a write command atempting to transfer more bytes + * Check if this is a write command attempting to transfer more bytes * than the controller can handle. Iterations for writes are not * supported here because each SPI write command needs to be preceded * and followed by other SPI commands, and this sequence is controlled diff --git a/src/southbridge/intel/lynxpoint/spi.c b/src/southbridge/intel/lynxpoint/spi.c index eaa17d5..5501efc 100644 --- a/src/southbridge/intel/lynxpoint/spi.c +++ b/src/southbridge/intel/lynxpoint/spi.c @@ -589,7 +589,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout, } /* - * Check if this is a write command atempting to transfer more bytes + * Check if this is a write command attempting to transfer more bytes * than the controller can handle. Iterations for writes are not * supported here because each SPI write command needs to be preceded * and followed by other SPI commands, and this sequence is controlled

1 0

Patch merged into coreboot/master: 5fbfc91 Move the HAVE_ARCH_* config options from src/arch/x86 to src/.
by gerrit＠coreboot.org 11 Jul '13

11 Jul '13

the following patch was just integrated into master: commit 5fbfc911c159dc449d3955367908c5443f23ca19 Author: Gabe Black <gabeblack(a)google.com> Date: Sun Jul 7 13:52:37 2013 -0700 Move the HAVE_ARCH_* config options from src/arch/x86 to src/. The options that keep track of whether there are arch versions of the standard string functions shouldn't be in the arch/x86 directory since they apply to all architectures. Move them into the higher level, shared Kconfig defaulting to off. Then, in each applicable arch (currently all of them) they can be selected to on. Change-Id: I7ea64a583230fdc28773f17fd7cc23e0f0a5f3d6 Signed-off-by: Gabe Black <gabeblack(a)chromium.org> Reviewed-on: http://review.coreboot.org/3760 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See http://review.coreboot.org/3760 for details. -gerrit

1 0

Patch merged into coreboot/master: db02069 arm: Add a W() macro for use in kernel assembler.
by gerrit＠coreboot.org 11 Jul '13

11 Jul '13

the following patch was just integrated into master: commit db02069d71af6adca96ff432ed0efd7218c076f3 Author: Gabe Black <gabeblack(a)google.com> Date: Sun Jul 7 13:35:37 2013 -0700 arm: Add a W() macro for use in kernel assembler. Some kernel assembly code uses a W macro to optionally add a .w to instructions that need to be 32 bit thumb. The gnu assembler doesn't seem to need the .w and won't assemble if it's provided. Change-Id: I0a288177788b5c61810ee7bd3d2debea66835de2 Signed-off-by: Gabe Black <gabeblack(a)chromium.org> Reviewed-on: http://review.coreboot.org/3759 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See http://review.coreboot.org/3759 for details. -gerrit

1 0

Patch set updated for coreboot: 8ecf7db Redefine pci_bus_default_ops as function
by Kyösti Mälkki 11 Jul '13

11 Jul '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3608 -gerrit commit 8ecf7dbd46a6e0e92a634654be48c4e7c5f4b0bf Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Jul 4 17:17:45 2013 +0300 Redefine pci_bus_default_ops as function Taking device_t as a parameter, this allows to alter the PCI config access handlers. This is useful to add tracing of PCI config writes for devices having problems to initialise correctly. On older AMD platform PCI MMIO may not be able to fully configure all PCI devices/nodes, while MMIO_SUPPORT_DEFAULT would be preferred due to its atomic nature. So those can be forced to IO config instead. Change-Id: I2162884185bbfe461b036caf737980b45a51e522 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/arch/armv7/include/arch/pci_ops.h | 5 +---- src/arch/x86/include/arch/pci_ops.h | 15 +------------ src/device/pci_ops.c | 41 ++++++++++++++++++++++++++--------- src/include/device/device.h | 2 +- src/include/device/pci.h | 12 ---------- 5 files changed, 34 insertions(+), 41 deletions(-) diff --git a/src/arch/armv7/include/arch/pci_ops.h b/src/arch/armv7/include/arch/pci_ops.h index 4bbb7d3..7a7ed32 100644 --- a/src/arch/armv7/include/arch/pci_ops.h +++ b/src/arch/armv7/include/arch/pci_ops.h @@ -20,9 +20,6 @@ #ifndef ARCH_ARMV7_PCI_OPS_H #define ARCH_ARMV7_PCI_OPS_H -static inline const struct pci_bus_operations *pci_config_default(void) -{ - return NULL; -} +/* Empty stub until PCI includes are properly fixed. */ #endif diff --git a/src/arch/x86/include/arch/pci_ops.h b/src/arch/x86/include/arch/pci_ops.h index fa29317..b7ec0ba 100644 --- a/src/arch/x86/include/arch/pci_ops.h +++ b/src/arch/x86/include/arch/pci_ops.h @@ -7,19 +7,6 @@ extern const struct pci_bus_operations pci_cf8_conf1; extern const struct pci_bus_operations pci_ops_mmconf; #endif -#if CONFIG_MMCONF_SUPPORT_DEFAULT -#define pci_bus_default_ops &pci_ops_mmconf -#else -#define pci_bus_default_ops &pci_cf8_conf1 -#endif - -static inline const struct pci_bus_operations *pci_config_default(void) -{ -#if CONFIG_MMCONF_SUPPORT_DEFAULT - return &pci_ops_mmconf; -#else - return &pci_cf8_conf1; -#endif -} +const struct pci_bus_operations *pci_bus_default_ops(device_t dev); #endif /* ARCH_I386_PCI_OPS_H */ diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c index b0281f4..5b633c8 100644 --- a/src/device/pci_ops.c +++ b/src/device/pci_ops.c @@ -25,9 +25,30 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> +const struct pci_bus_operations *pci_bus_default_ops(device_t dev) +{ +#if CONFIG_MMCONF_SUPPORT_DEFAULT + return &pci_ops_mmconf; +#else + return &pci_cf8_conf1; +#endif +} + +static const struct pci_bus_operations *pci_bus_ops(struct bus *bus, device_t dev) +{ + const struct pci_bus_operations *bops; + bops = NULL; + if (bus && bus->dev && bus->dev->ops && bus->dev->ops->ops_pci_bus) { + bops = bus->dev->ops->ops_pci_bus(dev); + } + if (!bops) + bops = pci_bus_default_ops(dev); + return bops; +} + /* - * The only consumer of the return value of get_pbus() is ops_pci_bus(). - * ops_pci_bus() can handle being passed NULL and auto-picks working ops. + * The only consumer of the return value of get_pbus() is pci_bus_ops(). + * pci_bus_ops() can handle being passed NULL and auto-picks working ops. */ static struct bus *get_pbus(device_t dev) { @@ -38,10 +59,10 @@ static struct bus *get_pbus(device_t dev) else pbus = dev->bus; - while (pbus && pbus->dev && !ops_pci_bus(pbus)) { + while (pbus && pbus->dev && !pci_bus_ops(pbus, dev)) { if (pbus == pbus->dev->bus) { printk(BIOS_ALERT, "%s in endless loop looking for a " - "parent bus with ops_pci_bus for %s, breaking " + "parent bus with pci_bus_ops for %s, breaking " "out.\n", __func__, dev_path(dev)); break; } @@ -64,42 +85,42 @@ static struct bus *get_pbus(device_t dev) u8 pci_read_config8(device_t dev, unsigned int where) { struct bus *pbus = get_pbus(dev); - return ops_pci_bus(pbus)->read8(pbus, dev->bus->secondary, + return pci_bus_ops(pbus, dev)->read8(pbus, dev->bus->secondary, dev->path.pci.devfn, where); } u16 pci_read_config16(device_t dev, unsigned int where) { struct bus *pbus = get_pbus(dev); - return ops_pci_bus(pbus)->read16(pbus, dev->bus->secondary, + return pci_bus_ops(pbus, dev)->read16(pbus, dev->bus->secondary, dev->path.pci.devfn, where); } u32 pci_read_config32(device_t dev, unsigned int where) { struct bus *pbus = get_pbus(dev); - return ops_pci_bus(pbus)->read32(pbus, dev->bus->secondary, + return pci_bus_ops(pbus, dev)->read32(pbus, dev->bus->secondary, dev->path.pci.devfn, where); } void pci_write_config8(device_t dev, unsigned int where, u8 val) { struct bus *pbus = get_pbus(dev); - ops_pci_bus(pbus)->write8(pbus, dev->bus->secondary, + pci_bus_ops(pbus, dev)->write8(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val); } void pci_write_config16(device_t dev, unsigned int where, u16 val) { struct bus *pbus = get_pbus(dev); - ops_pci_bus(pbus)->write16(pbus, dev->bus->secondary, + pci_bus_ops(pbus, dev)->write16(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val); } void pci_write_config32(device_t dev, unsigned int where, u32 val) { struct bus *pbus = get_pbus(dev); - ops_pci_bus(pbus)->write32(pbus, dev->bus->secondary, + pci_bus_ops(pbus, dev)->write32(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val); } diff --git a/src/include/device/device.h b/src/include/device/device.h index 9defb19..1eff4a2 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -42,7 +42,7 @@ struct device_operations { #endif const struct pci_operations *ops_pci; const struct smbus_bus_operations *ops_smbus_bus; - const struct pci_bus_operations *ops_pci_bus; + const struct pci_bus_operations * (*ops_pci_bus)(device_t dev); const struct pnp_mode_ops *ops_pnp_mode; }; #endif diff --git a/src/include/device/pci.h b/src/include/device/pci.h index 1f47daf..2dea1cf 100644 --- a/src/include/device/pci.h +++ b/src/include/device/pci.h @@ -94,17 +94,5 @@ static inline const struct pci_operations *ops_pci(device_t dev) return pops; } -static inline const struct pci_bus_operations *ops_pci_bus(struct bus *bus) -{ - const struct pci_bus_operations *bops; - bops = 0; - if (bus && bus->dev && bus->dev->ops) { - bops = bus->dev->ops->ops_pci_bus; - } - if (!bops) - bops = pci_config_default(); - return bops; -} - #endif #endif /* PCI_H */

1 0

New patch to review for coreboot: c397887 usbdebug: Cleanup dbgp_ehci_info call
by Kyösti Mälkki 11 Jul '13

11 Jul '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3766 -gerrit commit c397887b7b231dae02ea92f73195070206690800 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Jul 11 07:49:46 2013 +0300 usbdebug: Cleanup dbgp_ehci_info call Change-Id: I9cad64796fcfb7a50d9ed9ec95c56ab855c872e3 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/include/usbdebug.h | 5 ++--- src/lib/usbdebug.c | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/include/usbdebug.h b/src/include/usbdebug.h index e32410e..16077b0 100644 --- a/src/include/usbdebug.h +++ b/src/include/usbdebug.h @@ -62,9 +62,8 @@ int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size); void set_debug_port(unsigned port); int usbdebug_init(void); -struct ehci_debug_info *dbgp_ehci_info(void); -#define dbgp_console_output dbgp_ehci_info -#define dbgp_console_input dbgp_ehci_info +struct ehci_debug_info *dbgp_console_output(void); +struct ehci_debug_info *dbgp_console_input(void); int dbgp_ep_is_active(struct ehci_debug_info *dbg_info); void usbdebug_tx_byte(struct ehci_debug_info *info, unsigned char data); void usbdebug_tx_flush(struct ehci_debug_info *info); diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index b16e325..b6c7f10 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -94,6 +94,11 @@ static struct device_operations *ehci_drv_ops; static struct device_operations ehci_dbg_ops; #endif +static inline struct ehci_debug_info *dbgp_ehci_info(void) +{ + return car_get_var_ptr(&glob_dbg_info); +} + static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug) { u32 ctrl; @@ -603,7 +608,7 @@ void usbdebug_tx_flush(struct ehci_debug_info *dbg_info) #if !defined(__PRE_RAM__) && !defined(__SMM__) static void usbdebug_re_enable(unsigned ehci_base) { - struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info); + struct ehci_debug_info *dbg_info = dbgp_ehci_info(); unsigned diff; if (!dbg_info->ehci_debug) @@ -618,7 +623,7 @@ static void usbdebug_re_enable(unsigned ehci_base) static void usbdebug_disable(void) { - struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info); + struct ehci_debug_info *dbg_info = dbgp_ehci_info(); dbg_info->status &= ~DBGP_EP_ENABLED; } @@ -661,14 +666,19 @@ int dbgp_ep_is_active(struct ehci_debug_info *dbg_info) return (dbg_info->status & DBGP_EP_STATMASK) == (DBGP_EP_VALID | DBGP_EP_ENABLED); } -struct ehci_debug_info *dbgp_ehci_info(void) +struct ehci_debug_info *dbgp_console_input(void) { - return car_get_var_ptr(&glob_dbg_info); + return dbgp_ehci_info(); +} + +struct ehci_debug_info *dbgp_console_input(void) +{ + return dbgp_ehci_info(); } int usbdebug_init(void) { - struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info); + struct ehci_debug_info *dbg_info = dbgp_ehci_info(); #if defined(__PRE_RAM__) || !CONFIG_EARLY_CONSOLE enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);

1 0

Patch set updated for coreboot: 65542e9 usbdebug: Split endpoint buffers
by Kyösti Mälkki 11 Jul '13

11 Jul '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3726 -gerrit commit 65542e90ea9748f07a4234bbf570ea4b63b2116c Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Jul 8 18:11:44 2013 +0300 usbdebug: Split endpoint buffers Refactor the structure to better support receive and another set of endpoints over usbdebug. Change-Id: Ib0f76afdf4e638363ff30c67010920142c58f250 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/include/usbdebug.h | 34 +++++++----------- src/lib/usbdebug.c | 94 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 75 insertions(+), 53 deletions(-) diff --git a/src/include/usbdebug.h b/src/include/usbdebug.h index 16077b0..4ea1004 100644 --- a/src/include/usbdebug.h +++ b/src/include/usbdebug.h @@ -40,31 +40,23 @@ void pci_ehci_read_resources(struct device *dev); #endif #endif -struct ehci_debug_info { - void *ehci_caps; - void *ehci_regs; - void *ehci_debug; - u32 devnum; - u32 endpoint_out; - u32 endpoint_in; - char buf[8]; - u8 bufidx; - u8 status; +struct dbgp_pipe +{ + u8 ep_index; + u8 bufidx; + char buf[8]; }; -#define DBGP_EP_VALID (1<<0) -#define DBGP_EP_ENABLED (1<<1) -#define DBGP_EP_STATMASK (DBGP_EP_VALID | DBGP_EP_ENABLED) - void enable_usbdebug(unsigned int port); -int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size); -int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size); void set_debug_port(unsigned port); int usbdebug_init(void); -struct ehci_debug_info *dbgp_console_output(void); -struct ehci_debug_info *dbgp_console_input(void); -int dbgp_ep_is_active(struct ehci_debug_info *dbg_info); -void usbdebug_tx_byte(struct ehci_debug_info *info, unsigned char data); -void usbdebug_tx_flush(struct ehci_debug_info *info); + +struct dbgp_pipe *dbgp_console_output(void); +struct dbgp_pipe *dbgp_console_input(void); +int dbgp_ep_is_active(struct dbgp_pipe *pipe); +int dbgp_bulk_write_x(struct dbgp_pipe *pipe, const char *bytes, int size); +int dbgp_bulk_read_x(struct dbgp_pipe *pipe, void *data, int size); +void usbdebug_tx_byte(struct dbgp_pipe *pipe, unsigned char data); +void usbdebug_tx_flush(struct dbgp_pipe *pipe); #endif diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index b6c7f10..c59507f 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -29,6 +29,27 @@ #include <ehci.h> #include <usbdebug.h> +#define DBGP_MAX_ENDPOINTS 4 +#define DBGP_CONSOLE_EPOUT 0 +#define DBGP_CONSOLE_EPIN 1 + +struct ehci_debug_info { + u8 devnum; + u8 endpoint[DBGP_MAX_ENDPOINTS]; + u8 ep_status[DBGP_MAX_ENDPOINTS]; + + void *ehci_caps; + void *ehci_regs; + void *ehci_debug; + + struct dbgp_pipe ep_pipe[DBGP_MAX_ENDPOINTS]; +}; + +#define DBGP_EP_VALID (1<<0) +#define DBGP_EP_ENABLED (1<<1) +#define DBGP_EP_STATMASK (DBGP_EP_VALID | DBGP_EP_ENABLED) + + /* Set this to 1 to debug the start-up of EHCI debug port hardware. You need * to modify console_init() to initialise some other console before usbdebug * to receive the printk lines from here. @@ -215,10 +236,11 @@ static int dbgp_bulk_write(struct ehci_dbg_port *ehci_debug, return ret; } -int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size) +int dbgp_bulk_write_x(struct dbgp_pipe *pipe, const char *bytes, int size) { + struct ehci_debug_info *dbg_info = dbgp_ehci_info(); return dbgp_bulk_write(dbg_info->ehci_debug, dbg_info->devnum, - dbg_info->endpoint_out, bytes, size); + dbg_info->endpoint[pipe->ep_index], bytes, size); } static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum, @@ -252,10 +274,11 @@ static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum, return ret; } -int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size) +int dbgp_bulk_read_x(struct dbgp_pipe *pipe, void *data, int size) { + struct ehci_debug_info *dbg_info = dbgp_ehci_info(); return dbgp_bulk_read(dbg_info->ehci_debug, dbg_info->devnum, - dbg_info->endpoint_in, data, size, DBGP_LOOPS); + dbg_info->endpoint[pipe->ep_index], data, size, DBGP_LOOPS); } static void dbgp_mdelay(int ms) @@ -379,8 +402,6 @@ static int usbdebug_init_(unsigned ehci_bar, unsigned offset, struct ehci_debug_ struct ehci_caps *ehci_caps; struct ehci_regs *ehci_regs; struct ehci_dbg_port *ehci_debug; - unsigned dbgp_endpoint_out; - unsigned dbgp_endpoint_in; struct usb_debug_descriptor dbgp_desc; u32 cmd, ctrl, status, portsc, hcs_params; @@ -396,8 +417,12 @@ static int usbdebug_init_(unsigned ehci_bar, unsigned offset, struct ehci_debug_ HC_LENGTH(read32((unsigned long)&ehci_caps->hc_capbase))); ehci_debug = (struct ehci_dbg_port *)(ehci_bar + offset); info->ehci_debug = (void *)0; - info->bufidx = 0; - info->status = 0; + + memset(&info->ep_pipe, 0, sizeof (info->ep_pipe)); + for (i=0; i<DBGP_MAX_ENDPOINTS; i++) { + info->ep_status[i] = 0; + info->ep_pipe[i].ep_index = i; + } try_next_time: port_map_tried = 0; @@ -516,8 +541,6 @@ try_next_port: ret = -6; goto err; } - dbgp_endpoint_out = dbgp_desc.bDebugOutEndpoint; - dbgp_endpoint_in = dbgp_desc.bDebugInEndpoint; /* Move the device to 127 if it isn't already there */ if (devnum != USB_DEBUG_DEVNUM) { @@ -546,7 +569,7 @@ try_next_port: dbgp_printk("EHCI debug interface enabled.\n"); /* Perform a small write to get the even/odd data state in sync */ - ret = dbgp_bulk_write(ehci_debug, USB_DEBUG_DEVNUM, dbgp_endpoint_out, "USB\r\n",5); + ret = dbgp_bulk_write(ehci_debug, USB_DEBUG_DEVNUM, dbgp_desc.bDebugOutEndpoint, "USB\r\n",5); if (ret < 0) { dbgp_printk("dbgp_bulk_write failed: %d\n", ret); ret = -9; @@ -558,10 +581,11 @@ try_next_port: info->ehci_regs = ehci_regs; info->ehci_debug = ehci_debug; info->devnum = devnum; - info->endpoint_out = dbgp_endpoint_out; - info->endpoint_in = dbgp_endpoint_in; - info->status |= DBGP_EP_ENABLED | DBGP_EP_VALID; + info->endpoint[DBGP_CONSOLE_EPOUT] = dbgp_desc.bDebugOutEndpoint; + info->endpoint[DBGP_CONSOLE_EPIN] = dbgp_desc.bDebugInEndpoint; + info->ep_status[DBGP_CONSOLE_EPOUT] |= DBGP_EP_ENABLED | DBGP_EP_VALID; + info->ep_status[DBGP_CONSOLE_EPIN] |= DBGP_EP_ENABLED | DBGP_EP_VALID; return 0; err: /* Things didn't work so remove my claim */ @@ -586,22 +610,22 @@ next_debug_port: return -10; } -void usbdebug_tx_byte(struct ehci_debug_info *dbg_info, unsigned char data) +void usbdebug_tx_byte(struct dbgp_pipe *pipe, unsigned char data) { - if (dbgp_is_ep_active(dbg_info)) { - dbg_info->buf[dbg_info->bufidx++] = data; - if (dbg_info->bufidx >= 8) { - dbgp_bulk_write_x(dbg_info, dbg_info->buf, dbg_info->bufidx); - dbg_info->bufidx = 0; + if (dbgp_ep_is_active(pipe)) { + pipe->buf[pipe->bufidx++] = data; + if (pipe->bufidx >= 8) { + dbgp_bulk_write_x(pipe, pipe->buf, pipe->bufidx); + pipe->bufidx = 0; } } } -void usbdebug_tx_flush(struct ehci_debug_info *dbg_info) +void usbdebug_tx_flush(struct dbgp_pipe *pipe) { - if (dbgp_is_ep_active(dbg_info) && dbg_info->bufidx > 0) { - dbgp_bulk_write_x(dbg_info, dbg_info->buf, dbg_info->bufidx); - dbg_info->bufidx = 0; + if (dbgp_ep_is_active(pipe) && pipe->bufidx > 0) { + dbgp_bulk_write_x(pipe, pipe->buf, pipe->bufidx); + pipe->bufidx = 0; } } @@ -610,6 +634,7 @@ static void usbdebug_re_enable(unsigned ehci_base) { struct ehci_debug_info *dbg_info = dbgp_ehci_info(); unsigned diff; + int i; if (!dbg_info->ehci_debug) return; @@ -618,13 +643,17 @@ static void usbdebug_re_enable(unsigned ehci_base) dbg_info->ehci_regs -= diff; dbg_info->ehci_debug -= diff; dbg_info->ehci_caps = (void*)ehci_base; - dbg_info->status |= DBGP_EP_ENABLED; + + for (i=0; i<DBGP_MAX_ENDPOINTS; i++) + dbg_info->ep_status[i] |= DBGP_EP_ENABLED; } static void usbdebug_disable(void) { struct ehci_debug_info *dbg_info = dbgp_ehci_info(); - dbg_info->status &= ~DBGP_EP_ENABLED; + int i; + for (i=0; i<DBGP_MAX_ENDPOINTS; i++) + dbg_info->ep_status[i] &= ~DBGP_EP_ENABLED; } static void pci_ehci_set_resources(struct device *dev) @@ -661,19 +690,20 @@ void pci_ehci_read_resources(struct device *dev) } #endif -int dbgp_ep_is_active(struct ehci_debug_info *dbg_info) +int dbgp_ep_is_active(struct dbgp_pipe *pipe) { - return (dbg_info->status & DBGP_EP_STATMASK) == (DBGP_EP_VALID | DBGP_EP_ENABLED); + struct ehci_debug_info *dbg_info = dbgp_ehci_info(); + return (dbg_info->ep_status[pipe->ep_index] & DBGP_EP_STATMASK) == (DBGP_EP_VALID | DBGP_EP_ENABLED); } -struct ehci_debug_info *dbgp_console_input(void) +struct dbgp_pipe *dbgp_console_output(void) { - return dbgp_ehci_info(); + return &dbgp_ehci_info()->ep_pipe[DBGP_CONSOLE_EPOUT]; } -struct ehci_debug_info *dbgp_console_input(void) +struct dbgp_pipe *dbgp_console_input(void) { - return dbgp_ehci_info(); + return &dbgp_ehci_info()->ep_pipe[DBGP_CONSOLE_EPIN]; } int usbdebug_init(void)

1 0

New patch to review for coreboot: c81d27c change to (u32 *)(Data+nvram_pos) in src/cpu/amd/agesa/s3_resume.c
by Siyuan Wang 11 Jul '13

11 Jul '13

Siyuan Wang (wangsiyuanbuaa(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3765 -gerrit commit c81d27c9c58d0ad65a80b8b4650bc71e0701c346 Author: Siyuan Wang <wangsiyuanbuaa(a)gmail.com> Date: Thu Jul 11 17:26:18 2013 +0800 change to (u32 *)(Data+nvram_pos) in src/cpu/amd/agesa/s3_resume.c As Paul pointed in AMD S3 resume: Add framwork to write bigger data[1], change pointer from (u8 *)(Data+nvram_pos) to (u32 *)(Data+nvram_pos). I have tested on Parmer. [1] http://review.coreboot.org/#/c/3413/ Change-Id: Icc0cedffc4c488d1e86d5d0aad526ba69584c77f Signed-off-by: Siyuan Wang <SiYuan.Wang(a)amd.com> Signed-off-by: Siyuan Wang <wangsiyuanbuaa(a)gmail.com> --- src/cpu/amd/agesa/s3_resume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c index 6ba9212..5cf37cb 100644 --- a/src/cpu/amd/agesa/s3_resume.c +++ b/src/cpu/amd/agesa/s3_resume.c @@ -272,9 +272,9 @@ u32 OemAgesaSaveS3Info(S3_DATA_TYPE S3DataType, u32 DataSize, void *Data) for (nvram_pos = 0; nvram_pos < DataSize - CONFIG_AMD_SB_SPI_TX_LEN; nvram_pos += CONFIG_AMD_SB_SPI_TX_LEN) { data = *(u32 *) (Data + nvram_pos); - flash->write(flash, nvram_pos + pos + 4, CONFIG_AMD_SB_SPI_TX_LEN, (u8 *)(Data + nvram_pos)); + flash->write(flash, nvram_pos + pos + 4, CONFIG_AMD_SB_SPI_TX_LEN, (u32 *)(Data + nvram_pos)); } - flash->write(flash, nvram_pos + pos + 4, DataSize % CONFIG_AMD_SB_SPI_TX_LEN, (u8 *)(Data + nvram_pos)); + flash->write(flash, nvram_pos + pos + 4, DataSize % CONFIG_AMD_SB_SPI_TX_LEN, (u32 *)(Data + nvram_pos)); flash->spi->rw = SPI_WRITE_FLAG; spi_release_bus(flash->spi);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2013