system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-06 00:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make UEFI booting of 4Kn disks work:

Browse source 
-	convert boot1.efi to corrrectly calculate the lba for what the
	media reports and convert the size based on what FreeBSD uses.
	The existing code would use the 512 byte lba and convert the
	size using 4K byte size.
      -	make fsck_msdosfs read the boot block as 4K so the read doesn't
	fail on a 4Kn drive since FreeBSD will error out parition reads
	of a block.  Make the bpbBytesPerSec check a multiple of 512 since
	it can be 512 or 4K depending on the disk.  This allows fsck to
	pass checking the EFI partition on a 4Kn disk.

To create the EFI file system I used:
	newfs_msdos -F 32 -S 4096 -c 1 -m 0xf8 <partition>
This works for booting 512 and 4Kn disks.

Caveat is that loader.efi cannot read the 4Kn EFI partition.  This isn't
critical right now since boot1.efi will read loader.efi from the ufs
partition.  It looks like loader.efi can be fixed via making some of the
512 bytes reads more flexible.  loader.efi doesn't have trouble reading
the ufs partition.  This is probably a simple fix.

I now have FreeBSD installed on a system with 4Kn drives and tested the
same code works on 512.

MFC after:	1 week
This commit is contained in:
Doug Ambrisko 2014-10-30 15:52:01 +00:00
parent cf99ea5d13
commit db0b8e10a7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=273865
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sbin/fsck_msdosfs/boot.c
View file

@ -181,7 +181,7 @@ readboot(int dosfs, struct bootblock *boot)
boot->bpbResSectors + boot->bpbFATs * boot->FATsecs -
CLUST_FIRST * boot->bpbSecPerClust;
if (boot->bpbBytesPerSec % DOSBOOTBLOCKSIZE != 0) {
if (boot->bpbBytesPerSec % DOSBOOTBLOCKSIZE_REAL != 0) {
pfatal("Invalid sector size: %u", boot->bpbBytesPerSec);
return FSFATAL;
}

4
sbin/fsck_msdosfs/dosfs.h
View file

@ -30,7 +30,9 @@
#ifndef DOSFS_H
#define DOSFS_H
#define DOSBOOTBLOCKSIZE 512
/* support 4Kn disk reads */
#define DOSBOOTBLOCKSIZE_REAL 512
#define DOSBOOTBLOCKSIZE 4096
typedef u_int32_t cl_t; /* type holding a cluster number */

5
sys/boot/amd64/boot1.efi/boot1.c
View file

@ -168,9 +168,12 @@ static int
dskread(void *buf, u_int64_t lba, int nblk)
{
EFI_STATUS status;
int size;
lba = lba / (bootdev->Media->BlockSize / DEV_BSIZE);
size = nblk * DEV_BSIZE;
status = bootdev->ReadBlocks(bootdev, bootdev->Media->MediaId, lba,
nblk * bootdev->Media->BlockSize, buf);
size, buf);
if (EFI_ERROR(status))
return (-1);