From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::641; helo=mail-pl1-x641.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 689182118EF7C for ; Fri, 16 Nov 2018 16:45:31 -0800 (PST) Received: by mail-pl1-x641.google.com with SMTP id u6so1004217plm.8 for ; Fri, 16 Nov 2018 16:45:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HaRKF86kdPcDrDdc2MxZ4GGv5xFlCftrB/Lv6dYwy+U=; b=GEH6///kPzEdKZV28/QaSDWfGtodCoybJyOpk+wuew4HlyflQ8OXvC4zJwiHaOFcFB r7DbUgq+ud4K5I+2iSFL/Pgd9vetNN3GAIRFCZdJ79x950MTakarx5BaA5pIeLKggoiT 0W4owKcF1uGxGWrjbQG0g/ZoarMOJUx8YW6Vw= 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; bh=HaRKF86kdPcDrDdc2MxZ4GGv5xFlCftrB/Lv6dYwy+U=; b=AclQjsNKUnO7TPQ6ZSaQ328/aym4ugd8wyqZ+Z03KdghdP7j3IIkVJTGtO8YRDuIaA gcPm8/jtLBiH6wqo/wJZMlRqHBQClTxbCl3h0ntQOQajClgDqmJQmQSfq6pECAGKFn8U mWij8Km9k6EfZHItB/GcmiS84ULjd3LVrty9QnI+s9L1ZaqLBbPJ5jZvSIjJYikZg73x XTkpP0MWPdXy/cL8kaOW6KcD/MpIca3uRN9/eqQeqGB029Tv5GM89H7Z2R56etvJkgSC JeKLDm9mxAbIQbD8Ozse+rn0hT71mQcOjZWT1FEXKk5oLTltR7etH6XdfmyuBPgFC5s4 x5iQ== X-Gm-Message-State: AGRZ1gJC877aG9sjwClIIj4QCHiq3T4hUxBeuGlcqX09ckLCLF1lLjAq pOGJVgtS9wtOKfjCbRk12GURO5+v9x2AmA== X-Google-Smtp-Source: AJdET5cIKnn68eJmCf3JkTAYlH2QB1ja3w41RXg5+GFahvUCyxqd7BypetB234wfhStQRDXpyYpufg== X-Received: by 2002:a17:902:c5:: with SMTP id a63-v6mr13054718pla.201.1542415530776; Fri, 16 Nov 2018 16:45:30 -0800 (PST) Received: from mba13.psav.com ([64.114.255.114]) by smtp.gmail.com with ESMTPSA id f193-v6sm45674235pfc.74.2018.11.16.16.45.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 16:45:29 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: lersek@redhat.com, leif.lindholm@linaro.org, philmd@redhat.com, hongbo.zhang@linaro.org, Ard Biesheuvel Date: Fri, 16 Nov 2018 16:45:23 -0800 Message-Id: <20181117004524.31851-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181117004524.31851-1-ard.biesheuvel@linaro.org> References: <20181117004524.31851-1-ard.biesheuvel@linaro.org> Subject: [PATCH 1/2] ArmPlatformPkg/NorFlashDxe: use one GUID plus index to identify flash banks X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2018 00:45:31 -0000 Currently, each flash bank controlled by ArmPlatformPkg/NorFlashDxe has its own VendorHw GUID, and instances of NorFlashPlatformLib describe each bank to the driver, along with the GUID for each. This works ok for bare metal platforms, but it would be useful for virtual platforms if we could obtain this information from a device tree, which would require us to invent GUIDs on the fly, given that the 'cfi-flash' binding does not include a GUID. So instead, let's switch to a single GUID for all flash banks, and update the driver's device path handling to include an index to identify each bank uniquely. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c | 15 +++++++++------ ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h | 3 +++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c index 46e815beb343..60a06e4a5058 100644 --- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c +++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c @@ -82,10 +82,14 @@ NOR_FLASH_INSTANCE mNorFlashInstanceTemplate = { { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, - { (UINT8)sizeof(VENDOR_DEVICE_PATH), (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8) } + { + (UINT8)(OFFSET_OF(NOR_FLASH_DEVICE_PATH, End)), + (UINT8)(OFFSET_OF(NOR_FLASH_DEVICE_PATH, End) >> 8) + } }, { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }, // GUID ... NEED TO BE FILLED }, + 0, // Index { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, @@ -99,10 +103,9 @@ NorFlashCreateInstance ( IN UINTN NorFlashDeviceBase, IN UINTN NorFlashRegionBase, IN UINTN NorFlashSize, - IN UINT32 MediaId, + IN UINT32 Index, IN UINT32 BlockSize, IN BOOLEAN SupportFvb, - IN CONST GUID *NorFlashGuid, OUT NOR_FLASH_INSTANCE** NorFlashInstance ) { @@ -121,11 +124,12 @@ NorFlashCreateInstance ( Instance->Size = NorFlashSize; Instance->BlockIoProtocol.Media = &Instance->Media; - Instance->Media.MediaId = MediaId; + Instance->Media.MediaId = Index; Instance->Media.BlockSize = BlockSize; Instance->Media.LastBlock = (NorFlashSize / BlockSize)-1; - CopyGuid (&Instance->DevicePath.Vendor.Guid, NorFlashGuid); + CopyGuid (&Instance->DevicePath.Vendor.Guid, &gEfiCallerIdGuid); + Instance->DevicePath.Index = Index; Instance->ShadowBuffer = AllocateRuntimePool (BlockSize);; if (Instance->ShadowBuffer == NULL) { @@ -1311,7 +1315,6 @@ NorFlashInitialise ( Index, NorFlashDevices[Index].BlockSize, ContainVariableStorage, - &NorFlashDevices[Index].Guid, &mNorFlashInstances[Index] ); if (EFI_ERROR(Status)) { diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h index 5c07694fbfaa..8886aa43d9f3 100644 --- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h +++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h @@ -122,10 +122,13 @@ typedef struct _NOR_FLASH_INSTANCE NOR_FLASH_INSTANCE; +#pragma pack(1) typedef struct { VENDOR_DEVICE_PATH Vendor; + UINT8 Index; EFI_DEVICE_PATH_PROTOCOL End; } NOR_FLASH_DEVICE_PATH; +#pragma pack() struct _NOR_FLASH_INSTANCE { UINT32 Signature; -- 2.17.1