Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 15:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mtd: pxa3xx_nand: enhance suspend and resume routine

Browse Source 
This patch add protection on the suspend&resume path to prevent
some unexpected behavior, like interrupt occur at the very second
of resume back and it don't follow normal command path, which lead
to bug.

Signed-off-by: Lei Wen <leiwen@marvell.com>
This commit is contained in:
Lei Wen 2011-07-14 20:44:30 -07:00 committed by Artem Bityutskiy
parent 52a474de0a
commit 051fc41c2e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mtd/nand/pxa3xx_nand.c
View File

@ -1158,23 +1158,36 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state) static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct pxa3xx_nand_info *info = platform_get_drvdata(pdev); struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
struct mtd_info *mtd = info->mtd;
if (info->state) { if (info->state) {
dev_err(&pdev->dev, "driver busy, state = %d\n", info->state); dev_err(&pdev->dev, "driver busy, state = %d\n", info->state);
return -EAGAIN; return -EAGAIN;
} }
mtd->suspend(mtd);
return 0; return 0;
} }
static int pxa3xx_nand_resume(struct platform_device *pdev) static int pxa3xx_nand_resume(struct platform_device *pdev)
{ {
struct pxa3xx_nand_info *info = platform_get_drvdata(pdev); struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
struct mtd_info *mtd = info->mtd;
/* We don't want to handle interrupt without calling mtd routine */
disable_int(info, NDCR_INT_MASK);
nand_writel(info, NDTR0CS0, info->ndtr0cs0); nand_writel(info, NDTR0CS0, info->ndtr0cs0);
nand_writel(info, NDTR1CS0, info->ndtr1cs0); nand_writel(info, NDTR1CS0, info->ndtr1cs0);
clk_enable(info->clk);
/*
* As the spec says, the NDSR would be updated to 0x1800 when
* doing the nand_clk disable/enable.
* To prevent it damaging state machine of the driver, clear
* all status before resume
*/
nand_writel(info, NDSR, NDSR_MASK);
mtd->resume(mtd);
return 0; return 0;
} }
#else #else