From nobody Mon Feb 9 19:06:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1561667810; cv=none; d=zoho.com; s=zohoarc; b=Bjl+CedxVBfuEHal2vDwyGX8Z7bR3shxjAe5gMUZuudG/at+0dyVE8khhigmW2pfw8WYZ/vUaqWtJivxeJ2UdPhnM2RBc8Vp9mEEkG139Wk9wHrq/vz3GLVp6bJMh2hRZV2/1t0cdF3SPQSK8eogv2zWDEbRMQ5LLd24FWCaqgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561667810; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=OoXwSQ379f75RZiNG5V1yYayNlPT6Pmn/F3Rh5cyvjE=; b=mtNQDlWFAE2eBqowDgNqIyIJiZEB5dVqbh8pO/wSb8CEADK370gD+UVziKKo0lLBSsPmdT3bW53pqaBmRGfbb9Sd3RM1r7dEwfjmcYf/OtESzAL7Y2KBJHoTllRyT/e9GqD+vKdr8c34ekVsjB09QhOdbYJD+g/yBmceUHuEf2Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1561667810009503.98539358197365; Thu, 27 Jun 2019 13:36:50 -0700 (PDT) Received: from localhost ([::1]:54214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgb8N-0000UA-Tp for importer@patchew.org; Thu, 27 Jun 2019 16:36:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46148) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgb1i-0002n5-Cd for qemu-devel@nongnu.org; Thu, 27 Jun 2019 16:29:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgb1h-0001Ad-6l for qemu-devel@nongnu.org; Thu, 27 Jun 2019 16:29:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60838) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgb1c-00012L-96; Thu, 27 Jun 2019 16:29:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FE2488305; Thu, 27 Jun 2019 20:29:43 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-69.brq.redhat.com [10.40.204.69]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9685E600CC; Thu, 27 Jun 2019 20:29:33 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Stephen Checkoway , qemu-devel@nongnu.org Date: Thu, 27 Jun 2019 22:27:07 +0200 Message-Id: <20190627202719.17739-17-philmd@redhat.com> In-Reply-To: <20190627202719.17739-1-philmd@redhat.com> References: <20190627202719.17739-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 27 Jun 2019 20:29:43 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 16/28] hw/block/pflash_cfi02: Hold the PRI table offset in a variable 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: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, Peter Maydell , John Snow , Paolo Bonzini , Alistair Francis , Magnus Damm , Markus Armbruster , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Walle , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Antony Pavlov , "Edgar E. Iglesias" , Jan Kiszka , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Manufacturers are allowed to move the PRI table, this is why the offset is queryable via fixed offsets 0x15/0x16. Add a variable to hold the offset, so it will be easier to later move the PRI table. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/block/pflash_cfi02.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index f1bac480f5..23d05a6308 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -552,6 +552,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->status =3D 0; =20 /* Hardcoded CFI table (mostly from SG29 Spansion flash) */ + const uint16_t pri_ofs =3D 0x31; /* Standard "QRY" string */ pfl->cfi_table[0x10] =3D 'Q'; pfl->cfi_table[0x11] =3D 'R'; @@ -560,8 +561,8 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->cfi_table[0x13] =3D 0x02; pfl->cfi_table[0x14] =3D 0x00; /* Primary extended table address */ - pfl->cfi_table[0x15] =3D 0x31; - pfl->cfi_table[0x16] =3D 0x00; + pfl->cfi_table[0x15] =3D pri_ofs; + pfl->cfi_table[0x16] =3D pri_ofs >> 8; /* Alternate command set (none) */ pfl->cfi_table[0x17] =3D 0x00; pfl->cfi_table[0x18] =3D 0x00; @@ -609,32 +610,34 @@ static void pflash_cfi02_realize(DeviceState *dev, Er= ror **errp) pfl->cfi_table[0x2E] =3D (pfl->nb_blocs - 1) >> 8; pfl->cfi_table[0x2F] =3D pfl->sector_len >> 8; pfl->cfi_table[0x30] =3D pfl->sector_len >> 16; + assert(0x30 < pri_ofs); =20 /* Extended */ - pfl->cfi_table[0x31] =3D 'P'; - pfl->cfi_table[0x32] =3D 'R'; - pfl->cfi_table[0x33] =3D 'I'; + pfl->cfi_table[0x00 + pri_ofs] =3D 'P'; + pfl->cfi_table[0x01 + pri_ofs] =3D 'R'; + pfl->cfi_table[0x02 + pri_ofs] =3D 'I'; =20 /* Extended version 1.0 */ - pfl->cfi_table[0x34] =3D '1'; - pfl->cfi_table[0x35] =3D '0'; + pfl->cfi_table[0x03 + pri_ofs] =3D '1'; + pfl->cfi_table[0x04 + pri_ofs] =3D '0'; =20 /* Address sensitive unlock required. */ - pfl->cfi_table[0x36] =3D 0x00; + pfl->cfi_table[0x05 + pri_ofs] =3D 0x00; /* Erase suspend not supported. */ - pfl->cfi_table[0x37] =3D 0x00; + pfl->cfi_table[0x06 + pri_ofs] =3D 0x00; /* Sector protect not supported. */ - pfl->cfi_table[0x38] =3D 0x00; + pfl->cfi_table[0x07 + pri_ofs] =3D 0x00; /* Temporary sector unprotect not supported. */ - pfl->cfi_table[0x39] =3D 0x00; + pfl->cfi_table[0x08 + pri_ofs] =3D 0x00; =20 /* Sector protect/unprotect scheme. */ - pfl->cfi_table[0x3a] =3D 0x00; + pfl->cfi_table[0x09 + pri_ofs] =3D 0x00; =20 /* Simultaneous operation not supported. */ - pfl->cfi_table[0x3b] =3D 0x00; + pfl->cfi_table[0x0a + pri_ofs] =3D 0x00; /* Burst mode not supported. */ - pfl->cfi_table[0x3c] =3D 0x00; + pfl->cfi_table[0x0b + pri_ofs] =3D 0x00; + assert(0x0b + pri_ofs < ARRAY_SIZE(pfl->cfi_table)); } =20 static Property pflash_cfi02_properties[] =3D { --=20 2.20.1