date:20141218


On 12/12/2014 Stephen Warren wrote:

 On 12-12-14 10:50 AM, Hans de Goede wrote:

 When using usb-keyboard support, typically usb will already get started from
 preboot. In this case doing it again in the bootcmd is undesirable.

 Allow the user of config_distro_bootcmd to indicate that usb is inited in
 preboot through the user setting BOOTENV_PREBOOT_INITS_USB.

Sorry, I don't recall seeing this whenever it was posted before.


 Conceptually this seems fine. One issue it has is with the following
 sequence:

 PREBOOT inits USB, no USB drive found (not plugged in)
 User CTRL-Cs boot sequence
 User plugs in USB drive
 User runs boot or run bootcmd
 - USB not re-detected, so system doesn't boot from USB.

 Perhaps the best way to solve this is to have a flag controlling whether
 BOOTENV_SET_USB_NEED_INIT sets $usb_need_init?

 preboot:
 setenv usb_do_set_usb_need_init false

 BOOTENV_SET_USB_NEED_INIT:
 # Normally unset - true
 # In your case, preboot sets this to false
 if ${usb_do_set_usb_need_init}; then
  setenv usb_need_init
 else
  # Next time $boot is run, this will be unset - true
  # so we will re-init USB
  setenv usb_do_set_usb_need_init
  # This time through, we skip USB init
  setenv usb_need_init false
 endif

 Of course, that doesn't solve the problem of the user aborting auto-boot
 before it's ever run once. Perhaps better would be a flag that
 BOOTENV_SET_USB_NEED_INIT can use to distinguish auto-boot and manual
 invocation, i.e.:

 preboot:
 setenv usb_do_set_usb_need_init false

 BOOTENV_SET_USB_NEED_INIT:
 # U-Boot C code sets this appropriatelyL
 if ${auto_boot}; then
  # Auto case: Init USB unless preboot set a flag
  if ${usb_do_set_usb_need_init}; then
  setenv usb_need_init
  else
  # Next time $boot is run, this will be unset - true
  # so we will re-init USB
  setenv usb_do_set_usb_need_init
  # This time through, we skip USB init
  setenv usb_need_init false
  endif
 else
  # Manual case: Always init USB
  setenv usb_need_init
 endif

 Or do we just assume that if the user plugs in a new USB device after
 boot, they must manually run USB initialization? If so, we cam simplify
 the existing $usb_need_init a bit...

Looking at all the extra code (and possible bugs / problems that code may
introduce), I think that it makes sense to just expect the user to run
usb reset after plugging in a new device.

Regards,

Hans
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v2] ubi: enable error reporting in initialization

2014-12-18 Thread Hector Palacios

Hi Andrew,

On 11/05/2014 08:31 PM, Andrew Ruder wrote:
 The UBI layer will disable much of its error reporting when it is
 compiled into the linux kernel to avoid stopping boot.  We want this
 error reporting in U-Boot since we don't initialize the UBI layer until
 it is used and want the error reporting.
 
 We force this by telling the UBI layer we are building as a module.
 
 Signed-off-by: Andrew Ruder andrew.ru...@elecsyscorp.com
 Cc: Wolfgang Denk w...@denx.de
 Cc: Heiko Schocher h...@denx.de
 Cc: Kyungmin Park kmp...@infradead.org
 ---
  include/ubi_uboot.h | 8 
  1 file changed, 8 insertions(+)
 
 diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
 index 1fd15f4..324fe72 100644
 --- a/include/ubi_uboot.h
 +++ b/include/ubi_uboot.h
 @@ -51,6 +51,14 @@
  
  #undef CONFIG_MTD_UBI_BLOCK
  
 +/* ubi_init() disables returning error codes when built into the Linux
 + * kernel so that it doesn't hang the Linux kernel boot process.  Since
 + * the U-Boot driver code depends on getting valid error codes from this
 + * function we just tell the UBI layer that we are building as a module
 + * (which only enables the additional error reporting).
 + */
 +#define CONFIG_MTD_UBI_MODULE
 +
  #if !defined(CONFIG_MTD_UBI_BEB_LIMIT)
  #define CONFIG_MTD_UBI_BEB_LIMIT 20
  #endif
 

I applied this patch but apparently I'm suffering a memory leak in a certain
condition. I wonder if you can reproduce it:

1. Assume you have an empty partition called MyPart.
2. Write it with some dummy data:
= mw.l $loadaddr deadbeed 1000
= nand write $loadaddr MyPart 1000
3. Set it as the UBI part:
= ubi part MyPart
This (which returned 0 before, despite failing during the attach procedure now 
should
return an error).
4. Run the command again several times:
= ubi part MyPart
= ubi part MyPart

In my case, after calling this three times, the target hangs. I think the exit 
path in
ubi_init() does not properly free every allocated memory. I was not able to 
find the
root cause, though.

Regards
--
Hector Palacios
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 0/5] ARM: UniPhier: minor fixes




Masahiro Yamada (5):
  ARM: UniPhier: fix property names of aliases nodes of device trees
  ARM: UniPhier: remove unnecessary ifdef conditional
  ARM: UniPhier: use DRAM area for init stack of normal image
  ARM: UniPhier: select CONFIG_SPL
  ARM: UniPhier: enable CONFIG_CMD_DM

 arch/arm/Kconfig  | 1 +
 arch/arm/cpu/armv7/uniphier/init_page_table.c | 4 
 arch/arm/dts/uniphier-ph1-ld4-ref.dts | 8 
 arch/arm/dts/uniphier-ph1-pro4-ref.dts| 8 
 arch/arm/dts/uniphier-ph1-sld3-ref.dts| 6 +++---
 arch/arm/dts/uniphier-ph1-sld8-ref.dts| 8 
 configs/ph1_ld4_defconfig | 1 -
 configs/ph1_pro4_defconfig| 1 -
 configs/ph1_sld8_defconfig| 1 -
 include/configs/uniphier.h| 6 ++
 10 files changed, 22 insertions(+), 22 deletions(-)

-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 1/5] ARM: UniPhier: fix property names of aliases nodes of device trees

The property name of the aliases node should be serial*
to assign a desired number for the device sequence number.

Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
---

 arch/arm/dts/uniphier-ph1-ld4-ref.dts  | 8 
 arch/arm/dts/uniphier-ph1-pro4-ref.dts | 8 
 arch/arm/dts/uniphier-ph1-sld3-ref.dts | 6 +++---
 arch/arm/dts/uniphier-ph1-sld8-ref.dts | 8 
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/arm/dts/uniphier-ph1-ld4-ref.dts 
b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
index 08bbd03..6855878 100644
--- a/arch/arm/dts/uniphier-ph1-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
@@ -25,10 +25,10 @@
};
 
