ide: Add printf format string for CONFIG_SYS_64BIT_LBA option

From: Gabe Black <[email protected]>

usb_storage wouldn't compile when the CONFIG_SYS_64BIT_LBA option is turned on because the used fixed size data types in their exported functions when they should have used lbaint_t for the block count parameter. That meant that when the sizes happened to be the same, when using a 28 bit LBA, the driver would build, but when it wasn't, a 48 bit LBA, things broke.

This change adjusts the signatures to use the right type and makes small adjustments in the affected functions.

Signed-off-by Gabe Black <[email protected]>

Signed-off-by Simon Glass <[email protected]>

---
 common/usb_storage.c |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

common/usb_storage.c +0 -0

index 950451e..0c2a4c7 100644
@@ -179,9 +179,9 @@ int usb_stor_get_info(struct usb_device *dev, struct

us_data *us, int usb_storage_probe(struct usb_device *dev, unsigned int ifnum, struct us_data *ss);
unsigned long usb_stor_read(int device, unsigned long blknr,

common/usb_storage.c +2 -2

-			    unsigned long blkcnt, void *buffer);
+			    lbaint_t blkcnt, void *buffer);
 unsigned long usb_stor_write(int device, unsigned long blknr,
-			     unsigned long blkcnt, const void *buffer);
+			     lbaint_t blkcnt, const void *buffer);
 struct usb_device * usb_get_dev_index(int index);
 void uhci_show_temp_int_td(void);

