From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c06::242; helo=mail-io0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) (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 1F5CC21FCA297 for ; Wed, 1 Nov 2017 10:12:02 -0700 (PDT) Received: by mail-io0-x242.google.com with SMTP id n137so7605287iod.6 for ; Wed, 01 Nov 2017 10:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=/VgtzhIORT9MB+f/aeHwWqNve/4x5xUvQeUg5xg6ez4=; b=J/mmKn9PDzMBfhxguNho9D5+TGomyBcZ5UYopU6BVSpbAxqNJ+09xcy2FVP4Httb2M FTZJjxhZ3a7vh5mnZOoI2ENI5ugsESp2XLXQDjmOKEgtuPcDz6szO4ASgBkVTGv3DvGC MLLLlsyRA4duLRjVPh4rJm52p1gfgnsGHTE5U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/VgtzhIORT9MB+f/aeHwWqNve/4x5xUvQeUg5xg6ez4=; b=MjHba+WsdsR+vUuSQaW1F08RVxvoEICdxNQ5s72W0TvYn+zpE0AzmQG0AEOuueUsPp tFrQx0L1j/L2Xw6bnLYeWo2jNgKSIuSB39/6Ljc5J19DlnqXsntyTi3doNkBudRWNxGT zKOeIDSayXTMZHw50F8rejp8VkZJnYh2iSbIMyxTW9Gq2oBbsfx+2J+ZI/hZN5YiIigc 0yKZVsypKciFgaAfIpYVrgJZkL25SPsnEI1RfV/hZDLfNLuSSng2mkJnptEmI3/vNUb4 YVXXzMmOqF3FeCOpJZFTK/32pAkQr3sW9QQwUORc9/BytnWf9rs5/o2kCE3E/DiskSJ/ YEAQ== X-Gm-Message-State: AMCzsaUwllYnOIN7nkVfnYgz/dZJYK01dhrW0XVXcKWpmPbAvf0Fqrqt JQXcG6ryBdmOQVmrTsf6T20VUkpGzBQAzDDDMt7UXA== X-Google-Smtp-Source: ABhQp+QLq3UWXh+QUXvtDnwlZE1qfEQ+0UMIiyQQBQT4GcEl1oKmJ8Hb+a4/bbncT2kQYj2KPMBfrWyNGqbINFj09UQ= X-Received: by 10.36.141.70 with SMTP id w67mr1417434itd.58.1509556555047; Wed, 01 Nov 2017 10:15:55 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.131.167 with HTTP; Wed, 1 Nov 2017 10:15:54 -0700 (PDT) In-Reply-To: References: <1509422375-20198-1-git-send-email-mw@semihalf.com> <1509422375-20198-5-git-send-email-mw@semihalf.com> <20171101034534.bwm4qd3nuc76ccff@bivouac.eciton.net> From: Ard Biesheuvel Date: Wed, 1 Nov 2017 17:15:54 +0000 Message-ID: To: Marcin Wojtas Cc: Leif Lindholm , edk2-devel-01 , Nadav Haklai , Neta Zur Hershkovits , Kostya Porotchkin , Hua Jing , semihalf-dabros-jan Subject: Re: [platforms: PATCH 4/6] Marvell/Applications: SpiTool: Do not override existing slave device X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2017 17:12:03 -0000 Content-Type: text/plain; charset="UTF-8" On 1 November 2017 at 16:40, Marcin Wojtas wrote: > Leif, > > 2017-11-01 4:45 GMT+01:00 Leif Lindholm : >> On Tue, Oct 31, 2017 at 04:59:33AM +0100, Marcin Wojtas wrote: >>> Current usage of sf command requires running 'sf probe' prior to >>> executing any other option. Because it is done in two separate steps, >>> it turned out that SpiMasterProtocol->SetupDevice could easily >>> overwrite valid Slave pointer when performing second operation. >>> >>> Fix the issue by allocating Slave device only once and keep it >>> as global variable in the SpiTool application. This patch >>> also updates FirmwareUpdate command to follow the modified >>> SetupDevice operation. >> >> Really an unrelated question, but would we not expect to use capsule >> updates instead now? Do we have other uses for this tool? > > I use it massively for the development. Since the variables work now, > I have a plan to implement capsule update, but it's definitely not at > the top of the list now. I'm also wondering if there will be no > problems with the binaries concatenation and their handling by the > bootrom. BTW. Is capsule update supposed to replace only UEFI part or > the entire image stored in flash? > That depends on your use case, but you can easily update your .fdf to incorporate other binaries into the UEFI build (ARM-TF etc), and you can update everything using a single capsule. That also allows you to use the standard 'fwupdate' tool in Linux, and even allows you to host firmware updates at fwupd.org, and they can be installed automatically by the ordinary Software Update GUI that runs in the OS. >> >>> Contributed-under: TianoCore Contribution Agreement 1.1 >>> Signed-off-by: Marcin Wojtas >>> --- >>> Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c | 4 ++-- >>> Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c | 8 ++++---- >>> Platform/Marvell/Drivers/Spi/MvSpiDxe.c | 17 +++++++++-------- >>> Platform/Marvell/Drivers/Spi/MvSpiDxe.h | 1 + >>> Platform/Marvell/Include/Protocol/Spi.h | 1 + >>> 5 files changed, 17 insertions(+), 14 deletions(-) >>> >>> diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c b/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c >>> index 750e52a..9ccb1c7 100644 >>> --- a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c >>> +++ b/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.c >>> @@ -240,7 +240,7 @@ ShellCommandRunFUpdate ( >>> ) >>> { >>> IN SHELL_FILE_HANDLE FileHandle; >>> - SPI_DEVICE *Slave; >>> + SPI_DEVICE *Slave = NULL; >>> UINT64 FileSize; >>> UINTN *FileBuffer = NULL; >>> CHAR16 *ProblemParam; >>> @@ -302,7 +302,7 @@ ShellCommandRunFUpdate ( >>> } >>> >>> // Setup and probe SPI flash >>> - Slave = SpiMasterProtocol->SetupDevice (SpiMasterProtocol, 0, 0); >>> + Slave = SpiMasterProtocol->SetupDevice (SpiMasterProtocol, Slave, 0, 0); >>> if (Slave == NULL) { >>> Print(L"%s: Cannot allocate SPI device!\n", CMD_NAME_STRING); >>> goto HeaderError; >>> diff --git a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c b/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c >>> index 68a6cf7..1084f68 100644 >>> --- a/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c >>> +++ b/Platform/Marvell/Applications/SpiTool/SpiFlashCmd.c >>> @@ -191,7 +191,7 @@ ShellCommandRunSpiFlash ( >>> ) >>> { >>> EFI_STATUS Status; >>> - SPI_DEVICE *Slave; >>> + STATIC SPI_DEVICE *Slave; >> >> If this is a safe thing to do, please use a global variable called >> mSlave instead, to make it clear that it persists across calls. > > Right, this way it will be more clear. > >> >>> LIST_ENTRY *CheckPackage; >>> EFI_PHYSICAL_ADDRESS Address = 0, Offset = 0; >>> SHELL_FILE_HANDLE FileHandle = NULL; >>> @@ -273,7 +273,7 @@ EFI_STATUS Status; >>> Cs = PcdGet32 (PcdSpiFlashCs); >>> >>> // Setup new spi device >>> - Slave = SpiMasterProtocol->SetupDevice (SpiMasterProtocol, Cs, Mode); >>> + Slave = SpiMasterProtocol->SetupDevice (SpiMasterProtocol, Slave, Cs, Mode); >>> if (Slave == NULL) { >>> Print(L"sf: Cannot allocate SPI device!\n"); >>> return SHELL_ABORTED; >>> @@ -285,6 +285,8 @@ EFI_STATUS Status; >>> Status = FlashProbe (Slave); >>> if (EFI_ERROR(Status)) { >>> // No supported spi flash detected >>> + SpiMasterProtocol->FreeDevice(Slave); >> >> Space before (. > > Ok. > > Thanks, > Marcin > >> >> / >> Leif >> >>> + Slave = NULL; >>> return SHELL_ABORTED; >>> } else { >>> return Status; >>> @@ -426,8 +428,6 @@ EFI_STATUS Status; >>> break; >>> } >>> >>> - SpiMasterProtocol->FreeDevice(Slave); >>> - >>> if (EFI_ERROR (Status)) { >>> Print (L"sf: Error while performing spi transfer\n"); >>> return SHELL_ABORTED; >>> diff --git a/Platform/Marvell/Drivers/Spi/MvSpiDxe.c b/Platform/Marvell/Drivers/Spi/MvSpiDxe.c >>> index 3b49147..a7db5f2 100755 >>> --- a/Platform/Marvell/Drivers/Spi/MvSpiDxe.c >>> +++ b/Platform/Marvell/Drivers/Spi/MvSpiDxe.c >>> @@ -296,21 +296,22 @@ SPI_DEVICE * >>> EFIAPI >>> MvSpiSetupSlave ( >>> IN MARVELL_SPI_MASTER_PROTOCOL *This, >>> + IN SPI_DEVICE *Slave, >>> IN UINTN Cs, >>> IN SPI_MODE Mode >>> ) >>> { >>> - SPI_DEVICE *Slave; >>> + if (!Slave) { >>> + Slave = AllocateZeroPool (sizeof(SPI_DEVICE)); >>> + if (Slave == NULL) { >>> + DEBUG((DEBUG_ERROR, "Cannot allocate memory\n")); >>> + return NULL; >>> + } >>> >>> - Slave = AllocateZeroPool (sizeof(SPI_DEVICE)); >>> - if (Slave == NULL) { >>> - DEBUG((DEBUG_ERROR, "Cannot allocate memory\n")); >>> - return NULL; >>> + Slave->Cs = Cs; >>> + Slave->Mode = Mode; >>> } >>> >>> - Slave->Cs = Cs; >>> - Slave->Mode = Mode; >>> - >>> SpiSetupTransfer (This, Slave); >>> >>> return Slave; >>> diff --git a/Platform/Marvell/Drivers/Spi/MvSpiDxe.h b/Platform/Marvell/Drivers/Spi/MvSpiDxe.h >>> index 1401f62..e7e280a 100644 >>> --- a/Platform/Marvell/Drivers/Spi/MvSpiDxe.h >>> +++ b/Platform/Marvell/Drivers/Spi/MvSpiDxe.h >>> @@ -125,6 +125,7 @@ SPI_DEVICE * >>> EFIAPI >>> MvSpiSetupSlave ( >>> IN MARVELL_SPI_MASTER_PROTOCOL * This, >>> + IN SPI_DEVICE *Slave, >>> IN UINTN Cs, >>> IN SPI_MODE Mode >>> ); >>> diff --git a/Platform/Marvell/Include/Protocol/Spi.h b/Platform/Marvell/Include/Protocol/Spi.h >>> index 93a8ec0..0cf7914 100644 >>> --- a/Platform/Marvell/Include/Protocol/Spi.h >>> +++ b/Platform/Marvell/Include/Protocol/Spi.h >>> @@ -87,6 +87,7 @@ typedef >>> SPI_DEVICE * >>> (EFIAPI *MV_SPI_SETUP_DEVICE) ( >>> IN MARVELL_SPI_MASTER_PROTOCOL *This, >>> + IN SPI_DEVICE *Slave, >>> IN UINTN Cs, >>> IN SPI_MODE Mode >>> ); >>> -- >>> 2.7.4 >>>