From patchwork Wed Apr 20 22:37:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Xu X-Patchwork-Id: 8895321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7DF46BF29F for ; Wed, 20 Apr 2016 22:39:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90FC7202F2 for ; Wed, 20 Apr 2016 22:39:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB77220303 for ; Wed, 20 Apr 2016 22:39:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1at0kp-0007uH-OY; Wed, 20 Apr 2016 22:37:51 +0000 Received: from mail-ve1eur01on0058.outbound.protection.outlook.com ([104.47.1.58] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1at0kk-0007nz-AW; Wed, 20 Apr 2016 22:37:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-nxp-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tb8K9TREMu+h6CYAGoDA5VrbQ/csWDVpyePsnI26dSY=; b=P+eB6kIe1vqtal3IUNbdhklRh/rmSC1pi4HhA755bOkSmQLaFBQRFDXbgnSgm5B2pENAftjuvpgF0rRI/ps7ZfCWGzx1YTG3pontkFlnaEtljEhFjrkuiP2Dn157De7095qsoFRB0IPisXGHX4Tpuc4vjJ2a+IAwhe+GDQH6gLU= Received: from DB5PR0401MB1845.eurprd04.prod.outlook.com (10.165.6.15) by DB5PR0401MB1847.eurprd04.prod.outlook.com (10.165.6.17) with Microsoft SMTP Server (TLS) id 15.1.466.19; Wed, 20 Apr 2016 22:37:22 +0000 Received: from DB5PR0401MB1845.eurprd04.prod.outlook.com ([10.165.6.15]) by DB5PR0401MB1845.eurprd04.prod.outlook.com ([10.165.6.15]) with mapi id 15.01.0466.023; Wed, 20 Apr 2016 22:37:21 +0000 From: Han Xu To: Yunhui Cui , "dwmw2@infradead.org" , "computersforpeace@gmail.com" , "han.xu@freescale.com" Subject: Re: [PATCH 8/9] mtd: fsl-quadspi: disable AHB buffer prefetch Thread-Topic: [PATCH 8/9] mtd: fsl-quadspi: disable AHB buffer prefetch Thread-Index: AQHRlgI1BG2ejqJW40eJhGVmYE06xJ+Tfj9x Date: Wed, 20 Apr 2016 22:37:21 +0000 Message-ID: References: <1460605855-6689-1-git-send-email-B56489@freescale.com>, <1460605855-6689-9-git-send-email-B56489@freescale.com> In-Reply-To: <1460605855-6689-9-git-send-email-B56489@freescale.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=nxp.com; x-originating-ip: [192.88.168.49] x-ms-office365-filtering-correlation-id: 3677a9e6-a8e7-45d8-3893-08d3696c5685 x-microsoft-exchange-diagnostics: 1; DB5PR0401MB1847; 5:S0Z9V1hKZWf0ej562/5ct8sZO74hpDRJX/SWpQsAIP7gyrH0Gw0g4c82JgwicV5z1hfcbjfzeo2DkppAM5d9CKOVswVsZmX0hSPGPGTKoGbXq5m1xQ5mJ0b5fBHkcJE/8GdYAPp0ZTWW2WkVS10qTVgzaa1w99wg7zmk9XTx0SIElB1OaLupt8uOWfv9KLAx; 24:QpUV7MC5brjhFVhFyYG4epa58zH9AVT6VjvfpVQnewBdJZUDv3v8+4fmaoPJH5Q9k6gzOO+O9iZwSNyuyF9Y+GTVWTq0f06I92dNG4MvgZE=; 7:/9y9wPyfgpSzm5WD6DOI8AihDmSeN4mI2c27bIY65k37bwk10JZRJKt6a20h4PFElFYY0ywMbNLZEOYUuKJMHFJvpWc/r7xWe2XConofiUFam1gCm1tihnC+sZtWieRSu2GC5RU6z8/cPBrsiAQOZKLSYqPIatUxTuW4EVw/9IHtgJbrnFfn0A44/FGZv+dL//O+5LbbeEyXOVJXjo4/dYrvI3uE4SDuD+KGK3L3ybY= x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB5PR0401MB1847; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(9101521026)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:DB5PR0401MB1847; BCL:0; PCL:0; RULEID:; SRVR:DB5PR0401MB1847; x-forefront-prvs: 0918748D70 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(50944005)(377454003)(5004730100002)(3280700002)(1220700001)(1096002)(3846002)(102836003)(6116002)(2501003)(5003600100002)(586003)(5002640100001)(10400500002)(5001770100001)(106116001)(2906002)(76576001)(81166005)(4326007)(76176999)(54356999)(9686002)(19580405001)(19580395003)(50986999)(86362001)(2201001)(575784001)(33656002)(74316001)(66066001)(77096005)(189998001)(122556002)(3900700001)(5008740100001)(92566002)(3660700001)(2900100001)(2950100001)(87936001)(586874002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR0401MB1847; H:DB5PR0401MB1845.eurprd04.prod.outlook.com; FPR:; SPF:None; MLV:sfv; LANG:en; spamdiagnosticoutput: 1:23 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2016 22:37:21.6608 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR0401MB1847 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160420_153746_739848_F5DB6D44 X-CRM114-Status: GOOD ( 11.15 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yunhui Cui , "linux-mtd@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Yao Yuan Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index fea18b6..d9f3e50 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -752,19 +752,36 @@ static void fsl_qspi_init_abh_read(struct fsl_qspi *q) { void __iomem *base = q->iobase; int seqid; + const struct fsl_qspi_devtype_data *devtype_data = q->devtype_data; /* AHB configuration for access buffer 0/1/2 .*/ qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF0CR); qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF1CR); qspi_writel(q, QUADSPI_BUFXCR_INVALID_MSTRID, base + QUADSPI_BUF2CR); + /* - * Set ADATSZ with the maximum AHB buffer size to improve the - * read performance. + * Errata: A-009282: QuadSPI data prefetch may result in incorrect data + * Workaround: Keep the read data size to 64 bits (8 bytes). + * This disables the prefetch on the AHB buffer and + * prevents this issue from occurring. */ - qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK | - ((q->devtype_data->ahb_buf_size / 8) - << QUADSPI_BUF3CR_ADATSZ_SHIFT), - base + QUADSPI_BUF3CR); + if (devtype_data->devtype == FSL_QUADSPI_LS2080A || + devtype_data->devtype == FSL_QUADSPI_LS1021A) { Use QUIRK, not SoC name. + + qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK | + (1 << QUADSPI_BUF3CR_ADATSZ_SHIFT), + base + QUADSPI_BUF3CR); + + } else { + /* + * Set ADATSZ with the maximum AHB buffer size to improve the + * read performance. + */ + qspi_writel(q, QUADSPI_BUF3CR_ALLMST_MASK | + ((q->devtype_data->ahb_buf_size / 8) + << QUADSPI_BUF3CR_ADATSZ_SHIFT), + base + QUADSPI_BUF3CR); + }