coreboot-gerrit June 2013

coreboot-gerrit@coreboot.org

1 participants
744 discussions

Patch set updated for coreboot: 65e361f libpayload: usb: Deep search for endpoints descriptors
by Anton Kochkov 14 Jun '13

14 Jun '13

Anton Kochkov (anton.kochkov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3467 -gerrit commit 65e361f9c3247e119f8a2169d25ab29b79558234 Author: Anton Kochkov <anton.kochkov(a)gmail.com> Date: Fri Jun 14 19:41:48 2013 +0400 libpayload: usb: Deep search for endpoints descriptors This improving searching for endpoint descriptors and skipping non-endpoint interface descriptors. Change-Id: I063c096ab886f9753a9ee59f570fd81ce6f618cb Signed-off-by: Anton Kochkov <anton.kochkov(a)gmail.com> --- payloads/libpayload/drivers/usb/usb.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 47f8eb6..b3ce54b 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -389,9 +389,21 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) endpoint_descriptor_t *endp = (endpoint_descriptor_t *) (((char *) current) + current->bLength); - /* Skip any non-endpoint descriptor */ - if (endp->bDescriptorType != 0x05) - endp = (endpoint_descriptor_t *)(((char *)endp) + ((char *)endp)[0]); + /* Search only if endpoints exist */ + if (current->bNumEndPoints != 0) { + /* Skip any non-endpoint descriptor */ + while ((endp->bDescriptorType != 0x05) && + (endp->bDescriptorType != 0x04) && (endp->bLength != 0)) { + endp = (endpoint_descriptor_t *)((char *)endp + endp->bLength); + } + if (endp->bDescriptorType != 0x05) { + controller->devices[adr]->destroy(controller->devices[adr]); + free(controller->devices[adr]); + controller->devices[adr] = NULL; + return -1; + } + + } memset (dev->endpoints, 0, sizeof (dev->endpoints)); dev->num_endp = 1; // 0 always exists

1 0

Patch set updated for coreboot: 6217e9e libpayload: usb: Deep search for endpoints descriptors
by Paul Menzel 14 Jun '13

14 Jun '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3467 -gerrit commit 6217e9e3d1f916bcd0c244887efe3b4037ec6703 Author: Anton Kochkov <anton.kochkov(a)gmail.com> Date: Fri Jun 14 19:41:48 2013 +0400 libpayload: usb: Deep search for endpoints descriptors This improves searching for endpoint descriptors by skipping non-endpoint interface descriptors. Change-Id: I063c096ab886f9753a9ee59f570fd81ce6f618cb Signed-off-by: Anton Kochkov <anton.kochkov(a)gmail.com> --- payloads/libpayload/drivers/usb/usb.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 47f8eb6..e25d190 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -389,9 +389,20 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) endpoint_descriptor_t *endp = (endpoint_descriptor_t *) (((char *) current) + current->bLength); - /* Skip any non-endpoint descriptor */ - if (endp->bDescriptorType != 0x05) - endp = (endpoint_descriptor_t *)(((char *)endp) + ((char *)endp)[0]); + /* Search only if endpoints exist */ + if (current->bNumEndPoints != 0) { + /* Skip any non-endpoint descriptor */ + while ((endp->bDescriptorType != 0x05) && (endp->bDescriptorType != 0x04) && (endp->bLength !=0)) { + endp = (endpoint_descriptor_t *)((char *)endp + endp->bLength); + } + if (endp->bDescriptorType != 0x05) { + controller->devices[adr]->destroy(controller->devices[adr]); + free(controller->devices[adr]); + controller->devices[adr] = NULL; + return -1; + } + + } memset (dev->endpoints, 0, sizeof (dev->endpoints)); dev->num_endp = 1; // 0 always exists

1 0

Patch merged into coreboot/master: 00cc7f4 qemu: move i440fx bits
by gerrit＠coreboot.org 14 Jun '13

14 Jun '13

the following patch was just integrated into master: commit 00cc7f4355ca1bdd621d4618f24f3336b29463cb Author: Gerd Hoffmann <kraxel(a)redhat.com> Date: Fri Jun 7 15:46:23 2013 +0200 qemu: move i440fx bits Prepare tree for adding q35 support: Move emulation/qemu-x86 to emulation/qemu-i440fx. Rename some stuff to include 'i440fx'. Change-Id: Ib8c58175c5734cfcda1b22404ef52c09d38f0462 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> Reviewed-on: http://review.coreboot.org/3429 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See http://review.coreboot.org/3429 for details. -gerrit

