From 7ddba08d873a0ce6d2d32b8f6a1bea550107ca44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
Date: Tue, 10 Jul 2018 14:02:00 +0200
Subject: kernel: bcm47xxpart: fix getting user-space data partition name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Partition name is picked by a parser_trx_data_part_name(). It has to
get correct partition offset (taking care of bad blocks) to work
properly.

This fixes UBI support for devices that have kernel flashed on partition
with a bad block.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 .../431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch     | 3 ++-
 .../431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'target/linux')

diff --git a/target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch b/target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
index 9299e88671..d54c284c34 100644
--- a/target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
+++ b/target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
@@ -59,9 +59,10 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  
  	if (trx.offset[i]) {
  		part = &parts[curr_part++];
- 		part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
+-		part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
 -		part->offset = trx.offset[i];
 +		part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
++		part->name = parser_trx_data_part_name(mtd, part->offset);
  		i++;
  	}
  
diff --git a/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch b/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
index 9299e88671..d54c284c34 100644
--- a/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
+++ b/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
@@ -59,9 +59,10 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  
  	if (trx.offset[i]) {
  		part = &parts[curr_part++];
- 		part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
+-		part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
 -		part->offset = trx.offset[i];
 +		part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
++		part->name = parser_trx_data_part_name(mtd, part->offset);
  		i++;
  	}
  
-- 
cgit v1.2.3