From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org
Cc: maciej.rabeda@intel.com, michael.d.kinney@intel.com,
eric.jin@intel.com, leif.lindholm@linaro.org,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH edk2-staging 06/19] IntelUndiPkg/GigUndiDxe: use intermediate UINTN casts for pointers
Date: Tue, 6 Nov 2018 18:58:20 +0100 [thread overview]
Message-ID: <20181106175833.26964-7-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20181106175833.26964-1-ard.biesheuvel@linaro.org>
Use intermediate (UINTN) casts when casting pointers to UINT64.
This is needed to be able to build this code for 32-bit architectures
such as ARM or IA32.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
IntelUndiPkg/GigUndiDxe/Dma.c | 8 ++++----
IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c | 6 +++---
IntelUndiPkg/GigUndiDxe/Init.c | 6 +++---
IntelUndiPkg/GigUndiDxe/e1000.c | 10 +++++-----
IntelUndiPkg/GigUndiDxe/e1000.h | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/IntelUndiPkg/GigUndiDxe/Dma.c b/IntelUndiPkg/GigUndiDxe/Dma.c
index bf94c1e2fd54..eee2aa8a1ce3 100644
--- a/IntelUndiPkg/GigUndiDxe/Dma.c
+++ b/IntelUndiPkg/GigUndiDxe/Dma.c
@@ -127,7 +127,7 @@ FREE_BUF_ON_ERROR:
PciIo->FreeBuffer (
PciIo,
BytesToPages (DmaMapping->Size),
- (VOID *) DmaMapping->UnmappedAddress
+ (VOID *)(UINTN)DmaMapping->UnmappedAddress
);
DmaMapping->Size = 0;
DmaMapping->UnmappedAddress = 0;
@@ -173,7 +173,7 @@ UndiDmaFreeCommonBuffer (
PciIo->FreeBuffer (
PciIo,
BytesToPages (DmaMapping->Size),
- (VOID *) DmaMapping->UnmappedAddress
+ (VOID *)(UINTN)DmaMapping->UnmappedAddress
);
DmaMapping->UnmappedAddress = 0;
@@ -209,7 +209,7 @@ UndiDmaMapCommonBuffer (
return PciIo->Map (
PciIo,
EfiPciIoOperationBusMasterCommonBuffer,
- (VOID *) DmaMapping->UnmappedAddress,
+ (VOID *)(UINTN)DmaMapping->UnmappedAddress,
&DmaMapping->Size,
&DmaMapping->PhysicalAddress,
&DmaMapping->Mapping
@@ -243,7 +243,7 @@ UndiDmaMapMemoryRead (
return PciIo->Map (
PciIo,
EfiPciIoOperationBusMasterRead,
- (VOID *) DmaMapping->UnmappedAddress,
+ (VOID *)(UINTN)DmaMapping->UnmappedAddress,
&DmaMapping->Size,
&DmaMapping->PhysicalAddress,
&DmaMapping->Mapping
diff --git a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
index 559f2133281e..aceb015e480f 100644
--- a/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
+++ b/IntelUndiPkg/GigUndiDxe/DriverDiagnostics.c
@@ -1132,7 +1132,7 @@ GigUndiRunPhyLoopback (
while (j < PHY_LOOPBACK_ITERATIONS) {
Status = E1000Transmit (
GigAdapterInfo,
- (UINT64) &PxeCpbTransmit,
+ (UINT64)(UINTN)&PxeCpbTransmit,
PXE_OPFLAGS_TRANSMIT_WHOLE
);
_DisplayBuffersAndDescriptors (GigAdapterInfo);
@@ -1161,8 +1161,8 @@ GigUndiRunPhyLoopback (
for (i = 0; i <= 100000; i++) {
Status = E1000Receive (
GigAdapterInfo,
- (UINT64) &CpbReceive,
- (UINT64) &DbReceive
+ (UINT64)(UINTN)&CpbReceive,
+ (UINT64)(UINTN)&DbReceive
);
gBS->Stall (10);
diff --git a/IntelUndiPkg/GigUndiDxe/Init.c b/IntelUndiPkg/GigUndiDxe/Init.c
index 74b933674589..f99734d72823 100644
--- a/IntelUndiPkg/GigUndiDxe/Init.c
+++ b/IntelUndiPkg/GigUndiDxe/Init.c
@@ -301,7 +301,7 @@ GigUndiPxeStructInit (
PXE_ROMID_IMP_TX_COMPLETE_INT_SUPPORTED |
PXE_ROMID_IMP_PACKET_RX_INT_SUPPORTED;
- PxePtr->EntryPoint = (UINT64) E1000UndiApiEntry;
+ PxePtr->EntryPoint = (UINT64)(UINTN)E1000UndiApiEntry;
PxePtr->reserved2[0] = 0;
PxePtr->reserved2[1] = 0;
PxePtr->reserved2[2] = 0;
@@ -842,7 +842,7 @@ InitNiiProtocol (
return EFI_INVALID_PARAMETER;
}
- NiiProtocol31->Id = (UINT64) (mE1000Pxe31);
+ NiiProtocol31->Id = (UINT64)(UINTN)mE1000Pxe31;
NiiProtocol31->IfNum = mE1000Pxe31->IFcnt;
NiiProtocol31->Revision = EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION_31;
@@ -938,7 +938,7 @@ InitUndiCallbackFunctions (
NicInfo->MapMem = (VOID *) 0;
NicInfo->UnMapMem = (VOID *) 0;
NicInfo->SyncMem = (VOID *) 0;
- NicInfo->UniqueId = (UINT64) NicInfo;
+ NicInfo->UniqueId = (UINT64)(UINTN)NicInfo;
NicInfo->VersionFlag = 0x31;
}
diff --git a/IntelUndiPkg/GigUndiDxe/e1000.c b/IntelUndiPkg/GigUndiDxe/e1000.c
index 6f8529abf046..1f08a5d67b2d 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000.c
+++ b/IntelUndiPkg/GigUndiDxe/e1000.c
@@ -128,7 +128,7 @@ E1000MapMem (
VirtualAddress,
Size,
TO_DEVICE,
- (UINT64) MappedAddress
+ (UINT64)(UINTN)MappedAddress
);
if (*MappedAddress == 0) {
@@ -1079,7 +1079,7 @@ E1000TxRxConfigure (
ZeroMem (GigAdapter->TxBufferMappings, sizeof (GigAdapter->TxBufferMappings));
- RxBuffer = (LOCAL_RX_BUFFER *) GigAdapter->RxBufferMapping.PhysicalAddress;
+ RxBuffer = (LOCAL_RX_BUFFER *)(UINTN)GigAdapter->RxBufferMapping.PhysicalAddress;
DEBUGPRINT (
E1000, ("Tx Ring %x Added %x\n",
@@ -1578,17 +1578,17 @@ E1000Inititialize (
TempBar = NULL;
ZeroMem (
- (VOID *) GigAdapter->RxRing.UnmappedAddress,
+ (VOID *)(UINTN)GigAdapter->RxRing.UnmappedAddress,
RX_RING_SIZE
);
ZeroMem (
- (VOID *) GigAdapter->TxRing.UnmappedAddress,
+ (VOID *)(UINTN)GigAdapter->TxRing.UnmappedAddress,
TX_RING_SIZE
);
ZeroMem (
- (VOID *) GigAdapter->RxBufferMapping.UnmappedAddress,
+ (VOID *)(UINTN)GigAdapter->RxBufferMapping.UnmappedAddress,
RX_BUFFERS_SIZE
);
diff --git a/IntelUndiPkg/GigUndiDxe/e1000.h b/IntelUndiPkg/GigUndiDxe/e1000.h
index 71fe4591af05..a44fe3fa2ec8 100644
--- a/IntelUndiPkg/GigUndiDxe/e1000.h
+++ b/IntelUndiPkg/GigUndiDxe/e1000.h
@@ -233,7 +233,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@return Descriptor retrieved
**/
#define E1000_RX_DESC(R, i) \
- (&(((struct e1000_rx_desc *) ((R)->UnmappedAddress))[i]))
+ (&(((struct e1000_rx_desc *)(UINTN)((R)->UnmappedAddress))[i]))
/** Retrieves TX descriptor from TX ring structure
@@ -243,7 +243,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@return Descriptor retrieved
**/
#define E1000_TX_DESC(R, i) \
- (&(((struct e1000_tx_desc *) ((R)->UnmappedAddress))[i]))
+ (&(((struct e1000_tx_desc *)(UINTN)((R)->UnmappedAddress))[i]))
/** Retrieves UNDI_PRIVATE_DATA structure using NII Protocol 3.1 instance
--
2.19.1
next prev parent reply other threads:[~2018-11-06 17:58 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 17:58 [PATCH edk2-staging 00/19] IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 01/19] IntelOpenSourceUndiPkg.dsc: add AARCH64 and ARM to supported architectures Ard Biesheuvel
2019-01-29 13:54 ` Ryszard Knop
2019-01-29 14:04 ` Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 02/19] IntelUndiPkg: remove EOF markers Ard Biesheuvel
2018-11-06 19:34 ` Philippe Mathieu-Daudé
2019-01-29 13:58 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 03/19] IntelUndiPkg/GigUndiDxe: consistently use lowercase for e1000 in filenames Ard Biesheuvel
2018-11-06 19:35 ` Philippe Mathieu-Daudé
2019-01-29 14:21 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 04/19] IntelUndiPkg/GigUndiDxe: consistently use forward slashes as path separators Ard Biesheuvel
2018-11-06 19:37 ` Philippe Mathieu-Daudé
2019-01-29 14:26 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 05/19] IntelUndiPkg/GigUndiDxe: move BRAND_STRUCT declaration after type definition Ard Biesheuvel
2019-01-29 16:02 ` Ryszard Knop
2018-11-06 17:58 ` Ard Biesheuvel [this message]
2019-01-30 10:59 ` [PATCH edk2-staging 06/19] IntelUndiPkg/GigUndiDxe: use intermediate UINTN casts for pointers Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 07/19] IntelUndiPkg/GigUndiDxe: create GCC alternatives for MSFT build options Ard Biesheuvel
2019-01-30 11:48 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 08/19] IntelUndiPkg/GigUndiDxe: add missing VOID** cast Ard Biesheuvel
2018-11-07 9:16 ` Philippe Mathieu-Daudé
2018-11-07 14:05 ` Philippe Mathieu-Daudé
2019-01-30 12:05 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 09/19] IntelUndiPkg/GigUndiDxe: add missing UINT8* cast Ard Biesheuvel
2018-11-06 20:31 ` Philippe Mathieu-Daudé
2018-11-06 20:35 ` Ard Biesheuvel
2018-11-07 9:08 ` Philippe Mathieu-Daudé
2019-01-30 12:37 ` Ryszard Knop
2019-01-30 12:30 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 10/19] IntelUndiPkg/GigUndiDxe: add missing braces to GUID literals Ard Biesheuvel
2018-11-06 20:34 ` Philippe Mathieu-Daudé
2019-01-30 12:59 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 11/19] IntelUndiPkg/GigUndiDxe: fix incorrect use of CPP token pasting Ard Biesheuvel
2019-01-30 13:35 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 12/19] IntelUndiPkg/GigUndiDxe: cast E1000MemCopy () args to correct pointer type Ard Biesheuvel
2018-11-06 20:35 ` Philippe Mathieu-Daudé
2019-01-30 13:37 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 13/19] IntelUndiPkg/GigUndiDxe: don't take address of cast expression Ard Biesheuvel
2018-11-06 20:36 ` Philippe Mathieu-Daudé
2019-01-30 13:41 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 14/19] IntelUndiPkg/GigUndiDxe: redefine UNREFERENCED_nPARAMETER macros for GCC Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 15/19] IntelUndiPkg/GigUndiDxe: remove forward declaration of non-existent function Ard Biesheuvel
2018-11-06 20:40 ` Philippe Mathieu-Daudé
2019-01-30 15:26 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 16/19] IntelUndiPkg/GigUndiDxe: fix incorrect indentation Ard Biesheuvel
2018-11-06 20:41 ` Philippe Mathieu-Daudé
2018-11-06 17:58 ` [PATCH edk2-staging 17/19] IntelUndiPkg/GigUndiDxe: move MSFT warning overrides to INF file Ard Biesheuvel
2019-01-30 14:09 ` Ryszard Knop
2018-11-06 17:58 ` [PATCH edk2-staging 18/19] IntelUndiPkg/GigUndiDxe: add missing EFIAPI modifiers Ard Biesheuvel
2019-01-30 15:15 ` Ryszard Knop
2019-01-30 15:20 ` Ard Biesheuvel
2019-01-30 15:31 ` Ryszard Knop
2019-01-30 15:33 ` Ard Biesheuvel
2018-11-06 17:58 ` [PATCH edk2-staging 19/19] IntelUndiPkg/GigUndiDxe: remove or reorganize unused variables Ard Biesheuvel
2018-11-07 9:08 ` Philippe Mathieu-Daudé
2019-01-30 14:32 ` Ryszard Knop
2018-11-06 22:10 ` [PATCH edk2-staging 00/19] IntelUndiPkg/GigUndiDxe: build fixes for AARCH64/ARM/GCC Kinney, Michael D
2018-11-06 23:03 ` Ard Biesheuvel
2018-11-09 17:54 ` Knop, Ryszard
2018-11-09 18:00 ` Ard Biesheuvel
2018-11-07 14:56 ` Leif Lindholm
2019-01-29 13:13 ` Ryszard Knop
2019-01-29 13:55 ` Ryszard Knop
2019-03-27 15:32 ` Ard Biesheuvel
2019-03-28 10:46 ` Ryszard Knop
2019-03-28 11:38 ` Ard Biesheuvel
2020-01-07 12:49 ` [edk2-devel] " Maciej Rabeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181106175833.26964-7-ard.biesheuvel@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox