Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ff8666 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

qed: Fix address macros 



Last FW submission reverted various macros into an older form,
where they generate compilation warnings on some architectures.

Bring back the newer macros instead.

Fixes: 05fafbfb ("qed: utilize FW 8.10.10.0")
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e55dddfe

include/linux/qed/common_hsi.h

+8 −14
Original line number Diff line number Diff line
@@ -13,23 +13,17 @@ 
#include <linux/slab.h>



/* dma_addr_t manip */

#define DMA_LO(x)               ((u32)(((dma_addr_t)(x)) & 0xffffffff))

#define DMA_HI(x)               ((u32)(((dma_addr_t)(x)) >> 32))



#define DMA_LO_LE(x)            cpu_to_le32(DMA_LO(x))

#define DMA_HI_LE(x)            cpu_to_le32(DMA_HI(x))



/* It's assumed that whoever includes this has previously included an hsi

 * file defining the regpair.

 */

#define DMA_REGPAIR_LE(x, val)  (x).hi	= DMA_HI_LE((val)); \

	(x).lo				= DMA_LO_LE((val))

#define DMA_LO_LE(x)		cpu_to_le32(lower_32_bits(x))

#define DMA_HI_LE(x)		cpu_to_le32(upper_32_bits(x))

#define DMA_REGPAIR_LE(x, val)	do { \

					(x).hi = DMA_HI_LE((val)); \

					(x).lo = DMA_LO_LE((val)); \

				} while (0)



#define HILO_GEN(hi, lo, type)  ((((type)(hi)) << 32) + (lo))

#define HILO_DMA(hi, lo)        HILO_GEN(hi, lo, dma_addr_t)

#define HILO_64(hi, lo)         HILO_GEN(hi, lo, u64)

#define HILO_DMA_REGPAIR(regpair)       (HILO_DMA(regpair.hi, regpair.lo))

#define HILO_64(hi, lo) HILO_GEN((le32_to_cpu(hi)), (le32_to_cpu(lo)), u64)

#define HILO_64_REGPAIR(regpair)        (HILO_64(regpair.hi, regpair.lo))

#define HILO_DMA_REGPAIR(regpair)	((dma_addr_t)HILO_64_REGPAIR(regpair))



#ifndef __COMMON_HSI__

#define __COMMON_HSI__