1 0

Patch merged into coreboot/master: e49679d usbdebug: Drop temporary disables of log output
by gerrit＠coreboot.org 14 Jun '13

14 Jun '13

the following patch was just integrated into master: commit e49679d5a1e6a6225980a9ae8455fef47e56ab12 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sat Jun 8 15:48:14 2013 +0300 usbdebug: Drop temporary disables of log output With this patch, output on usbdebug also includes the section of MTRR setups for every CPU. This makes usbdebug output almost identical with that of serial port and CBMEM console. Tested with model_206ax. Also tested previously on model_f2x which does not have these disable/enable calls in model_f2x_init() without detected issues. Change-Id: Idfd0e93439907b17255633658195d698feab3895 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/3423 Reviewed-by: Aaron Durbin <adurbin(a)google.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/3423 for details. -gerrit

1 0

Patch set updated for coreboot: 341e2e4 libpayload: usb: Deep search for endpoints descriptors
by Anton Kochkov 14 Jun '13

14 Jun '13

Anton Kochkov (anton.kochkov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3467 -gerrit commit 341e2e4d4a563fdb4dcb6b3b77257bac11bcc326 Author: Anton Kochkov <anton.kochkov(a)gmail.com> Date: Fri Jun 14 19:41:48 2013 +0400 libpayload: usb: Deep search for endpoints descriptors This improving searching for endpoint descriptors and skipping non-endpoint interface descriptors. Change-Id: I063c096ab886f9753a9ee59f570fd81ce6f618cb Signed-off-by: Anton Kochkov <anton.kochkov(a)gmail.com> --- payloads/libpayload/drivers/usb/usb.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 47f8eb6..e25d190 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -389,9 +389,20 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) endpoint_descriptor_t *endp = (endpoint_descriptor_t *) (((char *) current) + current->bLength); - /* Skip any non-endpoint descriptor */ - if (endp->bDescriptorType != 0x05) - endp = (endpoint_descriptor_t *)(((char *)endp) + ((char *)endp)[0]); + /* Search only if endpoints exist */ + if (current->bNumEndPoints != 0) { + /* Skip any non-endpoint descriptor */ + while ((endp->bDescriptorType != 0x05) && (endp->bDescriptorType != 0x04) && (endp->bLength !=0)) { + endp = (endpoint_descriptor_t *)((char *)endp + endp->bLength); + } + if (endp->bDescriptorType != 0x05) { + controller->devices[adr]->destroy(controller->devices[adr]); + free(controller->devices[adr]); + controller->devices[adr] = NULL; + return -1; + } + + } memset (dev->endpoints, 0, sizeof (dev->endpoints)); dev->num_endp = 1; // 0 always exists

1 0

New patch to review for coreboot: 3b2725d libpayload: usb: Deep search for endpoints descriptors
by Anton Kochkov 14 Jun '13

14 Jun '13

Anton Kochkov (anton.kochkov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3467 -gerrit commit 3b2725deabc0257336aa639acd570c63a2a1d4d2 Author: Anton Kochkov <anton.kochkov(a)gmail.com> Date: Fri Jun 14 19:41:48 2013 +0400 libpayload: usb: Deep search for endpoints descriptors This improving searching for endpoint descriptors and skipping non-endpoint interface descriptors. Change-Id: I063c096ab886f9753a9ee59f570fd81ce6f618cb Signed-off-by: Anton Kochkov <anton.kochkov(a)gmail.com> --- payloads/libpayload/drivers/usb/usb.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 47f8eb6..764f3a6 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -389,9 +389,20 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) endpoint_descriptor_t *endp = (endpoint_descriptor_t *) (((char *) current) + current->bLength); - /* Skip any non-endpoint descriptor */ - if (endp->bDescriptorType != 0x05) - endp = (endpoint_descriptor_t *)(((char *)endp) + ((char *)endp)[0]); + /* Search only if endpoints exist */ + if (current->bNumEndPoints != 0) { + /* Skip any non-endpoint descriptor */ + while ((endp->bDescriptorType != 0x05) && (endp->bDescriptorType != 0x04) && (endp->bLength !=0)) { + endp = (endpoint_descriptor_t *)((char *)endp + endp->bLength); + } + if (endp->bDescriptorType != 0x05) { + controller->devices[adr]->destroy(controller->devices[adr]); + free(controller->devices[adr]); + controller->devices[adr] = NULL; + return -1; + } + + } memset (dev->endpoints, 0, sizeof (dev->endpoints)); dev->num_endp = 1; // 0 always exists

