From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1P3qSf-000676-2k for barebox@lists.infradead.org; Thu, 07 Oct 2010 13:24:42 +0000 From: Juergen Beisert Date: Thu, 7 Oct 2010 15:24:15 +0200 Message-Id: <1286457858-29771-5-git-send-email-jbe@pengutronix.de> In-Reply-To: <1286457858-29771-1-git-send-email-jbe@pengutronix.de> References: <1286457858-29771-1-git-send-email-jbe@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 4/7] Don't try to guess the size of a disk if its size value is already given To: barebox@lists.infradead.org Guessing the size of an attached harddisk (access via x86 BIOS) was needed due to the fact, barebox can't query this information from the BIOS easily. But with the SD/MMC cards, there will be a second user of the generic disk handling routines. And with this media it is very easy to know its size. This patch provides a workaround to keep the guessing feature if the size of the registered disk is 0. If it is not 0, the given value will be used instead. Note: This is in preparation to add MCI card support, which can be handled like a disk drive. Signed-off-by: Juergen Beisert --- arch/x86/boards/x86_generic/generic_pc.c | 2 +- drivers/ata/disk_drive.c | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/arch/x86/boards/x86_generic/generic_pc.c b/arch/x86/boards/x86_generic/generic_pc.c index a6cd7e0..b9c31aa 100644 --- a/arch/x86/boards/x86_generic/generic_pc.c +++ b/arch/x86/boards/x86_generic/generic_pc.c @@ -46,7 +46,7 @@ static struct device_d sdram_dev = { static struct device_d bios_disk_dev = { .id = -1, .name = "biosdrive", - .size = 1, + .size = 0, /* auto guess */ }; /* diff --git a/drivers/ata/disk_drive.c b/drivers/ata/disk_drive.c index e9d855b..9db408c 100644 --- a/drivers/ata/disk_drive.c +++ b/drivers/ata/disk_drive.c @@ -23,6 +23,7 @@ * @brief Generic disk drive support * * @todo Support for disks larger than 4 GiB + * @todo Reliable size detection for BIOS based disks (on x86 only) */ #include @@ -298,11 +299,16 @@ static int disk_probe(struct device_d *dev) else #endif disk_cdev->name = asprintf("disk%d", dev->id); - /** - * @todo we need the size of the drive, else its nearly impossible - * to do anything with it (at least with the generic routines) - */ - disk_cdev->size = 32; /* FIXME */ + + /* On x86, BIOS based disks are coming without a valid .size field */ + if (dev->size == 0) { + /* + * We need always the size of the drive, else its nearly impossible + * to do anything with it (at least with the generic routines) + */ + disk_cdev->size = 32; + } else + disk_cdev->size = dev->size; disk_cdev->ops = &disk_ops; disk_cdev->dev = dev; devfs_create(disk_cdev); @@ -313,10 +319,12 @@ static int disk_probe(struct device_d *dev) goto on_error; } - /* guess the size of this drive */ - dev->size = disk_guess_size(dev, (struct partition_entry*)§or[446]) * SECTOR_SIZE; - dev_info(dev, "Drive size guessed to %u kiB\n", dev->size / 1024); - disk_cdev->size = dev->size; + if (dev->size == 0) { + /* guess the size of this drive if not otherwise given */ + dev->size = disk_guess_size(dev, (struct partition_entry*)§or[446]) * SECTOR_SIZE; + dev_info(dev, "Drive size guessed to %u kiB\n", dev->size / 1024); + disk_cdev->size = dev->size; + } rc = disk_register_partitions(dev, (struct partition_entry*)§or[446]); -- 1.7.2.3 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox