From nobody Tue Nov 18 15:26:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611156313; cv=none; d=zohomail.com; s=zohoarc; b=jSeWKNOcSVlPM5TKh7wrAqwfT/+cB5WtQig5r8QPU4DyE7nSwGTiS47zjGd5AFeQEO1lu15FyrEnHSFu95wHCjUBpUDazE6pc8vUqm2HrXKIXweMQv+sIDGW4jF/OHgxXbw8LH16yUagYUxfYV7fHStpgDdU8DWuBHdoAS/QffA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611156313; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5gKL7iTatfCI0mX1g/0ZodtyxWtVdt3kWkz5/JlwvPU=; b=fv5sZXR567+NZIFc8NNYHPz0VcBqGMtGbqghkFs3x7hzou8ag9TtfInMF9i7OD3SKCPNqplWQiIbBIFGAzivz0nT2/HuI+2WUc1wSZvr48M9ilM3ajbhb4a1tdBTLlXE6PNB0xqGt9guATJ+/kiqtCdxDDPQsRjes72IMN1FF1o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611156313035285.53862219346956; Wed, 20 Jan 2021 07:25:13 -0800 (PST) Received: from localhost ([::1]:57934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2FM7-0008Kp-P2 for importer@patchew.org; Wed, 20 Jan 2021 10:25:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2FFW-0000GU-9x for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l2FFG-0007hm-9A for qemu-devel@nongnu.org; Wed, 20 Jan 2021 10:18:17 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-japLOEmwO1-K091xt_Bttw-1; Wed, 20 Jan 2021 10:18:01 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 718BE8066ED; Wed, 20 Jan 2021 15:18:00 +0000 (UTC) Received: from thuth.com (ovpn-114-135.ams2.redhat.com [10.36.114.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64D8C60C6C; Wed, 20 Jan 2021 15:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611155885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5gKL7iTatfCI0mX1g/0ZodtyxWtVdt3kWkz5/JlwvPU=; b=BvDnCt9+hglAzo4cS4AJbyhll6Q8M65yB2fFDKvCnaKI1Itk5FnP4HU+dBZES68n3J+e5s aRFeliyShw8Vw5bTfXfPsL0Eapszkan+/fS1YQGZ6Go8TW1QCVMH9KU4GAQE8DEwzHWG6i /BUOfthe5Bov/xk99c0mVp3O3SDE0tQ= X-MC-Unique: japLOEmwO1-K091xt_Bttw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 04/14] hw/block/nand: Rename PAGE_SIZE to NAND_PAGE_SIZE Date: Wed, 20 Jan 2021 16:17:41 +0100 Message-Id: <20210120151751.520597-5-thuth@redhat.com> In-Reply-To: <20210120151751.520597-1-thuth@redhat.com> References: <20210120151751.520597-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jiaxun Yang As per POSIX specification of limits.h [1], OS libc may define PAGE_SIZE in limits.h. To prevent collosion of definition, we rename PAGE_SIZE here. [1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html Signed-off-by: Jiaxun Yang Reviewed-by: Thomas Huth Message-Id: <20210118063808.12471-5-jiaxun.yang@flygoat.com> Signed-off-by: Thomas Huth --- hw/block/nand.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/hw/block/nand.c b/hw/block/nand.c index 123020aebf..913292ad1d 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -115,24 +115,24 @@ static void mem_and(uint8_t *dest, const uint8_t *src= , size_t n) # define NAND_IO =20 # define PAGE(addr) ((addr) >> ADDR_SHIFT) -# define PAGE_START(page) (PAGE(page) * (PAGE_SIZE + OOB_SIZE)) +# define PAGE_START(page) (PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE)) # define PAGE_MASK ((1 << ADDR_SHIFT) - 1) # define OOB_SHIFT (PAGE_SHIFT - 5) # define OOB_SIZE (1 << OOB_SHIFT) # define SECTOR(addr) ((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT)) # define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE_SHIFT) << 8)) =20 -# define PAGE_SIZE 256 +# define NAND_PAGE_SIZE 256 # define PAGE_SHIFT 8 # define PAGE_SECTORS 1 # define ADDR_SHIFT 8 # include "nand.c" -# define PAGE_SIZE 512 +# define NAND_PAGE_SIZE 512 # define PAGE_SHIFT 9 # define PAGE_SECTORS 1 # define ADDR_SHIFT 8 # include "nand.c" -# define PAGE_SIZE 2048 +# define NAND_PAGE_SIZE 2048 # define PAGE_SHIFT 11 # define PAGE_SECTORS 4 # define ADDR_SHIFT 16 @@ -652,7 +652,7 @@ type_init(nand_register_types) #else =20 /* Program a single page */ -static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s) +static void glue(nand_blk_write_, NAND_PAGE_SIZE)(NANDFlashState *s) { uint64_t off, page, sector, soff; uint8_t iobuf[(PAGE_SECTORS + 2) * 0x200]; @@ -672,11 +672,11 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlas= hState *s) return; } =20 - mem_and(iobuf + (soff | off), s->io, MIN(s->iolen, PAGE_SIZE - off= )); - if (off + s->iolen > PAGE_SIZE) { + mem_and(iobuf + (soff | off), s->io, MIN(s->iolen, NAND_PAGE_SIZE = - off)); + if (off + s->iolen > NAND_PAGE_SIZE) { page =3D PAGE(s->addr); - mem_and(s->storage + (page << OOB_SHIFT), s->io + PAGE_SIZE - = off, - MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE)); + mem_and(s->storage + (page << OOB_SHIFT), s->io + NAND_PAGE_SI= ZE - off, + MIN(OOB_SIZE, off + s->iolen - NAND_PAGE_SIZE)= ); } =20 if (blk_pwrite(s->blk, sector << BDRV_SECTOR_BITS, iobuf, @@ -704,7 +704,7 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashS= tate *s) } =20 /* Erase a single block */ -static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s) +static void glue(nand_blk_erase_, NAND_PAGE_SIZE)(NANDFlashState *s) { uint64_t i, page, addr; uint8_t iobuf[0x200] =3D { [0 ... 0x1ff] =3D 0xff, }; @@ -716,7 +716,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashS= tate *s) =20 if (!s->blk) { memset(s->storage + PAGE_START(addr), - 0xff, (PAGE_SIZE + OOB_SIZE) << s->erase_shift); + 0xff, (NAND_PAGE_SIZE + OOB_SIZE) << s->erase_shif= t); } else if (s->mem_oob) { memset(s->storage + (PAGE(addr) << OOB_SHIFT), 0xff, OOB_SIZE << s->erase_shift); @@ -742,7 +742,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashS= tate *s) =20 memset(iobuf, 0xff, 0x200); i =3D (addr & ~0x1ff) + 0x200; - for (addr +=3D ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200; + for (addr +=3D ((NAND_PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0= x200; i < addr; i +=3D 0x200) { if (blk_pwrite(s->blk, i, iobuf, BDRV_SECTOR_SIZE, 0) < 0) { printf("%s: write error in sector %" PRIu64 "\n", @@ -763,7 +763,7 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashS= tate *s) } } =20 -static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s, +static void glue(nand_blk_load_, NAND_PAGE_SIZE)(NANDFlashState *s, uint64_t addr, int offset) { if (PAGE(addr) >=3D s->pages) { @@ -777,7 +777,7 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashSt= ate *s, printf("%s: read error in sector %" PRIu64 "\n", __func__, SECTOR(addr)); } - memcpy(s->io + SECTOR_OFFSET(s->addr) + PAGE_SIZE, + memcpy(s->io + SECTOR_OFFSET(s->addr) + NAND_PAGE_SIZE, s->storage + (PAGE(s->addr) << OOB_SHIFT), OOB_SIZE); s->ioaddr =3D s->io + SECTOR_OFFSET(s->addr) + offset; @@ -791,23 +791,23 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlash= State *s, } } else { memcpy(s->io, s->storage + PAGE_START(s->addr) + - offset, PAGE_SIZE + OOB_SIZE - offset); + offset, NAND_PAGE_SIZE + OOB_SIZE - offset); s->ioaddr =3D s->io; } } =20 -static void glue(nand_init_, PAGE_SIZE)(NANDFlashState *s) +static void glue(nand_init_, NAND_PAGE_SIZE)(NANDFlashState *s) { s->oob_shift =3D PAGE_SHIFT - 5; s->pages =3D s->size >> PAGE_SHIFT; s->addr_shift =3D ADDR_SHIFT; =20 - s->blk_erase =3D glue(nand_blk_erase_, PAGE_SIZE); - s->blk_write =3D glue(nand_blk_write_, PAGE_SIZE); - s->blk_load =3D glue(nand_blk_load_, PAGE_SIZE); + s->blk_erase =3D glue(nand_blk_erase_, NAND_PAGE_SIZE); + s->blk_write =3D glue(nand_blk_write_, NAND_PAGE_SIZE); + s->blk_load =3D glue(nand_blk_load_, NAND_PAGE_SIZE); } =20 -# undef PAGE_SIZE +# undef NAND_PAGE_SIZE # undef PAGE_SHIFT # undef PAGE_SECTORS # undef ADDR_SHIFT --=20 2.27.0