aliases {
-   uart0 = uart0;
-   uart1 = uart1;
-   uart2 = uart2;
-   uart3 = uart3;
+   serial0 = uart0;
+   serial1 = uart1;
+   serial2 = uart2;
+   serial3 = uart3;
i2c0 = i2c0;
i2c1 = i2c1;
i2c2 = i2c2;
diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts 
b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
index 23add7c..1227b62 100644
--- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
@@ -25,10 +25,10 @@
};
 
aliases {
-   uart0 = uart0;
-   uart1 = uart1;
-   uart2 = uart2;
-   uart3 = uart3;
+   serial0 = uart0;
+   serial1 = uart1;
+   serial2 = uart2;
+   serial3 = uart3;
i2c0 = i2c0;
i2c1 = i2c1;
i2c2 = i2c2;
diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts 
b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
index 91b4dbe..fefc592 100644
--- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
@@ -25,9 +25,9 @@
};
 
aliases {
-   uart0 = uart0;
-   uart1 = uart1;
-   uart2 = uart2;
+   serial0 = uart0;
+   serial1 = uart1;
+   serial2 = uart2;
i2c0 = i2c0;
i2c1 = i2c1;
i2c2 = i2c2;
diff --git a/arch/arm/dts/uniphier-ph1-sld8-ref.dts 
b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
index a8ce049..9b6d95c 100644
--- a/arch/arm/dts/uniphier-ph1-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
@@ -25,10 +25,10 @@
};
 
aliases {
-   uart0 = uart0;
-   uart1 = uart1;
-   uart2 = uart2;
-   uart3 = uart3;
+   serial0 = uart0;
+   serial1 = uart1;
+   serial2 = uart2;
+   serial3 = uart3;
i2c0 = i2c0;
i2c1 = i2c1;
i2c2 = i2c2;
-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 3/5] ARM: UniPhier: use DRAM area for init stack of normal image

The normal image is working on DRAM.  It is better to use DRAM also
for init stack than L2 cache.

Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
---

 include/configs/uniphier.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index dd022fb..ed22111 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -273,7 +273,11 @@
 #define CONFIG_SYS_SPL_MALLOC_START(0x0ff0)
 #define CONFIG_SYS_SPL_MALLOC_SIZE (0x4000)
 
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SYS_INIT_SP_ADDR(0x0ff08000)
+#else
+#define CONFIG_SYS_INIT_SP_ADDR((CONFIG_SYS_TEXT_BASE) - 
0x1000)
+#endif
 
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SUPPORT
-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 4/5] ARM: UniPhier: select CONFIG_SPL

Now UniPhier platform is only supported with SPL.

Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
---

 arch/arm/Kconfig   | 1 +
 configs/ph1_ld4_defconfig  | 1 -
 configs/ph1_pro4_defconfig | 1 -
 configs/ph1_sld8_defconfig | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2b0d2c9..5eb1d03 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -800,6 +800,7 @@ config ARCH_UNIPHIER
bool Panasonic UniPhier platform
select CPU_V7
select SUPPORT_SPL
+   select SPL
select OF_CONTROL if !SPL_BUILD
 
 endchoice
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index 3155340..2e9dd00 100644
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 +S:CONFIG_ARM=y
diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index 7ea4e6e..5dca64b 100644
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 +S:CONFIG_ARM=y
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index ddf210c..2a6e334 100644
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -1,4 +1,3 @@
-CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 +S:CONFIG_ARM=y
-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 2/5] ARM: UniPhier: remove unnecessary ifdef conditional

init_page_table is only set on SPL.

Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
---

 arch/arm/cpu/armv7/uniphier/init_page_table.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/cpu/armv7/uniphier/init_page_table.c 
b/arch/arm/cpu/armv7/uniphier/init_page_table.c
index a0d10a9..febb3c8 100644
--- a/arch/arm/cpu/armv7/uniphier/init_page_table.c
+++ b/arch/arm/cpu/armv7/uniphier/init_page_table.c
@@ -17,11 +17,7 @@
 #define REGDEVICE  /* IO Register: Device */
 #define DDRDEVICE  /* DDR SDRAM: Device */
 
-#ifdef CONFIG_SPL_BUILD
 #define IS_SPL_TEXT_AREA(x)((x) == ((CONFIG_SPL_TEXT_BASE)  20))
-#else
-#define IS_SPL_TEXT_AREA(x)((x) == ((CONFIG_SYS_TEXT_BASE)  20))
-#endif
 
 #define IS_INIT_STACK_AREA(x)  ((x) == ((CONFIG_SYS_INIT_SP_ADDR)  20))
 
-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 5/5] ARM: UniPhier: enable CONFIG_CMD_DM

Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
---

 include/configs/uniphier.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index ed22111..5a53c50 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -187,6 +187,8 @@
 #define CONFIG_FAT_WRITE
 #define CONFIG_DOS_PARTITION
 
+#define CONFIG_CMD_DM
+
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START   CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x0100)
-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH] fs: fat: read: fix fat16 ls/read issue

2014-12-18 Thread Przemyslaw Marczak

Hello Simon,

On 12/18/2014 04:39 AM, Simon Glass wrote:

Hi Przemyslaw,

On 17 December 2014 at 02:03, Przemyslaw Marczak p.marc...@samsung.com wrote:

Hello,

On 12/16/2014 11:26 PM, Simon Glass wrote:

Hi Przemyslaw,

On 12 December 2014 at 08:30, Przemyslaw Marczak p.marc...@samsung.com
wrote:

Hello,

On 12/12/2014 01:32 AM, Simon Glass wrote:

Hi Przemyslaw,

On 11 December 2014 at 05:01, Przemyslaw Marczak p.marc...@samsung.com
wrote:

The present fat implementation ignores FAT16 long name
directory entries which aren't placed in a single sector.

This was becouse of the buffer was always filled by the
two sectors, and the loop was made also for two sectors.

If some file long name entries are stored in two sectors,
the we have two cases:

Case 1:
Both of sectors are in the buffer - all required data
for long file name is in the buffer.
- Read OK!

Case 2:
The current directory entry is placed at the end of the
second buffered sector. And the next entries are placed
in a sector which is not buffered yet. Then two next
sectors are buffered and the mentioned entry is ignored.
- Read fail!

This commit fixes this issue by:
- read two sectors after loop on each single is done
- keep the last used sector as a first in the buffer
before the read of two next

The commit doesn't affects the fat32 imlementation,
which works good as previous.

This is very interesting\! Is this the same failure that I saw on this
thread?

http://u-boot.10912.n7.nabble.com/PATCH-U-Boot-ARM-rpi-b-detect-board-revision-td196720.html