1 0

New patch to review for coreboot: 5761002 AMD sb800 agesa/hudson: Use PCI defines
by Kyösti Mälkki 14 Jun '13

14 Jun '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/3466 -gerrit commit 57610020877a34405b9a4000e87ea19ee37539b6 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Jun 14 17:48:20 2013 +0300 AMD sb800 agesa/hudson: Use PCI defines The original lines had contradicting comment and code. This change follows the code and sets MASTER bit too. Change-Id: Id2886bfc107612530f0e9747e5d49a9740fb8532 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/southbridge/amd/agesa/hudson/enable_usbdebug.c | 3 ++- src/southbridge/amd/sb800/enable_usbdebug.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c index c74ac9a..128885a 100644 --- a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c +++ b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c @@ -50,6 +50,7 @@ void enable_usbdebug(unsigned int port) pci_write_config32(PCI_DEV(0, HUDSON_DEVN_BASE + 0x12, 2), EHCI_BAR_INDEX, CONFIG_EHCI_BAR); - pci_write_config8(PCI_DEV(0, HUDSON_DEVN_BASE + 0x12, 2), 0x04, 0x6); /* mem space enabe */ + pci_write_config8(PCI_DEV(0, HUDSON_DEVN_BASE + 0x12, 2), + PCI_COMMAND, PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); set_debug_port(port); } diff --git a/src/southbridge/amd/sb800/enable_usbdebug.c b/src/southbridge/amd/sb800/enable_usbdebug.c index f085eab..28a1665 100644 --- a/src/southbridge/amd/sb800/enable_usbdebug.c +++ b/src/southbridge/amd/sb800/enable_usbdebug.c @@ -50,6 +50,7 @@ void enable_usbdebug(unsigned int port) pci_write_config32(PCI_DEV(0, SB800_DEVN_BASE + 0x12, 2), EHCI_BAR_INDEX, CONFIG_EHCI_BAR); - pci_write_config8(PCI_DEV(0, SB800_DEVN_BASE + 0x12, 2), 0x04, 0x6); /* mem space enabe */ + pci_write_config8(PCI_DEV(0, SB800_DEVN_BASE + 0x12, 2), + PCI_COMMAND, PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); set_debug_port(port); }

1 0

Patch set updated for coreboot: ec69cd5 usbdebug: Drop temporary disables of log output
by Kyösti Mälkki 14 Jun '13

