From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752366AbdJaDdd (ORCPT ); Mon, 30 Oct 2017 23:33:33 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:44502 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751207AbdJaDdb (ORCPT ); Mon, 30 Oct 2017 23:33:31 -0400 X-Google-Smtp-Source: ABhQp+QZwcD0HfwReHYz87WblfaJGIV9jFlUv9o8qMd78RZM1vrLtWNsa3joMjnQCXqm+sYAvoEu1Q== From: motobud@gmail.com To: boris.brezillon@free-electrons.com Cc: Brent Taylor , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] mtd: nand: Fix writing mtdoops to nand flash. Date: Mon, 30 Oct 2017 22:32:45 -0500 Message-Id: <20171031033246.8576-1-motobud@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171030042343.24551-1-motobud@gmail.com> References: <20171030042343.24551-1-motobud@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Brent Taylor When mtdoops calls mtd_panic_write, it eventually calls panic_nand_write in nand_base.c. In order to properly wait for the nand chip to be ready in panic_nand_wait, the chip must first be selected. When using the atmel nand flash controller, a panic would occur due to a NULL pointer exception. Signed-off-by: Brent Taylor --- Changes in v2: - drop deselecting the chip - move select_chip and panic_nand_wait after panic_nand_get_device drivers/mtd/nand/nand_base.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 12edaae17d81..2093667e2bcb 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2802,12 +2802,16 @@ static int panic_nand_write(struct mtd_info *mtd, loff_t to, size_t len, struct mtd_oob_ops ops; int ret; - /* Wait for the device to get ready */ - panic_nand_wait(mtd, chip, 400); + int chipnr = (int)(to >> chip->chip_shift); /* Grab the device */ panic_nand_get_device(chip, mtd, FL_WRITING); + chip->select_chip(mtd, chipnr); + + /* Wait for the device to get ready */ + panic_nand_wait(mtd, chip, 400); + memset(&ops, 0, sizeof(ops)); ops.len = len; ops.datbuf = (uint8_t *)buf; -- 2.14.2