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

Commit e6dff4e7 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Remove explicit usage of __iormb()"

parents 92a10f31 7a61bf79

drivers/media/platform/msm/npu/npu_hw_access.c

+4 −8
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ uint32_t npu_core_reg_read(struct npu_device *npu_dev, uint32_t off) 
{

	uint32_t ret = 0;



	ret = readl_relaxed(npu_dev->core_io.base + off);

	__iormb();

	ret = readl(npu_dev->core_io.base + off);

	return ret;

}
@@ -48,8 +47,7 @@ uint32_t npu_bwmon_reg_read(struct npu_device *npu_dev, uint32_t off) 
{

	uint32_t ret = 0;



	ret = readl_relaxed(npu_dev->bwmon_io.base + off);

	__iormb();

	ret = readl(npu_dev->bwmon_io.base + off);

	return ret;

}
@@ -64,10 +62,8 @@ uint32_t npu_qfprom_reg_read(struct npu_device *npu_dev, uint32_t off) 
{

	uint32_t ret = 0;



	if (npu_dev->qfprom_io.base) {

		ret = readl_relaxed(npu_dev->qfprom_io.base + off);

		__iormb();

	}

	if (npu_dev->qfprom_io.base)

		ret = readl(npu_dev->qfprom_io.base + off);



	return ret;

}

drivers/platform/msm/gsi/gsi.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -32,7 +32,7 @@ 
#define GSI_EVT_RING_MAX  24

#define GSI_NO_EVT_ERINDEX 31



#define gsi_readl(c)	({ u32 __v = readl_relaxed(c); __iormb(); __v; })

#define gsi_readl(c)	(readl(c))

#define gsi_writel(v, c)	({ __iowmb(); writel_relaxed((v), (c)); })



#define GSI_IPC_LOGGING(buf, fmt, args...) \

drivers/platform/msm/gsi/gsi_emulation.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -18,7 +18,7 @@ 
# include "gsi_reg.h"

# include "gsi_emulation_stubs.h"



# define gsi_emu_readl(c)     ({ u32 __v = readl_relaxed(c); __iormb(); __v; })

# define gsi_emu_readl(c)     (readl(c))

# define gsi_emu_writel(v, c) ({ __iowmb(); writel_relaxed((v), (c)); })



# define CNTRLR_BASE 0

drivers/platform/msm/gsi/gsi_emulation_stubs.h

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -14,7 +14,6 @@ 
# define _GSI_EMULATION_STUBS_H_



# include <asm/barrier.h>

# define __iormb()       rmb() /* used in gsi.h */

# define __iowmb()       wmb() /* used in gsi.h */



#endif /* #if !defined(_GSI_EMULATION_STUBS_H_) */

drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * are required by some of the macros and include files that follow...

 */

#define my_in_dword(addr) \

	({ u32 __v = readl_relaxed((addr)); __iormb(); __v; })

	(readl(addr))

#define in_dword(addr) \

	my_in_dword((u8 *) ipa3_ctx->reg_collection_base + \

		    (u32)(addr))