From nobody Mon Feb 9 21:37:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+48695+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+48695+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1570686152; cv=none; d=zoho.com; s=zohoarc; b=azAr3f9DFifpr0uYr15HGAnwGPvZ85hGajDh/TH+ns4J5a8WR2HRhHc8rd6Fl/CbTkTzIy22D0NGil3R4z5cBslaGpWK0U5GexQZkQvMC9OHWFqybVRrGg6+RahR/NsBfgKcCiqXWyXW53VouKJ6wm8U72hYgaVHJQlQ5WFM7G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570686152; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=3dik2b76tvqB3mVhbzA7NCoPDYE+SlqWChokGmbEU5o=; b=hviI9wlGpQr6qNW50EFHdct+JyKa5dbZxrWgLf4zG/JSXfkLio1SPqU2tRiXuc1h1teZ9/gj9gqsW2wvYJ2J3r4ljyvItqNoceapl/JHLUmylGrM/6aKB+xNP4S4B4YugQVs7NPf+H9WVCPsYmP1kdMEWX2xRajqZ/e1f5ZEpbQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+48695+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1570686152916355.4792081029141; Wed, 9 Oct 2019 22:42:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Wed, 09 Oct 2019 22:42:32 -0700 X-Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by mx.groups.io with SMTP id smtpd.web11.2578.1570686151355119877 for ; Wed, 09 Oct 2019 22:42:31 -0700 X-Received: by mail-lj1-f193.google.com with SMTP id m7so4878906lji.2 for ; Wed, 09 Oct 2019 22:42:31 -0700 (PDT) X-Gm-Message-State: aaaaaaaaaaaaaaaaaaaaaaaax1787277AA= X-Google-Smtp-Source: APXvYqxtBjiHGrnlziUUtKNSC1GKMopfcNZTpGpjI7SSFo9FhpbHBjq2a3VvCfvioeHjmjIRKz6vAA== X-Received: by 2002:a2e:3919:: with SMTP id g25mr4843197lja.162.1570686149340; Wed, 09 Oct 2019 22:42:29 -0700 (PDT) X-Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id p27sm1001481lfo.95.2019.10.09.22.42.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Oct 2019 22:42:28 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com Subject: [edk2-devel] [edk2-platforms: PATCH v3 1/9] Marvell/Armada7k8k: Fix 32-bit compilation Date: Thu, 10 Oct 2019 07:42:11 +0200 Message-Id: <1570686139-25182-2-git-send-email-mw@semihalf.com> In-Reply-To: <1570686139-25182-1-git-send-email-mw@semihalf.com> References: <1570686139-25182-1-git-send-email-mw@semihalf.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mw@semihalf.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1570686152; bh=EMNoThU4jdqbPPGMcWyZ/4Zyc7RUyfbLkxrX01f6cPA=; h=Cc:Date:From:Reply-To:Subject:To; b=u2u3DUVgGjO3M6ouLd/2hKNrc1GaIjW9CGoaClN7djr40nlfcuQE+Ky3nVjqZWTzr8T vI223qC2TYkHbxnwWMoQx9SzsXDfFHOjjbw2FIffN8//IRhwGW/V8wnlUadMlN3WWetoV SRB1eQYNhiEDcR6spMWB4FqyGsGLnK0Dq24= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It turned out, that the recently added features broke ARM compilation. Fix all issues: * Update signatures types in structures (UINTN -> UINT64) * Use fixed type for address in ICU * Limit memory for ARM build to 1GB and stop using non-existent PCD Signed-off-by: Marcin Wojtas Reviewed-by: Leif Lindholm --- Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.h |= 2 +- Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h |= 2 +- Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h |= 4 ++-- Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c |= 8 ++++++++ Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelper.S |= 11 ----------- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.h b/Silicon/M= arvell/Drivers/BoardDesc/MvBoardDescDxe.h index a6f551b..3b5a28c 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.h +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.h @@ -22,7 +22,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 typedef struct { MARVELL_BOARD_DESC_PROTOCOL BoardDescProtocol; - UINTN Signature; + UINT64 Signature; EFI_HANDLE Handle; EFI_LOCK Lock; } MV_BOARD_DESC; diff --git a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h b/Silicon/M= arvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h index 1cb006a..ce683e7 100644 --- a/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h +++ b/Silicon/Marvell/Drivers/Gpio/MvGpioDxe/MvGpioDxe.h @@ -36,7 +36,7 @@ typedef struct { EMBEDDED_GPIO GpioProtocol; GPIO_CONTROLLER *SoCGpio; UINTN GpioDeviceCount; - UINTN Signature; + UINT64 Signature; EFI_HANDLE Handle; } MV_GPIO; =20 diff --git a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h b/Silicon/M= arvell/Include/Library/ArmadaSoCDescLib.h index 6432916..da7a41e 100644 --- a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h +++ b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h @@ -109,8 +109,8 @@ typedef enum { =20 typedef struct { ICU_GROUP Group; - UINTN SetSpiAddr; - UINTN ClrSpiAddr; + EFI_PHYSICAL_ADDRESS SetSpiAddr; + EFI_PHYSICAL_ADDRESS ClrSpiAddr; } ICU_MSI; =20 typedef struct { diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLib= Mem.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c index a735fe5..cc19694 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c @@ -36,6 +36,7 @@ GetDramSize ( IN OUT UINT64 *MemSize ) { +#if defined(MDE_CPU_AARCH64) ARM_SMC_ARGS SmcRegs =3D {0}; EFI_STATUS Status; =20 @@ -48,6 +49,13 @@ GetDramSize ( ArmCallSmc (&SmcRegs); =20 *MemSize =3D SmcRegs.Arg0; +#else + // + // Use fixed value, as currently there is no support + // in Armada early firmware for 32-bit SMC + // + *MemSize =3D FixedPcdGet64 (PcdSystemMemorySize); +#endif =20 return EFI_SUCCESS; } diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatfo= rmHelper.S b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatfo= rmHelper.S index 4416163..db43b0f 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelpe= r.S +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/ARM/ArmPlatformHelpe= r.S @@ -28,17 +28,6 @@ ASM_FUNC(ArmPlatformPeiBootAction) .err PcdSystemMemoryBase should be 0x0 on this platform! .endif =20 - .if FixedPcdGet64 (PcdSystemMemorySize) > FixedPcdGet32 (PcdDramRemapT= arget) - // - // Use the low range for UEFI itself. The remaining memory will be map= ped - // and added to the GCD map later. - // - ADRL (r0, mSystemMemoryEnd) - MOV32 (r2, FixedPcdGet32 (PcdDramRemapTarget) - 1) - mov r3, #0 - strd r2, r3, [r0] - .endif - bx lr =20 //UINTN --=20 2.7.4 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#48695): https://edk2.groups.io/g/devel/message/48695 Mute This Topic: https://groups.io/mt/34471897/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-