From patchwork Fri Nov 9 16:56:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Ambarus X-Patchwork-Id: 995662 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iWLzaSQ4"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="ofuOSGtV"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=microchiptechnology.onmicrosoft.com header.i=@microchiptechnology.onmicrosoft.com header.b="F0Y+1u07"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42s5v62wghz9sBk for ; Sat, 10 Nov 2018 03:58:10 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iC35/A1FVAQJJfeDEJ9MqXPFD1I/HuQue574DXnxJwQ=; b=iWLzaSQ4frA76D UZBClYIahyZMZ7SPirbX/MouKtoL/uyTHash9QjcOv/qg12Jvv7t+Gwi9y2rgnUtvqgFt8TvOZvp0 nxnIh0bFn5KAwiSj68b1sNH6AAcPjcsaYxuqxKS2sX4qvIQCDIQLJQi8WA1kG9j4+wC7/28pGrvdi 5RWwrqdKezNUeEqr5QB+9Mux7yoyeIT+0IFy/PMvMWAvUEECXYz9bXsh+R4B+5QuMLzYvP3eTIS5a OBRkWpAjxgyVEfoImQkcsjZ8BA/2bznNyLNVBGeYmlaFjJ7MWP8j+Whv7FWJpxnum4cvn720OSndt VerC4r5T3RMdOOVNEfpQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLA6f-0005ox-IH; Fri, 09 Nov 2018 16:58:05 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLA5o-00057v-2S for linux-mtd@bombadil.infradead.org; Fri, 09 Nov 2018 16:57:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=MIME-Version:Content-Transfer-Encoding: Content-Type:In-Reply-To:References:Message-ID:Date:Subject:CC:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=7NXmHcYVKDO5wCbw46GgBXtyHrLrEe8DqX7Dq2bRGHI=; b=ofuOSGtVJsP+cOGkhIq8etpeGx bWMvSOufMoRwTReL8qinb3/iG0ii6amyGCwB6YQCU2/43LoHOiDFjyy2G1KFKyS5Nl60+5px0FUSD 5Y4Cg1t2wXXwAJ5345Ksdb1cOY+zg0MiJXa5LRhr+ms11pB6f7a+CNrr4T77CfbCB7l04P/5yeMdy l4H9SGzYd8BFFNbJeDcj51pBu2tIo4No1kNjc23Ri8ZmauqyA6vn/aF37scvNTnuXdbeq6TkerSxO unY+WeySpOKBXQ2vV3F90riFtAZz99VmqK2nWawXjuPAQSYBLmYcjCDutYrZhyXbcKv5tGnnV/rtO GYD59tCQ==; Received: from esa1.microchip.iphmx.com ([68.232.147.91]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLA5l-00064E-KX for linux-mtd@lists.infradead.org; Fri, 09 Nov 2018 16:57:10 +0000 X-IronPort-AV: E=Sophos;i="5.54,483,1534834800"; d="scan'208";a="23878245" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 09 Nov 2018 09:56:57 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (10.10.215.89) by email.microchip.com (10.10.76.108) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 9 Nov 2018 09:56:57 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microchiptechnology.onmicrosoft.com; s=selector1-microchiptechnology-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7NXmHcYVKDO5wCbw46GgBXtyHrLrEe8DqX7Dq2bRGHI=; b=F0Y+1u07wJm1ljDVYRqnpZxTRFUBz9obv3Fyw8AZkTqyscmbl0pJF+qhxMPjegYfb+E6X17mmcjS0GN21VYQ/4S6g533T48f8ASZ00VYxrBSYglu72+eC4SUikRE7Ongy7x1GAUSm/yuXr0M3p9ij/My8nrbBTsnCHFo6s4at9Y= Received: from BN6PR11MB1842.namprd11.prod.outlook.com (10.175.99.146) by BN6PR11MB1905.namprd11.prod.outlook.com (10.175.100.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Fri, 9 Nov 2018 16:56:54 +0000 Received: from BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::11b7:21db:803a:7cfa]) by BN6PR11MB1842.namprd11.prod.outlook.com ([fe80::11b7:21db:803a:7cfa%5]) with mapi id 15.20.1294.034; Fri, 9 Nov 2018 16:56:54 +0000 From: To: , , , , Subject: [PATCH v2 4/5] mtd: spi_nor: pass DMA-able buffer to spi_nor_read_raw() Thread-Topic: [PATCH v2 4/5] mtd: spi_nor: pass DMA-able buffer to spi_nor_read_raw() Thread-Index: AQHUeE03GtkA6RMtvU+Otx7Vo91x2Q== Date: Fri, 9 Nov 2018 16:56:54 +0000 Message-ID: <20181109165644.30534-5-tudor.ambarus@microchip.com> References: <20181109165644.30534-1-tudor.ambarus@microchip.com> In-Reply-To: <20181109165644.30534-1-tudor.ambarus@microchip.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR07CA0231.eurprd07.prod.outlook.com (2603:10a6:802:58::34) To BN6PR11MB1842.namprd11.prod.outlook.com (2603:10b6:404:103::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Tudor.Ambarus@microchip.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [94.177.32.154] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BN6PR11MB1905; 6:uC24TRdsEbrBoJXOB7zoyMG1AhFltI0Z/aPM4JSUdxqf7vdSanY/Jue0SEEeszQnpugy48sjnWOutGp7EnFG30Esn1UGUylCgvzSzbgmS9088TdEsikKRfF0MDQH1BO+Y050vbM6kf5OeFBQ+xW8UZWCQ3DKKuZ2Z2GqKJPnD4txqRc4NlRMSphqBTZzPeT5qWoWqCvCnm8/z1cbDNftFLlpQjuQG2llwg7rMRuOmrV4Udl3afJhxbv0pulYodZVCRByu89w7fjdJKmty3pp7DciSLrre0vgz+5PIriPad6XlULEPZqOd5TxDaYNuUXaGo46Scp+BxRig0vvyy7f4n7+84O9CJvwuasqsj09/+VLNaTkkYZdPg4kORtexUcDBoNnGLC08JWVDb2//cWuKSYxKeMWcQX/rPjj7uyZlKBJwgjI81DzBbybcTgkPUM1VJ15NPlxRXMspSI7wwUAvQ==; 5:SyS18VTMr4U1xFvK+9+AOJ9O6rVbbFNCzKBvCkZhMHB+b9D279kDwXZHyJbbatoUKNv+5aVThFHX7+b+PfomvZyJEY2WDsCnsQ8QFXKhB84sIsbGtTci/7ZVWgARF5uxQUuhTw3KqutHEZKOVZ0Yo3YWYYuOyIxPZ9dXkmNajMI=; 7:0FtDMA06mVkaHy98Db+aIhmzHOHrUXtnp/SQ9g5CIjVVv8JwgnYWEwJiM6REowl4aHxPw+53k5SNocPqK4sOehHt8pESlX+s/2orQwBvB5vq4Q8lTxl3V71Qe73+XfUYNi6M/LJ35xXDGYAoUoNfaA== x-ms-office365-filtering-correlation-id: db8a8a42-501c-48a7-5e71-08d646645a33 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BN6PR11MB1905; x-ms-traffictypediagnostic: BN6PR11MB1905: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231382)(944501410)(52105095)(93006095)(93001095)(148016)(149066)(150057)(6041310)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:BN6PR11MB1905; BCL:0; PCL:0; RULEID:; SRVR:BN6PR11MB1905; x-forefront-prvs: 08512C5403 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39860400002)(346002)(136003)(189003)(199004)(6486002)(8936002)(68736007)(3846002)(81156014)(486006)(8676002)(316002)(71190400001)(2616005)(110136005)(6116002)(11346002)(256004)(86362001)(66066001)(2201001)(39060400002)(186003)(446003)(102836004)(54906003)(71200400001)(7736002)(305945005)(14454004)(81166006)(6436002)(5660300001)(2501003)(97736004)(26005)(2906002)(1076002)(476003)(72206003)(76176011)(4326008)(99286004)(6512007)(52116002)(478600001)(386003)(2900100001)(105586002)(25786009)(106356001)(107886003)(6506007)(53936002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR11MB1905; H:BN6PR11MB1842.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microchip.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: xKqVy2bR7Ont9kY7KB9ejcM5a5ySpHqVrFTTG8G5/yThkp9UuxxsWun9a0Jecf04Df6VC162X0h0hm740VJaIKIP9cCe9pj95u0tsLDcVhKBRpkvJsdUpkPIkhmUQQ/QQ0TXIoiIK/fyc7itbVxmbUL1LdSIDqWD9mAj9eKqGcuU9/9vp/y0pI1jBOqGJguKjFn/vYs1rD4NRpREy0Rytdb2fAc5dzOqZAem6n7yF5pXzgjKMHG3NUk0DTue7x2RFR52C741AGKLkincn+OU2FCHIcYVzV73XS2CfnvwM6y/2pBa4HOVkb7glEwsKG3HwE1W90WytXEdNYdsxbOSqXl1olDDm01Bfr6J5J+lHr8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: db8a8a42-501c-48a7-5e71-08d646645a33 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Nov 2018 16:56:54.6256 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1905 X-OriginatorOrg: microchip.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181109_115709_821338_B1C182D1 X-CRM114-Status: GOOD ( 14.72 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.4.2 on merlin.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [68.232.147.91 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yogeshnarayan.gaur@nxp.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, Tudor.Ambarus@microchip.com, cyrille.pitchen@wedev4u.fr Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org spi_nor_read_raw() calls nor->read() which might be implemented by the m25p80 driver. m25p80 uses the spi-mem layer which requires DMA-able in/out buffers. Pass kmalloc'ed dma buffer to spi_nor_read_raw(). Fixes: b038e8e3be72 ("mtd: spi-nor: parse SFDP Sector Map Parameter Table") Signed-off-by: Tudor Ambarus --- v2: drop GFP_DMA, rename buf, add comment drivers/mtd/spi-nor/spi-nor.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 04a1c5b825e6..458ca8321999 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -2161,7 +2161,7 @@ spi_nor_set_pp_settings(struct spi_nor_pp_command *pp, * @nor: pointer to a 'struct spi_nor' * @addr: offset in the serial flash memory * @len: number of bytes to read - * @buf: buffer where the data is copied into + * @buf: buffer where the data is copied into (dma-safe memory) * * Return: 0 on success, -errno otherwise. */ @@ -2868,11 +2868,17 @@ static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt, u8 smpt_len) { const u32 *ret; + u8 *buf; u32 addr; int err; u8 i; u8 addr_width, read_opcode, read_dummy; - u8 read_data_mask, data_byte, map_id; + u8 read_data_mask, map_id; + + /* Use a kmalloc'ed bounce buffer to guarantee it is DMA-able. */ + buf = kmalloc(sizeof(*buf), GFP_KERNEL); + if (!buf) + return ERR_PTR(-ENOMEM); addr_width = nor->addr_width; read_dummy = nor->read_dummy; @@ -2890,7 +2896,7 @@ static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt, nor->read_opcode = SMPT_CMD_OPCODE(smpt[i]); addr = smpt[i + 1]; - err = spi_nor_read_raw(nor, addr, 1, &data_byte); + err = spi_nor_read_raw(nor, addr, 1, buf); if (err) { ret = ERR_PTR(err); goto out; @@ -2900,7 +2906,7 @@ static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt, * Build an index value that is used to select the Sector Map * Configuration that is currently in use. */ - map_id = map_id << 1 | !!(data_byte & read_data_mask); + map_id = map_id << 1 | !!(*buf & read_data_mask); } /* @@ -2931,6 +2937,7 @@ static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt, /* fall through */ out: + kfree(buf); nor->addr_width = addr_width; nor->read_dummy = read_dummy; nor->read_opcode = read_opcode;