From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942792AbcJ0TPI (ORCPT ); Thu, 27 Oct 2016 15:15:08 -0400 Received: from skprod2.natinst.com ([130.164.80.23]:54970 "EHLO ni.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S941644AbcJ0TO7 (ORCPT ); Thu, 27 Oct 2016 15:14:59 -0400 From: Zach Brown To: CC: , , , , , Subject: [RESEND PATCH v2 3/3] mtd: ubi: use 'max_bad_blocks' to compute bad_peb_limit if available Date: Thu, 27 Oct 2016 14:14:02 -0500 Message-ID: <1477595642-11454-4-git-send-email-zach.brown@ni.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477595642-11454-1-git-send-email-zach.brown@ni.com> References: <1477595642-11454-1-git-send-email-zach.brown@ni.com> X-MIMETrack: Itemize by SMTP Server on US-AUS-MGWOut2/AUS/H/NIC(Release 8.5.3FP6 HF1218|December 12, 2014) at 10/27/2016 02:13:57 PM, Serialize by Router on US-AUS-MGWOut2/AUS/H/NIC(Release 8.5.3FP6 HF1218|December 12, 2014) at 10/27/2016 02:13:57 PM, Serialize complete at 10/27/2016 02:13:57 PM MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-10-27_12:,, signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610270314 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeff Westfahl Use the MTD function 'max_bad_blocks' to compute the UBI bad_peb_limit, if the function is implemented for an MTD and doesn't return an error. Signed-off-by: Jeff Westfahl Signed-off-by: Zach Brown --- drivers/mtd/ubi/build.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 85d54f3..0648863 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -584,6 +584,15 @@ static int get_bad_peb_limit(const struct ubi_device *ubi, int max_beb_per1024) int limit, device_pebs; uint64_t device_size; + /* If the MTD provides a max_bad_blocks function, use that value. Fall + * back to max_beb_per1024 if that function returns an error. + */ + if (ubi->mtd->_max_bad_blocks) { + limit = ubi->mtd->_max_bad_blocks(ubi->mtd, 0, ubi->mtd->size); + if (limit > 0) + return limit; + } + if (!max_beb_per1024) return 0; -- 2.7.4