14 Jun '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/3423 -gerrit commit ec69cd5c816f6dd7eed679a2f6ccdcf5c62557ef Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sat Jun 8 15:48:14 2013 +0300 usbdebug: Drop temporary disables of log output With this patch, output on usbdebug also includes the section of MTRR setups for every CPU. This makes usbdebug output almost identical with that of serial port and CBMEM console. Tested with model_206ax. Also tested previously on model_f2x which does not have these disable/enable calls in model_f2x_init() without detected issues. Change-Id: Idfd0e93439907b17255633658195d698feab3895 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/cpu/amd/model_fxx/model_fxx_init.c | 14 -------------- src/cpu/intel/haswell/haswell_init.c | 15 --------------- src/cpu/intel/model_1067x/model_1067x_init.c | 15 --------------- src/cpu/intel/model_106cx/model_106cx_init.c | 15 --------------- src/cpu/intel/model_2065x/model_2065x_init.c | 14 -------------- src/cpu/intel/model_206ax/model_206ax_init.c | 15 --------------- src/cpu/intel/model_68x/model_68x_init.c | 15 --------------- src/cpu/intel/model_6bx/model_6bx_init.c | 15 --------------- src/cpu/intel/model_6ex/model_6ex_init.c | 15 --------------- src/cpu/intel/model_6fx/model_6fx_init.c | 15 --------------- 10 files changed, 148 deletions(-) diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index d053894..a18b982 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -456,31 +456,17 @@ static inline void k8_errata(void) } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static void model_fxx_init(device_t dev) { unsigned long i; msr_t msr; struct node_core_id id; -#if CONFIG_USBDEBUG - if (!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Turn on caching if we haven't already */ x86_enable_cache(); amd_setup_mtrrs(); x86_mtrr_check(); -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Update the microcode */ model_fxx_update_microcode(dev->device); diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c index 18636b0..0bf98ec 100644 --- a/src/cpu/intel/haswell/haswell_init.c +++ b/src/cpu/intel/haswell/haswell_init.c @@ -438,10 +438,6 @@ static void configure_mca(void) wrmsr(IA32_MC0_STATUS + (i * 4), msr); } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static void bsp_init_before_ap_bringup(struct bus *cpu_bus) { struct device_path cpu_path; @@ -466,22 +462,11 @@ static void bsp_init_before_ap_bringup(struct bus *cpu_bus) if (info->index != 0) printk(BIOS_CRIT, "BSP index(%d) != 0!\n", info->index); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Setup MTRRs based on physical address size. */ x86_setup_fixed_mtrrs(); x86_setup_var_mtrrs(cpuid_eax(0x80000008) & 0xff, 2); x86_mtrr_check(); -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Call through the cpu driver's initialization. */ cpu_initialize(0); } diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c index deb05c0..47d87de 100644 --- a/src/cpu/intel/model_1067x/model_1067x_init.c +++ b/src/cpu/intel/model_1067x/model_1067x_init.c @@ -303,10 +303,6 @@ static void configure_pic_thermal_sensors(const int tm2, const int quad) wrmsr(PIC_SENS_CFG, msr); } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static void model_1067x_init(device_t cpu) { char processor_name[49]; @@ -345,21 +341,10 @@ static void model_1067x_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Setup MTRRs */ x86_setup_mtrrs(); x86_mtrr_check(); -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ setup_lapic(); diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c index 050c3d1..9304b58 100644 --- a/src/cpu/intel/model_106cx/model_106cx_init.c +++ b/src/cpu/intel/model_106cx/model_106cx_init.c @@ -128,10 +128,6 @@ static void configure_misc(void) wrmsr(IA32_MISC_ENABLE, msr); } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static void model_106cx_init(device_t cpu) { char processor_name[49]; @@ -146,21 +142,10 @@ static void model_106cx_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Setup MTRRs */ x86_setup_mtrrs(); x86_mtrr_check(); -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ setup_lapic(); diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c index bdbddfb..f430276 100644 --- a/src/cpu/intel/model_2065x/model_2065x_init.c +++ b/src/cpu/intel/model_2065x/model_2065x_init.c @@ -342,10 +342,6 @@ static void configure_mca(void) wrmsr(IA32_MC0_STATUS + (i * 4), msr); } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - /* * Initialize any extra cores/threads in this package. */ @@ -420,12 +416,6 @@ static void model_2065x_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU:lapic=%ld, boot_cpu=%d\n", lapicid (), boot_cpu ()); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif /* Setup MTRRs based on physical address size */ cpuid_regs = cpuid(0x80000008); @@ -436,10 +426,6 @@ static void model_2065x_init(device_t cpu) /* Setup Page Attribute Tables (PAT) */ // TODO set up PAT -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ enable_lapic_tpr(); setup_lapic(); diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c index d1f9277..6bf158e 100644 --- a/src/cpu/intel/model_206ax/model_206ax_init.c +++ b/src/cpu/intel/model_206ax/model_206ax_init.c @@ -476,10 +476,6 @@ static void configure_mca(void) wrmsr(IA32_MC0_STATUS + (i * 4), msr); } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - /* * Initialize any extra cores/threads in this package. */ @@ -554,13 +550,6 @@ static void model_206ax_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Setup MTRRs based on physical address size */ cpuid_regs = cpuid(0x80000008); x86_setup_fixed_mtrrs(); @@ -570,10 +559,6 @@ static void model_206ax_init(device_t cpu) /* Setup Page Attribute Tables (PAT) */ // TODO set up PAT -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ enable_lapic_tpr(); setup_lapic(); diff --git a/src/cpu/intel/model_68x/model_68x_init.c b/src/cpu/intel/model_68x/model_68x_init.c index fa35e55..37145f1 100644 --- a/src/cpu/intel/model_68x/model_68x_init.c +++ b/src/cpu/intel/model_68x/model_68x_init.c @@ -59,10 +59,6 @@ static const uint32_t microcode_updates[] = { 0x0, 0x0, 0x0, 0x0, }; -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static void model_68x_init(device_t cpu) { char processor_name[49]; @@ -77,21 +73,10 @@ static void model_68x_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Setup MTRRs */ x86_setup_mtrrs(); x86_mtrr_check(); -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ setup_lapic(); } diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c index a06d7fb..2076274 100644 --- a/src/cpu/intel/model_6bx/model_6bx_init.c +++ b/src/cpu/intel/model_6bx/model_6bx_init.c @@ -45,10 +45,6 @@ static const uint32_t microcode_updates[] = { 0x0, 0x0, 0x0, 0x0, }; -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static void model_6bx_init(device_t cpu) { char processor_name[49]; @@ -63,21 +59,10 @@ static void model_6bx_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Setup MTRRs */ x86_setup_mtrrs(); x86_mtrr_check(); -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ setup_lapic(); } diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c index 2e25553..4862cf3 100644 --- a/src/cpu/intel/model_6ex/model_6ex_init.c +++ b/src/cpu/intel/model_6ex/model_6ex_init.c @@ -153,10 +153,6 @@ static void configure_pic_thermal_sensors(void) wrmsr(PIC_SENS_CFG, msr); } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static void model_6ex_init(device_t cpu) { char processor_name[49]; @@ -171,21 +167,10 @@ static void model_6ex_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Setup MTRRs */ x86_setup_mtrrs(); x86_mtrr_check(); -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ setup_lapic(); diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c index 5d5b956..31ba53a 100644 --- a/src/cpu/intel/model_6fx/model_6fx_init.c +++ b/src/cpu/intel/model_6fx/model_6fx_init.c @@ -190,10 +190,6 @@ static void configure_pic_thermal_sensors(void) wrmsr(PIC_SENS_CFG, msr); } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static void model_6fx_init(device_t cpu) { char processor_name[49]; @@ -208,13 +204,6 @@ static void model_6fx_init(device_t cpu) fill_processor_name(processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name); -#if CONFIG_USBDEBUG - // Is this caution really needed? - if(!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - /* Setup MTRRs */ x86_setup_mtrrs(); x86_mtrr_check(); @@ -222,10 +211,6 @@ static void model_6fx_init(device_t cpu) /* Setup Page Attribute Tables (PAT) */ // TODO set up PAT -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ setup_lapic();

1 0

Patch set updated for coreboot: eb8849b Three hunks which were missing on original 2065x commit
by Vladimir Serbinenko 14 Jun '13

14 Jun '13

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3455 -gerrit commit eb8849b5d5386da28429a2d354f170c3ab97710e Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Fri Jun 14 02:33:03 2013 +0200 Three hunks which were missing on original 2065x commit Change-Id: I52f5890d577f1eb3a3512c2486484e5a19a5e03d Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/cpu/intel/model_2065x/Kconfig | 2 +- src/cpu/intel/model_2065x/bootblock.c | 2 +- src/cpu/x86/lapic/lapic_cpu_init.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig index 019309d..9d5806b 100644 --- a/src/cpu/intel/model_2065x/Kconfig +++ b/src/cpu/intel/model_2065x/Kconfig @@ -33,7 +33,7 @@ config ENABLE_VMX config MICROCODE_INCLUDE_PATH string - default "3rdparty/mainboard/lenovo/x201" + default "src/cpu/intel/model_2065x" config XIP_ROM_SIZE hex diff --git a/src/cpu/intel/model_2065x/bootblock.c b/src/cpu/intel/model_2065x/bootblock.c index 3bd0871..3fd3d14 100644 --- a/src/cpu/intel/model_2065x/bootblock.c +++ b/src/cpu/intel/model_2065x/bootblock.c @@ -30,7 +30,7 @@ #include <southbridge/intel/ibexpeak/pch.h> #include "model_2065x.h" #else -#error "CPU must be paired with Intel BD82X6X or C216 southbridge" +#error "CPU must be paired with Intel Ibex Peak southbridge" #endif static void set_var_mtrr( diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index fbc8aa4..7f18c7c 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -141,7 +141,7 @@ static int lapic_start_cpu(unsigned long apicid) } return 0; } -#if !CONFIG_CPU_AMD_MODEL_10XXX && !CONFIG_CPU_INTEL_MODEL_206AX +#if !CONFIG_CPU_AMD_MODEL_10XXX && !CONFIG_CPU_INTEL_MODEL_206AX && !CONFIG_CPU_INTEL_MODEL_2065X mdelay(10); #endif

1 0

Patch merged into coreboot/master: f55a542 lynxpoint: Fix PCI IDs for EHCI
by gerrit＠coreboot.org 14 Jun '13

14 Jun '13

the following patch was just integrated into master: commit f55a54257a28d4d0444baa03b5699f73fc6cd05e Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Jun 14 11:16:25 2013 +0300 lynxpoint: Fix PCI IDs for EHCI IDs were leftovers from bd82x6x. Change-Id: I4ab6062929d346d7f000ce8c0b8c97490bb2b154 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/3463 Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin(a)google.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/3463 for details. -gerrit

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit June 2013