From 779927cbb333e1a85c1481cf523b279d71d7983f Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Mon, 20 May 2013 21:08:26 +0200 Subject: [PATCH 1/3] allocate 4096 bytes for 4k alligned devices To make 4k scsi devices to work, allocated memory needs to be increased accordingly Tested in the following scenario: modprobe scsi_debug dev_size_mb=100 sector_size=4096 parted /dev/sdc u b p Model: Linux scsi_debug (scsi) Disk /dev/sdc: 209715200B Sector size (logical/physical): 4096B/4096B Partition Table: msdos Number Start End Size Type File system Flags 1 262144B 2097151B 1835008B primary boot, prep, type=41 2 2097152B 200015871B 197918720B primary type=83 qemu-system-ppc64 -enable-kvm -M pseries -m 1024 -nographic -drive file=/dev/sdc,if=none,format=raw,id=drive-scsi0 -device scsi-block,drive=drive-scsi0,id=scsi0 -vga none Signed-off-by: Dinar Valeev --- slof/fs/packages/disk-label.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs index 2dc581b..4fb12f3 100644 --- a/slof/fs/packages/disk-label.fs +++ b/slof/fs/packages/disk-label.fs @@ -120,8 +120,8 @@ CONSTANT /partition-entry : init-block ( -- ) s" block-size" ['] $call-parent CATCH IF ABORT" parent has no block-size." THEN to block-size - d# 2048 alloc-mem - dup d# 2048 erase + d# 4096 alloc-mem + dup d# 4096 erase to block debug-disk-label? IF ." init-block: block-size=" block-size .d ." block=0x" block u. cr From 6155c690eb0f2c3307ca8ba3abf216cc26cf3505 Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Mon, 20 May 2013 21:43:48 +0200 Subject: [PATCH 2/3] Free 4096 bytes as well While allocating 4096 bytes, we need to free the same amount Signed-off-by: Dinar Valeev --- slof/fs/packages/disk-label.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs index 4fb12f3..4a7d3ca 100644 --- a/slof/fs/packages/disk-label.fs +++ b/slof/fs/packages/disk-label.fs @@ -506,7 +506,7 @@ CONSTANT /partition-entry : close ( -- ) debug-disk-label? IF ." Closing disk-label: block=0x" block u. ." block-size=" block-size .d cr THEN - block d# 2048 free-mem + block d# 4096 free-mem ; From ee49218e48ba2ab34858ba5d37f4a9ae8ed615bc Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Tue, 15 Oct 2013 08:44:24 +0200 Subject: [PATCH 3/3] Don't print backspaces on CP codes Firefox tries to be smart and displays the logs as binary data. This is OBS specific hack as it unlikely will be wanted by upstream. Signed-off-by: Dinar Valeev --- lib/libbootmsg/bootmsg_lvl.S | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/libbootmsg/bootmsg_lvl.S b/lib/libbootmsg/bootmsg_lvl.S index 2e4c135..1bccaeb 100644 --- a/lib/libbootmsg/bootmsg_lvl.S +++ b/lib/libbootmsg/bootmsg_lvl.S @@ -58,10 +58,6 @@ ENTRY(bootmsg_cp) bl io_putchar // print character mr r3, r9 bl io_printhex16 // print checkpoint ID - .rept 5 - li r3,'\b' - bl io_putchar // print backspaces - .endr mtlr r11 blr