| Message ID | 1324126698-9919-3-git-send-email-jonas.gorski@gmail.com |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jonas, 2011/12/17 Jonas Gorski <jonas.gorski@gmail.com>: > - spareaddr = roundup(totallen, master->erasesize) + master->erasesize; > - sparelen = master->size - spareaddr - master->erasesize; > + spareaddr = roundup(totallen, master->erasesize) + cfelen; spareaddr = roundup(totallen, cfelen) + cfelen ?
Hi Guillaume, On 17 December 2011 14:13, Guillaume LECERF <glecerf@gmail.com> wrote: > Hi Jonas, > > 2011/12/17 Jonas Gorski <jonas.gorski@gmail.com>: >> - spareaddr = roundup(totallen, master->erasesize) + master->erasesize; >> - sparelen = master->size - spareaddr - master->erasesize; >> + spareaddr = roundup(totallen, master->erasesize) + cfelen; > > spareaddr = roundup(totallen, cfelen) + cfelen ? The intention is to align the spareaddr to the next eraseblock (cfelen can be bigger than the erasesize). Maybe writing it as spareaddr = roundup(cfelen + totallen, master->erasesize); would be cleaner. Jonas
2011/12/17 Jonas Gorski <jonas.gorski@gmail.com>: > The intention is to align the spareaddr to the next eraseblock (cfelen > can be bigger than the erasesize). Maybe writing it as > > spareaddr = roundup(cfelen + totallen, master->erasesize); > > would be cleaner. Humm, you're right, forget my comment. BTW I don't mind what syntax you chose. Good job ;)
On Sat, 2011-12-17 at 13:58 +0100, Jonas Gorski wrote: > The CFE and NVRAM are always at least 64K big, so make sure their > partitions are never smaller than this in case the flash has smaller > erase sectors. > > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Not that I have any knowledge about BCM platform, but still, I think it is good idea to explain why these partitions have to be at least 64KiB. Could you please do this, just for the sake of having good commit messages? Artem.
On 17 December 2011 22:33, Artem Bityutskiy <dedekind1@gmail.com> wrote: > Not that I have any knowledge about BCM platform, but still, I think > it is good idea to explain why these partitions have to be at least > 64KiB. Could you please do this, just for the sake of having good > commit messages? Sure, no problem. Should I sent the whole series again or is a V2 of this one enough? Jonas
On Sat, 2011-12-17 at 22:57 +0100, Jonas Gorski wrote: > On 17 December 2011 22:33, Artem Bityutskiy <dedekind1@gmail.com> wrote: > > Not that I have any knowledge about BCM platform, but still, I think > > it is good idea to explain why these partitions have to be at least > > 64KiB. Could you please do this, just for the sake of having good > > commit messages? > > Sure, no problem. Should I sent the whole series again or is a V2 of > this one enough? Just one patch is better - less traffic.
diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c index 9933b34..23f6201 100644 --- a/drivers/mtd/bcm63xxpart.c +++ b/drivers/mtd/bcm63xxpart.c @@ -36,6 +36,9 @@ #define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */ +#define BCM63XX_MIN_CFE_SIZE 0x10000 /* always at least 64K */ +#define BCM63XX_MIN_NVRAM_SIZE 0x10000 /* always at least 64K */ + #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0 static int bcm63xx_detect_cfe(struct mtd_info *master) @@ -74,6 +77,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, size_t retlen; unsigned int rootfsaddr, kerneladdr, spareaddr; unsigned int rootfslen, kernellen, sparelen, totallen; + unsigned int cfelen, nvramlen; int namelen = 0; int i; char *boardid; @@ -82,14 +86,18 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, if (bcm63xx_detect_cfe(master)) return -EINVAL; + cfelen = max_t(uint32_t, master->erasesize, BCM63XX_MIN_CFE_SIZE); + nvramlen = max_t(uint32_t, master->erasesize, BCM63XX_MIN_NVRAM_SIZE); + /* Allocate memory for buffer */ buf = vmalloc(sizeof(struct bcm_tag)); if (!buf) return -ENOMEM; /* Get the tag */ - ret = master->read(master, master->erasesize, sizeof(struct bcm_tag), - &retlen, (void *)buf); + ret = master->read(master, cfelen, sizeof(struct bcm_tag), &retlen, + (void *)buf); + if (retlen != sizeof(struct bcm_tag)) { vfree(buf); return -EIO; @@ -106,8 +114,8 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; rootfsaddr = kerneladdr + kernellen; - spareaddr = roundup(totallen, master->erasesize) + master->erasesize; - sparelen = master->size - spareaddr - master->erasesize; + spareaddr = roundup(totallen, master->erasesize) + cfelen; + sparelen = master->size - spareaddr - nvramlen; rootfslen = spareaddr - rootfsaddr; /* Determine number of partitions */ @@ -131,7 +139,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, /* Start building partition list */ parts[curpart].name = "CFE"; parts[curpart].offset = 0; - parts[curpart].size = master->erasesize; + parts[curpart].size = cfelen; curpart++; if (kernellen > 0) { @@ -151,8 +159,8 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, } parts[curpart].name = "nvram"; - parts[curpart].offset = master->size - master->erasesize; - parts[curpart].size = master->erasesize; + parts[curpart].offset = master->size - nvramlen; + parts[curpart].size = nvramlen; /* Global partition "linux" to make easy firmware upgrade */ curpart++;
The CFE and NVRAM are always at least 64K big, so make sure their partitions are never smaller than this in case the flash has smaller erase sectors. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- drivers/mtd/bcm63xxpart.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-)