From patchwork Fri Jun 24 08:07:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Krzeminski, Marcin (Nokia - PL/Wroclaw)" X-Patchwork-Id: 640082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rbWH66PRSz9syB for ; Fri, 24 Jun 2016 18:10:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b=lqlXEVPX; dkim-atps=neutral Received: from localhost ([::1]:41758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGMCG-0000u3-GZ for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2016 04:10:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGMAX-0007jo-KY for qemu-devel@nongnu.org; Fri, 24 Jun 2016 04:09:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGMAE-000863-36 for qemu-devel@nongnu.org; Fri, 24 Jun 2016 04:08:52 -0400 Received: from mail-db3on0135.outbound.protection.outlook.com ([157.55.234.135]:12261 helo=emea01-db3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGMAD-00085C-In for qemu-devel@nongnu.org; Fri, 24 Jun 2016 04:08:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9/Kuk72eu1qkFM6B2iAibdiWM8BoVSmnqRO37wmE6BM=; b=lqlXEVPXHA36Udbo/+E4LrLQ/fKQOZWd9R2n5MsiMFT/T7w7qwatmhGDYQMMtNTqy3vicgf6OZJZcSqMo77jQObd6KDvyLqz/C4/+uF1RKXsZ7kQ4ZiJfnpCo1M24CNFcagQcOAFplQIsE2jKJUm/sRDZ7Jqc00E7d8oiqL3b58= Received: from AMXPR07CA0021.eurprd07.prod.outlook.com (10.242.64.21) by VI1PR0701MB2128.eurprd07.prod.outlook.com (10.169.137.9) with Microsoft SMTP Server (TLS) id 15.1.523.12; Fri, 24 Jun 2016 08:08:30 +0000 Received: from DB3FFO11FD043.protection.gbl (2a01:111:f400:7e04::196) by AMXPR07CA0021.outlook.office365.com (2a01:111:e400:1000::21) with Microsoft SMTP Server (TLS) id 15.1.523.12 via Frontend Transport; Fri, 24 Jun 2016 08:08:30 +0000 Authentication-Results: spf=pass (sender IP is 131.228.2.241) smtp.mailfrom=nokia.com; nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=pass action=none header.from=nokia.com; Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.241 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.241; helo=fihe3nok0735.emea.nsn-net.net; Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.241) by DB3FFO11FD043.mail.protection.outlook.com (10.47.217.74) with Microsoft SMTP Server (TLS) id 15.1.517.7 via Frontend Transport; Fri, 24 Jun 2016 08:08:29 +0000 Received: from fihe3nok0735.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0735.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id u5O87x1I008565 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jun 2016 11:07:59 +0300 Received: from CNU418C7XK.nsn-intra.net ([10.154.155.220]) by fihe3nok0735.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id u5O87u74008453; Fri, 24 Jun 2016 11:07:58 +0300 X-HPESVCS-Source-Ip: 10.154.155.220 From: To: Date: Fri, 24 Jun 2016 10:07:04 +0200 Message-ID: <1466755631-25201-4-git-send-email-marcin.krzeminski@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466755631-25201-1-git-send-email-marcin.krzeminski@nokia.com> References: <1466755631-25201-1-git-send-email-marcin.krzeminski@nokia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:131.228.2.241; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(2980300002)(438002)(199003)(189002)(50986999)(6806005)(92566002)(2950100001)(76176999)(68736007)(86362001)(586003)(189998001)(86152002)(356003)(87936001)(4326007)(2876002)(50226002)(106466001)(33646002)(110136002)(16796002)(2906002)(50466002)(229853001)(47776003)(5820100001)(97736004)(2351001)(81156014)(2870700001)(8936002)(81166006)(19580405001)(19580395003)(8676002)(11100500001)(53416004)(305945005)(77096005)(7846002)(36756003)(23676002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0701MB2128; H:fihe3nok0735.emea.nsn-net.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11FD043; 1:z2MaxbGEJ/dPU5nuob0gYntx2ZXq71G/BSSarbwvj2Bg4D1Roc11Cq95U2r7BZoOqkNfO9S21xTDsWU5ox3s7yBHrCp36Yn9cKV9Qu1SoMpDAYW7GbMy1d0c8CN+uEpFZqW9+hZ1dJ9PVwq+dPS8tAsk1b8N8/hDf1C9KLLgSuRECi+HMQkw+GLSOAKW2fsKlZIcTd4oCOnTqbFf5frJmbUbmPKwMq3Jn1stcbRRuWgfrc8Ie3IVEYlmLbGfVeFbyP7kBrqz4XTK6cPK2q0TpYLieFvUzITOsV0vgtpmn27KFubcUON9eg2BCzsmYyWI92O528oxi31Gl3KFHq0jfaSNJOcvo2AbMvQBSOS3rmlcGcOjVjAGHx69dYQgbyrY+UcML1/mWG/LMvS9OfzsyvKvY1c5vu3NDP1Tj4YFzHCaakZ0e0+h1RXxSKba67gc X-MS-Office365-Filtering-Correlation-Id: f3d415a4-46ea-4560-ab4f-08d39c06ba5c X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2128; 2:NdjfbLlsrsWPs+RLhw4JApXGyVEiXOsMz09/CjZ4GOseXo1DRQg64gsjWxaNj1tdeIvHEmgHCx7CW3y236Iwl13pv2eGu+F2jfyzj5xcHgF8AS8QyU4hJCNmXe15JXnlmqkBQqwQDOUEKy7zpizbFu7RuMg95n/flMgJejQEBzDQQy1adq5i2KHbUQ01/5f3; 3:KkT3lnBF0Mu6mkC3J9ADvQmjODc/UZV5y5mDv4uu2WhKoTqNR3Iqe41JaCHYqQVeEUP62RQf//BV7BldrxVcWNDoON9jq60rGWR/K9BL1Xc0E3GSVP5aEtqMU01UcxGjH2ygH+kRp9wkzOIFc4wWYc1GssbzuLZ0KmWwU8/rXFDzh0expTaYzPa6O3E2RIC9h4kt4/gOEyALWkn+pDq4TiF3xbedSqw9armdK5lLuA8mvH4AQv8aaG8p6XgRyN6bvS81IIxMQL/hDJmooOwarg==; 25:S35n0bsdo03jDZbKhuNv8aLjd1+8JTi68cMic2Y3udiWoPoIjFPWoUtW41msFPTdOzAXG4bP0bK23kZlXGW1hTy5sVuPopuVWtvGiiLj3tE1P53QrfdWbV93izPMrLlfxoVuIdoCzHCmfdfpAMDpFpuOIHQ55X62Xv7j8T68SzDNstob6f2xqXG32VYM/gZCRdkm5GLqG4UoucgSJtMhrzeIwV6Hh8LPOnQRoxYv1rnE+AYfUbGVSEztEZyOpJFiByd9QcGwO2cWnXdMyA0A9/FyXF9ZDpZvmKwaeZyWiDXfSClihERoDOtbgNjtbqCfsyLIWMeKS1SOIEx86w5nijZFW16aSNVkC+b0KAr5bqxSAgHev6QuM/bWuC6Qtxu7qvK2n+WheDtyjK/WFfhk4r+Ug2gDRaROkCEaH6rosdI= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:VI1PR0701MB2128; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2128; 20:LKo17Nu2IglNatpxPVL4zvtUanhkkUlAr0vZeNbtZyKVpNYEyX4+8r7M7ChD8vnR7JP3pboLtrpORS1bqSOJxSqKLZG2zI0PMUYFsbCJG8i1n1/G9EOs53XE/35eoOd1fII79IdljCLZzaolKNI3JgaTftIHluGP9StoVJ3SjKK8JKew1woSmOCDXaYbpKSAxg/jmTtjz+VSZl1N8kmoN4Oe9o9boKX5E5fSC1xwTnJnpIB634AQ8pV2mwUvy/qwQt65HiqloGqMfq4m3JCdm7gnZ4fe2TlcmJajsGiz8Wof3LWPQgVKqxY+t6c3l1T6v+lzMpItnuTmJWGv1fg2ZZqiyG71dkrJZ0WWt29wzDUFd9hW4tCE3ke5UILvcmfLiAo/hofPDKF0Vx6xYW9F2pIUbCpBZhFgePT7SMnd5+5FTrpSBRevUa0G8ZzZXCRjjdGeUVp+uXPE3vmC03SS+DB1CGF+L8x6c5Oq+iGf0oQPTYgw9rqOFiwg7LeEJQGlO4oGZlfvgoHzywhOPm9iRL/CxYrxBt8iATFqCxgdKMetob4Ih4+VKfpCd7DsWZ0Z2fcipKNt0EDdZGaVv9rZyDJRQHaASMd26fc6YCj/qPw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(10201501046)(3002001); SRVR:VI1PR0701MB2128; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0701MB2128; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2128; 4:OEO0veBpIwP7Kmu1luTfWDzAQTxzR4z20lA+UvkEvJJpJeoGMBFwY/uZL0LPHwBcOMbSU4AA95Lr1tLqsa9VI8EWV6j6HoRZltI/RbvamrYPLp2+rbwKEIFVE0gt+m47qjTSh7CVpo2bAdrWr68CJw/qlooI0Bw8S3qGG/jjgT3JjfJfZxZDUtHvTqjr9YSQxFUxVXu2hUIpOd/UzTcCzKixvmFMfmqgPlt/fNE5nVzXc2hey+S2eQZmkuTy5/DQqY9U7HVG3QFqF0DLAf4i3JkBmiH1HvSfhQdsAKHrL06e60mrIn/gFgVYxre1ryNeIMFiSzdqBC2YKPGnkGru7oOIUGDCpQzjybOnWEQJDbZtp7KVL5YuNSfEUtbuPb9M3N2PNd8d5GJzpj1ezWSbzPbNDF9cDagfUhr0+99lLyigoo+HqfTADQCf8CxpE7vBgMDRSxaPbXIpX3O6mobKyQ== X-Forefront-PRVS: 0983EAD6B2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0701MB2128; 23:sgONy1D7KfwR7Ca1Sw/86eBa+NlYuD9+goiHGv6?= =?us-ascii?Q?V84BRzFJDbZE3LYj+Vjv2qt8R3e+GjmDGJsb36A9cAy0veugTDSF8qoi1+AH?= =?us-ascii?Q?7g39WUBUBrY2wAYHzjzhauN+bL806ytUu5c2gr/c7Z81JEpOuhHxoczr+NJm?= =?us-ascii?Q?yw3+OK6BTmKWgROgH35vmTo8YLSjInclRTw41Mnum0xXzCz3nadgCBlyQrJG?= =?us-ascii?Q?SbxpINjoPFCNv7+rZ3xV+0N7TSP9zJkZbvoqVXbfcoOAKXqwdYYBoSdP0viT?= =?us-ascii?Q?zmaKhLxytkS9aVVD+VFKVkCAgr/Ohjw77IN3jUUXLCHTEA+Lxuar2VCouXbJ?= =?us-ascii?Q?j/fg9cE2b7quwD1uqF0anrv677UU2GRZrj4bgf4Jb+EoLF0v7YNnwwoTFszc?= =?us-ascii?Q?mi6h6UmIvkDf1/RvldHgh2vtWDXlubqe1gyL8oXvnvQ1W1uImoOH438es+T3?= =?us-ascii?Q?25QVwMMEmnj0OJHfmVkzNMbxXGGtHMv5Gg+bwCgJT3r4nOenuhKMBJ0OHpOx?= =?us-ascii?Q?tNvngM/a7FFmOCcVB0FP9sRNEm1S3B8kIx0ukXwgDS28uwWLySSIQKtXYXOe?= =?us-ascii?Q?sAnZnbBqo5ViD5Ic3nqE+YSf8mKnmDwo8S6UOHtsyCx1XiDLm3+ptoYrw7Su?= =?us-ascii?Q?BMz2em4Qje6m4Aghs3h4lEghf32pyBO26bDQmFt5AurUoR6UrqauHpEbHPUc?= =?us-ascii?Q?IX1Eh1wzcQr3LZG4Bd50iX9rOtXypS5kOKk6FOPHbA1DCHbnkLv9DhHVrp7d?= =?us-ascii?Q?/G99MsCs49CPax+94m6JCiBs9j9J6MJdWNUtZNVisLgFUzqzKzWMkQCMrfmL?= =?us-ascii?Q?5R9Sw6QBOE8WYU/FcgivwaxyKf7OpkCU1qYZ5PZN1gYKXbGe/P8LLu9fUrqM?= =?us-ascii?Q?4w9TCedo82jxfEGbSj8HK19dRB0w+UM9+Mpo00UtdREOwT+loi+s0fNMlCNI?= =?us-ascii?Q?8F8lq5oObHEiJGePvZr4MyudYHQ3Tmz5joQP+ecjFu72d9AtlTutzfv9TdvI?= =?us-ascii?Q?AthQdR0dDI3XKouW7Yy0Dfg2TFy7OL7XepGwoYpODgBSMxnQqD+O6lSEp28b?= =?us-ascii?Q?sBHMhncIDUQQZUoBfAblZ2GOhCKSwRDFTGqJh0dcvKsgUswLnFnDPzzvNN1m?= =?us-ascii?Q?XYqNgK3BPAFR2AGP9ZkgcrGACzUiL3IbF?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2128; 6:7ne2E2BQ8T/O9rfBSWpQFIVssMnwM5gvZMB2Zi3Kyx8dsY277Lff2gd8XZ1m2f/bWMNYS45CHm+h/NpWxH8q0mWaI6nHHG8j/Gy8Ybh/oQMiDjpEp26Dn7WwXdpqCHcb1jLcsTvmonlyL6Ra1FWRRbzZFg0sjJjcrrR1oOh13ZyTYg7BxjqKqVXQaGRANKZPgkDEsbXOibfcETlafy6DXCIPwZ79ly3cTGdECUp81RWwCEutj04sPNfKzqOaHMdLYrd3lM4I3PH9+qS/7WLmOK6g7JJr7fZivGfmzVHm5NAA3Gv8Cyyupcs5DrRvrg+v; 5:yP9DcefD8rL1RfgguIhJbyNuPtfsCGTbg8cXmw2AeksNHcuzg2QG1EANMNE3uNG9mJtIhmPPf5NBYl7M6y8OQN+ZxbZwAU6nFnR6l44JkCJXdfxNhzkE7l55wUXzPMGZo/7olCuq30HXJYpwIpQTUA==; 24:frVO/tqoFFVxGhPfsF92MRTHR3j+nLL34ybu39jcTqV2lYH8sLemI6vx4LbwuDXBE4LTDYaHdo2qaj9CaeODELK86hjMmKIw/hiiXbiVDlc=; 7:xEQbLE63LO1mfVIPcN0pvxLhZykSYVwsE8b+nNf7tQuyeRuPuCGKPQj6zcFqadWqVF4bRVUr8Cp1a54ghjHWUgmDht1ZLcb4nr+d7tQqKzIwCgVVobcw+WXT5UO+PXjje/3iwqYEIvysyrJV34fYbcKGb41GlYDNPXP4PhxA48DWFE0F1SomIElC7/pLjmTs5RsUEFhgYfUnOwV7vqpwSrWMAdfdgqd0nQkbYHehEsNTC7bzPxo2TBfa39mcbPbKz4Xu0Uim2+pDCeQuARhC+w== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2016 08:08:29.7716 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.241]; Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB2128 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.55.234.135 Subject: [Qemu-devel] [PATCH v3 03/10] m25p80: Allow more than four banks. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, crosthwaitepeter@gmail.com, clg@fr.ibm.com, clg@kaod.org, pawel.lenkow@itlen.com, rfsw-patches@mlist.emea.nsn-intra.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marcin Krzeminski Allow to have more than four 16MiB regions for bigger flash devices. Signed-off-by: Marcin Krzeminski Reviewed-by: Cédric Le Goater --- hw/block/m25p80.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 342f7c9..6910c52 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -129,7 +129,6 @@ typedef struct FlashPartInfo { #define EVCFG_QUAD_IO_ENABLED (1 << 7) #define NVCFG_4BYTE_ADDR_MASK (1 << 0) #define NVCFG_LOWER_SEGMENT_MASK (1 << 1) -#define CFG_UPPER_128MB_SEG_ENABLED 0x3 /* Numonyx (Micron) Flag Status Register macros */ #define FSR_4BYTE_ADDR_MODE_ENABLED 0x1 @@ -545,7 +544,7 @@ static void complete_collecting_data(Flash *s) } if (get_addr_length(s) == 3) { - s->cur_addr += (s->ear & 0x3) * MAX_3BYTES_SIZE; + s->cur_addr += s->ear * MAX_3BYTES_SIZE; } s->state = STATE_IDLE; @@ -644,7 +643,7 @@ static void reset_memory(Flash *s) s->four_bytes_address_mode = true; } if (!(s->nonvolatile_cfg & NVCFG_LOWER_SEGMENT_MASK)) { - s->ear = CFG_UPPER_128MB_SEG_ENABLED; + s->ear = s->size / MAX_3BYTES_SIZE - 1; } break; default: