* [PATCH] mtd: improve calculating partition boundaries when checking for alignment
@ 2018-11-20 8:56 Rafał Miłecki
2018-11-20 9:16 ` Boris Brezillon
2018-11-20 9:24 ` [PATCH V2] " Rafał Miłecki
0 siblings, 2 replies; 4+ messages in thread
From: Rafał Miłecki @ 2018-11-20 8:56 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger
Cc: linux-mtd, Rafał Miłecki
From: Rafał Miłecki <rafal@milecki.pl>
When checking for alignment mtd should check absolute offsets. It's
important for subpartitions as it doesn't make sense to check their
relative addresses.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
drivers/mtd/mtdpart.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 2b6e53af47da..15197d923ec0 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -61,6 +61,15 @@ static inline struct mtd_part *mtd_to_part(const struct mtd_info *mtd)
return container_of(mtd, struct mtd_part, mtd);
}
+static uint64_t part_absolute_offset(struct mtd_info *mtd)
+{
+ struct mtd_part *part = mtd_to_part(mtd);
+
+ if (!mtd_is_partition(mtd))
+ return 0;
+
+ return part_absolute_offset(part->parent) + part->offset;
+}
/*
* MTD methods which simply translate the effective address and pass through
@@ -514,7 +523,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
if (!(slave->mtd.flags & MTD_NO_ERASE))
wr_alignment = slave->mtd.erasesize;
- tmp = slave->offset;
+ tmp = part_absolute_offset(parent) + slave->offset;
remainder = do_div(tmp, wr_alignment);
if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
/* Doesn't start on a boundary of major erase size */
@@ -525,7 +534,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
part->name);
}
- tmp = slave->mtd.size;
+ tmp = part_absolute_offset(parent) + slave->mtd.size;
remainder = do_div(tmp, wr_alignment);
if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
slave->mtd.flags &= ~MTD_WRITEABLE;
--
2.13.7
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] mtd: improve calculating partition boundaries when checking for alignment
2018-11-20 8:56 [PATCH] mtd: improve calculating partition boundaries when checking for alignment Rafał Miłecki
@ 2018-11-20 9:16 ` Boris Brezillon
2018-11-20 9:24 ` [PATCH V2] " Rafał Miłecki
1 sibling, 0 replies; 4+ messages in thread
From: Boris Brezillon @ 2018-11-20 9:16 UTC (permalink / raw)
To: Rafał Miłecki
Cc: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd, Rafał Miłecki
On Tue, 20 Nov 2018 09:56:12 +0100
Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> When checking for alignment mtd should check absolute offsets. It's
> important for subpartitions as it doesn't make sense to check their
> relative addresses.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
> drivers/mtd/mtdpart.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
> index 2b6e53af47da..15197d923ec0 100644
> --- a/drivers/mtd/mtdpart.c
> +++ b/drivers/mtd/mtdpart.c
> @@ -61,6 +61,15 @@ static inline struct mtd_part *mtd_to_part(const struct mtd_info *mtd)
> return container_of(mtd, struct mtd_part, mtd);
> }
>
> +static uint64_t part_absolute_offset(struct mtd_info *mtd)
^ u64
Looks good otherwise.
> +{
> + struct mtd_part *part = mtd_to_part(mtd);
> +
> + if (!mtd_is_partition(mtd))
> + return 0;
> +
> + return part_absolute_offset(part->parent) + part->offset;
> +}
>
> /*
> * MTD methods which simply translate the effective address and pass through
> @@ -514,7 +523,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
> if (!(slave->mtd.flags & MTD_NO_ERASE))
> wr_alignment = slave->mtd.erasesize;
>
> - tmp = slave->offset;
> + tmp = part_absolute_offset(parent) + slave->offset;
> remainder = do_div(tmp, wr_alignment);
> if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
> /* Doesn't start on a boundary of major erase size */
> @@ -525,7 +534,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
> part->name);
> }
>
> - tmp = slave->mtd.size;
> + tmp = part_absolute_offset(parent) + slave->mtd.size;
> remainder = do_div(tmp, wr_alignment);
> if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
> slave->mtd.flags &= ~MTD_WRITEABLE;
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH V2] mtd: improve calculating partition boundaries when checking for alignment
2018-11-20 8:56 [PATCH] mtd: improve calculating partition boundaries when checking for alignment Rafał Miłecki
2018-11-20 9:16 ` Boris Brezillon
@ 2018-11-20 9:24 ` Rafał Miłecki
2018-12-03 7:53 ` Boris Brezillon
1 sibling, 1 reply; 4+ messages in thread
From: Rafał Miłecki @ 2018-11-20 9:24 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger
Cc: linux-mtd, Rafał Miłecki
From: Rafał Miłecki <rafal@milecki.pl>
When checking for alignment mtd should check absolute offsets. It's
important for subpartitions as it doesn't make sense to check their
relative addresses.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
V2: Switch from uint64_t to u64. I got incorrectly inspired by
uint64_t offset;
---
drivers/mtd/mtdpart.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 2b6e53af47da..b6af41b04622 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -61,6 +61,15 @@ static inline struct mtd_part *mtd_to_part(const struct mtd_info *mtd)
return container_of(mtd, struct mtd_part, mtd);
}
+static u64 part_absolute_offset(struct mtd_info *mtd)
+{
+ struct mtd_part *part = mtd_to_part(mtd);
+
+ if (!mtd_is_partition(mtd))
+ return 0;
+
+ return part_absolute_offset(part->parent) + part->offset;
+}
/*
* MTD methods which simply translate the effective address and pass through
@@ -514,7 +523,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
if (!(slave->mtd.flags & MTD_NO_ERASE))
wr_alignment = slave->mtd.erasesize;
- tmp = slave->offset;
+ tmp = part_absolute_offset(parent) + slave->offset;
remainder = do_div(tmp, wr_alignment);
if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
/* Doesn't start on a boundary of major erase size */
@@ -525,7 +534,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
part->name);
}
- tmp = slave->mtd.size;
+ tmp = part_absolute_offset(parent) + slave->mtd.size;
remainder = do_div(tmp, wr_alignment);
if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
slave->mtd.flags &= ~MTD_WRITEABLE;
--
2.13.7
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH V2] mtd: improve calculating partition boundaries when checking for alignment
2018-11-20 9:24 ` [PATCH V2] " Rafał Miłecki
@ 2018-12-03 7:53 ` Boris Brezillon
0 siblings, 0 replies; 4+ messages in thread
From: Boris Brezillon @ 2018-12-03 7:53 UTC (permalink / raw)
To: Rafał Miłecki
Cc: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, linux-mtd, Rafał Miłecki
On Tue, 20 Nov 2018 10:24:09 +0100
Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> When checking for alignment mtd should check absolute offsets. It's
> important for subpartitions as it doesn't make sense to check their
> relative addresses.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Queued to mtd/next.
> ---
> V2: Switch from uint64_t to u64. I got incorrectly inspired by
> uint64_t offset;
> ---
> drivers/mtd/mtdpart.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
> index 2b6e53af47da..b6af41b04622 100644
> --- a/drivers/mtd/mtdpart.c
> +++ b/drivers/mtd/mtdpart.c
> @@ -61,6 +61,15 @@ static inline struct mtd_part *mtd_to_part(const struct mtd_info *mtd)
> return container_of(mtd, struct mtd_part, mtd);
> }
>
> +static u64 part_absolute_offset(struct mtd_info *mtd)
> +{
> + struct mtd_part *part = mtd_to_part(mtd);
> +
> + if (!mtd_is_partition(mtd))
> + return 0;
> +
> + return part_absolute_offset(part->parent) + part->offset;
> +}
>
> /*
> * MTD methods which simply translate the effective address and pass through
> @@ -514,7 +523,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
> if (!(slave->mtd.flags & MTD_NO_ERASE))
> wr_alignment = slave->mtd.erasesize;
>
> - tmp = slave->offset;
> + tmp = part_absolute_offset(parent) + slave->offset;
> remainder = do_div(tmp, wr_alignment);
> if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
> /* Doesn't start on a boundary of major erase size */
> @@ -525,7 +534,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent,
> part->name);
> }
>
> - tmp = slave->mtd.size;
> + tmp = part_absolute_offset(parent) + slave->mtd.size;
> remainder = do_div(tmp, wr_alignment);
> if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
> slave->mtd.flags &= ~MTD_WRITEABLE;
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-03 7:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-20 8:56 [PATCH] mtd: improve calculating partition boundaries when checking for alignment Rafał Miłecki
2018-11-20 9:16 ` Boris Brezillon
2018-11-20 9:24 ` [PATCH V2] " Rafał Miłecki
2018-12-03 7:53 ` Boris Brezillon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox