diff mbox

[edk2] ArmPkg: fix compilation error in ArmDmaLib

Message ID 20161201164502.9470-1-leif.lindholm@linaro.org
State Accepted
Commit 018c3c0b3e0c04f7f422a0b41b228482870d11f0
Headers show

Commit Message

Leif Lindholm Dec. 1, 2016, 4:45 p.m. UTC
Commit 0a99a65d2c8a ("fix incorrect device address of double buffer")
retained an explicit cast on the variable "Buffer" which became
incorrect with the other changes, leading to compilation failures
with some toolchains. Drop the cast.

Contributed-under: TianoCore Contribution Agreement 1.0
Reported-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---

Mike, Andrew - since Ard is on holiday and the fix is trivial,
could either of you give me a Reviewed-by: on this one?

 ArmPkg/Library/ArmDmaLib/ArmDmaLib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.10.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Sudeep Holla Dec. 1, 2016, 4:46 p.m. UTC | #1
On 01/12/16 16:45, Leif Lindholm wrote:
> Commit 0a99a65d2c8a ("fix incorrect device address of double buffer")

> retained an explicit cast on the variable "Buffer" which became

> incorrect with the other changes, leading to compilation failures

> with some toolchains. Drop the cast.

>

> Contributed-under: TianoCore Contribution Agreement 1.0

> Reported-by: Sudeep Holla <sudeep.holla@arm.com>


It fixes the build for me.

Tested-by: Sudeep Holla <sudeep.holla@arm.com>


-- 
Regards,
Sudeep
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Dec. 1, 2016, 5 p.m. UTC | #2
On 1 December 2016 at 16:45, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Commit 0a99a65d2c8a ("fix incorrect device address of double buffer")

> retained an explicit cast on the variable "Buffer" which became

> incorrect with the other changes, leading to compilation failures

> with some toolchains. Drop the cast.

>

> Contributed-under: TianoCore Contribution Agreement 1.0

> Reported-by: Sudeep Holla <sudeep.holla@arm.com>

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>


Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


> ---

>

> Mike, Andrew - since Ard is on holiday and the fix is trivial,

> could either of you give me a Reviewed-by: on this one?

>

>  ArmPkg/Library/ArmDmaLib/ArmDmaLib.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c

> index acc106b..f4ee9e4 100644

> --- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c

> +++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c

> @@ -142,7 +142,7 @@ DmaMap (

>          CopyMem (Buffer, HostAddress, *NumberOfBytes);

>        }

>

> -      *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress ((UINTN)Buffer));

> +      *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress (Buffer));

>        Map->BufferAddress = Buffer;

>      } else {

>        Map->DoubleBuffer  = FALSE;

> --

> 2.10.2

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Leif Lindholm Dec. 1, 2016, 5:07 p.m. UTC | #3
On Thu, Dec 01, 2016 at 05:00:19PM +0000, Ard Biesheuvel wrote:
> On 1 December 2016 at 16:45, Leif Lindholm <leif.lindholm@linaro.org> wrote:

> > Commit 0a99a65d2c8a ("fix incorrect device address of double buffer")

> > retained an explicit cast on the variable "Buffer" which became

> > incorrect with the other changes, leading to compilation failures

> > with some toolchains. Drop the cast.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.0

> > Reported-by: Sudeep Holla <sudeep.holla@arm.com>

> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> 

> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Get back on holiday!

Thanks :)

Pushed as 018c3c0, thanks.

/
    Leif

> > ---

> >

> > Mike, Andrew - since Ard is on holiday and the fix is trivial,

> > could either of you give me a Reviewed-by: on this one?

> >

> >  ArmPkg/Library/ArmDmaLib/ArmDmaLib.c | 2 +-

> >  1 file changed, 1 insertion(+), 1 deletion(-)

> >

> > diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c

> > index acc106b..f4ee9e4 100644

> > --- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c

> > +++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c

> > @@ -142,7 +142,7 @@ DmaMap (

> >          CopyMem (Buffer, HostAddress, *NumberOfBytes);

> >        }

> >

> > -      *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress ((UINTN)Buffer));

> > +      *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress (Buffer));

> >        Map->BufferAddress = Buffer;

> >      } else {

> >        Map->DoubleBuffer  = FALSE;

> > --

> > 2.10.2

> >

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox

Patch

diff --git a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c
index acc106b..f4ee9e4 100644
--- a/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c
+++ b/ArmPkg/Library/ArmDmaLib/ArmDmaLib.c
@@ -142,7 +142,7 @@  DmaMap (
         CopyMem (Buffer, HostAddress, *NumberOfBytes);
       }
 
-      *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress ((UINTN)Buffer));
+      *DeviceAddress = HostToDeviceAddress (ConvertToPhysicalAddress (Buffer));
       Map->BufferAddress = Buffer;
     } else {
       Map->DoubleBuffer  = FALSE;