(search for fatload)

I tried this out. It worked OK for me except that it can't find the
device tree file bcm2835-rpi-b-rev2.dtb.

Oddly I can fatload it from /bcm2835-rpi-b-rev2.dtb but when I try
from /syslinux/..//bcm2835-rpi-b-rev2.dtb it fails and cannot find the
file. Reducing the filename length to 8 chars works. I wonder what
year of my life FAT will stop plaguing me?

Also can you write a test for this in test/fs/fs-test.sh?

Regards,
Simon

[snip]

Probably this is an another case which is caused by the sector buffer
bug.
Does this patch fixed your issue?

I have some simple test for manual use with the ums tool.
It just copy the test files to the tested fat16 partition mounted using
the
UMS, next it computes CRC32 of those files on the host and next using
U-Boot
fatload/crc32 commands - it tests the read feature. But it's not full
automated - I didn't work on getting the log from U-Boot console.

So I could check if the file checksums are proper and if all files were
found on the partiion, by the U-Boot read command. It's not useful for
the
test/fs/fs-test.sh because this is not designed for the sandbox.
My test writes some commands directly to U-Boot console, like this: echo
some cmd /dev/ttyS0.

Unfortunately the sandbox config seems to be broken.

The bug was not so obvious, any read/write on fat partition can change
fat
directory entries or add the new ones and then all data can be read
right.

I will send the scripts for such simple test.

I'm not sure if it fixes my problem but it seems likely. I will see if
I can make time to test it.

If you want to write input data to U-Boot sandbox we can do that
fairly easily. You can import cros_subprocess and use the function
there to generate output from your test and inspect the input from
U-Boot's command line. Let me know if you'd like an example.

Regards,
Simon

Before, I wrote, that sandbox seems to be broken, sorry for this - it was
just my dirty repo - sandbox compiles and works well.

Somewhat bewildering, but it does not in fact fix my problem.

Here is a compressed version of the fat filesystem if you want to take a look:

https://drive.google.com/file/d/0B7WYZbZ9zd-3NGRMNkFQQTdtV2M/view?usp=sharing

Regards,
Simon

I had put this image on my Trats2 device on partition mmc 0:6 using ums
and dd linux command. Next I put latest mainline u-boot, commit:
e3bf81b1e841ecabe7c8b3d48621256db8b8623e : Merge branch 'master' of
git://git.denx.de/u-boot-mpc85xx

So this is the version with the fat bug. But I can see and load the
file: bcm2835-rpi-b-rev2.dtb.

Trats2 # fatls mmc 0:6
17840 bootcode.bin
120 cmdline.txt
1331 config.txt
6115 fixup.dat
2324 fixup_cd.dat
9166 fixup_x.dat
3232856 kernel.img
2615064 start.elf
533080 start_cd.elf
3572200 start_x.elf
137 issue.txt
18974 license.oracle
295524 u-boot.bin
1331 config.txt~
extlinux/
3368648 zimage
3963 bcm2835-rpi-b.dtb
3963 bcm2835.dtb
3963 bcm2835-rpi-b-rev2.dtb

18 file(s), 1 dir(s)

Trats2 # fatload mmc 0:6 0x4000 bcm2835-rpi-b-rev2.dtb
reading bcm2835-rpi-b-rev2.dtb
3963 bytes read in 5 ms (773.4 KiB/s)
Trats2 # crc32 0x4000 0xf7b
CRC32 for 4000 ... 4f7a == c36ee8db
Trats2 #

The only missing file is boot.scr, it's ignored by ls command but
can be loaded...

Trats2 # fatload mmc 0:6 0x4000 boot.scr

Re: [U-Boot] [PATCH v2 5/5] sun6i: Add new CSQ_CS908 board


Hi,

On 14-12-14 15:57, Ian Campbell wrote:

On Sun, 2014-11-23 at 14:43 +0100, Hans de Goede wrote:

The CSQ CS908 is an A31s based top-set box, with 1G RAM, 8G NAND,
rtl8188etv usb wifi, 2 USB A receptacles (1 connected through the OTG
controller), ethernet, 3.5 mm jack with a/v out and hdmi out:

http://www.geekbuying.com/item/CS908-Allwinner-A31S-Quad-Core-1-2GHz-Android-4-4-Mini-TV-Box-HDMI-HDD-Player-1G-8G-WIFI-Miracast---Black-95.html

Note it has no sdcard slot and therefore can only be fel booted.

Signed-off-by: Hans de Goede hdego...@redhat.com
Acked-by: Ian Campbell i...@hellion.org.uk
---
  configs/CSQ_CS908_defconfig | 19 +++


Apparently I'm terrible at remembering this during review: this is
missing a MAINTAINERS entry. (MAKEALL warns about this when regenerating
boards.cfg).


Yeah, I'm bad at remembering to update MAINTAINERS too...


Since this patch is only in u-boot-sunxi#next so far do you just want to
fold in an update to add it to your stanza (or add a new appropriate
stanza) and force push? Ack to that plan if you do.


Done (fixed, forced-push).

I've also fixed the same problem for the new Ippo_q8h_v1.2_defconfig in
my sun8i spl / draminit set in my personal tree.

Regards,

Hans
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 1/2] kbuild: Fix a false error of generic board support

Hi Matthew, Tom,