@@ -1053,9 +1053,10 @@ static void usb_bin_fixup(struct

usb_device_descriptor descriptor, #endif /* CONFIG_USB_BIN_FIXUP */

unsigned long usb_stor_read(int device, unsigned long blknr,

common/usb_storage.c +12 -8

-			    unsigned long blkcnt, void *buffer)
+			    lbaint_t blkcnt, void *buffer)
 {
-	unsigned long start, blks, buf_addr;
+	lbaint_t start, blks;
+	uintptr_t buf_addr;
 	unsigned short smallblks;
 	struct usb_device *dev;
 	struct us_data *ss;

@@ -1084,7 +1085,7 @@ unsigned long usb_stor_read(int device, unsigned long
 blknr, start = blknr;
 	blks = blkcnt;
 
-	USB_STOR_PRINTF("\nusb_read: dev %d startblk %lx, blccnt %lx"
+	USB_STOR_PRINTF("\nusb_read: dev %d startblk " LBAF ", blccnt " LBAF
 			" buffer %lx\n", device, start, blks, buf_addr);
 
 	do {

@@ -1114,7 +1115,8 @@ retry_it:
 	} while (blks != 0);
 	ss->flags &= ~USB_READY;
 
-	USB_STOR_PRINTF("usb_read: end startblk %lx, blccnt %x buffer %lx\n",
+	USB_STOR_PRINTF("usb_read: end startblk " LBAF
+			", blccnt %x buffer %lx\n",
 			start, smallblks, buf_addr);
 
 	usb_disable_asynch(0); /* asynch transfer allowed */

@@ -1124,9 +1126,10 @@ retry_it:
 }
 
 unsigned long usb_stor_write(int device, unsigned long blknr,
-				unsigned long blkcnt, const void *buffer)
+				lbaint_t blkcnt, const void *buffer)
 {
-	unsigned long start, blks, buf_addr;
+	lbaint_t start, blks;
+	uintptr_t buf_addr;
 	unsigned short smallblks;
 	struct usb_device *dev;
 	struct us_data *ss;

@@ -1156,7 +1159,7 @@ unsigned long usb_stor_write(int device, unsigned
 long blknr, start = blknr;
 	blks = blkcnt;
 
-	USB_STOR_PRINTF("\nusb_write: dev %d startblk %lx, blccnt %lx"
+	USB_STOR_PRINTF("\nusb_write: dev %d startblk " LBAF ", blccnt " LBAF
 			" buffer %lx\n", device, start, blks, buf_addr);
 
 	do {

@@ -1188,7 +1191,8 @@ retry_it:
 	} while (blks != 0);
 	ss->flags &= ~USB_READY;
 
-	USB_STOR_PRINTF("usb_write: end startblk %lx, blccnt %x buffer %lx\n",
+	USB_STOR_PRINTF("usb_write: end startblk " LBAF
+			", blccnt %x buffer %lx\n",
 			start, smallblks, buf_addr);
 
 	usb_disable_asynch(0); /* asynch transfer allowed */

From: Stefan Reinauer <[email protected]>

ChromeOS uses a GPT partition table to partition the disk. However, Windows will refuse to install on a GPT partitioned disk if there is no EFI available (Even if there is an MBR, too) To hide the GPT partition table from Windows, we need to write it with a header magic other than "EFI PART". To support old and new systems, Check for the magic string "CHROMEOS" too.

Quoted 8 lines · Simon Glass

From: Stefan Reinauer <[email protected]>

ChromeOS uses a GPT partition table to partition the disk. However, Windows will refuse to install on a GPT partitioned disk if there is no EFI available (Even if there is an MBR, too) To hide the GPT partition table from Windows, we need to write it with a header magic other than "EFI PART". To support old and new systems, Check for the magic string "CHROMEOS" too.

Surely if you wanted to install Windows on a disk containing ChromeOS, you would just wipe the disk and re-partition it? I suppose perhaps you're talking about dual-boot though?

signatures - especially if the idea is to hide the GPT from Windows, and presumably then have Windows use the MBR partitions, since that will end up with a decidedly non-standard partition setup; some partitions will only be represented in the MBR (those Windows creates) and some in GPT (presumably whatever ChromeOS created before).

On Mon, Oct 15, 2012 at 8:19 AM, Stephen Warren <[email protected] <mailto:[email protected]>> wrote:

On 10/12/2012 06:26 PM, Simon Glass wrote:
> From: Stefan Reinauer <[email protected] <mailto:[email protected]>>
>
> ChromeOS uses a GPT partition table to partition the disk. > However, Windows will refuse to install on a GPT partitioned > disk if there is no EFI available (Even if there is an MBR, too) > To hide the GPT partition table from Windows, we need to write > it with a header magic other than "EFI PART". To support old > and new systems, Check for the magic string "CHROMEOS" too.

Surely if you wanted to install Windows on a disk containing ChromeOS, you would just wipe the disk and re-partition it? I suppose perhaps you're talking about dual-boot though?

Yes, this is only required if we're dual-booting on Windows and ChromeOS on the same disk.

Either way, it doesn't see like a good idea to be using non-standard EFI signatures - especially if the idea is to hide the GPT from Windows, and presumably then have Windows use the MBR partitions, since that will end up with a decidedly non-standard partition setup; some partitions will only be represented in the MBR (those Windows creates) and some in GPT (presumably whatever ChromeOS created before).

Yes, you will have to create a hybrid partition setup to make this work. It is unfortunate that Windows enforces this and there is no real way around it.

From: Stefan Reinauer <[email protected]>

ChromeOS uses a GPT partition table to partition the disk. However, Windows will refuse to install on a GPT partitioned disk if there is no EFI available (Even if there is an MBR, too) To hide the GPT partition table from Windows, we need to write it with a header magic other than "EFI PART". To support old and new systems, Check for the magic string "CHROMEOS" too.

Signed-off-by Stefan Reinauer <[email protected]>

Signed-off-by Simon Glass <[email protected]>

Stephen brings up a good point in that this is a ChromeOS specific work-around for a real issue. With my TI hat on, we've been pushing the idea that our releases will be mainline + patches, and those patches will be things that are either backports, works in progress or simply not mainlineable patches (enforce a CONFIG_BOOTDELAY of 3 for all boards, add mojo to just load uImages to their XIP address, etc). In my mind, this patch falls into the last grouping and I hope you're OK with just holding onto this as a not appropriate for mainline change.

The rest of the series looks fine and no need to respin, I'll just skip this patch when I pick it up, assuming no further changes are needed elsewhere.

Quoted 9 lines · Tom Rini

Stephen brings up a good point in that this is a ChromeOS specific work-around for a real issue. With my TI hat on, we've been pushing the idea that our releases will be mainline + patches, and those patches will be things that are either backports, works in progress or simply not mainlineable patches (enforce a CONFIG_BOOTDELAY of 3 for all boards, add mojo to just load uImages to their XIP address, etc). In my mind, this patch falls into the last grouping and I hope you're OK with just holding onto this as a not appropriate for mainline change.

Yes, it's exactly that kind of change.

Quoted 1 line

Quoted 3 lines

The rest of the series looks fine and no need to respin, I'll just skip this patch when I pick it up, assuming no further changes are needed elsewhere.

Great! Thanks a lot

Stefan

From: Gabe Black <[email protected]>

This change adds CBFS support and some commands to use it to u-boot. These commands are:

cbfsinit - Initialize CBFS support and pull all metadata into RAM. The end of the ROM is an optional parameter which defaults to the standard 0xffffffff and can be used to support multiple CBFSes in a system. The last one set up with cbfsinit is the one that will be used.

cbfsinfo - Print information from the CBFS header.

cbfsls - Print out the size, type, and name of all the files in the current CBFS. Recognized types are translated into symbolic names.

cbfsload - Load a file from CBFS into memory. Like the similar command for fat filesystems, you can optionally provide a maximum size.

Support for CBFS is compiled in when the CONFIG_CMD_CBFS option is specified.

The CBFS driver can also be used programmatically from within u-boot.

If u-boot needs something out of CBFS very early before the heap is configured, it won't be able to use the normal CBFS support which caches some information in memory it allocates from the heap. The cbfs_file_find_uncached function searches a CBFS instance without touching the heap.

Signed-off-by Gabe Black <[email protected]>

Signed-off-by Stefan Reinauer <[email protected]>

Signed-off-by Simon Glass <[email protected]>

Quoted 28 lines · Simon Glass

From: Gabe Black <[email protected]>

This change adds CBFS support and some commands to use it to u-boot. These commands are:

cbfsinit - Initialize CBFS support and pull all metadata into RAM. The end of the ROM is an optional parameter which defaults to the standard 0xffffffff and can be used to support multiple CBFSes in a system. The last one set up with cbfsinit is the one that will be used.

cbfsinfo - Print information from the CBFS header.

cbfsls - Print out the size, type, and name of all the files in the current CBFS. Recognized types are translated into symbolic names.

cbfsload - Load a file from CBFS into memory. Like the similar command for fat filesystems, you can optionally provide a maximum size.

Support for CBFS is compiled in when the CONFIG_CMD_CBFS option is specified.

The CBFS driver can also be used programmatically from within u-boot.

If u-boot needs something out of CBFS very early before the heap is configured, it won't be able to use the normal CBFS support which caches some information in memory it allocates from the heap. The cbfs_file_find_uncached function searches a CBFS instance without touching the heap.

Quoted 3 lines

Signed-off-by Gabe Black <[email protected]>

Signed-off-by Stefan Reinauer <[email protected]>

Signed-off-by Simon Glass <[email protected]>

I would like to see a follow-up enhancement adding a DocBook tmpl file for cbfs now that we have DocBook support, thanks!

--
Tom

From: Gabe Black <[email protected]>

This change adds CBFS support and some commands to use it to u-boot. These commands are:

Dear Simon Glass,

Quoted 4 lines · In message <[email protected]> you wrote:

From: Gabe Black <[email protected]>

This change adds CBFS support and some commands to use it to u-boot. These commands are:

...

common/cmd_cbfs.c line 5

Quoted 8 lines

common/cmd_cbfs.c new file +5 -0

@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.

file CREDITS ? Please fix globally...

Is any of this code taken from any other project? If yes, then please attribute properly...

Quoted 20 lines · Wolfgang Denk

Dear Simon Glass,

Quoted 4 lines · In message <[email protected]> you wrote:

From: Gabe Black <[email protected]>

This change adds CBFS support and some commands to use it to u-boot. These commands are:

...

common/cmd_cbfs.c line 5

Quoted 8 lines

common/cmd_cbfs.c new file +5 -0

@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.

file CREDITS ? Please fix globally...

Quoted 2 lines

Is any of this code taken from any other project? If yes, then please attribute properly...

Sorry? U-Boot has a CREDITS file but only ~10% of the files reference it.

--
Tom

Quoted 13 lines

Quoted 13 lines

common/cmd_cbfs.c line 5

Quoted 9 lines

common/cmd_cbfs.c new file +5 -0

@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.

file CREDITS ? Please fix globally...

Quoted 5 lines

Quoted 2 lines

Is any of this code taken from any other project? If yes, then please attribute properly...

Sorry? U-Boot has a CREDITS file but only ~10% of the files reference it.

Tom or Wolfgang, can you please explain what I should do here? I don't know what to do about the CREDITS line.

Dear Simon Glass,

Quoted 13 lines · In message <CAPnjgZ2hD4ZgzM=0RpPSGr0-iOJTV+q40E3gYExEqXndkoPPxQ@mail.gmail.com>…

Quoted 13 lines

Quoted 13 lines

common/cmd_cbfs.c line 5

Quoted 9 lines

common/cmd_cbfs.c new file +5 -0

@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.

file CREDITS ? Please fix globally...

Quoted 5 lines

Quoted 5 lines

Quoted 2 lines

Is any of this code taken from any other project? If yes, then please attribute properly...

Sorry? U-Boot has a CREDITS file but only ~10% of the files reference it.

Yes, U-Boot has such a file, and I wonder if we should remove it. After all, all the credits are maintained in the git history of changes.

Quoted 2 lines

Tom or Wolfgang, can you please explain what I should do here? I don't know what to do about the CREDITS line.

To me the reference to a CREDITS file is reason to suspect that this code has not been written from scratch, but copied from some other project, which eventually had it's own CREDITS file.

I'm missing a reference to the origin of the code.

If this was indeed written from scratch, with no code borrowed from elsewhere, then please just drop these lines.

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Text processing has made it possible to right-justify any idea, even one which cannot be justified on any other grounds."
-- J. Finnegan, USC.

Hi Wolfgang,

Quoted 26 lines · Wolfgang Denk

Dear Simon Glass,

Quoted 13 lines · In message <CAPnjgZ2hD4ZgzM=0RpPSGr0-iOJTV+q40E3gYExEqXndkoPPxQ@mail.gmail.com>…

Quoted 13 lines

Quoted 13 lines

common/cmd_cbfs.c line 5

Quoted 9 lines

common/cmd_cbfs.c new file +5 -0

@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.

file CREDITS ? Please fix globally...

Quoted 5 lines

Quoted 5 lines

Quoted 2 lines

Is any of this code taken from any other project? If yes, then please attribute properly...

Sorry? U-Boot has a CREDITS file but only ~10% of the files reference it.

Yes, U-Boot has such a file, and I wonder if we should remove it. After all, all the credits are maintained in the git history of changes.

Quoted 6 lines

Quoted 2 lines

Tom or Wolfgang, can you please explain what I should do here? I don't know what to do about the CREDITS line.

To me the reference to a CREDITS file is reason to suspect that this code has not been written from scratch, but copied from some other project, which eventually had it's own CREDITS file.

Yes, quite likely the boilerplate came from another U-Boot file.

Quoted 2 lines

I'm missing a reference to the origin of the code.

It was written from scratch by Gabe - it did not come from coreboot if that is what you as asking. I confirmed with him again yesterday.

Quoted 1 line

Quoted 2 lines

If this was indeed written from scratch, with no code borrowed from elsewhere, then please just drop these lines.

OK, I will do this in my follow-up patch to add DocBook support. I did find a shorter message which some U-Boot files use at one point. I will try to find that again, and use it.

Quoted 12 lines

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Text processing has made it possible to right-justify any idea, even one which cannot be justified on any other grounds."
-- J. Finnegan, USC.

Well I found a very short version:

* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.

but it is inaccurate. We could perhaps change it to:

* Use of this source code is governed by a BSD-style license that can be
* found in the COPYING file.

or something similar? But so much of U-Boot already has the full version that I'm not sure this is a good idea. Here is the one I am using>

# This program is free software; you can redistribute it and/or

# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.

Dear Simon Glass,

Quoted 15 lines · In message <CAPnjgZ0STfp2UcFN4tMDPg_X-4VDW7gxOdsSCGsBq6sUM0oe7Q@mail.gmail.com>…

Well I found a very short version:

* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.

but it is inaccurate. We could perhaps change it to:

* Use of this source code is governed by a BSD-style license that can be
* found in the COPYING file.

or something similar? But so much of U-Boot already has the full version that I'm not sure this is a good idea. Here is the one I am using>

Quoted 4 lines

# This program is free software; you can redistribute it and/or

# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.

Note that this is the GPL, and _not_ any BSD-style license !

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Children begin by loving their parents. After a time they judge them.
Rarely, if ever, do they forgive them. - Oscar Wilde

Quoted 20 lines

Quoted 19 lines

Well I found a very short version:

* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.

but it is inaccurate. We could perhaps change it to:

* Use of this source code is governed by a BSD-style license that can be
* found in the COPYING file.

or something similar? But so much of U-Boot already has the full version that I'm not sure this is a good idea. Here is the one I am using>

# This program is free software; you can redistribute it and/or

# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.

Quoted 1 line

Note that this is the GPL, and _not_ any BSD-style license !

Yes. I've gone with the longer one, just removing the CREDITS. That seems to be the most common message in U-Boot.

Dear Simon Glass,

Quoted 22 lines · In message <CAPnjgZ1DbXwS=bgzLecoLM-V0785Zi6bytKTM=RP2EcnSkt4eA@mail.gmail.com>…

Quoted 21 lines

Quoted 11 lines

Well I found a very short version:

* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.

but it is inaccurate. We could perhaps change it to:

* Use of this source code is governed by a BSD-style license that can be
* found in the COPYING file.

Quoted 8 lines

or something similar? But so much of U-Boot already has the full version that I'm not sure this is a good idea. Here is the one I am using>

# This program is free software; you can redistribute it and/or

# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.

Note that this is the GPL, and _not_ any BSD-style license !

Quoted 2 lines

Yes. I've gone with the longer one, just removing the CREDITS. That seems to be the most common message in U-Boot.

You appear to miss the point. You switched the licensing model from BSD to GPL - not that I would complain about such a move, on contrary, but I wonder if this is intentional and agreed by the authors of the code?

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The sight of death frightens them [Earthers].
-- Kras the Klingon, "Friday's Child", stardate 3497.2

Yes I am now completely lost :-)

Where have I changed the licensing model?

Your original request was to remove the CREDITS line I think. I have done that in this patch:

http://patchwork.ozlabs.org/patch/197314/

The above discussion about copyright message is separate to that. I

was looking around the code base for a possible replacement (shorter) message because I thought that was what you were looking for. I found the BSD one, but have not changed any code to use it.

So yes, please can you explain what I am missing here?

Dear Simon,

Quoted 2 lines · In message <CAPnjgZ0k58-JG+MxvKp=6JxThMPb8pzHp+xFpDnB8JCtamtGJQ@mail.gmail.com>…

Yes I am now completely lost :-)

Me too.

Quoted 8 lines

Where have I changed the licensing model?

Your original request was to remove the CREDITS line I think. I have done that in this patch:

http://patchwork.ozlabs.org/patch/197314/

The above discussion about copyright message is separate to that. I

Ah... I understood it was part of your intended changes.

Quoted 4 lines

was looking around the code base for a possible replacement (shorter) message because I thought that was what you were looking for. I found the BSD one, but have not changed any code to use it.

Quoted 1 line

So yes, please can you explain what I am missing here?

Maybe everything is clear to you, And I just did not understand. I just wanted to point out thatt he misc postings to this topic contained references to different licenses - starting from code under GPLv2+ metioning some BSD license to GPL again. If all this doesn't change the code, I suggest we ignore it all.

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de As far as the laws of mathematics refer to reality, they are not certain; and as far as they are certain, they do not refer to
reality. -- Albert Einstein

Enable Coreboot and EXT4 Filesystems on the coreboot board.

Signed-off-by Simon Glass <[email protected]>

Quoted 3 lines · Simon Glass

Enable Coreboot and EXT4 Filesystems on the coreboot board.

Signed-off-by Simon Glass <[email protected]>

cmd_ext4.c: In function 'do_ext4_write':
cmd_ext4.c:110:3: error: format '%lu' expects type 'long unsigned int', but argument 4 has type 'int'

Is what I see with my toolchain.

--
Tom

From: Gabe Black <[email protected]>

The size of an LBA type changes depending on this option. We need to use a different printf() string in each case, so create a define for this.

Signed-off-by Gabe Black <[email protected]>

Signed-off-by Simon Glass <[email protected]>