December 2014 - U-Boot

[U-Boot] [PATCH 1/2] sunxi: video: Add a hpd_delay parameter to configure hpd delay
by Hans de Goede 29 Dec '14

29 Dec '14

In some extreme cases it may be necessary to wait 1.5 seconds or more for a hpd signal to show up (and be able to read edid info), but we do not want to penalize all headless boots with an extra second boot delay, so add a hpd_delay parameter which can be set through the video-mode env. variable. While at it raise the default from 300ms to 500ms as 300 may very well be too low in many cases. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- doc/README.video | 8 +++++++- drivers/video/sunxi_display.c | 9 +++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/README.video b/doc/README.video index 2c55d6a..d0a3ad6 100644 --- a/doc/README.video +++ b/doc/README.video @@ -53,6 +53,12 @@ The sunxi u-boot driver supports the following video-mode options: 1: Enabled. Fallback to the lcd / vga / none in that order (if available) Defaults to hpd=1. +- hpd_delay=<int> - How long to wait for the hdmi HPD signal in milliseconds + When the monitor and the board power up at the same time, it may take some + time for the monitor to assert the HPD signal. This configures how long to + wait for the HPD signal before assuming no cable is connected. + Defaults to hpd_delay=500. + - edid=[0|1] - Enable use of DDC + EDID to get monitor info 0: Disabled. 1: Enabled. If valid EDID info was read from the monitor the EDID info will @@ -61,4 +67,4 @@ The sunxi u-boot driver supports the following video-mode options: For example to always use the hdmi connector, even if no cable is inserted, using edid info when available and otherwise initalizing it at 1024x768@60Hz, -use: video-mode=sunxi:1024x768-24@60,monitor=dvi,hpd=0,edid=1 . +use: "setenv video-mode sunxi:1024x768-24@60,monitor=dvi,hpd=0,edid=1". diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index 2eafcab..9d17522 100644 --- a/drivers/video/sunxi_display.c +++ b/drivers/video/sunxi_display.c @@ -56,13 +56,13 @@ static int await_completion(u32 *reg, u32 mask, u32 val) return 0; } -static int sunxi_hdmi_hpd_detect(void) +static int sunxi_hdmi_hpd_detect(int hpd_delay) { struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; struct sunxi_hdmi_reg * const hdmi = (struct sunxi_hdmi_reg *)SUNXI_HDMI_BASE; - unsigned long tmo = timer_get_us() + 300000; + unsigned long tmo = timer_get_us() + hpd_delay * 1000; /* Set pll3 to 300MHz */ clock_set_pll3(300000000); @@ -854,7 +854,7 @@ void *video_hw_init(void) struct ctfb_res_modes custom; const char *options; #ifdef CONFIG_VIDEO_HDMI - int ret, hpd, edid; + int ret, hpd, hpd_delay, edid; #endif char mon[16]; char *lcd_mode = CONFIG_VIDEO_LCD_MODE; @@ -870,6 +870,7 @@ void *video_hw_init(void) &sunxi_display.depth, &options); #ifdef CONFIG_VIDEO_HDMI hpd = video_get_option_int(options, "hpd", 1); + hpd_delay = video_get_option_int(options, "hpd_delay", 500); edid = video_get_option_int(options, "edid", 1); sunxi_display.monitor = sunxi_monitor_dvi; #elif defined CONFIG_VIDEO_VGA_VIA_LCD @@ -894,7 +895,7 @@ void *video_hw_init(void) if (sunxi_display.monitor == sunxi_monitor_dvi || sunxi_display.monitor == sunxi_monitor_hdmi) { /* Always call hdp_detect, as it also enables clocks, etc. */ - ret = sunxi_hdmi_hpd_detect(); + ret = sunxi_hdmi_hpd_detect(hpd_delay); if (ret) { printf("HDMI connected: "); if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0) -- 2.1.0

2 3

[U-Boot] [PATCH v2] sunxi: video: Improve monitor video-mode option handling
by Hans de Goede 29 Dec '14

29 Dec '14

Add a sunxi_monitor enum and parse the monitor option string into this enum once, rather then doing strcmp-s on it in various places. This also adds checking for it being a valid value. This also adds new "none" and "lcd" values in preparation for lcd support. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- Changes in v2: -Add a sunxi_get_mon_desc helper to convert from the monitor enum to strings --- drivers/video/sunxi_display.c | 63 ++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index ced5ce5..84ecef9 100644 --- a/drivers/video/sunxi_display.c +++ b/drivers/video/sunxi_display.c @@ -21,9 +21,19 @@ DECLARE_GLOBAL_DATA_PTR; +enum sunxi_monitor { + sunxi_monitor_none, + sunxi_monitor_dvi, + sunxi_monitor_hdmi, + sunxi_monitor_lcd, + sunxi_monitor_vga, +}; +#define SUNXI_MONITOR_LAST sunxi_monitor_vga + struct sunxi_display { GraphicDevice graphic_device; bool enabled; + enum sunxi_monitor monitor; } sunxi_display; /* @@ -159,7 +169,7 @@ static int sunxi_hdmi_edid_get_block(int block, u8 *buf) return r; } -static int sunxi_hdmi_edid_get_mode(struct ctfb_res_modes *mode, char *monitor) +static int sunxi_hdmi_edid_get_mode(struct ctfb_res_modes *mode) { struct edid1_info edid1; struct edid_cea861_info cea681[4]; @@ -241,14 +251,14 @@ static int sunxi_hdmi_edid_get_mode(struct ctfb_res_modes *mode, char *monitor) } /* Check for basic audio support, if found enable hdmi output */ - strcpy(monitor, "dvi"); + sunxi_display.monitor = sunxi_monitor_dvi; for (i = 0; i < ext_blocks; i++) { if (cea681[i].extension_tag != EDID_CEA861_EXTENSION_TAG || cea681[i].revision < 2) continue; if (EDID_CEA861_SUPPORTS_BASIC_AUDIO(cea681[i])) - strcpy(monitor, "hdmi"); + sunxi_display.monitor = sunxi_monitor_hdmi; } return 0; @@ -489,7 +499,7 @@ static void sunxi_hdmi_setup_info_frames(const struct ctfb_res_modes *mode) } static void sunxi_hdmi_mode_set(const struct ctfb_res_modes *mode, - bool hdmi_mode, int clk_div, int clk_double) + int clk_div, int clk_double) { struct sunxi_hdmi_reg * const hdmi = (struct sunxi_hdmi_reg *)SUNXI_HDMI_BASE; @@ -498,7 +508,7 @@ static void sunxi_hdmi_mode_set(const struct ctfb_res_modes *mode, /* Write clear interrupt status bits */ writel(SUNXI_HDMI_IRQ_STATUS_BITS, &hdmi->irq); - if (hdmi_mode) + if (sunxi_display.monitor == sunxi_monitor_hdmi) sunxi_hdmi_setup_info_frames(mode); /* Set input sync enable */ @@ -549,7 +559,7 @@ static void sunxi_engines_init(void) #endif } -static void sunxi_mode_set(const struct ctfb_res_modes *mode, char *monitor, +static void sunxi_mode_set(const struct ctfb_res_modes *mode, unsigned int address) { struct sunxi_de_be_reg * const de_be = @@ -559,11 +569,10 @@ static void sunxi_mode_set(const struct ctfb_res_modes *mode, char *monitor, struct sunxi_hdmi_reg * const hdmi = (struct sunxi_hdmi_reg *)SUNXI_HDMI_BASE; int clk_div, clk_double; - bool hdmi_mode = strcmp(monitor, "hdmi") == 0; sunxi_composer_mode_set(mode, address); sunxi_lcdc_mode_set(mode, &clk_div, &clk_double); - sunxi_hdmi_mode_set(mode, hdmi_mode, clk_div, clk_double); + sunxi_hdmi_mode_set(mode, clk_div, clk_double); setbits_le32(&de_be->reg_ctrl, SUNXI_DE_BE_REG_CTRL_LOAD_REGS); setbits_le32(&de_be->mode, SUNXI_DE_BE_MODE_START); @@ -574,6 +583,18 @@ static void sunxi_mode_set(const struct ctfb_res_modes *mode, char *monitor, setbits_le32(&hdmi->video_ctrl, SUNXI_HDMI_VIDEO_CTRL_ENABLE); } +static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor) +{ + switch (monitor) { + case sunxi_monitor_none: return "none"; + case sunxi_monitor_dvi: return "dvi"; + case sunxi_monitor_hdmi: return "hdmi"; + case sunxi_monitor_lcd: return "lcd"; + case sunxi_monitor_vga: return "vga"; + } + return NULL; /* never reached */ +} + void *video_hw_init(void) { static GraphicDevice *graphic_device = &sunxi_display.graphic_device; @@ -581,8 +602,8 @@ void *video_hw_init(void) struct ctfb_res_modes edid_mode; const char *options; unsigned int depth; - int ret, hpd, edid; - char monitor[16]; + int i, ret, hpd, edid; + char mon[16]; memset(&sunxi_display, 0, sizeof(struct sunxi_display)); @@ -593,8 +614,18 @@ void *video_hw_init(void) video_get_ctfb_res_modes(RES_MODE_1024x768, 24, &mode, &depth, &options); hpd = video_get_option_int(options, "hpd", 1); edid = video_get_option_int(options, "edid", 1); - video_get_option_string(options, "monitor", monitor, sizeof(monitor), - "dvi"); + sunxi_display.monitor = sunxi_monitor_dvi; + video_get_option_string(options, "monitor", mon, sizeof(mon), + sunxi_get_mon_desc(sunxi_display.monitor)); + for (i = 0; i <= SUNXI_MONITOR_LAST; i++) { + if (strcmp(mon, sunxi_get_mon_desc(i)) == 0) { + sunxi_display.monitor = i; + break; + } + } + if (i > SUNXI_MONITOR_LAST) + printf("Unknown monitor: '%s', falling back to '%s'\n", + mon, sunxi_get_mon_desc(sunxi_display.monitor)); /* Always call hdp_detect, as it also enables various clocks, etc. */ ret = sunxi_hdmi_hpd_detect(); @@ -607,7 +638,7 @@ void *video_hw_init(void) /* Check edid if requested and we've a cable plugged in */ if (edid && ret) { - if (sunxi_hdmi_edid_get_mode(&edid_mode, monitor) == 0) + if (sunxi_hdmi_edid_get_mode(&edid_mode) == 0) mode = &edid_mode; } @@ -615,13 +646,13 @@ void *video_hw_init(void) printf("Only non-interlaced modes supported, falling back to 1024x768\n"); mode = &res_mode_init[RES_MODE_1024x768]; } else { - printf("Setting up a %dx%d %s console\n", - mode->xres, mode->yres, monitor); + printf("Setting up a %dx%d %s console\n", mode->xres, + mode->yres, sunxi_get_mon_desc(sunxi_display.monitor)); } sunxi_display.enabled = true; sunxi_engines_init(); - sunxi_mode_set(mode, monitor, gd->fb_base - CONFIG_SYS_SDRAM_BASE); + sunxi_mode_set(mode, gd->fb_base - CONFIG_SYS_SDRAM_BASE); /* * These are the only members of this structure that are used. All the -- 2.1.0

2 1

[U-Boot] [PATCH v2] sunxi: gpio: Add support for gpio pins on the AXP209 pmic
by Hans de Goede 29 Dec '14

29 Dec '14

Some boards use GPIO-s on the pmic, one example of this is the A13-OLinuXino board, which uses gpio0 of the axp209 for the lcd-power signal. This commit adds support for gpio pins on the AXP209 pmic, the sunxi_gpio.c changes are universal, adding gpio support for the other AXP pmics (when necessary) should be a matter of adding the necessary axp_gpio_foo functions to their resp. drivers, and add "#define AXP_GPIO" to their header file. Note this commit only adds support for the non device-model version of the gpio code, patches for adding support to the device-model version are very welcome. The string representation for these gpio-s is AXP0-#, the 0 in the AXP0 prefix is there in case we need to support gpio-s on more then 1 pmic in the future. At least A80 boards have 2 pmics, and we may end up needing to support gpio-s on both. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- Changes in v2: -Remove duplicate defines for AXP209_GPIO_OUTPUT_LOW / HIGH -Add & improve some comments --- arch/arm/include/asm/arch-sunxi/gpio.h | 3 ++ drivers/gpio/sunxi_gpio.c | 30 ++++++++++++++ drivers/power/axp209.c | 72 ++++++++++++++++++++++++++++++++++ include/axp209.h | 7 ++++ 4 files changed, 112 insertions(+) diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h index 6730879..32941cb 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h @@ -114,6 +114,7 @@ enum sunxi_gpio_number { SUNXI_GPIO_I_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_H), SUNXI_GPIO_L_START = 352, SUNXI_GPIO_M_START = SUNXI_GPIO_NEXT(SUNXI_GPIO_L), + SUNXI_GPIO_AXP0_START = 1024, }; /* SUNXI GPIO number definitions */ @@ -129,6 +130,8 @@ enum sunxi_gpio_number { #define SUNXI_GPL(_nr) (SUNXI_GPIO_L_START + (_nr)) #define SUNXI_GPM(_nr) (SUNXI_GPIO_M_START + (_nr)) +#define SUNXI_GPAXP0(_nr) (SUNXI_GPIO_AXP0_START + (_nr)) + /* GPIO pin function config */ #define SUNXI_GPIO_INPUT 0 #define SUNXI_GPIO_OUTPUT 1 diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index 2fa50f9..6296092 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -18,6 +18,9 @@ #include <asm/io.h> #include <asm/gpio.h> #include <dm/device-internal.h> +#ifdef CONFIG_AXP209_POWER +#include <axp209.h> +#endif DECLARE_GLOBAL_DATA_PTR; @@ -73,6 +76,10 @@ int gpio_free(unsigned gpio) int gpio_direction_input(unsigned gpio) { +#ifdef AXP_GPIO + if (gpio >= SUNXI_GPIO_AXP0_START) + return axp_gpio_direction_input(gpio - SUNXI_GPIO_AXP0_START); +#endif sunxi_gpio_set_cfgpin(gpio, SUNXI_GPIO_INPUT); return 0; @@ -80,6 +87,11 @@ int gpio_direction_input(unsigned gpio) int gpio_direction_output(unsigned gpio, int value) { +#ifdef AXP_GPIO + if (gpio >= SUNXI_GPIO_AXP0_START) + return axp_gpio_direction_output(gpio - SUNXI_GPIO_AXP0_START, + value); +#endif sunxi_gpio_set_cfgpin(gpio, SUNXI_GPIO_OUTPUT); return sunxi_gpio_output(gpio, value); @@ -87,11 +99,19 @@ int gpio_direction_output(unsigned gpio, int value) int gpio_get_value(unsigned gpio) { +#ifdef AXP_GPIO + if (gpio >= SUNXI_GPIO_AXP0_START) + return axp_gpio_get_value(gpio - SUNXI_GPIO_AXP0_START); +#endif return sunxi_gpio_input(gpio); } int gpio_set_value(unsigned gpio, int value) { +#ifdef AXP_GPIO + if (gpio >= SUNXI_GPIO_AXP0_START) + return axp_gpio_set_value(gpio - SUNXI_GPIO_AXP0_START, value); +#endif return sunxi_gpio_output(gpio, value); } @@ -101,6 +121,16 @@ int sunxi_name_to_gpio(const char *name) int groupsize = 9 * 32; long pin; char *eptr; + +#ifdef AXP_GPIO + if (strncasecmp(name, "AXP0-", 5) == 0) { + name += 5; + pin = simple_strtol(name, &eptr, 10); + if (!*name || *eptr) + return -1; + return SUNXI_GPIO_AXP0_START + pin; + } +#endif if (*name == 'P' || *name == 'p') name++; if (*name >= 'A') { diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c index 9798e5b..91edd61 100644 --- a/drivers/power/axp209.c +++ b/drivers/power/axp209.c @@ -18,6 +18,11 @@ enum axp209_reg { AXP209_LDO3_VOLTAGE = 0x29, AXP209_IRQ_STATUS5 = 0x4c, AXP209_SHUTDOWN = 0x32, + AXP209_GPIO0_CTRL = 0x90, + AXP209_GPIO1_CTRL = 0x92, + AXP209_GPIO2_CTRL = 0x93, + AXP209_GPIO_STATE = 0x94, + AXP209_GPIO3_CTRL = 0x95, }; #define AXP209_POWER_STATUS_ON_BY_DC (1 << 0) @@ -27,6 +32,15 @@ enum axp209_reg { #define AXP209_POWEROFF (1 << 7) +#define AXP209_GPIO_OUTPUT_LOW 0x00 /* Drive pin low */ +#define AXP209_GPIO_OUTPUT_HIGH 0x01 /* Drive pin high */ +#define AXP209_GPIO_INPUT 0x02 /* Float pin */ + +/* GPIO3 is different from the others */ +#define AXP209_GPIO3_OUTPUT_LOW 0x00 /* Drive pin low, Output mode */ +#define AXP209_GPIO3_OUTPUT_HIGH 0x02 /* Float pin, Output mode */ +#define AXP209_GPIO3_INPUT 0x06 /* Float pin, Input mode */ + static int axp209_write(enum axp209_reg reg, u8 val) { return i2c_write(0x34, reg, 1, &val, 1); @@ -165,3 +179,61 @@ int axp209_power_button(void) return v & AXP209_IRQ5_PEK_DOWN; } + +static u8 axp209_get_gpio_ctrl_reg(unsigned int pin) +{ + switch (pin) { + case 0: return AXP209_GPIO0_CTRL; + case 1: return AXP209_GPIO1_CTRL; + case 2: return AXP209_GPIO2_CTRL; + case 3: return AXP209_GPIO3_CTRL; + } + return 0; +} + +int axp_gpio_direction_input(unsigned int pin) +{ + u8 reg = axp209_get_gpio_ctrl_reg(pin); + /* GPIO3 is "special" */ + u8 val = (pin == 3) ? AXP209_GPIO3_INPUT : AXP209_GPIO_INPUT; + + return axp209_write(reg, val); +} + +int axp_gpio_direction_output(unsigned int pin, unsigned int val) +{ + u8 reg = axp209_get_gpio_ctrl_reg(pin); + + if (val) { + val = (pin == 3) ? AXP209_GPIO3_OUTPUT_HIGH : + AXP209_GPIO_OUTPUT_HIGH; + } else { + val = (pin == 3) ? AXP209_GPIO3_OUTPUT_LOW : + AXP209_GPIO_OUTPUT_LOW; + } + + return axp209_write(reg, val); +} + +int axp_gpio_get_value(unsigned int pin) +{ + u8 val, mask; + int rc; + + if (pin == 3) { + rc = axp209_read(AXP209_GPIO3_CTRL, &val); + mask = 1; + } else { + rc = axp209_read(AXP209_GPIO_STATE, &val); + mask = 1 << (pin + 4); + } + if (rc) + return rc; + + return (val & mask) ? 1 : 0; +} + +int axp_gpio_set_value(unsigned int pin, unsigned int val) +{ + return axp_gpio_direction_output(pin, val); +} diff --git a/include/axp209.h b/include/axp209.h index 21efce6..0436249 100644 --- a/include/axp209.h +++ b/include/axp209.h @@ -4,6 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#define AXP_GPIO + extern int axp209_set_dcdc2(int mvolt); extern int axp209_set_dcdc3(int mvolt); extern int axp209_set_ldo2(int mvolt); @@ -12,3 +14,8 @@ extern int axp209_set_ldo4(int mvolt); extern int axp209_init(void); extern int axp209_poweron_by_dc(void); extern int axp209_power_button(void); + +extern int axp_gpio_direction_input(unsigned int pin); +extern int axp_gpio_direction_output(unsigned int pin, unsigned int val); +extern int axp_gpio_get_value(unsigned int pin); +extern int axp_gpio_set_value(unsigned int pin, unsigned int val); -- 2.1.0

2 1

[U-Boot] fw_readenv not working with uboot.env stored on FAT partition BAD CRC
by Christian Erhardt 29 Dec '14

29 Dec '14

Hello, i'm using a Raspberry Pi with u-boot. I'm building a stock RPI Kernel 3.12.y with buildroot. The u-boot version is 2015.01-rc3. U-Boot is working fine and when i call saveenv a file uboot.env is written to the first FAT Partition on the SD Card. But when i try to access the boot params with fw_readenv, i always get the BAD CRC error. I tried every possible configuration in fw_env.config, but it will not work. if first tried the obvious configuration /dev/mmcblk0p1 0x0000 0x4000 does not work, then i tried to calculate the offset from /dev/mmcblk0: /dev/mmcblk0p1 0x100000 0x4000 0x100000 because startsecotor is 2048 * 512 byte = 1048576 = 0x100000 in hex It will not work. I'm a little confused if this configuration makes sense at all, i thought, with the rpi config, fw_readenv will look for the file uboot.env in the given partition? My partion layout is as follows 243 heads, 62 sectors/track, 1022 cylinders, total 15407104 sectors Units = sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disk identifier: 0xee294a37 Device Boot Start End Blocks Id System /dev/sdf1 * 2048 104447 51200 e W95 FAT16 (LBA) /dev/sdf2 104448 411647 153600 83 Linux /dev/sdf3 411648 718847 153600 83 Linux /dev/sdf4 718848 15407103 7344128 83 Linux Regards Christian Erhardt

1 0

[U-Boot] [PATCH v2] arc: introduce "mdbtrick" target
by Alexey Brodkin 29 Dec '14

29 Dec '14

MetaWare debugger (MDB) is still used as a primary tool for interaction with target via JTAG. Moreover some very advanced features are not yet implemented in GDB for ARC (and not sure if they will be implemnted sometime soon given complexity and rare need for those features for common user). So if we're talking about development process when U-Boot is loaded in target memory not by low-level boot-loader but manually through JTAG chances are high developer uses MDB for it. But MDB doesn't support PIE (position-independent executable) - it will refuse to even start - that means no chance to load elf contents on target. Then the only way to load U-Boot in MDB is to fake it by: 1. Reset PIE flag in ELF header This is simpe - on attempt to open elf MDB checks header and if it doesn't match its expectation refuces to use provided elf. 2. Strip all debug information from elf If (1) is done then MDB will open elf but on parsing of elf's debug info it will refuse to process due to debug info it cannot understand (symbols with PIE relocation). Even though it could be done manually (I got it documented quite a while ago here http://www.denx.de/wiki/U-Boot/ARCNotes) having this automated way is very convenient. User may build U-Boot that will be loaded on target via MDB saying "make mdbtrick". Then if we now apply the manipulation MDB will happily start and will load all required sections into the target. Indeed there will be no source-level debug info available. But still MDB will do its work on showing disassembly, global symbols, registers, accessing low-level debug facilities etc. As a summary - this is a pretty dirty hack but it simplifies life a lot for us ARc developers. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Tom Rini <trini(a)ti.com> Cc: Wolfgang Denk <wd(a)denx.de> --- In v2 I only updated commit message with more info on why we do need this change --- arch/arc/Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arc/Makefile b/arch/arc/Makefile index de25cc9..03ea6db 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -6,3 +6,18 @@ head-y := arch/arc/cpu/$(CPU)/start.o libs-y += arch/arc/cpu/$(CPU)/ libs-y += arch/arc/lib/ + +# MetaWare debugger doesn't support PIE (position-independent executable) +# so the only way to load U-Boot in MDB is to fake it by: +# 1. Reset PIE flag in ELF header +# 2. Strip all debug information from elf +ifdef CONFIG_SYS_LITTLE_ENDIAN + EXEC_TYPE_OFFSET=16 +else + EXEC_TYPE_OFFSET=17 +endif + +mdbtrick: u-boot + $(Q)printf '\x02' | dd of=u-boot bs=1 seek=$(EXEC_TYPE_OFFSET) count=1 \ + conv=notrunc &> /dev/null + $(Q)$(CROSS_COMPILE)strip -g u-boot -- 2.1.0

1 0

[U-Boot] [PATCH 9/9] [v3] rsa: Use checksum algorithms from struct hash_algo
by Ruchika Gupta 29 Dec '14

29 Dec '14

Sorry. Resending as message bounced on uboot mailing list. Hi Simon, > -----Original Message----- > From: sjg(a)google.com [mailto:sjg@google.com] On Behalf Of Simon Glass > Sent: Wednesday, December 24, 2014 6:20 AM > To: Gupta Ruchika-R66431 > Cc: U-Boot Mailing List; Sun York-R58495 > Subject: Re: [PATCH 9/9] [v3] rsa: Use checksum algorithms from struct > hash_algo > > Hi Ruchika, > > On 23 December 2014 at 04:32, Ruchika Gupta <ruchika.gupta(a)freescale.com> > wrote: > > Currently the hash functions used in RSA are called directly from the > > sha1 and sha256 libraries. Change the RSA checksum library to use the > > progressive hash API's registered with struct hash_algo. This will > > allow the checksum library to use the hardware accelerated progressive hash > API's once available. > > > > Signed-off-by: Ruchika Gupta <ruchika.gupta(a)freescale.com> > > CC: Simon Glass <sjg(a)chromium.org> > > --- > > Changes in v3: > > Modified rsa-verify to check for return from checksum function > > > > Changes in v2: > > Added generic function hash_calculate. Pass an additional argument as > > name of algorithm. > > > > common/image-sig.c | 6 ++--- > > include/image.h | 5 ++-- > > include/u-boot/rsa-checksum.h | 7 +++--- > > lib/rsa/rsa-checksum.c | 53 > +++++++++++++++++++++++++++++++++++++++---- > > lib/rsa/rsa-verify.c | 7 +++++- > > 5 files changed, 64 insertions(+), 14 deletions(-) > > > > diff --git a/common/image-sig.c b/common/image-sig.c index > > 8601eda..2c9f0cd 100644 > > --- a/common/image-sig.c > > +++ b/common/image-sig.c > > @@ -38,7 +38,7 @@ struct checksum_algo checksum_algos[] = { #if > > IMAGE_ENABLE_SIGN > > EVP_sha1, > > #endif > > - sha1_calculate, > > + hash_calculate, > > padding_sha1_rsa2048, > > }, > > { > > @@ -48,7 +48,7 @@ struct checksum_algo checksum_algos[] = { #if > > IMAGE_ENABLE_SIGN > > EVP_sha256, > > #endif > > - sha256_calculate, > > + hash_calculate, > > padding_sha256_rsa2048, > > }, > > { > > @@ -58,7 +58,7 @@ struct checksum_algo checksum_algos[] = { #if > > IMAGE_ENABLE_SIGN > > EVP_sha256, > > #endif > > - sha256_calculate, > > + hash_calculate, > > padding_sha256_rsa4096, > > } > > > > diff --git a/include/image.h b/include/image.h index af30d60..ec55f23 > > 100644 > > --- a/include/image.h > > +++ b/include/image.h > > @@ -926,8 +926,9 @@ struct checksum_algo { #if IMAGE_ENABLE_SIGN > > const EVP_MD *(*calculate_sign)(void); #endif > > - void (*calculate)(const struct image_region region[], > > - int region_count, uint8_t *checksum); > > + int (*calculate)(const char *name, > > + const struct image_region region[], > > + int region_count, uint8_t *checksum); > > const uint8_t *rsa_padding; > > }; > > > > diff --git a/include/u-boot/rsa-checksum.h > > b/include/u-boot/rsa-checksum.h index c996fb3..c546c80 100644 > > --- a/include/u-boot/rsa-checksum.h > > +++ b/include/u-boot/rsa-checksum.h > > @@ -16,9 +16,8 @@ extern const uint8_t padding_sha256_rsa4096[]; > > extern const uint8_t padding_sha256_rsa2048[]; extern const uint8_t > > padding_sha1_rsa2048[]; > > > > -void sha256_calculate(const struct image_region region[], int > region_count, > > - uint8_t *checksum); > > -void sha1_calculate(const struct image_region region[], int region_count, > > - uint8_t *checksum); > > +int hash_calculate(const char *name, > > + const struct image_region region[], int region_count, > > + uint8_t *checksum); > > > > This could use a function comment. > > > #endif > > diff --git a/lib/rsa/rsa-checksum.c b/lib/rsa/rsa-checksum.c index > > 8d8b59f..7f1909a 100644 > > --- a/lib/rsa/rsa-checksum.c > > +++ b/lib/rsa/rsa-checksum.c > > @@ -10,12 +10,13 @@ > > #include <asm/byteorder.h> > > #include <asm/errno.h> > > #include <asm/unaligned.h> > > +#include <hash.h> > > #else > > #include "fdt_host.h" > > -#endif > > -#include <u-boot/rsa.h> > > #include <u-boot/sha1.h> > > #include <u-boot/sha256.h> > > +#endif > > +#include <u-boot/rsa.h> > > > > /* PKCS 1.5 paddings as described in the RSA PKCS#1 v2.1 standard. */ > > > > @@ -136,7 +137,33 @@ const uint8_t padding_sha256_rsa4096[RSA4096_BYTES - > SHA256_SUM_LEN] = { > > 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 }; > > > > -void sha1_calculate(const struct image_region region[], int > > region_count, > > +#ifndef USE_HOSTCC > > +int hash_calculate(const char *name, > > + const struct image_region region[], > > + int region_count, uint8_t *checksum) { > > + struct hash_algo *algo; > > + int ret = 0; > > + void *ctx; > > + uint32_t i; > > + i = 0; > > + > > + ret = hash_progressive_lookup_algo(name, &algo); > > + if (ret) > > + return ret; > > + > > + algo->hash_init(algo, &ctx); > > + for (i = 0; i < region_count - 1; i++) > > + algo->hash_update(algo, ctx, region[i].data, > > + region[i].size, 0); > > + > > + algo->hash_update(algo, ctx, region[i].data, region[i].size, 1); > > + algo->hash_finish(algo, ctx, checksum, algo->digest_size); > > + > > + return 0; > > +} > > + > > +#else > > The above looks good, but what is happening here? Why do you need to do > something different for USE_HOSTCC? The hash_algo struct is defined in common/hash.c which doesn’t get compiled for tools. That is why I did it differently for USE_HOSTCC > > > +int sha1_calculate(const struct image_region region[], int > > +region_count, > > uint8_t *checksum) { > > sha1_context ctx; > > @@ -147,9 +174,11 @@ void sha1_calculate(const struct image_region > region[], int region_count, > > for (i = 0; i < region_count; i++) > > sha1_update(&ctx, region[i].data, region[i].size); > > sha1_finish(&ctx, checksum); > > + > > + return 0; > > } > > > > -void sha256_calculate(const struct image_region region[], int > > region_count, > > +int sha256_calculate(const struct image_region region[], int > > +region_count, > > uint8_t *checksum) { > > sha256_context ctx; > > @@ -160,4 +189,20 @@ void sha256_calculate(const struct image_region > region[], int region_count, > > for (i = 0; i < region_count; i++) > > sha256_update(&ctx, region[i].data, region[i].size); > > sha256_finish(&ctx, checksum); > > + > > + return 0; > > } > > + > > +int hash_calculate(const char *name, > > + const struct image_region region[], int region_count, > > + uint8_t *checksum) > > +{ > > + if (!strcmp(name, "sha1")) > > + sha1_calculate(region, region_count, checksum); > > + > > + if (!strcmp(name, "sha256")) > > + sha256_calculate(region, region_count, checksum); > > + > > + return 0; > > +} > > +#endif > > diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c index > > 27f10ef..0028304 100644 > > --- a/lib/rsa/rsa-verify.c > > +++ b/lib/rsa/rsa-verify.c > > @@ -188,7 +188,12 @@ int rsa_verify(struct image_sign_info *info, > > } > > > > /* Calculate checksum with checksum-algorithm */ > > - info->algo->checksum->calculate(region, region_count, hash); > > + ret = info->algo->checksum->calculate(info->algo->checksum->name, > > + region, region_count, hash); > > + if (ret < 0) { > > + debug("%s: Error in checksum calculation\n", __func__); > > + return -EINVAL; > > + } > > > > /* See if we must use a particular key */ > > if (info->required_keynode != -1) { > > -- > > 1.8.1.4 > > > > Regards, > Simon Regards, Ruchika

1 0

[U-Boot] [PATCH] sunxi: Fix PLL1 running at half speed on sun8i
by Hans de Goede 28 Dec '14

28 Dec '14

PLL1 on sun6i / sun8i also has a p factor which divides the clock by 2^p (to the power p). On sun6i the p factor is ignored, but on sun8i it is used and we were setting it to 1, resulting in the CPU running at 504 MHz instead of 1008 MHz, this commit fixes this. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 8 ++++++-- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c index 8ef19df..36e502f 100644 --- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c @@ -97,6 +97,7 @@ void clock_set_pll1(unsigned int clk) { struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; + const int p = 0; int k = 1; int m = 1; @@ -113,8 +114,11 @@ void clock_set_pll1(unsigned int clk) CPU_CLK_SRC_OSC24M << CPU_CLK_SRC_SHIFT, &ccm->cpu_axi_cfg); - /* PLL1 rate = 24000000 * n * k / m */ - writel(CCM_PLL1_CTRL_EN | CCM_PLL1_CTRL_MAGIC | + /* + * sun6i: PLL1 rate = ((24000000 * n * k) >> 0) / m (p is ignored) + * sun8i: PLL1 rate = ((24000000 * n * k) >> p) / m + */ + writel(CCM_PLL1_CTRL_EN | CCM_PLL1_CTRL_P(p) | CCM_PLL1_CTRL_N(clk / (24000000 * k / m)) | CCM_PLL1_CTRL_K(k) | CCM_PLL1_CTRL_M(m), &ccm->pll1_cfg); sdelay(200); diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index f2f1a9b..0e57abe 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -173,7 +173,7 @@ struct sunxi_ccm_reg { #define CCM_PLL1_CTRL_M(n) ((((n) - 1) & 0x3) << 0) #define CCM_PLL1_CTRL_K(n) ((((n) - 1) & 0x3) << 4) #define CCM_PLL1_CTRL_N(n) ((((n) - 1) & 0x1f) << 8) -#define CCM_PLL1_CTRL_MAGIC (0x1 << 16) +#define CCM_PLL1_CTRL_P(n) (((n) & 0x3) << 16) #define CCM_PLL1_CTRL_EN (0x1 << 31) #define CCM_PLL3_CTRL_M(n) ((((n) - 1) & 0xf) << 0) -- 2.1.0

2 2

[U-Boot] [PATCH 01/22] x86: Correct XIP_ROM_SIZE
by Simon Glass 28 Dec '14

28 Dec '14

This should default to the size of the ROM for faster execution before relocation. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ebf72b3..7d007bb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -53,7 +53,7 @@ config RAMTOP config XIP_ROM_SIZE hex - default 0x10000 + default ROM_SIZE config CPU_ADDR_BITS int -- 2.2.0.rc0.207.ga3a616c

1 0

[U-Boot] [PATCH] sunxi: Fix buggy sun6i/sun8i DRAM size detection logic
by Siarhei Siamashka 27 Dec '14

27 Dec '14

After reboot, reset or even short power off, DRAM typically retains the old stale data for some period of time (for this type of memory, the bits of data are stored in slowly discharging capacitors). The current sun6i/sun8i DRAM size detection logic, which is inherited from the Allwinner code, relies on using a large magic signature with the hope that it is unique enough and unlikely to ever accidentally match this leftover garbage data in RAM. But this approach is inherently unsafe, as can be demonstrated using the following test program: /***** A testcase for reproducing the problem ******/ #include <stdlib.h> #include <stdio.h> #include <stdint.h> void main(int argc, char *argv[]) { size_t size, i; uint32_t *buf; /* Allocate the buffer */ if (argc < 2 || !(size = (size_t)atoi(argv[1]) * 1048576) || !(buf = malloc(size))) { printf("Need buffer size in MiB as a cmdline argument\n"); exit(1); } /* Fill it with the Allwinner DRAM "magic" values */ for (i = 0; i < size / 4; i++) buf[i] = 0xaa55aa55 + ((uintptr_t)&buf[i] / 4) % 64; /* Try to reboot */ system("reboot"); /* And wait */ for (;;) {} } /***************************************************/ If this test program is run on the device (giving it a large chunk of memory), then the DRAM size detection logic in u-boot gets confused after reboot and fails to initialize DRAM properly. A better approach is not to rely on luck and abstain from making any assumptions about the properties of the leftover garbage data in RAM. Instead just use a more reliable code for testing whether two different addresses refer to the same memory location. Signed-off-by: Siarhei Siamashka <siarhei.siamashka(a)gmail.com> --- Done only very limited testing on MSI Primo81 tablet (Allwinner A31s), which is currently a rather impractical device for doing any sun6i code development due to having no access to the serial console, USB or other convenient ways to interact with the device. It might be a good idea to backup/restore the data in RAM when doing this check in the code. Using the standard u-boot 'get_ram_size' function could be also an option to replace the loops and simplify the sun6i/sun8i dram code in the future. The only inconvenience is that 'get_ram_size' returns 'size' instead of 'log2(size)'. This could be probably resolved by introducing a new 'get_ram_size_log2' common function. But since I don't have any Allwinner A23/A31 devboard for testing/debugging, don't expect me to do this work any time soon, or ever at all. arch/arm/cpu/armv7/sunxi/dram_sun6i.c | 1 - arch/arm/cpu/armv7/sunxi/dram_sun8i.c | 1 - arch/arm/include/asm/arch-sunxi/dram.h | 22 ++++++---------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/dram_sun6i.c b/arch/arm/cpu/armv7/sunxi/dram_sun6i.c index 4675c48..4518b80 100644 --- a/arch/arm/cpu/armv7/sunxi/dram_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/dram_sun6i.c @@ -377,7 +377,6 @@ unsigned long sunxi_dram_init(void) MCTL_CR_BANK(1) | MCTL_CR_RANK(1)); /* Detect and set page size */ - mctl_mem_fill(); for (columns = 7; columns < 20; columns++) { if (mctl_mem_matches(1 << columns)) break; diff --git a/arch/arm/cpu/armv7/sunxi/dram_sun8i.c b/arch/arm/cpu/armv7/sunxi/dram_sun8i.c index df9ff1f..ebba53b 100644 --- a/arch/arm/cpu/armv7/sunxi/dram_sun8i.c +++ b/arch/arm/cpu/armv7/sunxi/dram_sun8i.c @@ -289,7 +289,6 @@ unsigned long sunxi_dram_init(void) writel(0x000310f4 | MCTL_CR_PAGE_SIZE(page_size), &mctl_com->cr); setbits_le32(&mctl_com->swonr, 0x0003ffff); - mctl_mem_fill(); for (rows = 11; rows < 16; rows++) { offset = 1 << (rows + columns + bus); if (mctl_mem_matches(offset)) diff --git a/arch/arm/include/asm/arch-sunxi/dram.h b/arch/arm/include/asm/arch-sunxi/dram.h index 8d78029..7ff43e6 100644 --- a/arch/arm/include/asm/arch-sunxi/dram.h +++ b/arch/arm/include/asm/arch-sunxi/dram.h @@ -24,8 +24,6 @@ #include <asm/arch/dram_sun4i.h> #endif -#define MCTL_MEM_FILL_MATCH_COUNT 64 - unsigned long sunxi_dram_init(void); /* @@ -42,24 +40,16 @@ static inline void mctl_await_completion(u32 *reg, u32 mask, u32 val) } /* - * Fill beginning of DRAM with "random" data for mctl_mem_matches() - */ -static inline void mctl_mem_fill(void) -{ - int i; - - for (i = 0; i < MCTL_MEM_FILL_MATCH_COUNT; i++) - writel(0xaa55aa55 + i, CONFIG_SYS_SDRAM_BASE + i * 4); -} - -/* * Test if memory at offset offset matches memory at begin of DRAM */ static inline bool mctl_mem_matches(u32 offset) { - return memcmp((u32 *)CONFIG_SYS_SDRAM_BASE, - (u32 *)(CONFIG_SYS_SDRAM_BASE + offset), - MCTL_MEM_FILL_MATCH_COUNT * 4) == 0; + /* Try to write different values to RAM at two addresses */ + writel(0, CONFIG_SYS_SDRAM_BASE); + writel(0xaa55aa55, CONFIG_SYS_SDRAM_BASE + offset); + /* Check if the same value is actually observed when reading back */ + return readl(CONFIG_SYS_SDRAM_BASE) == + readl(CONFIG_SYS_SDRAM_BASE + offset); } #endif /* _SUNXI_DRAM_H */ -- 2.0.4

2 6

[U-Boot] [PATCH] arc: introduce "mdbtrick" target
by Alexey Brodkin 26 Dec '14

26 Dec '14

MetaWare debugger doesn't support PIE (position-independent executable) so the only way to load U-Boot in MDB is to fake it by: 1. Reset PIE flag in ELF header 2. Strip all debug information from elf Even though it could be done manually but having this automated way is very convenient. User may build U-Boot that will be loaded on target via MDB saying "make mdbtrick". Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Tom Rini <trini(a)ti.com> --- arch/arc/Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arc/Makefile b/arch/arc/Makefile index de25cc9..03ea6db 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -6,3 +6,18 @@ head-y := arch/arc/cpu/$(CPU)/start.o libs-y += arch/arc/cpu/$(CPU)/ libs-y += arch/arc/lib/ + +# MetaWare debugger doesn't support PIE (position-independent executable) +# so the only way to load U-Boot in MDB is to fake it by: +# 1. Reset PIE flag in ELF header +# 2. Strip all debug information from elf +ifdef CONFIG_SYS_LITTLE_ENDIAN + EXEC_TYPE_OFFSET=16 +else + EXEC_TYPE_OFFSET=17 +endif + +mdbtrick: u-boot + $(Q)printf '\x02' | dd of=u-boot bs=1 seek=$(EXEC_TYPE_OFFSET) count=1 \ + conv=notrunc &> /dev/null + $(Q)$(CROSS_COMPILE)strip -g u-boot -- 2.1.0

2 3