From patchwork Mon May 4 09:30:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 11528269 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E819E139F for ; Tue, 5 May 2020 06:58:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C07D120663 for ; Tue, 5 May 2020 06:58:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bJU8W1fM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C07D120663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 238026E507; Tue, 5 May 2020 06:58:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id A3FDC89D2F for ; Mon, 4 May 2020 09:30:41 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id d15so20080791wrx.3 for ; Mon, 04 May 2020 02:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ILoe7y0shto7bU0P2H+2klHY8P228w9POxLvuitoG7I=; b=bJU8W1fM3zw2r4Ba5Dl1PuJBnxl0FmJIjrjpwbeYBXO4OlYdW7lQCPRbjaFrAZYsTT 91aVNepFk6EylE+Ux5jwIBE+2zDHUDWgjwZhJwOTo0/F7O1H3+NTgCO+rPRZvQ8fmqoe FVgqDvpt3wT59lVSABdupwMmw4+nmai4HG6lzXT4BxEETAFXbCp/sSTwowDU/UaJvdd9 UJL+6Wnt0HFxDCDw2PTSavg9pYv5fB/EC8bY8BcjZyNke0e6lDRXAf5vj20V8offQ84l EmMpo1B4aDnynA71nShdaLEnEtxCGBnLX6IRhCbmU0dn8pW7nxcC8acevT5mtmhoZa5J JVOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ILoe7y0shto7bU0P2H+2klHY8P228w9POxLvuitoG7I=; b=A3I67b/1Fgg6VdYQjEwl+13hHwDECvCRcU8LWYpesKRjR1SUXDa9gBnHTdcsPRO9IQ ThEeb2PA0ib7OX8guFsQ9jCnpRrfyl63QhAm99riGRgCNDx6KzvB7Xo3B+a2yS97hpap yK1/pzRo60t/AxTqcb+akOddiP/jmuDD9/McRLCGr9WvTIpYjCWR7ThZiBHe4hjneqBk Pwq3ALwr5ah23OwNa1aTfz2TSDWD9mhb0BjM6ZY9aaFa6FYxpDellLebHNFnyNKCDQtH KvDcfOx8BgZMYUsaJ0SmIT174ErcwCJkaVdPUOo0ICyLhIL9iF/d9wo6npzYpSUogcOB /sAg== X-Gm-Message-State: AGi0PuYzhhXzy0K+EbsoaBTb/fW92BmftXdciD32IiBxsILpYcovm+86 PBAsjksKtxUOrNmaDTWXAjc= X-Google-Smtp-Source: APiQypLvAvPIqV4mmOd08kzXGbxUOuVUQXP/BU97hOB+1KAm8BHZmwLzY/vOTCYPLk1/KgNU/leseA== X-Received: by 2002:a5d:6a04:: with SMTP id m4mr19509274wru.326.1588584640260; Mon, 04 May 2020 02:30:40 -0700 (PDT) Received: from skynet.lan (246.red-83-44-9.dynamicip.rima-tde.net. [83.44.9.246]) by smtp.gmail.com with ESMTPSA id u12sm13075570wmu.25.2020.05.04.02.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 02:30:39 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: computersforpeace@gmail.com, kdasu.kdev@gmail.com, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sumit.semwal@linaro.org, linux-mtd@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 1/2] nand: brcmnand: improve hamming oob layout Date: Mon, 4 May 2020 11:30:33 +0200 Message-Id: <20200504093034.2739968-1-noltari@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 05 May 2020 06:58:49 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The current code generates 8 oob sections: S1 1-5 ECC 6-8 S2 9-15 S3 16-21 ECC 22-24 S4 25-31 S5 32-37 ECC 38-40 S6 41-47 S7 48-53 ECC 54-56 S8 57-63 Change it by merging continuous sections: S1 1-5 ECC 6-8 S2 9-21 ECC 22-24 S3 25-37 ECC 38-40 S4 41-53 ECC 54-56 S5 57-63 Signed-off-by: Álvaro Fernández Rojas --- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 28 +++++++++--------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index e4e3ceeac38f..1bba309c7684 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -1100,29 +1100,21 @@ static int brcmnand_hamming_ooblayout_free(struct mtd_info *mtd, int section, struct brcmnand_cfg *cfg = &host->hwcfg; int sas = cfg->spare_area_size << cfg->sector_size_1k; int sectors = cfg->page_size / (512 << cfg->sector_size_1k); + u32 next; - if (section >= sectors * 2) + if (section > sectors) return -ERANGE; - oobregion->offset = (section / 2) * sas; + next = (section * sas); + if (section < sectors) + next += 6; - if (section & 1) { - oobregion->offset += 9; - oobregion->length = 7; - } else { - oobregion->length = 6; + if (section) + oobregion->offset = ((section - 1) * sas) + 9; + else + oobregion->offset = 1; /* BBI */ - /* First sector of each page may have BBI */ - if (!section) { - /* - * Small-page NAND use byte 6 for BBI while large-page - * NAND use byte 0. - */ - if (cfg->page_size > 512) - oobregion->offset++; - oobregion->length--; - } - } + oobregion->length = next - oobregion->offset; return 0; } From patchwork Mon May 4 18:59:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 11528277 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 32BA9139F for ; Tue, 5 May 2020 06:59:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 112742064A for ; Tue, 5 May 2020 06:59:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TRQM1Y5Y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 112742064A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E69976E513; Tue, 5 May 2020 06:58:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id B51046E486 for ; Mon, 4 May 2020 18:59:52 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id h9so421588wrt.0 for ; Mon, 04 May 2020 11:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dTu28xUDgKPSOfBD93/Q64n/TLopzl8Xcrc16onzdb4=; b=TRQM1Y5Y/kjYZMLRbOikbwDibHa3llJJVJ/bc7jGQWQvtEvHnYk+1txiccS6Rgx+6T 1cpp1S+GVHWE22ZiEMtiCRXQWeW/mtePV1UrimBZe/Rsw6y0mt6J0YlRUdfmkWvPMU72 D9rdhVW3L/6GTSOCfkvt6gRQDp8I/s7nzXE5vpUzPNKKbuVL913l/pHILh2AmLNoa7X4 2fSfTjShbGngeSDvAdACnvzOFfyriEE8CQYvSTJpqBC852ad1HA5FjpKz+1lqLRnPcsY jNREp73WKhNlU9NPAI3hqdLEuyfcJzOM5PLSxBtKjKSzv7jgQ+9uSFF94uhiC2g/SHpv Hn8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dTu28xUDgKPSOfBD93/Q64n/TLopzl8Xcrc16onzdb4=; b=uJAwvWhIQubioYG+MDVUVm3OEhyEdSVXPYw8klWiRM/+U2gRfQ5mRbl/oOKgaopq+y R3qyjgpQa9roiRELG1h3ZMGjI5Zblft7Nl7CXK2m3iHeBqUULnhRD4L/0XspkL3UcGQY D7VxiOeba6ZJxhDuFS976Far17Lb1xfx+ia0aSYw2IAKL3SAKenDSw+gjwVcvo0UJuVa ND0UAa/nBq57EUDdxxIPGt2RVbxN7n5XoJZgdtqrxkBNZFFsvixB4UT7Zr+UX4D9XEuq c1A36FofSvDKtWvjbr4b1LhH/htzVaKuoX7tTBAr4DBCrNPoZNBoSDolY3Ts4A1jxCpO zh6Q== X-Gm-Message-State: AGi0Pua0uR5HHTXXiA+axQ/nWrUpr7sjvxyx8HRN92najMMbA/hE4ay1 r3koBP8w8/UrnH/pdWKFxSM= X-Google-Smtp-Source: APiQypKIse9qXrWL+g42FDTv87t6NfFQ+bDzxi1DIXWKshuoMbdJwHPaPEgXUDiQ6wAWMVLgt0psUQ== X-Received: by 2002:adf:9447:: with SMTP id 65mr534819wrq.331.1588618791289; Mon, 04 May 2020 11:59:51 -0700 (PDT) Received: from skynet.lan (246.red-83-44-9.dynamicip.rima-tde.net. [83.44.9.246]) by smtp.gmail.com with ESMTPSA id i25sm452952wml.43.2020.05.04.11.59.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 11:59:50 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: computersforpeace@gmail.com, kdasu.kdev@gmail.com, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sumit.semwal@linaro.org, linux-mtd@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH v2 2/2] nand: brcmnand: fix hamming oob layout Date: Mon, 4 May 2020 20:59:45 +0200 Message-Id: <20200504185945.2776148-2-noltari@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504185945.2776148-1-noltari@gmail.com> References: <20200504093034.2739968-1-noltari@gmail.com> <20200504185945.2776148-1-noltari@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 05 May 2020 06:58:49 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" First 2 bytes are used in large-page nand. Signed-off-by: Álvaro Fernández Rojas --- v2: extend original comment drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index 767343e0e6e7..0a1d76fde37b 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -1114,10 +1114,10 @@ static int brcmnand_hamming_ooblayout_free(struct mtd_info *mtd, int section, } else { /* * Small-page NAND use byte 6 for BBI while large-page - * NAND use byte 0. + * NAND use bytes 0 and 1. */ if (cfg->page_size > 512) { - oobregion->offset = 1; + oobregion->offset = 2; } else { oobregion->offset = 0; next--;