On Tue, 16 Dec 2014 18:56:46 -0500
Tom Rini tr...@ti.com wrote:

 On Tue, Dec 16, 2014 at 02:56:44PM -0600, mgerlach wrote:
 
  Hello Masahiro Yamada,
  
  Even the with this patch, we encountered a false error of generic board
  support.  The problem was very interrmittent for us, but we were able 
  to debug the problem to performing builds on EXT3 file systems which
  have a time stamp resolution of one second.  To reproduce the problem,
  touch ./include/config/auto.conf and .config on a configured uboot tree on
  an EXT3 file system.
  
  The patch below fixes the problem for us.  
 
 This makes an odd race condition problem I run into when doing massively
 paralell builds worse :(  With MAKEALL no ARM boards build (ARCH wasn't
 set in time so it tried arch//Makefile for something) and buildman was
 also broken in a bunch of places.
 

Me too.

Although I do not know why, Methew's patch makes it worse.
Without MAKEALL or buildman, I hit the same error every time.


$ LANG=C make -j8 CROSS_COMPILE=arm-linux-gnueabi-  ph1_ld4_defconfig all
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  SHIPPED scripts/kconfig/zconf.tab.c
  SHIPPED scripts/kconfig/zconf.lex.c
  SHIPPED scripts/kconfig/zconf.hash.c
  HOSTCC  scripts/kconfig/zconf.tab.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
#
# configuration written to spl/.config
#
./Makefile:511: arch//Makefile: No such file or directory
make[1]: *** No rule to make target `arch//Makefile'.  Stop.
make: *** [__build_one_by_one] Error 2


Best Regards
Masahiro Yamada

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 03/14] sunxi: axp221: Add axp223 support


Hi,

On 17-12-14 03:34, Chen-Yu Tsai wrote:

On Wed, Dec 17, 2014 at 4:31 AM, Hans de Goede hdego...@redhat.com wrote:

The axp223 appears to be the same as the axp221, except that it uses the
rsb to communicate rather then the p2wi. At least all the registers we use
are 100% the same.

Signed-off-by: Hans de Goede hdego...@redhat.com
---
  arch/arm/cpu/armv7/sunxi/cpu_info.c |  2 +-
  drivers/power/Kconfig   |  8 ++--
  drivers/power/axp221.c  | 88 -
  include/axp221.h|  4 ++
  4 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c 
b/arch/arm/cpu/armv7/sunxi/cpu_info.c
index 7a3a4ca..b6cb9de 100644
--- a/arch/arm/cpu/armv7/sunxi/cpu_info.c
+++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c
@@ -76,7 +76,7 @@ int print_cpuinfo(void)

  int sunxi_get_sid(unsigned int *sid)
  {
-#ifdef CONFIG_MACH_SUN6I
+#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I
  #ifdef CONFIG_AXP221_POWER
 return axp221_get_sid(sid);
  #else
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 1ec7c0e..7373a79 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -1,10 +1,10 @@
  config AXP221_POWER
-   boolean axp221 pmic support
-   depends on MACH_SUN6I
+   boolean axp221 / axp223 pmic support
+   depends on MACH_SUN6I || MACH_SUN8I
 default y
 ---help---
-   Say y here to enable support for the axp221 pmic found on most sun6i
-   (A31) boards.
+   Say y here to enable support for the axp221 / axp223 pmic found on most
+   sun6i (A31) / sun8i (A23) boards.

  config AXP221_DLDO1_VOLT
 int axp221 dldo1 voltage
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index 826567a..717adad 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -1,4 +1,10 @@
  /*
+ * AXP221 and AXP223 driver
+ *
+ * IMPORTANT when making changes to this file check that the registers
+ * used are the same for the axp221 and axp223.
+ *
+ * (C) Copyright 2014 Hans de Goede hdego...@redhat.com
   * (C) Copyright 2013 Oliver Schinagl oli...@schinagl.nl
   *
   * SPDX-License-Identifier:GPL-2.0+
@@ -7,8 +13,50 @@
  #include common.h
  #include errno.h
  #include asm/arch/p2wi.h
+#include asm/arch/rsb.h
  #include axp221.h

+/*
+ * The axp221 uses the p2wi bus, the axp223 is identical (for all registers
+ * used sofar) but uses the rsb bus. These functions abstract this.
+ */
+static int pmic_bus_init(void)
+{
+#ifdef CONFIG_MACH_SUN6I
+   p2wi_init();
+   return p2wi_change_to_p2wi_mode(AXP221_CHIP_ADDR, AXP221_CTRL_ADDR,
+   AXP221_INIT_DATA);
+#else
+   int ret;
+
+   rsb_init();
+
+   ret = rsb_set_device_mode(AXP223_DEVICE_MODE_DATA);
+   if (ret)
+   return ret;
+
+   return rsb_set_device_address(AXP223_DEVICE_ADDR, AXP223_RUNTIME_ADDR);
+#endif
+}
+
+static int pmic_bus_read(const u8 addr, u8 *data)
+{
+#ifdef CONFIG_MACH_SUN6I
+   return p2wi_read(addr, data);
+#else
+   return rsb_read(AXP223_RUNTIME_ADDR, addr, data);
+#endif
+}
+
+static int pmic_bus_write(const u8 addr, u8 data)
+{
+#ifdef CONFIG_MACH_SUN6I
+   return p2wi_write(addr, data);
+#else
+   return rsb_write(AXP223_RUNTIME_ADDR, addr, data);
+#endif
+}
+
  static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
  {
 if (mvolt  min)
@@ -24,12 +72,12 @@ static int axp221_setbits(u8 reg, u8 bits)
 int ret;
 u8 val;

-   ret = p2wi_read(reg, val);
+   ret = pmic_bus_read(reg, val);
 if (ret)
 return ret;

 val |= bits;
-   return p2wi_write(reg, val);
+   return pmic_bus_write(reg, val);
  }

  int axp221_set_dcdc1(unsigned int mvolt)
@@ -37,7 +85,7 @@ int axp221_set_dcdc1(unsigned int mvolt)
 int ret;
 u8 cfg = axp221_mvolt_to_cfg(mvolt, 1600, 3400, 100);

-   ret = p2wi_write(AXP221_DCDC1_CTRL, cfg);
+   ret = pmic_bus_write(AXP221_DCDC1_CTRL, cfg);
 if (ret)
 return ret;

@@ -49,28 +97,28 @@ int axp221_set_dcdc2(unsigned int mvolt)
  {
 u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);

-   return p2wi_write(AXP221_DCDC2_CTRL, cfg);
+   return pmic_bus_write(AXP221_DCDC2_CTRL, cfg);
  }

  int axp221_set_dcdc3(unsigned int mvolt)
  {
 u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1860, 20);

-   return p2wi_write(AXP221_DCDC3_CTRL, cfg);
+   return pmic_bus_write(AXP221_DCDC3_CTRL, cfg);
  }

  int axp221_set_dcdc4(unsigned int mvolt)
  {
 u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);

-   return p2wi_write(AXP221_DCDC4_CTRL, cfg);
+   return pmic_bus_write(AXP221_DCDC4_CTRL, cfg);
  }

  int axp221_set_dcdc5(unsigned int mvolt)
  {
 u8 cfg = axp221_mvolt_to_cfg(mvolt, 1000, 2550, 50);

-   return p2wi_write(AXP221_DCDC5_CTRL, cfg);
+   return

Re: [U-Boot] [PATCH 1/2] kbuild: Fix a false error of generic board support

Hi Marek, Tom,


On Wed, 17 Dec 2014 10:52:32 -0500
Tom Rini tr...@ti.com wrote:

 On Wed, Dec 17, 2014 at 02:04:32AM +0100, Marek Vasut wrote:
  On Wednesday, December 17, 2014 at 12:56:46 AM, Tom Rini wrote:
   On Tue, Dec 16, 2014 at 02:56:44PM -0600, mgerlach wrote:
Hello Masahiro Yamada,

Even the with this patch, we encountered a false error of generic board
support.  The problem was very interrmittent for us, but we were able
to debug the problem to performing builds on EXT3 file systems which
have a time stamp resolution of one second.  To reproduce the problem,
touch ./include/config/auto.conf and .config on a configured uboot tree
on an EXT3 file system.

The patch below fixes the problem for us.
   
   This makes an odd race condition problem I run into when doing massively
   paralell builds worse :(  With MAKEALL no ARM boards build (ARCH wasn't
   set in time so it tried arch//Makefile for something) and buildman was
   also broken in a bunch of places.
  
  Let me just chime in, I recall I did report something possibly similar some 
  time 
  ago [1]. I did not manage to put a finger on this issue though and I can no 
  longer trigger it.
  
  [1] http://lists.denx.de/pipermail/u-boot/2013-June/157481.html
 
 No, my problem was introduced with the switch to Kbuild itself.


Marek's problem is unrelated to this issue.  (2013-June is before Kbuild)


York Sun also reported the similar build error in this thread.
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/203331/focus=203468

This is really related to what Mathew saw, I think.


Some bug reports imply autoconf_is_current is not working on some cases
although I have never been able to reproduce the problem on my box.

I guess it is almost time for further build-system refactoring.


Best Regards
Masahiro Yamada

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH] ARM: OMAP5: DRA7xx: Enable I2C4 and I2C5 usage on the J6Eco EVM

2014-12-18 Thread Lubomir Popov

Tom,

Even if this patch is not applied if considered useless, the one fixing
the clocks (http://patchwork.ozlabs.org/patch/410834/) should be, in my
opinion, as it is essentially a bug fix. Now, for the DRA7xx SoCs,
1) a write to a undefined (or zero) register address is occurring since
   struct member .cm_l4per_i2c5_clkctrl is not initialized, and
2) a 'data abort' exception shall happen if access to I2C5 is tried due
   to lack of the functional clock.

Best regards,
Lubo
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH] i2c_eeprom: include linux/err.h to fix build error

drivers/misc/i2c_eeprom.c fails to build unless CONFIG_FIT_SIGNATURE
is defined.

  CC  drivers/misc/i2c_eeprom.o
drivers/misc/i2c_eeprom.c: In function 'i2c_eeprom_read':
drivers/misc/i2c_eeprom.c:15:10: error: 'ENODEV' undeclared
(first use in this function)
drivers/misc/i2c_eeprom.c:15:10: note: each undeclared identifier
is reported only once for each function it appears in
drivers/misc/i2c_eeprom.c: In function 'i2c_eeprom_write':
drivers/misc/i2c_eeprom.c:21:10: error: 'ENODEV' undeclared
(first use in this function)
drivers/misc/i2c_eeprom.c:22:1: warning: control reaches end of
non-void function [-Wreturn-type]
drivers/misc/i2c_eeprom.c: In function 'i2c_eeprom_read':
drivers/misc/i2c_eeprom.c:16:1: warning: control reaches end of
non-void function [-Wreturn-type]
make[2]: *** [drivers/misc/i2c_eeprom.o] Error 1
make[1]: *** [drivers/misc] Error 2
make: *** [drivers] Error 2

By the way, Sandbox (enabling CONFIG_FIT_SIGNATURE) is luckily
working depending on it.
Sandbox includes include/asm-generic/errno.h
from include/errno.h
from include/u-boot/rsa-checksum.h
from include/image.h
from include/common.h
from drivers/misc/i2c_eeprom.c

Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
---

 drivers/misc/i2c_eeprom.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index d0548ec..814134a 100644
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -5,6 +5,7 @@
  */
 
 #include common.h
+#include linux/err.h
 #include dm.h
 #include i2c.h
 #include i2c_eeprom.h
-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 13/14] sun8i: Add dram initialization support

2014-12-18 Thread Chen-Yu Tsai

On Wed, Dec 17, 2014 at 4:31 AM, Hans de Goede hdego...@redhat.com wrote:
 Based on the register / dram_para headers from the Allwinner u-boot / linux
 sources + the init sequences from boot0.

 Signed-off-by: Hans de Goede hdego...@redhat.com
 ---
  arch/arm/cpu/armv7/sunxi/Makefile |   1 +
  arch/arm/cpu/armv7/sunxi/board.c  |   3 +-
  arch/arm/cpu/armv7/sunxi/dram_sun8i.c | 340 
 ++
  arch/arm/include/asm/arch-sunxi/clock_sun6i.h |   4 +
  arch/arm/include/asm/arch-sunxi/dram.h|   2 +
  arch/arm/include/asm/arch-sunxi/dram_sun8i.h  | 266 
  board/sunxi/Kconfig   |   3 +-
  configs/Ippo_q8h_v5_defconfig |  17 +-
  include/configs/sun8i.h   |   2 +
  9 files changed, 631 insertions(+), 7 deletions(-)
  create mode 100644 arch/arm/cpu/armv7/sunxi/dram_sun8i.c
  create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun8i.h

 diff --git a/arch/arm/cpu/armv7/sunxi/Makefile 
 b/arch/arm/cpu/armv7/sunxi/Makefile
 index 3e8975a..1e89937 100644
 --- a/arch/arm/cpu/armv7/sunxi/Makefile
 +++ b/arch/arm/cpu/armv7/sunxi/Makefile
 @@ -33,6 +33,7 @@ obj-$(CONFIG_MACH_SUN4I)  += dram_sun4i.o
  obj-$(CONFIG_MACH_SUN5I)   += dram_sun4i.o
  obj-$(CONFIG_MACH_SUN6I)   += dram_sun6i.o
  obj-$(CONFIG_MACH_SUN7I)   += dram_sun4i.o
 +obj-$(CONFIG_MACH_SUN8I)   += dram_sun8i.o
  ifdef CONFIG_SPL_FEL
  obj-y  += start.o
  endif
 diff --git a/arch/arm/cpu/armv7/sunxi/board.c 
 b/arch/arm/cpu/armv7/sunxi/board.c
 index 9b3e80c..bc98c56 100644
 --- a/arch/arm/cpu/armv7/sunxi/board.c
 +++ b/arch/arm/cpu/armv7/sunxi/board.c
 @@ -114,7 +114,8 @@ void reset_cpu(ulong addr)
  /* do some early init */
  void s_init(void)
  {
 -#if defined CONFIG_SPL_BUILD  defined CONFIG_MACH_SUN6I
 +#if defined CONFIG_SPL_BUILD  \
 +   (defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I)
 /* Magic (undocmented) value taken from boot0, without this DRAM
  * access gets messed up (seems cache related) */
 setbits_le32(SUNXI_SRAMC_BASE + 0x44, 0x1800);
 diff --git a/arch/arm/cpu/armv7/sunxi/dram_sun8i.c 
 b/arch/arm/cpu/armv7/sunxi/dram_sun8i.c
 new file mode 100644
 index 000..3736fd1
 --- /dev/null
 +++ b/arch/arm/cpu/armv7/sunxi/dram_sun8i.c
 @@ -0,0 +1,340 @@
 +/*
 + * Sun8i platform dram controller init.
 + *
 + * (C) Copyright 2014 Hans de Goede hdego...@redhat.com
 + *
 + * SPDX-License-Identifier:GPL-2.0+
 + */
 +
 +/*
 + * Note this code uses a lot of magic hex values, that is because this code
 + * simply replays the init sequence as done by the Allwinner boot0 code, so
 + * we do not know what these values mean. There are no symbolic constants for
 + * these magic values, since we do not know how to name them and making up
 + * names for them is not useful.
 + */
 +
 +#include common.h
 +#include errno.h
 +#include asm/io.h
 +#include asm/arch/clock.h
 +#include asm/arch/dram.h
 +#include asm/arch/prcm.h
 +
 +static const struct dram_para dram_para = {
 +   .clock = CONFIG_DRAM_CLK,
 +   .type = 3,
 +   .zq = CONFIG_DRAM_ZQ,
 +   .odt_en = 1,
 +   .para1 = 0, /* not used (only used when tpr13 bit 31 is set */
 +   .para2 = 0, /* not used (only used when tpr13 bit 31 is set */
 +   .mr0 = 6736,
 +   .mr1 = 4,
 +   .mr2 = 16,
 +   .mr3 = 0,
 +   /* tpr0 - 10 contain timing constants or-ed together in u32 vals */
 +   .tpr0 = 0x2ab83def,
 +   .tpr1 = 0x18082356,
 +   .tpr2 = 0x00034156,
 +   .tpr3 = 0x448c5533,
 +   .tpr4 = 0x08010d00,
 +   .tpr5 = 0x0340b20f,
 +   .tpr6 = 0x20d118cc,
 +   .tpr7 = 0x14062485,
 +   .tpr8 = 0x220d1d52,
 +   .tpr9 = 0x1e078c22,
 +   .tpr10 = 0x3c,
 +   .tpr11 = 0, /* not used */
 +   .tpr12 = 0, /* not used */
 +   .tpr13 = 0x3,
 +};
 +
 +static void mctl_sys_init(void)
 +{
 +   struct sunxi_ccm_reg * const ccm =
 +   (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
 +
 +   /* enable pll5, note the divide by 2 is deliberate! */
 +   clock_set_pll5(dram_para.clock * 100 / 2, 1, 2,
 +  dram_para.tpr13  0x4);
 +
 +   /* deassert ahb mctl reset */
 +   setbits_le32(ccm-ahb_reset0_cfg, 1  AHB_RESET_OFFSET_MCTL);
 +
 +   /* enable ahb mctl clock */
 +   setbits_le32(ccm-ahb_gate0, 1  AHB_GATE_OFFSET_MCTL);
 +}
 +
 +static void mctl_apply_odt_correction(u32 *reg, int correction)
 +{
 +   int val;
 +
 +   val = (readl(reg)  8)  0xff;
 +   val += correction;
 +
 +   /* clamp */
 +   if (val  0)
 +   val = 0;
 +   else if (val  255)
 +   val = 255;
 +
 +   clrsetbits_le32(reg, 0xff00, val  8);
 +}
 +
 +static void mctl_init(u32 *bus_width)
 +{
 +   struct sunxi_ccm_reg * const ccm =
 +   (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
 +   struct sunxi_mctl_com_reg * const mctl_com =
 +

[U-Boot] [PATCH 1/4] [RFC] [v2] rsa: Split the rsa-verify

Public exponentiation which is required in rsa verify
functionality is currently tightly integrated with
verification code in rsa_verify.c. Currently this
implementation is software based. Some platforms
having support of the exponentiation in hardware.
To enable the rsa verify functionality to use the
Modular exponentiation if present in hardware, the
patch-set splits the file into two files:

1. rsa-verify.c
- The file parses device tree keys node to fill a keyprop
structure. The keyprop structure can then be converted
to implementation specific formal (struct rsa_pub_key
for sw implementation).
- The parsed device tree node is then passed to a generic
rsa_mod_exp function.

2. rsa-mod-exp.c
Move the software specific functions related to exponentiation
from rsa-verify.c to this file. The file is compiled if
CONFIG_RSA_MOD_EXP_SW is defined. In general if both
CONFIG_FIT_SIGNATURE and CONFIG_RSA are defined,
CONFIG_RSA_MOD_EXP_SW gets automatically defined.

Platforms having hardware implementation for rsa_mod_exp can
add a define CONFIG_RSA_MOD_EXP_HW to their config files.
Adding this defined, undefs the CONFIG_RSA_MOD_EXP_SW and
hardware implementation of mod_exp gets compiled.

Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com
CC: Simon Glass s...@chromium.org
---
Changes in v2:
Addressed few of Simon Glass's comments:
- Kconfig option added for RSA
- Comments added for new keyprop struct

 Kconfig  |   2 +
 include/config_fallbacks.h   |   8 ++
 include/u-boot/rsa-mod-exp.h |  34 +
 lib/Kconfig  |  15 +++
 lib/rsa/Makefile |   1 +
 lib/rsa/rsa-mod-exp.c| 308 +++
 lib/rsa/rsa-verify.c | 307 +-
 tools/Makefile   |   2 +-
 8 files changed, 399 insertions(+), 278 deletions(-)
 create mode 100644 include/u-boot/rsa-mod-exp.h
 create mode 100644 lib/rsa/rsa-mod-exp.c

diff --git a/Kconfig b/Kconfig
index 153ee2b..82b14bd 100644
--- a/Kconfig
+++ b/Kconfig
@@ -101,6 +101,7 @@ config TPL
help
  If you want to build TPL as well as the normal image and SPL, say Y.
 
+
 config FIT
bool Support Flattened Image Tree
depends on !SPL_BUILD
@@ -118,6 +119,7 @@ config FIT_VERBOSE
 config FIT_SIGNATURE
bool Enabel signature verification of FIT uImages
depends on FIT
+   select RSA
help
  This option enables signature verification of FIT uImages,
  using a hash signed and verified using RSA.
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index ddfe045..b46bef9 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -83,6 +83,14 @@
 #define CONFIG_SYS_PBSIZE  (CONFIG_SYS_CBSIZE + 128)
 #endif
 
+/* This can be removed once all platforms move to defconfig 
+ * option to enable FIT_SIGNATURE 
+ */
+#if defined(CONFIG_FIT_SIGNATURE)  defined(CONFIG_RSA)  \
+   !defined(CONFIG_RSA_MOD_EXP_HW)  !defined(CONFIG_RSA_MOD_EXP_SW)
+#define CONFIG_RSA_MOD_EXP_SW
+#endif
+
 #ifndef CONFIG_FIT_SIGNATURE
 #define CONFIG_IMAGE_FORMAT_LEGACY
 #endif
diff --git a/include/u-boot/rsa-mod-exp.h b/include/u-boot/rsa-mod-exp.h
new file mode 100644
index 000..0d2ccd6
--- /dev/null
+++ b/include/u-boot/rsa-mod-exp.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, Ruchika Gupta.
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+*/
+
+#ifndef _RSA_MOD_EXP_H
+#define _RSA_MOD_EXP_H
+
+#include errno.h
+#include image.h
+
+/**
+ * struct key_prop - holder for a public key properties
+ *
+ * The struct has pointers to modulus (Typically called N),
+ * The inverse, R^2, exponent. These can be typecasted and
+ * used as byte arrays or converted to the required format
+ * as per requirement of RSA implementation.
+ *
+ */
+struct key_prop {
+   const void *rr; /* R^2 can be treated as byte array */
+   const void *modulus;/* modulus as byte array */
+   const void *public_exponent; /* public exponent as byte array */
+   uint32_t n0inv; /* -1 / modulus[0] mod 2^32 */
+   int num_bits;   /* Key length in bits */
+   uint32_t exp_len;   /* Exponent length in number of uint8_t */
+};
+
+int rsa_mod_exp(const uint8_t *sig, uint32_t sig_len,
+   struct key_prop *node, uint8_t *out);
+
+#endif
diff --git a/lib/Kconfig b/lib/Kconfig
index 8460439..a921bb3 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -27,4 +27,19 @@ config SYS_HZ
  get_timer() must operate in milliseconds and this option must be
  set to 1000.
 
+config RSA
+   bool Use RSA Library
+   help
+ RSA support
+
+if RSA
+
+config RSA_MOD_EXP_SW
+   depends on RSA
+   bool Implement RSA Modular Exponentiation in software
+   default y
+   help
+ Modular Exponentiation support in SW
+
+endif
 endmenu
diff --git a/lib/rsa/Makefile b/lib/rsa/Makefile
index a5a96cb6..ccc6060 100644
---

[U-Boot] [PATCH 2/4] [RFC] [v2] crypto/fsl: Add support for RSA Modular Exponentiation

Support added for offloading Modular Exponentiation required
in RSA Verify functionality to hardware which depends on
CONFIG_RSA_MOD_EXP_HW.

Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com
CC: Simon Glass s...@chromium.org
---
Changes in v2:
Added Kconfig option for RSA_MOD_HW

 drivers/crypto/fsl/Kconfig|  5 +
 drivers/crypto/fsl/Makefile   |  1 +
 drivers/crypto/fsl/fsl_rsa.c  | 44 +++
 drivers/crypto/fsl/jobdesc.c  | 28 +++
 drivers/crypto/fsl/jobdesc.h  |  5 +
 drivers/crypto/fsl/rsa_caam.h | 27 ++
 lib/Kconfig   | 11 +--
 7 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 drivers/crypto/fsl/Kconfig
 create mode 100644 drivers/crypto/fsl/fsl_rsa.c
 create mode 100644 drivers/crypto/fsl/rsa_caam.h

diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig
new file mode 100644
index 000..45e6683
--- /dev/null
+++ b/drivers/crypto/fsl/Kconfig
@@ -0,0 +1,5 @@
+config FSL_CAAM
+   depends on CRYPTO
+   bool Freescale Crypto Driver Support
+   help
+ HW Acceleration support for RSA based platforms
diff --git a/drivers/crypto/fsl/Makefile b/drivers/crypto/fsl/Makefile
index 067d0a9..ef36f67 100644
--- a/drivers/crypto/fsl/Makefile
+++ b/drivers/crypto/fsl/Makefile
@@ -8,4 +8,5 @@
 
 obj-y += sec.o
 obj-$(CONFIG_FSL_CAAM) += jr.o fsl_hash.o jobdesc.o error.o
+obj-$(CONFIG_RSA_MOD_EXP_HW) += fsl_rsa.o
 obj-$(CONFIG_CMD_BLOB) += fsl_blob.o
diff --git a/drivers/crypto/fsl/fsl_rsa.c b/drivers/crypto/fsl/fsl_rsa.c
new file mode 100644
index 000..1100316
--- /dev/null
+++ b/drivers/crypto/fsl/fsl_rsa.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2013, Google Inc.
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
+#include common.h
+#include asm/types.h
+#include malloc.h
+#include jobdesc.h
+#include desc.h
+#include jr.h
+#include rsa_caam.h
+#include u-boot/rsa-mod-exp.h
+
+int rsa_mod_exp(const uint8_t *sig, uint32_t sig_len,
+   struct key_prop *prop, uint8_t *out)
+{
+   uint32_t keylen;
+   struct pk_in_params pkin;
+   uint32_t desc[MAX_CAAM_DESCSIZE];
+   int ret;
+
+   /* Length in bytes */
+   keylen = prop-num_bits / 8;
+
+   pkin.a = sig;
+   pkin.a_siz = sig_len;
+   pkin.n = prop-modulus;
+   pkin.n_siz = keylen;
+   pkin.e = prop-public_exponent;
+   pkin.e_siz = prop-exp_len;
+
+   inline_cnstr_jobdesc_pkha_rsaexp(desc, pkin, out, sig_len);
+
+   ret = run_descriptor_jr(desc);
+
+   if (ret) {
+   debug(%s: RSA failed to verify: %d\n, __func__, ret);
+   return ret;
+   }
+
+   return 0;
+}
diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c
index 1386bae..cc0dced 100644
--- a/drivers/crypto/fsl/jobdesc.c
+++ b/drivers/crypto/fsl/jobdesc.c
@@ -11,6 +11,7 @@
 #include common.h
 #include desc_constr.h
 #include jobdesc.h
+#include rsa_caam.h
 
 #define KEY_BLOB_SIZE  32
 #define MAC_SIZE   16
@@ -123,3 +124,30 @@ void inline_cnstr_jobdesc_rng_instantiation(uint32_t *desc)
append_operation(desc, OP_TYPE_CLASS1_ALG | OP_ALG_ALGSEL_RNG |
 OP_ALG_RNG4_SK);
 }
+
+/* Change key size to bytes form bits in calling function*/
+void inline_cnstr_jobdesc_pkha_rsaexp(uint32_t *desc,
+ struct pk_in_params *pkin, uint8_t *out,
+ uint32_t out_siz)
+{
+   dma_addr_t dma_addr_e, dma_addr_a, dma_addr_n, dma_addr_out;
+
+   dma_addr_e = virt_to_phys((void *)pkin-e);
+   dma_addr_a = virt_to_phys((void *)pkin-a);
+   dma_addr_n = virt_to_phys((void *)pkin-n);
+   dma_addr_out = virt_to_phys((void *)out);
+
+   init_job_desc(desc, 0);
+   append_key(desc, dma_addr_e, pkin-e_siz, KEY_DEST_PKHA_E | CLASS_1);
+
+   append_fifo_load(desc, dma_addr_a,
+pkin-a_siz, LDST_CLASS_1_CCB | FIFOLD_TYPE_PK_A);
+
+   append_fifo_load(desc, dma_addr_n,
+pkin-n_siz, LDST_CLASS_1_CCB | FIFOLD_TYPE_PK_N);
+
+   append_operation(desc, OP_TYPE_PK | OP_ALG_PK | OP_ALG_PKMODE_MOD_EXPO);
+
+   append_fifo_store(desc, dma_addr_out, out_siz,
+ LDST_CLASS_1_CCB | FIFOST_TYPE_PKHA_B);
+}
diff --git a/drivers/crypto/fsl/jobdesc.h b/drivers/crypto/fsl/jobdesc.h
index 3cf7226..84b3edd 100644
--- a/drivers/crypto/fsl/jobdesc.h
+++ b/drivers/crypto/fsl/jobdesc.h
@@ -10,6 +10,7 @@
 
 #include common.h
 #include asm/io.h
+#include rsa_caam.h
 
 #define KEY_IDNFR_SZ_BYTES 16
 
@@ -26,4 +27,8 @@ void inline_cnstr_jobdesc_blob_decap(uint32_t *desc, uint8_t 
*key_idnfr,
 uint32_t out_sz);
 
 void inline_cnstr_jobdesc_rng_instantiation(uint32_t *desc);
+
+void inline_cnstr_jobdesc_pkha_rsaexp(uint32_t *desc,
+ struct

[U-Boot] [PATCH 4/4] [RFC] [v2] rsa: Use checksum algorithms from struct hash_algo

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 support of hardware
accelerated progressive hash API's once available.

Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com
CC: Simon Glass s...@chromium.org
---
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  |  3 ++-
 5 files changed, 60 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);
 
 #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
+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

[U-Boot] [PATCH 3/4] [RFC] [v2] hash: Add function to find hash_algo struct with progressive hash

The hash_algo structure has some implementations in which
progressive hash API's are not defined. These are basically the
hardware based implementations of SHA. An API is added to find
the algo which has progressive hash API's defined. This can then
be integrated with RSA checksum library which used Progressive
Hash API's.

Signed-off-by: Ruchika Gupta ruchika.gu...@freescale.com
CC: Simon Glass s...@chromium.org
---
Changes in v2 :
Added commit message

 common/hash.c  | 35 ++-
 include/hash.h | 15 +++
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/common/hash.c b/common/hash.c
index 12d6759..87263df 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -20,7 +20,7 @@
 #include asm/io.h
 #include asm/errno.h
 
-#ifdef CONFIG_CMD_SHA1SUM
+#ifdef CONFIG_SHA256
 static int hash_init_sha1(struct hash_algo *algo, void **ctxp)
 {
sha1_context *ctx = malloc(sizeof(sha1_context));
@@ -125,12 +125,8 @@ static struct hash_algo hash_algo[] = {
CHUNKSZ_SHA256,
},
 #endif
-   /*
-* This is CONFIG_CMD_SHA1SUM instead of CONFIG_SHA1 since otherwise
-* it bloats the code for boards which use SHA1 but not the 'hash'
-* or 'sha1sum' commands.
-*/
-#ifdef CONFIG_CMD_SHA1SUM
+
+#ifdef CONFIG_SHA1
{
sha1,
SHA1_SUM_LEN,
@@ -140,7 +136,6 @@ static struct hash_algo hash_algo[] = {
hash_update_sha1,
hash_finish_sha1,
},
-#define MULTI_HASH
 #endif
 #ifdef CONFIG_SHA256
{
@@ -152,7 +147,6 @@ static struct hash_algo hash_algo[] = {
hash_update_sha256,
hash_finish_sha256,
},
-#define MULTI_HASH
 #endif
{
crc32,
@@ -165,6 +159,10 @@ static struct hash_algo hash_algo[] = {
},
 };
 
+#if defined(CONFIG_SHA256) || defined(CONFIG_CMD_SHA1SUM)
+#define MULTI_HASH
+#endif
+
 #if defined(CONFIG_HASH_VERIFY) || defined(CONFIG_CMD_HASH)
 #define MULTI_HASH
 #endif
@@ -311,6 +309,25 @@ int hash_lookup_algo(const char *algo_name, struct 
hash_algo **algop)
return -EPROTONOSUPPORT;
 }
 
+int hash_progressive_lookup_algo(const char *algo_name,
+struct hash_algo **algop)
+{
+   int i;
+
+   for (i = 0; i  ARRAY_SIZE(hash_algo); i++) {
+   if (!strcmp(algo_name, hash_algo[i].name)) {
+   if (hash_algo[i].hash_init) {
+   *algop = hash_algo[i];
+   return 0;
+   }
+   }
+   }
+
+   debug(Unknown hash algorithm '%s'\n, algo_name);
+   return -EPROTONOSUPPORT;
+}
+
+
 void hash_show(struct hash_algo *algo, ulong addr, ulong len, uint8_t *output)
 {
int i;
diff --git a/include/hash.h b/include/hash.h
index d8ec4f0..059f84e 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -128,6 +128,21 @@ int hash_block(const char *algo_name, const void *data, 
unsigned int len,
 int hash_lookup_algo(const char *algo_name, struct hash_algo **algop);
 
 /**
+ * hash_progressive_lookup_algo() - Look up the hash_algo struct with 
progressive
+ * hash support for an algorithm
+ *
+ * The function returns the pointer to the struct or -EPROTONOSUPPORT if the
+ * algorithm is not available with progressive hash support.
+ *
+ * @algo_name: Hash algorithm to look up
+ * @algop: Pointer to the hash_algo struct if found
+ *
+ * @return 0 if ok, -EPROTONOSUPPORT for an unknown algorithm.
+ */
+int hash_progressive_lookup_algo(const char *algo_name,
+struct hash_algo **algop);
+
+/**
  * hash_show() - Print out a hash algorithm and value
  *
  * You will get a message like this (without a newline at the end):
-- 
1.8.1.4

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] A23 u-boot with SPL / dram init available in my personal git repo