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 1Q9ZY5-0006Bp-PD for barebox@lists.infradead.org; Tue, 12 Apr 2011 09:06:15 +0000 From: Juergen Beisert Date: Tue, 12 Apr 2011 11:05:22 +0200 References: <1302596272-21635-1-git-send-email-s.hauer@pengutronix.de> <1302596272-21635-4-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1302596272-21635-4-git-send-email-s.hauer@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201104121105.22864.jbe@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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: Re: [PATCH 3/3] ata: guessing disk sizes is only needed on X86 To: barebox@lists.infradead.org Sascha Hauer wrote: > Signed-off-by: Sascha Hauer > --- > drivers/ata/disk_drive.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/ata/disk_drive.c b/drivers/ata/disk_drive.c > index f526b1e..d17fbcb 100644 > --- a/drivers/ata/disk_drive.c > +++ b/drivers/ata/disk_drive.c > @@ -60,6 +60,7 @@ struct partition_entry { > * @param table partition table > * @return size in sectors > */ > +#ifdef CONFIG_X86 > static unsigned long disk_guess_size(struct device_d *dev, struct partition_entry *table) { > int part_order[4] = {0, 1, 2, 3}; > @@ -83,6 +84,7 @@ static unsigned long disk_guess_size(struct device_d *dev, struct partition_entr > #endif > return size; > } > +#endif > > /** > * Register partitions found on the drive > @@ -186,6 +188,7 @@ static int disk_probe(struct device_d *dev) > #endif > atablk->blk.cdev.name = asprintf("disk%d", dev->id); > > +#ifdef CONFIG_X86 > /* On x86, BIOS based disks are coming without a valid .size field */ > if (dev->size == 0) { > /* guess the size of this drive if not otherwise given */ > @@ -193,7 +196,7 @@ static int disk_probe(struct device_d *dev) > (struct partition_entry*)§or[446]) * SECTOR_SIZE; > dev_info(dev, "Drive size guessed to %u kiB\n", dev->size / 1024); > } > - > +#endif > atablk->blk.num_blocks = dev->size / SECTOR_SIZE; > atablk->blk.ops = &ataops; > atablk->blk.blockbits = 9; Hmm, as there are other architectures with ATA interfaces out than x86, I think we need a different solution, when to guessing the size and when not to do so. In the current x86 case it depends on the ATA interface type: The BIOS driver cannot read the disk size. But a native ATA driver (or SD card driver) can. So, we should exclude this code on the symbol "CONFIG_ATA_BIOS" instead of CONFIG_X86. jbe -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | Phone: +49-8766-939 228 | Vertretung Sued/Muenchen, Germany | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de/ | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox