From patchwork Tue Nov 19 01:55:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Franz X-Patchwork-Id: 21590 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gg0-f197.google.com (mail-gg0-f197.google.com [209.85.161.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BDA9720972 for ; Tue, 19 Nov 2013 01:55:56 +0000 (UTC) Received: by mail-gg0-f197.google.com with SMTP id e5sf11580267ggk.8 for ; Mon, 18 Nov 2013 17:55:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Etdh6mnm+MaNbI0/f5zSGnOLWzsEf7UZprmi3P+fk8Y=; b=SLXG7X4inD6lN52obaIABbBKq/MUNIWEweuBS5ZWYHkhAWGXZx88Zf8fy23+N0QLmz u64GososiqPpIUUZ7PR46UWikSrXpQJjlE24RANO/jG5akOXgSIZqp6Dtc3fGLeMD0Qm gkttDEMlj5NmHoLmjqdXum9aMUlCrnS/Choq676J3q0NDIBUWS7sUV40QEmPSQKh3w0e ssOMuSSjdVvMcIAcE8PWmyl1QnWJh2tqt1PZXAfKskrzeeIv5XMVIGca7RTDqSQwiUX/ wE6BvJ6EAdER/UfRf381TJ8BkgPe4UF4r4nQ4DTseuNybSJhG+IBsifpLPiC4Dfb2oPa GeiA== X-Gm-Message-State: ALoCoQnDB8Ci7QxWqWLTnEazgbeBim6dunQA6bPMhz1wo3TVhkMpjYtxUIL32lIOLCcpBBidsZmv X-Received: by 10.236.145.34 with SMTP id o22mr12512398yhj.22.1384826156341; Mon, 18 Nov 2013 17:55:56 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.109.233 with SMTP id hv9ls1659534qeb.91.gmail; Mon, 18 Nov 2013 17:55:56 -0800 (PST) X-Received: by 10.220.58.1 with SMTP id e1mr18634507vch.0.1384826156202; Mon, 18 Nov 2013 17:55:56 -0800 (PST) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id k10si7783515vca.124.2013.11.18.17.55.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Nov 2013 17:55:56 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id oy12so1641115veb.29 for ; Mon, 18 Nov 2013 17:55:56 -0800 (PST) X-Received: by 10.58.207.15 with SMTP id ls15mr18546937vec.17.1384826155870; Mon, 18 Nov 2013 17:55:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp243684vcz; Mon, 18 Nov 2013 17:55:55 -0800 (PST) X-Received: by 10.50.77.83 with SMTP id q19mr17528750igw.21.1384826155243; Mon, 18 Nov 2013 17:55:55 -0800 (PST) Received: from mail-ie0-f178.google.com (mail-ie0-f178.google.com [209.85.223.178]) by mx.google.com with ESMTPS id yn8si4551802icb.33.2013.11.18.17.55.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Nov 2013 17:55:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.178 is neither permitted nor denied by best guess record for domain of roy.franz@linaro.org) client-ip=209.85.223.178; Received: by mail-ie0-f178.google.com with SMTP id lx4so1995158iec.37 for ; Mon, 18 Nov 2013 17:55:54 -0800 (PST) X-Received: by 10.50.234.162 with SMTP id uf2mr17270538igc.48.1384826154815; Mon, 18 Nov 2013 17:55:54 -0800 (PST) Received: from rfranz-v430.caveonetworks.com (64.2.3.195.ptr.us.xo.net. [64.2.3.195]) by mx.google.com with ESMTPSA id x6sm640634igb.3.2013.11.18.17.55.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Nov 2013 17:55:54 -0800 (PST) From: Roy Franz To: linaro-uefi-internal@linaro.org Cc: patches@linaro.org, Roy Franz Subject: [PATCH] Move RTSM/FVP VExpress variable storage to 256k flash blocks Date: Mon, 18 Nov 2013 17:55:48 -0800 Message-Id: <1384826148-25059-1-git-send-email-roy.franz@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: roy.franz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Change the addresses/sizes of the variable storage areas to use 256k blocks so UEFI is compatible with both the RTSM/FVP models and QEMU. The VExpress flash has non-uniform block sizes, with most blocks being 256k and the top 4 blocks being 64k. UEFI has been using these top 64k blocks for persistent variable storage. The RTSM models the non-uniform sizes, while QEMU only supports emulating flash with uniform block sizes which results in the top 256k (the 4 64k blocks) of flash being unusable for writing in QEMU. Note that this change will require RTSM flash images to be updated, as the variable storage has moved. Currently on the A15 model is supported by QEMU, but all RTSM/FVP models are being changed to keep the simulation configurations consistent. Signed-off-by: Roy Franz Contributed-under: TianoCore Contribution Agreement 1.0 --- Steven - here is the patch to change the flash usage to be compatible with QEMU. This only changes the A15 RTSM VExpress configurations, as Ryan found that this change caused problems on the V8 models, and it is not needed there yet. ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc | 12 ++++++------ .../ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc index 480da19..8b71ba8 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc @@ -81,12 +81,12 @@ # # NV Storage PCDs. Use base of 0x0C000000 for NOR1 # - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0FFC0000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00010000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0FFD0000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x00010000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0FFE0000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00010000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0FF00000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00040000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0FF40000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x00040000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0FF80000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00040000 gArmTokenSpaceGuid.PcdVFPEnabled|1 diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc index b08b7cb..2b14bd8 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc @@ -83,12 +83,12 @@ # # NV Storage PCDs. Use base of 0x0C000000 for NOR1 # - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0FFC0000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00010000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0FFD0000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x00010000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0FFE0000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00010000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0FF00000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00040000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0FF40000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x00040000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0FF80000 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00040000 gArmTokenSpaceGuid.PcdVFPEnabled|1