* [PATCH SLOF v2 1/5] disk-label: simplify gpt-prep-partition? routine
2015-06-25 6:45 [PATCH SLOF v2 0/5] GPT fixes/cleanup and LVM support with FAT Nikunj A Dadhania
@ 2015-06-25 6:45 ` Nikunj A Dadhania
2015-06-25 6:45 ` [PATCH SLOF v2 2/5] introduce 8-byte LE helpers Nikunj A Dadhania
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Nikunj A Dadhania @ 2015-06-25 6:45 UTC (permalink / raw)
To: linuxppc-dev, thuth, segher; +Cc: aik, dvaleev, nikunj
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
slof/fs/packages/disk-label.fs | 42 ++++++++++++++++--------------------------
1 file changed, 16 insertions(+), 26 deletions(-)
diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs
index fe1c25e..bb64d57 100644
--- a/slof/fs/packages/disk-label.fs
+++ b/slof/fs/packages/disk-label.fs
@@ -352,42 +352,32 @@ CONSTANT /gpt-part-entry
drop 0
;
-\ Check for GPT PReP partition GUID
-9E1A2D38 CONSTANT GPT-PREP-PARTITION-1
-C612 CONSTANT GPT-PREP-PARTITION-2
-4316 CONSTANT GPT-PREP-PARTITION-3
-AA26 CONSTANT GPT-PREP-PARTITION-4
-8B49521E5A8B CONSTANT GPT-PREP-PARTITION-5
+\ Check for GPT PReP partition GUID. Only first 3 blocks are
+\ byte-swapped treating last two blocks as contigous for simplifying
+\ comparison
+9E1A2D38 CONSTANT GPT-PREP-PARTITION-1
+C612 CONSTANT GPT-PREP-PARTITION-2
+4316 CONSTANT GPT-PREP-PARTITION-3
+AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
: gpt-prep-partition? ( -- true|false )
- block gpt-part-entry>part-type-guid l@-le GPT-PREP-PARTITION-1 = IF
- block gpt-part-entry>part-type-guid 4 + w@-le
- GPT-PREP-PARTITION-2 = IF
- block gpt-part-entry>part-type-guid 6 + w@-le
- GPT-PREP-PARTITION-3 = IF
- block gpt-part-entry>part-type-guid 8 + w@
- GPT-PREP-PARTITION-4 = IF
- block gpt-part-entry>part-type-guid a + w@
- block gpt-part-entry>part-type-guid c + l@ swap lxjoin
- GPT-PREP-PARTITION-5 = IF
- TRUE EXIT
- THEN
- THEN
- THEN
- THEN
- THEN
- FALSE
+ block gpt-part-entry>part-type-guid
+ dup l@-le GPT-PREP-PARTITION-1 <> IF drop false EXIT THEN
+ dup 4 + w@-le GPT-PREP-PARTITION-2 <> IF drop false EXIT THEN
+ dup 6 + w@-le GPT-PREP-PARTITION-3 <> IF drop false EXIT THEN
+ 8 + x@ GPT-PREP-PARTITION-4 <> IF false EXIT THEN
+ true
;
: load-from-gpt-prep-partition ( addr -- size )
- no-gpt? IF drop FALSE EXIT THEN
+ no-gpt? IF drop false EXIT THEN
debug-disk-label? IF
cr ." GPT partition found " cr
THEN
1 read-sector block gpt>part-entry-lba l@-le
block-size * to seek-pos
block gpt>part-entry-size l@-le to gpt-part-size
- block gpt>num-part-entry l@-le dup 0= IF FALSE EXIT THEN
+ block gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
1+ 1 ?DO
seek-pos 0 seek drop
block gpt-part-size read drop gpt-prep-partition? IF
@@ -405,7 +395,7 @@ AA26 CONSTANT GPT-PREP-PARTITION-4
THEN
seek-pos gpt-part-size i * + to seek-pos
LOOP
- FALSE
+ false
;
\ Extract the boot loader path from a bootinfo.txt file
--
2.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH SLOF v2 2/5] introduce 8-byte LE helpers
2015-06-25 6:45 [PATCH SLOF v2 0/5] GPT fixes/cleanup and LVM support with FAT Nikunj A Dadhania
2015-06-25 6:45 ` [PATCH SLOF v2 1/5] disk-label: simplify gpt-prep-partition? routine Nikunj A Dadhania
@ 2015-06-25 6:45 ` Nikunj A Dadhania
2015-06-25 6:45 ` [PATCH SLOF v2 3/5] disk-label: rename confusing "block" word Nikunj A Dadhania
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Nikunj A Dadhania @ 2015-06-25 6:45 UTC (permalink / raw)
To: linuxppc-dev, thuth, segher; +Cc: aik, dvaleev, nikunj
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
slof/fs/little-endian.fs | 6 ++++++
slof/fs/packages/disk-label.fs | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/slof/fs/little-endian.fs b/slof/fs/little-endian.fs
index f2e4e8d..6b4779e 100644
--- a/slof/fs/little-endian.fs
+++ b/slof/fs/little-endian.fs
@@ -17,6 +17,9 @@ here c@ ef = CONSTANT ?littleendian
?bigendian [IF]
+: x!-le >r xbflip r> x! ;
+: x@-le x@ xbflip ;
+
: l!-le >r lbflip r> l! ;
: l@-le l@ lbflip ;
@@ -47,6 +50,9 @@ here c@ ef = CONSTANT ?littleendian
[ELSE]
+: x!-le x! ;
+: x@-le x@ ;
+
: l!-le l! ;
: l@-le l@ ;
diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs
index bb64d57..8c93cfb 100644
--- a/slof/fs/packages/disk-label.fs
+++ b/slof/fs/packages/disk-label.fs
@@ -384,8 +384,8 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
debug-disk-label? IF
." GPT PReP partition found " cr
THEN
- block gpt-part-entry>first-lba x@ xbflip
- block gpt-part-entry>last-lba x@ xbflip
+ block gpt-part-entry>first-lba x@-le
+ block gpt-part-entry>last-lba x@-le
over - 1+ ( addr offset len )
swap ( addr len offset )
block-size * to part-offset
--
2.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH SLOF v2 3/5] disk-label: rename confusing "block" word
2015-06-25 6:45 [PATCH SLOF v2 0/5] GPT fixes/cleanup and LVM support with FAT Nikunj A Dadhania
2015-06-25 6:45 ` [PATCH SLOF v2 1/5] disk-label: simplify gpt-prep-partition? routine Nikunj A Dadhania
2015-06-25 6:45 ` [PATCH SLOF v2 2/5] introduce 8-byte LE helpers Nikunj A Dadhania
@ 2015-06-25 6:45 ` Nikunj A Dadhania
2015-06-29 8:44 ` Thomas Huth
2015-06-25 6:45 ` [PATCH SLOF v2 4/5] disk-label: introduce helper to check fat filesystem Nikunj A Dadhania
2015-06-25 6:45 ` [PATCH SLOF v2 5/5] disk-label: add support for booting from GPT FAT partition Nikunj A Dadhania
4 siblings, 1 reply; 10+ messages in thread
From: Nikunj A Dadhania @ 2015-06-25 6:45 UTC (permalink / raw)
To: linuxppc-dev, thuth, segher; +Cc: aik, dvaleev, nikunj
"block" word is not a block number, actually its an allocated host
address. Rename it to disk-buf along with a associated
size(disk-buf-size=4096) for using during allocation/free.
Also renaming the helper routine read-sector to read-disk-buf. This
routine assumes the address to be disk-buf and only takes sector number
as argument.
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
---
slof/fs/packages/disk-label.fs | 78 ++++++++++++++++++++++--------------------
1 file changed, 41 insertions(+), 37 deletions(-)
diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs
index 8c93cfb..0995808 100644
--- a/slof/fs/packages/disk-label.fs
+++ b/slof/fs/packages/disk-label.fs
@@ -33,7 +33,8 @@ s" disk-label" device-name
0 INSTANCE VALUE dos-logical-partitions
0 INSTANCE VALUE block-size
-0 INSTANCE VALUE block
+0 INSTANCE VALUE disk-buf
+d# 4096 VALUE disk-buf-size
0 INSTANCE VALUE args
0 INSTANCE VALUE args-len
@@ -126,11 +127,11 @@ CONSTANT /gpt-part-entry
;
-\ read sector to array "block"
-: read-sector ( sector-number -- )
+\ read sector to array "disk-buf"
+: read-disk-buf ( sector-number -- )
\ block-size is 0x200 on disks, 0x800 on cdrom drives
block-size * 0 seek drop \ seek to sector
- block block-size read drop \ read sector
+ disk-buf block-size read drop \ read sector
;
: (.part-entry) ( part-entry )
@@ -149,35 +150,35 @@ CONSTANT /gpt-part-entry
: (.name) r@ begin cell - dup @ <colon> = UNTIL xt>name cr type space ;
-: init-block ( -- )
+: init-disk-buf ( -- )
s" block-size" ['] $call-parent CATCH IF ABORT" parent has no block-size." THEN
to block-size
- d# 4096 alloc-mem
- dup d# 4096 erase
- to block
+ disk-buf-size alloc-mem
+ dup disk-buf-size erase
+ to disk-buf
debug-disk-label? IF
- ." init-block: block-size=" block-size .d ." block=0x" block u. cr
+ ." init-disk-buf: block-size=" block-size .d ." disk-buf=0x" disk-buf u. cr
THEN
;
: partition>part-entry ( partition -- part-entry )
- 1- /partition-entry * block mbr>partition-table +
+ 1- /partition-entry * disk-buf mbr>partition-table +
;
: partition>start-sector ( partition -- sector-offset )
partition>part-entry part-entry>sector-offset l@-le
;
-\ This word returns true if the currently loaded block has _NO_ MBR magic
+\ This word returns true if the currently loaded disk-buf has _NO_ MBR magic
: no-mbr? ( -- true|false )
- 0 read-sector
+ 0 read-disk-buf
1 partition>part-entry part-entry>id c@ ee = IF TRUE EXIT THEN \ GPT partition found
- block mbr>magic w@-le aa55 <>
+ disk-buf mbr>magic w@-le aa55 <>
;
-\ This word returns true if the currently loaded block has _NO_ GPT partition id
+\ This word returns true if the currently loaded disk-buf has _NO_ GPT partition id
: no-gpt? ( -- true|false )
- 0 read-sector
+ 0 read-disk-buf
1 partition>part-entry part-entry>id c@ ee <>
;
@@ -197,7 +198,7 @@ CONSTANT /gpt-part-entry
part-entry>sector-offset l@-le ( current sector )
dup to part-start to lpart-start ( current )
BEGIN
- part-start read-sector \ read EBR
+ part-start read-disk-buf \ read EBR
1 partition>start-sector IF
\ ." Logical Partition found at " part-start .d cr
1+
@@ -240,7 +241,7 @@ CONSTANT /gpt-part-entry
part-entry>sector-offset l@-le ( log-part current sector )
dup to part-start to lpart-start ( log-part current )
BEGIN
- part-start read-sector \ read EBR
+ part-start read-disk-buf \ read EBR
1 partition>start-sector IF \ first partition entry
1+ 2dup = IF ( log-part current )
2drop
@@ -306,13 +307,13 @@ CONSTANT /gpt-part-entry
: has-iso9660-filesystem ( -- TRUE|FALSE )
\ Seek to the beginning of logical 2048-byte sector 16
\ refer to Chapter C.11.1 in PAPR 2.0 Spec
- \ was: 10 read-sector, but this might cause trouble if you
+ \ was: 10 read-disk-buf, but this might cause trouble if you
\ try booting an ISO image from a device with 512b sectors.
10 800 * 0 seek drop \ seek to sector
- block 800 read drop \ read sector
+ disk-buf 800 read drop \ read sector
\ Check for CD-ROM volume magic:
- block c@ 1 =
- block 1+ 5 s" CD001" str=
+ disk-buf c@ 1 =
+ disk-buf 1+ 5 s" CD001" str=
and
dup IF 800 to block-size THEN
;
@@ -361,7 +362,7 @@ C612 CONSTANT GPT-PREP-PARTITION-2
AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
: gpt-prep-partition? ( -- true|false )
- block gpt-part-entry>part-type-guid
+ disk-buf gpt-part-entry>part-type-guid
dup l@-le GPT-PREP-PARTITION-1 <> IF drop false EXIT THEN
dup 4 + w@-le GPT-PREP-PARTITION-2 <> IF drop false EXIT THEN
dup 6 + w@-le GPT-PREP-PARTITION-3 <> IF drop false EXIT THEN
@@ -374,18 +375,18 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
debug-disk-label? IF
cr ." GPT partition found " cr
THEN
- 1 read-sector block gpt>part-entry-lba l@-le
+ 1 read-disk-buf disk-buf gpt>part-entry-lba l@-le
block-size * to seek-pos
- block gpt>part-entry-size l@-le to gpt-part-size
- block gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
+ disk-buf gpt>part-entry-size l@-le to gpt-part-size
+ disk-buf gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
1+ 1 ?DO
seek-pos 0 seek drop
- block gpt-part-size read drop gpt-prep-partition? IF
+ disk-buf gpt-part-size read drop gpt-prep-partition? IF
debug-disk-label? IF
." GPT PReP partition found " cr
THEN
- block gpt-part-entry>first-lba x@-le
- block gpt-part-entry>last-lba x@-le
+ disk-buf gpt-part-entry>first-lba x@-le
+ disk-buf gpt-part-entry>last-lba x@-le
over - 1+ ( addr offset len )
swap ( addr len offset )
block-size * to part-offset
@@ -548,12 +549,12 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
: try-dos-files ( -- found? )
no-mbr? IF false EXIT THEN
- \ block 0 byte 0-2 is a jump instruction in all FAT
+ \ disk-buf 0 byte 0-2 is a jump instruction in all FAT
\ filesystems.
\ e9 and eb are jump instructions in x86 assembler.
- block c@ e9 <> IF
- block c@ eb <>
- block 2+ c@ 90 <> or
+ disk-buf c@ e9 <> IF
+ disk-buf c@ eb <>
+ disk-buf 2+ c@ 90 <> or
IF false EXIT THEN
THEN
s" fat-files" (interpose-filesystem)
@@ -561,8 +562,8 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
;
: try-ext2-files ( -- found? )
- 2 read-sector \ read first superblock
- block d# 56 + w@-le \ fetch s_magic
+ 2 read-disk-buf \ read first superblock
+ disk-buf d# 56 + w@-le \ fetch s_magic
ef53 <> IF false EXIT THEN \ s_magic found?
s" ext2-files" (interpose-filesystem)
true
@@ -599,13 +600,16 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
\ as defined by IEEE 1275-1994 3.8.1
: close ( -- )
- debug-disk-label? IF ." Closing disk-label: block=0x" block u. ." block-size=" block-size .d cr THEN
- block d# 4096 free-mem
+ debug-disk-label? IF
+ ." Closing disk-label: disk-buf=0x" disk-buf u.
+ ." block-size=" block-size .d cr
+ THEN
+ disk-buf disk-buf-size free-mem
;
: open ( -- true|false )
- init-block
+ init-disk-buf
parse-partition 0= IF
close
--
2.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH SLOF v2 3/5] disk-label: rename confusing "block" word
2015-06-25 6:45 ` [PATCH SLOF v2 3/5] disk-label: rename confusing "block" word Nikunj A Dadhania
@ 2015-06-29 8:44 ` Thomas Huth
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Huth @ 2015-06-29 8:44 UTC (permalink / raw)
To: Nikunj A Dadhania; +Cc: linuxppc-dev, segher, aik, dvaleev
On Thu, 25 Jun 2015 12:15:27 +0530
Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> wrote:
> "block" word is not a block number, actually its an allocated host
> address. Rename it to disk-buf along with a associated
> size(disk-buf-size=4096) for using during allocation/free.
>
> Also renaming the helper routine read-sector to read-disk-buf. This
> routine assumes the address to be disk-buf and only takes sector number
> as argument.
>
> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
> ---
> slof/fs/packages/disk-label.fs | 78 ++++++++++++++++++++++--------------------
> 1 file changed, 41 insertions(+), 37 deletions(-)
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH SLOF v2 4/5] disk-label: introduce helper to check fat filesystem
2015-06-25 6:45 [PATCH SLOF v2 0/5] GPT fixes/cleanup and LVM support with FAT Nikunj A Dadhania
` (2 preceding siblings ...)
2015-06-25 6:45 ` [PATCH SLOF v2 3/5] disk-label: rename confusing "block" word Nikunj A Dadhania
@ 2015-06-25 6:45 ` Nikunj A Dadhania
2015-06-29 8:47 ` Thomas Huth
2015-06-25 6:45 ` [PATCH SLOF v2 5/5] disk-label: add support for booting from GPT FAT partition Nikunj A Dadhania
4 siblings, 1 reply; 10+ messages in thread
From: Nikunj A Dadhania @ 2015-06-25 6:45 UTC (permalink / raw)
To: linuxppc-dev, thuth, segher; +Cc: aik, dvaleev, nikunj
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
---
slof/fs/packages/disk-label.fs | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs
index 0995808..7ed5526 100644
--- a/slof/fs/packages/disk-label.fs
+++ b/slof/fs/packages/disk-label.fs
@@ -321,6 +321,14 @@ CONSTANT /gpt-part-entry
\ Load from first active DOS boot partition.
+: fat-bootblock? ( addr -- flag )
+ \ byte 0-2 of the bootblock is a jump instruction in
+ \ all FAT filesystems.
+ \ e9 and eb are jump instructions in x86 assembler.
+ dup c@ e9 = IF drop true EXIT THEN
+ dup c@ eb = swap 2+ c@ 90 = and
+;
+
\ NOTE: block-size is always 512 bytes for DOS partition tables.
: load-from-dos-boot-partition ( addr -- size )
@@ -549,14 +557,7 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
: try-dos-files ( -- found? )
no-mbr? IF false EXIT THEN
- \ disk-buf 0 byte 0-2 is a jump instruction in all FAT
- \ filesystems.
- \ e9 and eb are jump instructions in x86 assembler.
- disk-buf c@ e9 <> IF
- disk-buf c@ eb <>
- disk-buf 2+ c@ 90 <> or
- IF false EXIT THEN
- THEN
+ disk-buf fat-bootblock? 0= IF false EXIT THEN
s" fat-files" (interpose-filesystem)
true
;
--
2.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH SLOF v2 4/5] disk-label: introduce helper to check fat filesystem
2015-06-25 6:45 ` [PATCH SLOF v2 4/5] disk-label: introduce helper to check fat filesystem Nikunj A Dadhania
@ 2015-06-29 8:47 ` Thomas Huth
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Huth @ 2015-06-29 8:47 UTC (permalink / raw)
To: Nikunj A Dadhania; +Cc: linuxppc-dev, segher, aik, dvaleev
On Thu, 25 Jun 2015 12:15:28 +0530
Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> wrote:
> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
> ---
> slof/fs/packages/disk-label.fs | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs
> index 0995808..7ed5526 100644
> --- a/slof/fs/packages/disk-label.fs
> +++ b/slof/fs/packages/disk-label.fs
> @@ -321,6 +321,14 @@ CONSTANT /gpt-part-entry
>
> \ Load from first active DOS boot partition.
>
> +: fat-bootblock? ( addr -- flag )
> + \ byte 0-2 of the bootblock is a jump instruction in
> + \ all FAT filesystems.
> + \ e9 and eb are jump instructions in x86 assembler.
> + dup c@ e9 = IF drop true EXIT THEN
> + dup c@ eb = swap 2+ c@ 90 = and
> +;
> +
> \ NOTE: block-size is always 512 bytes for DOS partition tables.
>
> : load-from-dos-boot-partition ( addr -- size )
> @@ -549,14 +557,7 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
> : try-dos-files ( -- found? )
> no-mbr? IF false EXIT THEN
>
> - \ disk-buf 0 byte 0-2 is a jump instruction in all FAT
> - \ filesystems.
> - \ e9 and eb are jump instructions in x86 assembler.
> - disk-buf c@ e9 <> IF
> - disk-buf c@ eb <>
> - disk-buf 2+ c@ 90 <> or
> - IF false EXIT THEN
> - THEN
> + disk-buf fat-bootblock? 0= IF false EXIT THEN
> s" fat-files" (interpose-filesystem)
> true
> ;
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH SLOF v2 5/5] disk-label: add support for booting from GPT FAT partition
2015-06-25 6:45 [PATCH SLOF v2 0/5] GPT fixes/cleanup and LVM support with FAT Nikunj A Dadhania
` (3 preceding siblings ...)
2015-06-25 6:45 ` [PATCH SLOF v2 4/5] disk-label: introduce helper to check fat filesystem Nikunj A Dadhania
@ 2015-06-25 6:45 ` Nikunj A Dadhania
2015-06-29 9:17 ` Thomas Huth
4 siblings, 1 reply; 10+ messages in thread
From: Nikunj A Dadhania @ 2015-06-25 6:45 UTC (permalink / raw)
To: linuxppc-dev, thuth, segher; +Cc: aik, dvaleev, nikunj
For a GPT+LVM combination disk, older bootloader that does not support
LVM, cannot load kernel from LVM.
The patch adds support to read from BASIC_DATA UUID partitions for the
case that the OS installer has installed the CHRP-BOOT config on a FAT
file system.
Makes GPT detection robust
* Check for Protective MBR Magic
* Check for valid GPT Signature
* Boundary check for allocated block size before reading into the
buffer
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
---
slof/fs/packages/disk-label.fs | 96 +++++++++++++++++++++++++++++++++---------
1 file changed, 76 insertions(+), 20 deletions(-)
diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs
index 7ed5526..e5759a3 100644
--- a/slof/fs/packages/disk-label.fs
+++ b/slof/fs/packages/disk-label.fs
@@ -179,7 +179,8 @@ CONSTANT /gpt-part-entry
\ This word returns true if the currently loaded disk-buf has _NO_ GPT partition id
: no-gpt? ( -- true|false )
0 read-disk-buf
- 1 partition>part-entry part-entry>id c@ ee <>
+ 1 partition>part-entry part-entry>id c@ ee <> IF true EXIT THEN
+ disk-buf mbr>magic w@-le aa55 <>
;
: pc-extended-partition? ( part-entry-addr -- true|false )
@@ -267,7 +268,10 @@ CONSTANT /gpt-part-entry
: try-dos-partition ( -- okay? )
\ Read partition table and check magic.
- no-mbr? IF cr ." No DOS disk-label found." cr false EXIT THEN
+ no-mbr? IF
+ debug-disk-label? IF cr ." No DOS disk-label found." cr THEN
+ false EXIT
+ THEN
count-dos-logical-partitions TO dos-logical-partitions
@@ -378,29 +382,80 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
true
;
-: load-from-gpt-prep-partition ( addr -- size )
- no-gpt? IF drop false EXIT THEN
- debug-disk-label? IF
- cr ." GPT partition found " cr
- THEN
- 1 read-disk-buf disk-buf gpt>part-entry-lba l@-le
+\ Check for GPT MSFT BASIC DATA GUID - fat based
+EBD0A0A2 CONSTANT GPT-BASIC-DATA-PARTITION-1
+B9E5 CONSTANT GPT-BASIC-DATA-PARTITION-2
+4433 CONSTANT GPT-BASIC-DATA-PARTITION-3
+87C068B6B72699C7 CONSTANT GPT-BASIC-DATA-PARTITION-4
+
+: gpt-basic-data-partition? ( -- true|false )
+ disk-buf gpt-part-entry>part-type-guid
+ dup l@-le GPT-BASIC-DATA-PARTITION-1 <> IF drop false EXIT THEN
+ dup 4 + w@-le GPT-BASIC-DATA-PARTITION-2 <> IF drop false EXIT THEN
+ dup 6 + w@-le GPT-BASIC-DATA-PARTITION-3 <> IF drop false EXIT THEN
+ 8 + x@ GPT-BASIC-DATA-PARTITION-4 <> IF false EXIT THEN
+ true
+;
+
+\
+\ GPT Signature
+\ ("EFI PART", 45h 46h 49h 20h 50h 41h 52h 54h)
+\
+4546492050415254 CONSTANT GPT-SIGNATURE
+
+: verify-gpt-partition ( -- true | false )
+ no-gpt? IF false EXIT THEN
+ debug-disk-label? IF cr ." GPT partition found " cr THEN
+ 1 read-disk-buf
+ disk-buf gpt>part-entry-lba x@-le
block-size * to seek-pos
disk-buf gpt>part-entry-size l@-le to gpt-part-size
- disk-buf gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
+ gpt-part-size disk-buf-size > IF
+ cr ." GPT part size exceeds buffer allocated " cr
+ false exit
+ THEN
+ disk-buf gpt>signature x@ GPT-SIGNATURE =
+;
+
+: load-from-gpt-prep-partition ( addr -- size )
+ verify-gpt-partition 0= IF false EXIT THEN
+ disk-buf gpt>num-part-entry l@-le dup 0= IF false exit THEN
1+ 1 ?DO
seek-pos 0 seek drop
disk-buf gpt-part-size read drop gpt-prep-partition? IF
- debug-disk-label? IF
- ." GPT PReP partition found " cr
- THEN
- disk-buf gpt-part-entry>first-lba x@-le
- disk-buf gpt-part-entry>last-lba x@-le
- over - 1+ ( addr offset len )
- swap ( addr len offset )
- block-size * to part-offset
- 0 0 seek drop ( addr len )
- block-size * read ( size )
+ debug-disk-label? IF ." GPT PReP partition found " cr THEN
+ disk-buf gpt-part-entry>first-lba x@-le ( addr first-lba )
+ disk-buf gpt-part-entry>last-lba x@-le ( addr first-lba last-lba)
+ over - 1+ ( addr first-lba blocks )
+ swap ( addr blocks )
+ block-size * to part-offset ( addr blocks )
+ 0 0 seek drop ( addr blocks )
+ block-size * read ( size )
UNLOOP EXIT
+ THEN
+ seek-pos gpt-part-size i * + to seek-pos
+ LOOP
+ false
+;
+
+: try-gpt-dos-partition ( -- true | false )
+ verify-gpt-partition 0= IF false EXIT THEN
+ disk-buf gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
+ 1+ 1 ?DO
+ seek-pos 0 seek drop
+ disk-buf gpt-part-size read drop
+ gpt-basic-data-partition? IF
+ debug-disk-label? IF ." GPT LINUX DATA partition found " cr THEN
+ disk-buf gpt-part-entry>first-lba x@-le ( first-lba )
+ dup to part-start ( first-lba )
+ disk-buf gpt-part-entry>last-lba x@-le ( first-lba last-lba )
+ over - 1+ ( first-lba s1 )
+ block-size * to part-size ( first-lba )
+ block-size * to part-offset ( )
+ 0 0 seek drop ( )
+ disk-buf block-size read drop ( )
+ disk-buf fat-bootblock? 0= IF false UNLOOP EXIT THEN
+ true UNLOOP EXIT
THEN
seek-pos gpt-part-size i * + to seek-pos
LOOP
@@ -492,7 +547,7 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
debug-disk-label? IF ." Trying CHRP boot " .s cr THEN
1 disk-chrp-boot !
- dup load-chrp-boot-file ?dup 0 <> IF .s cr nip EXIT THEN
+ dup load-chrp-boot-file ?dup 0 <> IF nip EXIT THEN
0 disk-chrp-boot !
debug-disk-label? IF ." Trying GPT boot " .s cr THEN
@@ -592,6 +647,7 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
: try-partitions ( -- found? )
try-dos-partition IF try-files EXIT THEN
+ try-gpt-dos-partition IF try-files EXIT THEN
\ try-iso9660-partition IF try-files EXIT THEN
\ ... more partition types here...
false
--
2.4.3
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH SLOF v2 5/5] disk-label: add support for booting from GPT FAT partition
2015-06-25 6:45 ` [PATCH SLOF v2 5/5] disk-label: add support for booting from GPT FAT partition Nikunj A Dadhania
@ 2015-06-29 9:17 ` Thomas Huth
2015-06-29 11:13 ` Nikunj A Dadhania
0 siblings, 1 reply; 10+ messages in thread
From: Thomas Huth @ 2015-06-29 9:17 UTC (permalink / raw)
To: Nikunj A Dadhania; +Cc: linuxppc-dev, segher, aik, dvaleev
On Thu, 25 Jun 2015 12:15:29 +0530
Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> wrote:
> For a GPT+LVM combination disk, older bootloader that does not support
> LVM, cannot load kernel from LVM.
>
> The patch adds support to read from BASIC_DATA UUID partitions for the
> case that the OS installer has installed the CHRP-BOOT config on a FAT
> file system.
>
> Makes GPT detection robust
> * Check for Protective MBR Magic
> * Check for valid GPT Signature
> * Boundary check for allocated block size before reading into the
> buffer
>
> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
> ---
> slof/fs/packages/disk-label.fs | 96 +++++++++++++++++++++++++++++++++---------
> 1 file changed, 76 insertions(+), 20 deletions(-)
>
> diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs
> index 7ed5526..e5759a3 100644
> --- a/slof/fs/packages/disk-label.fs
> +++ b/slof/fs/packages/disk-label.fs
...
> @@ -378,29 +382,80 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
> true
> ;
>
> -: load-from-gpt-prep-partition ( addr -- size )
> - no-gpt? IF drop false EXIT THEN
> - debug-disk-label? IF
> - cr ." GPT partition found " cr
> - THEN
> - 1 read-disk-buf disk-buf gpt>part-entry-lba l@-le
> +\ Check for GPT MSFT BASIC DATA GUID - fat based
> +EBD0A0A2 CONSTANT GPT-BASIC-DATA-PARTITION-1
> +B9E5 CONSTANT GPT-BASIC-DATA-PARTITION-2
> +4433 CONSTANT GPT-BASIC-DATA-PARTITION-3
> +87C068B6B72699C7 CONSTANT GPT-BASIC-DATA-PARTITION-4
> +
> +: gpt-basic-data-partition? ( -- true|false )
> + disk-buf gpt-part-entry>part-type-guid
> + dup l@-le GPT-BASIC-DATA-PARTITION-1 <> IF drop false EXIT THEN
> + dup 4 + w@-le GPT-BASIC-DATA-PARTITION-2 <> IF drop false EXIT THEN
> + dup 6 + w@-le GPT-BASIC-DATA-PARTITION-3 <> IF drop false EXIT THEN
> + 8 + x@ GPT-BASIC-DATA-PARTITION-4 <> IF false EXIT THEN
> + true
> +;
You could remove the "<> IF false EXIT THEN true" at the end and
replace it with a simple "=".
> +\
> +\ GPT Signature
> +\ ("EFI PART", 45h 46h 49h 20h 50h 41h 52h 54h)
> +\
> +4546492050415254 CONSTANT GPT-SIGNATURE
> +
> +: verify-gpt-partition ( -- true | false )
I'd prefer if you could write "true|false" without spaces around the
"|" so that it is clear at a glance that there is only one item on the
stack.
Could you maybe also add a comment above the function that it sets up
gpt-part-size with the size of partition entry and seek-pos with the
position of the partition entry? ...since these are non-obvious
side-effect of this function... All in all, maybe you should also name
the function differently, since it does more than just verifying.
> + no-gpt? IF false EXIT THEN
> + debug-disk-label? IF cr ." GPT partition found " cr THEN
> + 1 read-disk-buf
> + disk-buf gpt>part-entry-lba x@-le
> block-size * to seek-pos
> disk-buf gpt>part-entry-size l@-le to gpt-part-size
> - disk-buf gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
> + gpt-part-size disk-buf-size > IF
> + cr ." GPT part size exceeds buffer allocated " cr
> + false exit
> + THEN
> + disk-buf gpt>signature x@ GPT-SIGNATURE =
> +;
> +
> +: load-from-gpt-prep-partition ( addr -- size )
> + verify-gpt-partition 0= IF false EXIT THEN
> + disk-buf gpt>num-part-entry l@-le dup 0= IF false exit THEN
> 1+ 1 ?DO
> seek-pos 0 seek drop
> disk-buf gpt-part-size read drop gpt-prep-partition? IF
> - debug-disk-label? IF
> - ." GPT PReP partition found " cr
> - THEN
> - disk-buf gpt-part-entry>first-lba x@-le
> - disk-buf gpt-part-entry>last-lba x@-le
> - over - 1+ ( addr offset len )
> - swap ( addr len offset )
> - block-size * to part-offset
> - 0 0 seek drop ( addr len )
> - block-size * read ( size )
> + debug-disk-label? IF ." GPT PReP partition found " cr THEN
> + disk-buf gpt-part-entry>first-lba x@-le ( addr first-lba )
> + disk-buf gpt-part-entry>last-lba x@-le ( addr first-lba last-lba)
> + over - 1+ ( addr first-lba blocks )
> + swap ( addr blocks )
The stack comment looks wrong here, should this be:
( addr blocks first-lba )
?
> + block-size * to part-offset ( addr blocks )
> + 0 0 seek drop ( addr blocks )
> + block-size * read ( size )
> UNLOOP EXIT
> + THEN
> + seek-pos gpt-part-size i * + to seek-pos
> + LOOP
> + false
> +;
> +
> +: try-gpt-dos-partition ( -- true | false )
"true | false" --> "true|false" ?
> + verify-gpt-partition 0= IF false EXIT THEN
> + disk-buf gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
> + 1+ 1 ?DO
> + seek-pos 0 seek drop
> + disk-buf gpt-part-size read drop
> + gpt-basic-data-partition? IF
> + debug-disk-label? IF ." GPT LINUX DATA partition found " cr THEN
I think that string should maybe rather talk about "basic data
partition" instead of "LINUX data partition" ?
> + disk-buf gpt-part-entry>first-lba x@-le ( first-lba )
> + dup to part-start ( first-lba )
> + disk-buf gpt-part-entry>last-lba x@-le ( first-lba last-lba )
> + over - 1+ ( first-lba s1 )
> + block-size * to part-size ( first-lba )
> + block-size * to part-offset ( )
> + 0 0 seek drop ( )
> + disk-buf block-size read drop ( )
> + disk-buf fat-bootblock? 0= IF false UNLOOP EXIT THEN
> + true UNLOOP EXIT
You could simplify the above two lines to:
disk-buf fat-bootblock?
UNLOOP EXIT
> THEN
> seek-pos gpt-part-size i * + to seek-pos
> LOOP
> @@ -492,7 +547,7 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
>
> debug-disk-label? IF ." Trying CHRP boot " .s cr THEN
> 1 disk-chrp-boot !
> - dup load-chrp-boot-file ?dup 0 <> IF .s cr nip EXIT THEN
> + dup load-chrp-boot-file ?dup 0 <> IF nip EXIT THEN
> 0 disk-chrp-boot !
>
> debug-disk-label? IF ." Trying GPT boot " .s cr THEN
> @@ -592,6 +647,7 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
>
> : try-partitions ( -- found? )
> try-dos-partition IF try-files EXIT THEN
> + try-gpt-dos-partition IF try-files EXIT THEN
> \ try-iso9660-partition IF try-files EXIT THEN
> \ ... more partition types here...
> false
Thomas
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH SLOF v2 5/5] disk-label: add support for booting from GPT FAT partition
2015-06-29 9:17 ` Thomas Huth
@ 2015-06-29 11:13 ` Nikunj A Dadhania
0 siblings, 0 replies; 10+ messages in thread
From: Nikunj A Dadhania @ 2015-06-29 11:13 UTC (permalink / raw)
To: Thomas Huth; +Cc: linuxppc-dev, segher, aik, dvaleev
Thomas Huth <thuth@redhat.com> writes:
> On Thu, 25 Jun 2015 12:15:29 +0530
> Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> wrote:
>
>> For a GPT+LVM combination disk, older bootloader that does not support
>> LVM, cannot load kernel from LVM.
>>
>> The patch adds support to read from BASIC_DATA UUID partitions for the
>> case that the OS installer has installed the CHRP-BOOT config on a FAT
>> file system.
>>
>> Makes GPT detection robust
>> * Check for Protective MBR Magic
>> * Check for valid GPT Signature
>> * Boundary check for allocated block size before reading into the
>> buffer
>>
>> Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
>> ---
>> slof/fs/packages/disk-label.fs | 96 +++++++++++++++++++++++++++++++++---------
>> 1 file changed, 76 insertions(+), 20 deletions(-)
>>
>> diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs
>> index 7ed5526..e5759a3 100644
>> --- a/slof/fs/packages/disk-label.fs
>> +++ b/slof/fs/packages/disk-label.fs
> ...
>> @@ -378,29 +382,80 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
>> true
>> ;
>>
>> -: load-from-gpt-prep-partition ( addr -- size )
>> - no-gpt? IF drop false EXIT THEN
>> - debug-disk-label? IF
>> - cr ." GPT partition found " cr
>> - THEN
>> - 1 read-disk-buf disk-buf gpt>part-entry-lba l@-le
>> +\ Check for GPT MSFT BASIC DATA GUID - fat based
>> +EBD0A0A2 CONSTANT GPT-BASIC-DATA-PARTITION-1
>> +B9E5 CONSTANT GPT-BASIC-DATA-PARTITION-2
>> +4433 CONSTANT GPT-BASIC-DATA-PARTITION-3
>> +87C068B6B72699C7 CONSTANT GPT-BASIC-DATA-PARTITION-4
>> +
>> +: gpt-basic-data-partition? ( -- true|false )
>> + disk-buf gpt-part-entry>part-type-guid
>> + dup l@-le GPT-BASIC-DATA-PARTITION-1 <> IF drop false EXIT THEN
>> + dup 4 + w@-le GPT-BASIC-DATA-PARTITION-2 <> IF drop false EXIT THEN
>> + dup 6 + w@-le GPT-BASIC-DATA-PARTITION-3 <> IF drop false EXIT THEN
>> + 8 + x@ GPT-BASIC-DATA-PARTITION-4 <> IF false EXIT THEN
>> + true
>> +;
>
> You could remove the "<> IF false EXIT THEN true" at the end and
> replace it with a simple "=".
Sure, will update the prep code as well.
>
>> +\
>> +\ GPT Signature
>> +\ ("EFI PART", 45h 46h 49h 20h 50h 41h 52h 54h)
>> +\
>> +4546492050415254 CONSTANT GPT-SIGNATURE
>> +
>> +: verify-gpt-partition ( -- true | false )
>
> I'd prefer if you could write "true|false" without spaces around the
> "|" so that it is clear at a glance that there is only one item on the
> stack.
Sure.
> Could you maybe also add a comment above the function that it sets up
> gpt-part-size with the size of partition entry and seek-pos with the
> position of the partition entry? ...since these are non-obvious
> side-effect of this function... All in all, maybe you should also name
> the function differently, since it does more than just verifying.
Yes, I was thinking to have this out of verify-gpt-partition, but then
it would be duplication, will rename and add comments accordingly.
>> + no-gpt? IF false EXIT THEN
>> + debug-disk-label? IF cr ." GPT partition found " cr THEN
>> + 1 read-disk-buf
>> + disk-buf gpt>part-entry-lba x@-le
>> block-size * to seek-pos
>> disk-buf gpt>part-entry-size l@-le to gpt-part-size
>> - disk-buf gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
>> + gpt-part-size disk-buf-size > IF
>> + cr ." GPT part size exceeds buffer allocated " cr
>> + false exit
>> + THEN
>> + disk-buf gpt>signature x@ GPT-SIGNATURE =
>> +;
>> +
>> +: load-from-gpt-prep-partition ( addr -- size )
>> + verify-gpt-partition 0= IF false EXIT THEN
>> + disk-buf gpt>num-part-entry l@-le dup 0= IF false exit THEN
>> 1+ 1 ?DO
>> seek-pos 0 seek drop
>> disk-buf gpt-part-size read drop gpt-prep-partition? IF
>> - debug-disk-label? IF
>> - ." GPT PReP partition found " cr
>> - THEN
>> - disk-buf gpt-part-entry>first-lba x@-le
>> - disk-buf gpt-part-entry>last-lba x@-le
>> - over - 1+ ( addr offset len )
>> - swap ( addr len offset )
>> - block-size * to part-offset
>> - 0 0 seek drop ( addr len )
>> - block-size * read ( size )
>> + debug-disk-label? IF ." GPT PReP partition found " cr THEN
>> + disk-buf gpt-part-entry>first-lba x@-le ( addr first-lba )
>> + disk-buf gpt-part-entry>last-lba x@-le ( addr first-lba last-lba)
>> + over - 1+ ( addr first-lba blocks )
>> + swap ( addr blocks )
>
> The stack comment looks wrong here, should this be:
>
> ( addr blocks first-lba )
>
> ?
Yes, i missed first-lap at top :-(
>
>> + block-size * to part-offset ( addr blocks )
>> + 0 0 seek drop ( addr blocks )
>> + block-size * read ( size )
>> UNLOOP EXIT
>> + THEN
>> + seek-pos gpt-part-size i * + to seek-pos
>> + LOOP
>> + false
>> +;
>> +
>> +: try-gpt-dos-partition ( -- true | false )
>
> "true | false" --> "true|false" ?
OK
>
>> + verify-gpt-partition 0= IF false EXIT THEN
>> + disk-buf gpt>num-part-entry l@-le dup 0= IF false EXIT THEN
>> + 1+ 1 ?DO
>> + seek-pos 0 seek drop
>> + disk-buf gpt-part-size read drop
>> + gpt-basic-data-partition? IF
>> + debug-disk-label? IF ." GPT LINUX DATA partition found " cr THEN
>
> I think that string should maybe rather talk about "basic data
> partition" instead of "LINUX data partition" ?
Ok
>
>> + disk-buf gpt-part-entry>first-lba x@-le ( first-lba )
>> + dup to part-start ( first-lba )
>> + disk-buf gpt-part-entry>last-lba x@-le ( first-lba last-lba )
>> + over - 1+ ( first-lba s1 )
>> + block-size * to part-size ( first-lba )
>> + block-size * to part-offset ( )
>> + 0 0 seek drop ( )
>> + disk-buf block-size read drop ( )
>> + disk-buf fat-bootblock? 0= IF false UNLOOP EXIT THEN
>> + true UNLOOP EXIT
>
> You could simplify the above two lines to:
>
> disk-buf fat-bootblock?
> UNLOOP EXIT
Right, as we exit in both cases.
>
>> THEN
>> seek-pos gpt-part-size i * + to seek-pos
>> LOOP
>> @@ -492,7 +547,7 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
>>
>> debug-disk-label? IF ." Trying CHRP boot " .s cr THEN
>> 1 disk-chrp-boot !
>> - dup load-chrp-boot-file ?dup 0 <> IF .s cr nip EXIT THEN
>> + dup load-chrp-boot-file ?dup 0 <> IF nip EXIT THEN
>> 0 disk-chrp-boot !
>>
>> debug-disk-label? IF ." Trying GPT boot " .s cr THEN
>> @@ -592,6 +647,7 @@ AA268B49521E5A8B CONSTANT GPT-PREP-PARTITION-4
>>
>> : try-partitions ( -- found? )
>> try-dos-partition IF try-files EXIT THEN
>> + try-gpt-dos-partition IF try-files EXIT THEN
>> \ try-iso9660-partition IF try-files EXIT THEN
>> \ ... more partition types here...
>> false
>
> Thomas
Thanks
Nikunj
^ permalink raw reply [flat|nested] 10+ messages in thread