mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-14 22:23:56 +09:00
![Fabio Estevam](/assets/img/avatar_default.png)
Since commit ff98cb9051
("part: extract MBR signature from partitions")
SPL boot on i.MX6 starts to fail:
U-Boot SPL 2017.09-00221-g0d6ab32 (Oct 02 2017 - 15:13:19)
Trying to boot from MMC1
(keep in loop)
Use the original allocation scheme for the SPL case, so that MX6 boards
can boot again.
This is a temporary solution to avoid the boot regression.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
320 lines
8.1 KiB
C
320 lines
8.1 KiB
C
/*
|
|
* (C) Copyright 2001
|
|
* Raymond Lo, lo@routefree.com
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
/*
|
|
* Support for harddisk partitions.
|
|
*
|
|
* To be compatible with LinuxPPC and Apple we use the standard Apple
|
|
* SCSI disk partitioning scheme. For more information see:
|
|
* http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <ide.h>
|
|
#include <memalign.h>
|
|
#include "part_dos.h"
|
|
|
|
#ifdef HAVE_BLOCK_DEVICE
|
|
|
|
#define DOS_PART_DEFAULT_SECTOR 512
|
|
|
|
/* Convert char[4] in little endian format to the host format integer
|
|
*/
|
|
static inline unsigned int le32_to_int(unsigned char *le32)
|
|
{
|
|
return ((le32[3] << 24) +
|
|
(le32[2] << 16) +
|
|
(le32[1] << 8) +
|
|
le32[0]
|
|
);
|
|
}
|
|
|
|
static inline int is_extended(int part_type)
|
|
{
|
|
return (part_type == 0x5 ||
|
|
part_type == 0xf ||
|
|
part_type == 0x85);
|
|
}
|
|
|
|
static inline int is_bootable(dos_partition_t *p)
|
|
{
|
|
return (p->sys_ind == 0xef) || (p->boot_ind == 0x80);
|
|
}
|
|
|
|
static void print_one_part(dos_partition_t *p, lbaint_t ext_part_sector,
|
|
int part_num, unsigned int disksig)
|
|
{
|
|
lbaint_t lba_start = ext_part_sector + le32_to_int (p->start4);
|
|
lbaint_t lba_size = le32_to_int (p->size4);
|
|
|
|
printf("%3d\t%-10" LBAFlength "u\t%-10" LBAFlength
|
|
"u\t%08x-%02x\t%02x%s%s\n",
|
|
part_num, lba_start, lba_size, disksig, part_num, p->sys_ind,
|
|
(is_extended(p->sys_ind) ? " Extd" : ""),
|
|
(is_bootable(p) ? " Boot" : ""));
|
|
}
|
|
|
|
static int test_block_type(unsigned char *buffer)
|
|
{
|
|
int slot;
|
|
struct dos_partition *p;
|
|
|
|
if((buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) ||
|
|
(buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) ) {
|
|
return (-1);
|
|
} /* no DOS Signature at all */
|
|
p = (struct dos_partition *)&buffer[DOS_PART_TBL_OFFSET];
|
|
for (slot = 0; slot < 3; slot++) {
|
|
if (p->boot_ind != 0 && p->boot_ind != 0x80) {
|
|
if (!slot &&
|
|
(strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],
|
|
"FAT", 3) == 0 ||
|
|
strncmp((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET],
|
|
"FAT32", 5) == 0)) {
|
|
return DOS_PBR; /* is PBR */
|
|
} else {
|
|
return -1;
|
|
}
|
|
}
|
|
}
|
|
return DOS_MBR; /* Is MBR */
|
|
}
|
|
|
|
|
|
static int part_test_dos(struct blk_desc *dev_desc)
|
|
{
|
|
#ifndef CONFIG_SPL_BUILD
|
|
ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz);
|
|
|
|
if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1)
|
|
return -1;
|
|
|
|
if (test_block_type((unsigned char *)mbr) != DOS_MBR)
|
|
return -1;
|
|
|
|
if (dev_desc->sig_type == SIG_TYPE_NONE &&
|
|
mbr->unique_mbr_signature != 0) {
|
|
dev_desc->sig_type = SIG_TYPE_MBR;
|
|
dev_desc->mbr_sig = mbr->unique_mbr_signature;
|
|
}
|
|
#else
|
|
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
|
|
|
|
if (blk_dread(dev_desc, 0, 1, (ulong *)buffer) != 1)
|
|
return -1;
|
|
|
|
if (test_block_type(buffer) != DOS_MBR)
|
|
return -1;
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Print a partition that is relative to its Extended partition table
|
|
*/
|
|
static void print_partition_extended(struct blk_desc *dev_desc,
|
|
lbaint_t ext_part_sector,
|
|
lbaint_t relative,
|
|
int part_num, unsigned int disksig)
|
|
{
|
|
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
|
|
dos_partition_t *pt;
|
|
int i;
|
|
|
|
if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
|
|
printf ("** Can't read partition table on %d:" LBAFU " **\n",
|
|
dev_desc->devnum, ext_part_sector);
|
|
return;
|
|
}
|
|
i=test_block_type(buffer);
|
|
if (i != DOS_MBR) {
|
|
printf ("bad MBR sector signature 0x%02x%02x\n",
|
|
buffer[DOS_PART_MAGIC_OFFSET],
|
|
buffer[DOS_PART_MAGIC_OFFSET + 1]);
|
|
return;
|
|
}
|
|
|
|
if (!ext_part_sector)
|
|
disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]);
|
|
|
|
/* Print all primary/logical partitions */
|
|
pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
|
|
for (i = 0; i < 4; i++, pt++) {
|
|
/*
|
|
* fdisk does not show the extended partitions that
|
|
* are not in the MBR
|
|
*/
|
|
|
|
if ((pt->sys_ind != 0) &&
|
|
(ext_part_sector == 0 || !is_extended (pt->sys_ind)) ) {
|
|
print_one_part(pt, ext_part_sector, part_num, disksig);
|
|
}
|
|
|
|
/* Reverse engr the fdisk part# assignment rule! */
|
|
if ((ext_part_sector == 0) ||
|
|
(pt->sys_ind != 0 && !is_extended (pt->sys_ind)) ) {
|
|
part_num++;
|
|
}
|
|
}
|
|
|
|
/* Follows the extended partitions */
|
|
pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
|
|
for (i = 0; i < 4; i++, pt++) {
|
|
if (is_extended (pt->sys_ind)) {
|
|
lbaint_t lba_start
|
|
= le32_to_int (pt->start4) + relative;
|
|
|
|
print_partition_extended(dev_desc, lba_start,
|
|
ext_part_sector == 0 ? lba_start : relative,
|
|
part_num, disksig);
|
|
}
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
|
|
/* Print a partition that is relative to its Extended partition table
|
|
*/
|
|
static int part_get_info_extended(struct blk_desc *dev_desc,
|
|
lbaint_t ext_part_sector, lbaint_t relative,
|
|
int part_num, int which_part,
|
|
disk_partition_t *info, unsigned int disksig)
|
|
{
|
|
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
|
|
dos_partition_t *pt;
|
|
int i;
|
|
int dos_type;
|
|
|
|
if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
|
|
printf ("** Can't read partition table on %d:" LBAFU " **\n",
|
|
dev_desc->devnum, ext_part_sector);
|
|
return -1;
|
|
}
|
|
if (buffer[DOS_PART_MAGIC_OFFSET] != 0x55 ||
|
|
buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) {
|
|
printf ("bad MBR sector signature 0x%02x%02x\n",
|
|
buffer[DOS_PART_MAGIC_OFFSET],
|
|
buffer[DOS_PART_MAGIC_OFFSET + 1]);
|
|
return -1;
|
|
}
|
|
|
|
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
|
|
if (!ext_part_sector)
|
|
disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]);
|
|
#endif
|
|
|
|
/* Print all primary/logical partitions */
|
|
pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
|
|
for (i = 0; i < 4; i++, pt++) {
|
|
/*
|
|
* fdisk does not show the extended partitions that
|
|
* are not in the MBR
|
|
*/
|
|
if (((pt->boot_ind & ~0x80) == 0) &&
|
|
(pt->sys_ind != 0) &&
|
|
(part_num == which_part) &&
|
|
(is_extended(pt->sys_ind) == 0)) {
|
|
info->blksz = DOS_PART_DEFAULT_SECTOR;
|
|
info->start = (lbaint_t)(ext_part_sector +
|
|
le32_to_int(pt->start4));
|
|
info->size = (lbaint_t)le32_to_int(pt->size4);
|
|
part_set_generic_name(dev_desc, part_num,
|
|
(char *)info->name);
|
|
/* sprintf(info->type, "%d, pt->sys_ind); */
|
|
strcpy((char *)info->type, "U-Boot");
|
|
info->bootable = is_bootable(pt);
|
|
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
|
|
sprintf(info->uuid, "%08x-%02x", disksig, part_num);
|
|
#endif
|
|
info->sys_ind = pt->sys_ind;
|
|
return 0;
|
|
}
|
|
|
|
/* Reverse engr the fdisk part# assignment rule! */
|
|
if ((ext_part_sector == 0) ||
|
|
(pt->sys_ind != 0 && !is_extended (pt->sys_ind)) ) {
|
|
part_num++;
|
|
}
|
|
}
|
|
|
|
/* Follows the extended partitions */
|
|
pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
|
|
for (i = 0; i < 4; i++, pt++) {
|
|
if (is_extended (pt->sys_ind)) {
|
|
lbaint_t lba_start
|
|
= le32_to_int (pt->start4) + relative;
|
|
|
|
return part_get_info_extended(dev_desc, lba_start,
|
|
ext_part_sector == 0 ? lba_start : relative,
|
|
part_num, which_part, info, disksig);
|
|
}
|
|
}
|
|
|
|
/* Check for DOS PBR if no partition is found */
|
|
dos_type = test_block_type(buffer);
|
|
|
|
if (dos_type == DOS_PBR) {
|
|
info->start = 0;
|
|
info->size = dev_desc->lba;
|
|
info->blksz = DOS_PART_DEFAULT_SECTOR;
|
|
info->bootable = 0;
|
|
strcpy((char *)info->type, "U-Boot");
|
|
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
|
|
info->uuid[0] = 0;
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
void part_print_dos(struct blk_desc *dev_desc)
|
|
{
|
|
printf("Part\tStart Sector\tNum Sectors\tUUID\t\tType\n");
|
|
print_partition_extended(dev_desc, 0, 0, 1, 0);
|
|
}
|
|
|
|
int part_get_info_dos(struct blk_desc *dev_desc, int part,
|
|
disk_partition_t *info)
|
|
{
|
|
return part_get_info_extended(dev_desc, 0, 0, 1, part, info, 0);
|
|
}
|
|
|
|
int is_valid_dos_buf(void *buf)
|
|
{
|
|
return test_block_type(buf) == DOS_MBR ? 0 : -1;
|
|
}
|
|
|
|
int write_mbr_partition(struct blk_desc *dev_desc, void *buf)
|
|
{
|
|
if (is_valid_dos_buf(buf))
|
|
return -1;
|
|
|
|
/* write MBR */
|
|
if (blk_dwrite(dev_desc, 0, 1, buf) != 1) {
|
|
printf("%s: failed writing '%s' (1 blks at 0x0)\n",
|
|
__func__, "MBR");
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
U_BOOT_PART_TYPE(dos) = {
|
|
.name = "DOS",
|
|
.part_type = PART_TYPE_DOS,
|
|
.max_entries = DOS_ENTRY_NUMBERS,
|
|
.get_info = part_get_info_ptr(part_get_info_dos),
|
|
.print = part_print_ptr(part_print_dos),
|
|
.test = part_test_dos,
|
|
};
|
|
|
|
#endif
|