From patchwork Thu Jun 15 08:08:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 108348 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp481527vqr; Thu, 15 Jun 2023 01:42:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4z4lbiDGcVOLkb4qCgxSwrfwS98umVpx0eNdBml5u7IqgMJPnKGR0/lllAAZPzFpMbelwr X-Received: by 2002:a17:907:9309:b0:96a:861:a2ac with SMTP id bu9-20020a170907930900b0096a0861a2acmr16793199ejc.0.1686818563786; Thu, 15 Jun 2023 01:42:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686818563; cv=none; d=google.com; s=arc-20160816; b=lG8UCHwySHi2EftgFoHWbSW7pOZAPf+5Rcva1Fgo4fbv0iUP+wWzDtfQRFdFDrHXfu E+ZEDP2MueNhmULfMUL+JpzE8YG53zhJ9QPR5ozefxCKNm6oL2hY6QRMvwTCMZAE/E16 aOdCHbfHGV8kruvojTZ9vzxGv4m8ViyF4osePOXG3Z7YhiKgIV3CmxPRVFSUMMUHC226 O0fqAkrtAeT6/lcey8oqLVrToScReZoCr8fRnVdFK6AdeZXj0Ezor8iboafy3JSkBSh9 29GMJ2Q+tYvA9N2PlBgCLHKMJE2k4TjHvF284+2esOS24W3xBi8e08/fy5A7c+jPmfMj MLeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=GBnQWGCpveCmHdPQY/TjNI8gfHlI0L3tYi9rnXILou8=; b=rxyE81x6L8GtvrK2UNkJyOk4K7+V14oWXgpRcqOxo+gjG9+TKJR4O6YWPwHktxMv0V jRhvYWofamlRUApaqnbO7ASc14WThYBzYHtNXIbUw7tz0EhxF8ddOROLb75EdjV4a8v/ ns1avXjZJDBJKPRuRky7hGSOl4D15k+h71cy9rr0LuecQc3slNd2nk4yH9AHZ69+EICc v97z78zzlEGj0nTwcX4fbLpxKkEYigXYYdpZz+brzNkCK629wShImNLojG6eHqYomsF/ kVm9DYvPrOioWYC7XuN4Wt8BqqNZ3Ch8P033bVZ4lngv3tBzlnfInDrTLdluGtUUczLl p24A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=lBczXaDz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g21-20020a170906395500b0097463080c4bsi8931764eje.525.2023.06.15.01.42.16; Thu, 15 Jun 2023 01:42:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=lBczXaDz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239287AbjFOIN7 (ORCPT + 99 others); Thu, 15 Jun 2023 04:13:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243790AbjFOINW (ORCPT ); Thu, 15 Jun 2023 04:13:22 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F8DA2715; Thu, 15 Jun 2023 01:13:17 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 68ED95FD03; Thu, 15 Jun 2023 11:13:14 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1686816794; bh=GBnQWGCpveCmHdPQY/TjNI8gfHlI0L3tYi9rnXILou8=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=lBczXaDzv17chSATJKsingHks6742x8wGEMdGFVLG1XPOqD2wzQM+UE0FihDzmGeO 2GXW74Fu4+8iiSzBljsiSMBrJUERZpllOOEErBkjx9fCw3DHAUqi+9ELe6399I2M2H 1KfX/kb7gOIL6CkHyJo3U2gTa8XZfNjSBPGR0C+owxZu5vZpdhfJHiRGTFS/Yax/jh 7XEidqMgNwSepry8OFLOrOjmDeCzJTtm5GzUpYpWg1RsIP3Le0RNyVc4LHceIQKtgb WAefYtGyjZsgmrRsK3VXyh0iCxa/tQ1s6NVOAbl89GLBRWd+WedkzLoWtmpXAPE7oS YOt2dSZRKV4EA== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) by mx.sberdevices.ru (Postfix) with ESMTP; Thu, 15 Jun 2023 11:13:12 +0300 (MSK) From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Yixun Lan , Jianxin Pan CC: , , Arseniy Krasnov , , , , , Subject: [PATCH v1] mtd: rawnand: meson: fix unaligned DMA buffers handling Date: Thu, 15 Jun 2023 11:08:15 +0300 Message-ID: <20230615080815.3291006-1-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 MIME-Version: 1.0 X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH02.sberdevices.ru (172.16.1.5) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/06/15 01:19:00 #21506022 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768757462545373934?= X-GMAIL-MSGID: =?utf-8?q?1768757462545373934?= Meson NAND controller requires 8 bytes alignment for DMA addresses, otherwise it "aligns" passed address by itself thus accessing invalid location in the provided buffer. This patch makes unaligned buffers to be reallocated to become valid. Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") Cc: Signed-off-by: Arseniy Krasnov --- drivers/mtd/nand/raw/meson_nand.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index c5628f7ac3b1..aa2b64dde74b 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -77,6 +77,7 @@ #define GENCMDIADDRH(aih, addr) ((aih) | (((addr) >> 16) & 0xffff)) #define DMA_DIR(dir) ((dir) ? NFC_CMD_N2M : NFC_CMD_M2N) +#define DMA_ADDR_ALIGN 8 #define ECC_CHECK_RETURN_FF (-1) @@ -1001,6 +1002,9 @@ static int meson_nfc_read_page_hwecc(struct nand_chip *nand, u8 *buf, static bool meson_nfc_is_buffer_dma_safe(const void *buffer) { + if ((uintptr_t)buffer % DMA_ADDR_ALIGN) + return false; + if (virt_addr_valid(buffer) && (!object_is_on_stack(buffer))) return true; return false;