[PATCH] drm/bridge: analogix_dp: Use relaxed MMIO accessors
From: Marc Zyngier
Date: Mon Dec 18 2017 - 06:40:01 EST
The analogix DP bridge is entierely driven via MMIO accesses, and
does not do any DMA that requires coherency with the CPU. Yet, the
driver uses the non-relaxed accessors, forcing strong barriers to
be emitted on architectures with a relaxed memory ordering.
This is of course completely unnecessary, and only serves as a way
to pointlessly reduce the performance of unsuspecting platforms.
Switch the driver to the _relaxed accessors, making my kevin platform
a slightly better machine.
Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
---
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 488 +++++++++++-----------
1 file changed, 244 insertions(+), 244 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index 303083ad28e3..248d6ba913dc 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -31,13 +31,13 @@ void analogix_dp_enable_video_mute(struct analogix_dp_device *dp, bool enable)
u32 reg;
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
reg |= HDCP_VIDEO_MUTE;
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
reg &= ~HDCP_VIDEO_MUTE;
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
}
}
@@ -45,9 +45,9 @@ void analogix_dp_stop_video(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
reg &= ~VIDEO_EN;
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
}
void analogix_dp_lane_swap(struct analogix_dp_device *dp, bool enable)
@@ -61,7 +61,7 @@ void analogix_dp_lane_swap(struct analogix_dp_device *dp, bool enable)
reg = LANE3_MAP_LOGIC_LANE_3 | LANE2_MAP_LOGIC_LANE_2 |
LANE1_MAP_LOGIC_LANE_1 | LANE0_MAP_LOGIC_LANE_0;
- writel(reg, dp->reg_base + ANALOGIX_DP_LANE_MAP);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LANE_MAP);
}
void analogix_dp_init_analog_param(struct analogix_dp_device *dp)
@@ -69,53 +69,53 @@ void analogix_dp_init_analog_param(struct analogix_dp_device *dp)
u32 reg;
reg = TX_TERMINAL_CTRL_50_OHM;
- writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_1);
reg = SEL_24M | TX_DVDD_BIT_1_0625V;
- writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_2);
if (dp->plat_data && is_rockchip(dp->plat_data->dev_type)) {
reg = REF_CLK_24M;
if (dp->plat_data->dev_type == RK3288_DP)
reg ^= REF_CLK_MASK;
- writel(reg, dp->reg_base + ANALOGIX_DP_PLL_REG_1);
- writel(0x95, dp->reg_base + ANALOGIX_DP_PLL_REG_2);
- writel(0x40, dp->reg_base + ANALOGIX_DP_PLL_REG_3);
- writel(0x58, dp->reg_base + ANALOGIX_DP_PLL_REG_4);
- writel(0x22, dp->reg_base + ANALOGIX_DP_PLL_REG_5);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_PLL_REG_1);
+ writel_relaxed(0x95, dp->reg_base + ANALOGIX_DP_PLL_REG_2);
+ writel_relaxed(0x40, dp->reg_base + ANALOGIX_DP_PLL_REG_3);
+ writel_relaxed(0x58, dp->reg_base + ANALOGIX_DP_PLL_REG_4);
+ writel_relaxed(0x22, dp->reg_base + ANALOGIX_DP_PLL_REG_5);
}
reg = DRIVE_DVDD_BIT_1_0625V | VCO_BIT_600_MICRO;
- writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_3);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_3);
reg = PD_RING_OSC | AUX_TERMINAL_CTRL_50_OHM |
TX_CUR1_2X | TX_CUR_16_MA;
- writel(reg, dp->reg_base + ANALOGIX_DP_PLL_FILTER_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_PLL_FILTER_CTL_1);
reg = CH3_AMP_400_MV | CH2_AMP_400_MV |
CH1_AMP_400_MV | CH0_AMP_400_MV;
- writel(reg, dp->reg_base + ANALOGIX_DP_TX_AMP_TUNING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_TX_AMP_TUNING_CTL);
}
void analogix_dp_init_interrupt(struct analogix_dp_device *dp)
{
/* Set interrupt pin assertion polarity as high */
- writel(INT_POL1 | INT_POL0, dp->reg_base + ANALOGIX_DP_INT_CTL);
+ writel_relaxed(INT_POL1 | INT_POL0, dp->reg_base + ANALOGIX_DP_INT_CTL);
/* Clear pending regisers */
- writel(0xff, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1);
- writel(0x4f, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_2);
- writel(0xe0, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_3);
- writel(0xe7, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4);
- writel(0x63, dp->reg_base + ANALOGIX_DP_INT_STA);
+ writel_relaxed(0xff, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1);
+ writel_relaxed(0x4f, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_2);
+ writel_relaxed(0xe0, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_3);
+ writel_relaxed(0xe7, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4);
+ writel_relaxed(0x63, dp->reg_base + ANALOGIX_DP_INT_STA);
/* 0:mask,1: unmask */
- writel(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_1);
- writel(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_2);
- writel(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_3);
- writel(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
- writel(0x00, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
+ writel_relaxed(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_1);
+ writel_relaxed(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_2);
+ writel_relaxed(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_3);
+ writel_relaxed(0x00, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
+ writel_relaxed(0x00, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
}
void analogix_dp_reset(struct analogix_dp_device *dp)
@@ -128,44 +128,44 @@ void analogix_dp_reset(struct analogix_dp_device *dp)
reg = MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N |
AUD_FIFO_FUNC_EN_N | AUD_FUNC_EN_N |
HDCP_FUNC_EN_N | SW_FUNC_EN_N;
- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
reg = SSC_FUNC_EN_N | AUX_FUNC_EN_N |
SERDES_FIFO_FUNC_EN_N |
LS_CLK_DOMAIN_FUNC_EN_N;
- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
usleep_range(20, 30);
analogix_dp_lane_swap(dp, 0);
- writel(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
- writel(0x40, dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
- writel(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
- writel(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ writel_relaxed(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
+ writel_relaxed(0x40, dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
+ writel_relaxed(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ writel_relaxed(0x0, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
- writel(0x0, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
- writel(0x0, dp->reg_base + ANALOGIX_DP_HDCP_CTL);
+ writel_relaxed(0x0, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
+ writel_relaxed(0x0, dp->reg_base + ANALOGIX_DP_HDCP_CTL);
- writel(0x5e, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_L);
- writel(0x1a, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_H);
+ writel_relaxed(0x5e, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_L);
+ writel_relaxed(0x1a, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_H);
- writel(0x10, dp->reg_base + ANALOGIX_DP_LINK_DEBUG_CTL);
+ writel_relaxed(0x10, dp->reg_base + ANALOGIX_DP_LINK_DEBUG_CTL);
- writel(0x0, dp->reg_base + ANALOGIX_DP_PHY_TEST);
+ writel_relaxed(0x0, dp->reg_base + ANALOGIX_DP_PHY_TEST);
- writel(0x0, dp->reg_base + ANALOGIX_DP_VIDEO_FIFO_THRD);
- writel(0x20, dp->reg_base + ANALOGIX_DP_AUDIO_MARGIN);
+ writel_relaxed(0x0, dp->reg_base + ANALOGIX_DP_VIDEO_FIFO_THRD);
+ writel_relaxed(0x20, dp->reg_base + ANALOGIX_DP_AUDIO_MARGIN);
- writel(0x4, dp->reg_base + ANALOGIX_DP_M_VID_GEN_FILTER_TH);
- writel(0x2, dp->reg_base + ANALOGIX_DP_M_AUD_GEN_FILTER_TH);
+ writel_relaxed(0x4, dp->reg_base + ANALOGIX_DP_M_VID_GEN_FILTER_TH);
+ writel_relaxed(0x2, dp->reg_base + ANALOGIX_DP_M_AUD_GEN_FILTER_TH);
- writel(0x00000101, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
+ writel_relaxed(0x00000101, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
}
void analogix_dp_swreset(struct analogix_dp_device *dp)
{
- writel(RESET_DP_TX, dp->reg_base + ANALOGIX_DP_TX_SW_RESET);
+ writel_relaxed(RESET_DP_TX, dp->reg_base + ANALOGIX_DP_TX_SW_RESET);
}
void analogix_dp_config_interrupt(struct analogix_dp_device *dp)
@@ -174,19 +174,19 @@ void analogix_dp_config_interrupt(struct analogix_dp_device *dp)
/* 0: mask, 1: unmask */
reg = COMMON_INT_MASK_1;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_1);
reg = COMMON_INT_MASK_2;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_2);
reg = COMMON_INT_MASK_3;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_3);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_3);
reg = COMMON_INT_MASK_4;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
reg = INT_STA_MASK;
- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
}
void analogix_dp_mute_hpd_interrupt(struct analogix_dp_device *dp)
@@ -194,13 +194,13 @@ void analogix_dp_mute_hpd_interrupt(struct analogix_dp_device *dp)
u32 reg;
/* 0: mask, 1: unmask */
- reg = readl(dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
reg &= ~COMMON_INT_MASK_4;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
reg &= ~INT_STA_MASK;
- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
}
void analogix_dp_unmute_hpd_interrupt(struct analogix_dp_device *dp)
@@ -209,17 +209,17 @@ void analogix_dp_unmute_hpd_interrupt(struct analogix_dp_device *dp)
/* 0: mask, 1: unmask */
reg = COMMON_INT_MASK_4;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_4);
reg = INT_STA_MASK;
- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_INT_STA_MASK);
}
enum pll_status analogix_dp_get_pll_lock_status(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_DEBUG_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_DEBUG_CTL);
if (reg & PLL_LOCK)
return PLL_LOCKED;
else
@@ -231,13 +231,13 @@ void analogix_dp_set_pll_power_down(struct analogix_dp_device *dp, bool enable)
u32 reg;
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_PLL_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_PLL_CTL);
reg |= DP_PLL_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PLL_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_PLL_CTL);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_PLL_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_PLL_CTL);
reg &= ~DP_PLL_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PLL_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_PLL_CTL);
}
}
@@ -254,77 +254,77 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,
switch (block) {
case AUX_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg |= AUX_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg &= ~AUX_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
}
break;
case CH0_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg |= CH0_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg &= ~CH0_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
}
break;
case CH1_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg |= CH1_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg &= ~CH1_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
}
break;
case CH2_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg |= CH2_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg &= ~CH2_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
}
break;
case CH3_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg |= CH3_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg &= ~CH3_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
}
break;
case ANALOG_TOTAL:
if (enable) {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg |= DP_PHY_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + phy_pd_addr);
+ reg = readl_relaxed(dp->reg_base + phy_pd_addr);
reg &= ~DP_PHY_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
}
break;
case POWER_ALL:
if (enable) {
reg = DP_PHY_PD | AUX_PD | CH3_PD | CH2_PD |
CH1_PD | CH0_PD;
- writel(reg, dp->reg_base + phy_pd_addr);
+ writel_relaxed(reg, dp->reg_base + phy_pd_addr);
} else {
- writel(0x00, dp->reg_base + phy_pd_addr);
+ writel_relaxed(0x00, dp->reg_base + phy_pd_addr);
}
break;
default:
@@ -340,11 +340,11 @@ void analogix_dp_init_analog_func(struct analogix_dp_device *dp)
analogix_dp_set_analog_power_down(dp, POWER_ALL, 0);
reg = PLL_LOCK_CHG;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1);
- reg = readl(dp->reg_base + ANALOGIX_DP_DEBUG_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_DEBUG_CTL);
reg &= ~(F_PLL_LOCK | PLL_LOCK_CTRL);
- writel(reg, dp->reg_base + ANALOGIX_DP_DEBUG_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_DEBUG_CTL);
/* Power up PLL */
if (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
@@ -361,10 +361,10 @@ void analogix_dp_init_analog_func(struct analogix_dp_device *dp)
}
/* Enable Serdes FIFO function and Link symbol clock domain module */
- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
reg &= ~(SERDES_FIFO_FUNC_EN_N | LS_CLK_DOMAIN_FUNC_EN_N
| AUX_FUNC_EN_N);
- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
}
void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp)
@@ -375,10 +375,10 @@ void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp)
return;
reg = HOTPLUG_CHG | HPD_LOST | PLUG;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4);
reg = INT_HPD;
- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_INT_STA);
}
void analogix_dp_init_hpd(struct analogix_dp_device *dp)
@@ -390,18 +390,18 @@ void analogix_dp_init_hpd(struct analogix_dp_device *dp)
analogix_dp_clear_hotplug_interrupts(dp);
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
reg &= ~(F_HPD | HPD_CTRL);
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
}
void analogix_dp_force_hpd(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
reg = (F_HPD | HPD_CTRL);
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
}
enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp)
@@ -416,7 +416,7 @@ enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp)
return DP_IRQ_TYPE_HP_CABLE_OUT;
} else {
/* Parse hotplug interrupt status register */
- reg = readl(dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4);
if (reg & PLUG)
return DP_IRQ_TYPE_HP_CABLE_IN;
@@ -436,9 +436,9 @@ void analogix_dp_reset_aux(struct analogix_dp_device *dp)
u32 reg;
/* Disable AUX channel module */
- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
reg |= AUX_FUNC_EN_N;
- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
}
void analogix_dp_init_aux(struct analogix_dp_device *dp)
@@ -447,7 +447,7 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp)
/* Clear inerrupts related to AUX channel */
reg = RPLY_RECEIV | AUX_ERR;
- writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_INT_STA);
analogix_dp_reset_aux(dp);
@@ -460,16 +460,16 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp)
reg = AUX_BIT_PERIOD_EXPECTED_DELAY(3) |
AUX_HW_RETRY_COUNT_SEL(0) |
AUX_HW_RETRY_INTERVAL_600_MICROSECONDS;
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_HW_RETRY_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_HW_RETRY_CTL);
/* Receive AUX Channel DEFER commands equal to DEFFER_COUNT*64 */
reg = DEFER_CTRL_EN | DEFER_COUNT(1);
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_DEFER_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_DEFER_CTL);
/* Enable AUX channel module */
- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
reg &= ~AUX_FUNC_EN_N;
- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_2);
}
int analogix_dp_get_plug_in_status(struct analogix_dp_device *dp)
@@ -480,7 +480,7 @@ int analogix_dp_get_plug_in_status(struct analogix_dp_device *dp)
if (gpio_get_value(dp->hpd_gpio))
return 0;
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
if (reg & HPD_STATUS)
return 0;
}
@@ -492,9 +492,9 @@ void analogix_dp_enable_sw_function(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
reg &= ~SW_FUNC_EN_N;
- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
}
int analogix_dp_start_aux_transaction(struct analogix_dp_device *dp)
@@ -504,34 +504,34 @@ int analogix_dp_start_aux_transaction(struct analogix_dp_device *dp)
int timeout_loop = 0;
/* Enable AUX CH operation */
- reg = readl(dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
reg |= AUX_EN;
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
/* Is AUX CH command reply received? */
- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_INT_STA);
while (!(reg & RPLY_RECEIV)) {
timeout_loop++;
if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) {
dev_err(dp->dev, "AUX CH command reply failed!\n");
return -ETIMEDOUT;
}
- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_INT_STA);
usleep_range(10, 11);
}
/* Clear interrupt source for AUX CH command reply */
- writel(RPLY_RECEIV, dp->reg_base + ANALOGIX_DP_INT_STA);
+ writel_relaxed(RPLY_RECEIV, dp->reg_base + ANALOGIX_DP_INT_STA);
/* Clear interrupt source for AUX CH access error */
- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_INT_STA);
if (reg & AUX_ERR) {
- writel(AUX_ERR, dp->reg_base + ANALOGIX_DP_INT_STA);
+ writel_relaxed(AUX_ERR, dp->reg_base + ANALOGIX_DP_INT_STA);
return -EREMOTEIO;
}
/* Check AUX CH error access status */
- reg = readl(dp->reg_base + ANALOGIX_DP_AUX_CH_STA);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_AUX_CH_STA);
if ((reg & AUX_STATUS_MASK) != 0) {
dev_err(dp->dev, "AUX CH error happens: %d\n\n",
reg & AUX_STATUS_MASK);
@@ -552,19 +552,19 @@ int analogix_dp_write_byte_to_dpcd(struct analogix_dp_device *dp,
for (i = 0; i < 3; i++) {
/* Clear AUX CH data buffer */
reg = BUF_CLR;
- writel(reg, dp->reg_base + ANALOGIX_DP_BUFFER_DATA_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_BUFFER_DATA_CTL);
/* Select DPCD device address */
reg = AUX_ADDR_7_0(reg_addr);
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_7_0);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_7_0);
reg = AUX_ADDR_15_8(reg_addr);
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_15_8);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_15_8);
reg = AUX_ADDR_19_16(reg_addr);
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_19_16);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_19_16);
/* Write data buffer */
reg = (unsigned int)data;
- writel(reg, dp->reg_base + ANALOGIX_DP_BUF_DATA_0);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_BUF_DATA_0);
/*
* Set DisplayPort transaction and write 1 byte
@@ -572,7 +572,7 @@ int analogix_dp_write_byte_to_dpcd(struct analogix_dp_device *dp,
* If Bit 3 is 0, I2C transaction.
*/
reg = AUX_TX_COMM_DP_TRANSACTION | AUX_TX_COMM_WRITE;
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_1);
/* Start AUX transaction */
retval = analogix_dp_start_aux_transaction(dp);
@@ -591,14 +591,14 @@ void analogix_dp_set_link_bandwidth(struct analogix_dp_device *dp, u32 bwtype)
reg = bwtype;
if ((bwtype == DP_LINK_BW_2_7) || (bwtype == DP_LINK_BW_1_62))
- writel(reg, dp->reg_base + ANALOGIX_DP_LINK_BW_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LINK_BW_SET);
}
void analogix_dp_get_link_bandwidth(struct analogix_dp_device *dp, u32 *bwtype)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_LINK_BW_SET);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_LINK_BW_SET);
*bwtype = reg;
}
@@ -607,14 +607,14 @@ void analogix_dp_set_lane_count(struct analogix_dp_device *dp, u32 count)
u32 reg;
reg = count;
- writel(reg, dp->reg_base + ANALOGIX_DP_LANE_COUNT_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LANE_COUNT_SET);
}
void analogix_dp_get_lane_count(struct analogix_dp_device *dp, u32 *count)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_LANE_COUNT_SET);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_LANE_COUNT_SET);
*count = reg;
}
@@ -624,13 +624,13 @@ void analogix_dp_enable_enhanced_mode(struct analogix_dp_device *dp,
u32 reg;
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
reg |= ENHANCED;
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
reg &= ~ENHANCED;
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
}
}
@@ -642,25 +642,25 @@ void analogix_dp_set_training_pattern(struct analogix_dp_device *dp,
switch (pattern) {
case PRBS7:
reg = SCRAMBLING_ENABLE | LINK_QUAL_PATTERN_SET_PRBS7;
- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
break;
case D10_2:
reg = SCRAMBLING_ENABLE | LINK_QUAL_PATTERN_SET_D10_2;
- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
break;
case TRAINING_PTN1:
reg = SCRAMBLING_DISABLE | SW_TRAINING_PATTERN_SET_PTN1;
- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
break;
case TRAINING_PTN2:
reg = SCRAMBLING_DISABLE | SW_TRAINING_PATTERN_SET_PTN2;
- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
break;
case DP_NONE:
reg = SCRAMBLING_ENABLE |
LINK_QUAL_PATTERN_SET_DISABLE |
SW_TRAINING_PATTERN_SET_NORMAL;
- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
break;
default:
break;
@@ -672,10 +672,10 @@ void analogix_dp_set_lane0_pre_emphasis(struct analogix_dp_device *dp,
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
reg &= ~PRE_EMPHASIS_SET_MASK;
reg |= level << PRE_EMPHASIS_SET_SHIFT;
- writel(reg, dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
}
void analogix_dp_set_lane1_pre_emphasis(struct analogix_dp_device *dp,
@@ -683,10 +683,10 @@ void analogix_dp_set_lane1_pre_emphasis(struct analogix_dp_device *dp,
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
reg &= ~PRE_EMPHASIS_SET_MASK;
reg |= level << PRE_EMPHASIS_SET_SHIFT;
- writel(reg, dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
}
void analogix_dp_set_lane2_pre_emphasis(struct analogix_dp_device *dp,
@@ -694,10 +694,10 @@ void analogix_dp_set_lane2_pre_emphasis(struct analogix_dp_device *dp,
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
reg &= ~PRE_EMPHASIS_SET_MASK;
reg |= level << PRE_EMPHASIS_SET_SHIFT;
- writel(reg, dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
}
void analogix_dp_set_lane3_pre_emphasis(struct analogix_dp_device *dp,
@@ -705,10 +705,10 @@ void analogix_dp_set_lane3_pre_emphasis(struct analogix_dp_device *dp,
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
reg &= ~PRE_EMPHASIS_SET_MASK;
reg |= level << PRE_EMPHASIS_SET_SHIFT;
- writel(reg, dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
}
void analogix_dp_set_lane0_link_training(struct analogix_dp_device *dp,
@@ -717,7 +717,7 @@ void analogix_dp_set_lane0_link_training(struct analogix_dp_device *dp,
u32 reg;
reg = training_lane;
- writel(reg, dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
}
void analogix_dp_set_lane1_link_training(struct analogix_dp_device *dp,
@@ -726,7 +726,7 @@ void analogix_dp_set_lane1_link_training(struct analogix_dp_device *dp,
u32 reg;
reg = training_lane;
- writel(reg, dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
}
void analogix_dp_set_lane2_link_training(struct analogix_dp_device *dp,
@@ -735,7 +735,7 @@ void analogix_dp_set_lane2_link_training(struct analogix_dp_device *dp,
u32 reg;
reg = training_lane;
- writel(reg, dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
}
void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
@@ -744,42 +744,42 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
u32 reg;
reg = training_lane;
- writel(reg, dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
{
- return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
+ return readl_relaxed(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
{
- return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
+ return readl_relaxed(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
{
- return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
+ return readl_relaxed(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
{
- return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
+ return readl_relaxed(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
}
void analogix_dp_reset_macro(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_TEST);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_PHY_TEST);
reg |= MACRO_RST;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_TEST);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_PHY_TEST);
/* 10 us is the minimum reset time. */
usleep_range(10, 20);
reg &= ~MACRO_RST;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_TEST);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_PHY_TEST);
}
void analogix_dp_init_video(struct analogix_dp_device *dp)
@@ -787,19 +787,19 @@ void analogix_dp_init_video(struct analogix_dp_device *dp)
u32 reg;
reg = VSYNC_DET | VID_FORMAT_CHG | VID_CLK_CHG;
- writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_1);
reg = 0x0;
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
reg = CHA_CRI(4) | CHA_CTRL;
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
reg = 0x0;
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
reg = VID_HRES_TH(2) | VID_VRES_TH(0);
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_8);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_8);
}
void analogix_dp_set_video_color_format(struct analogix_dp_device *dp)
@@ -810,36 +810,36 @@ void analogix_dp_set_video_color_format(struct analogix_dp_device *dp)
reg = (dp->video_info.dynamic_range << IN_D_RANGE_SHIFT) |
(dp->video_info.color_depth << IN_BPC_SHIFT) |
(dp->video_info.color_space << IN_COLOR_F_SHIFT);
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_2);
/* Set Input Color YCbCr Coefficients to ITU601 or ITU709 */
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
reg &= ~IN_YC_COEFFI_MASK;
if (dp->video_info.ycbcr_coeff)
reg |= IN_YC_COEFFI_ITU709;
else
reg |= IN_YC_COEFFI_ITU601;
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
}
int analogix_dp_is_slave_video_stream_clock_on(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_1);
if (!(reg & DET_STA)) {
dev_dbg(dp->dev, "Input stream clock not detected.\n");
return -EINVAL;
}
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_2);
dev_dbg(dp->dev, "wait SYS_CTL_2.\n");
if (reg & CHA_STA) {
@@ -857,30 +857,30 @@ void analogix_dp_set_video_cr_mn(struct analogix_dp_device *dp,
u32 reg;
if (type == REGISTER_M) {
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
reg |= FIX_M_VID;
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
reg = m_value & 0xff;
- writel(reg, dp->reg_base + ANALOGIX_DP_M_VID_0);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_M_VID_0);
reg = (m_value >> 8) & 0xff;
- writel(reg, dp->reg_base + ANALOGIX_DP_M_VID_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_M_VID_1);
reg = (m_value >> 16) & 0xff;
- writel(reg, dp->reg_base + ANALOGIX_DP_M_VID_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_M_VID_2);
reg = n_value & 0xff;
- writel(reg, dp->reg_base + ANALOGIX_DP_N_VID_0);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_N_VID_0);
reg = (n_value >> 8) & 0xff;
- writel(reg, dp->reg_base + ANALOGIX_DP_N_VID_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_N_VID_1);
reg = (n_value >> 16) & 0xff;
- writel(reg, dp->reg_base + ANALOGIX_DP_N_VID_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_N_VID_2);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
reg &= ~FIX_M_VID;
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_4);
- writel(0x00, dp->reg_base + ANALOGIX_DP_N_VID_0);
- writel(0x80, dp->reg_base + ANALOGIX_DP_N_VID_1);
- writel(0x00, dp->reg_base + ANALOGIX_DP_N_VID_2);
+ writel_relaxed(0x00, dp->reg_base + ANALOGIX_DP_N_VID_0);
+ writel_relaxed(0x80, dp->reg_base + ANALOGIX_DP_N_VID_1);
+ writel_relaxed(0x00, dp->reg_base + ANALOGIX_DP_N_VID_2);
}
}
@@ -889,13 +889,13 @@ void analogix_dp_set_video_timing_mode(struct analogix_dp_device *dp, u32 type)
u32 reg;
if (type == VIDEO_TIMING_FROM_CAPTURE) {
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
reg &= ~FORMAT_SEL;
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
reg |= FORMAT_SEL;
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
}
}
@@ -904,15 +904,15 @@ void analogix_dp_enable_video_master(struct analogix_dp_device *dp, bool enable)
u32 reg;
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
reg &= ~VIDEO_MODE_MASK;
reg |= VIDEO_MASTER_MODE_EN | VIDEO_MODE_MASTER_MODE;
- writel(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
reg &= ~VIDEO_MODE_MASK;
reg |= VIDEO_MODE_SLAVE_MODE;
- writel(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
}
}
@@ -920,19 +920,19 @@ void analogix_dp_start_video(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
reg |= VIDEO_EN;
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_1);
}
int analogix_dp_is_video_stream_on(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
- writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
- reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
if (!(reg & STRM_VALID)) {
dev_dbg(dp->dev, "Input video stream is not detected.\n");
return -EINVAL;
@@ -945,51 +945,51 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
reg &= ~(MASTER_VID_FUNC_EN_N | SLAVE_VID_FUNC_EN_N);
reg |= MASTER_VID_FUNC_EN_N;
- writel(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_FUNC_EN_1);
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
reg &= ~INTERACE_SCAN_CFG;
reg |= (dp->video_info.interlaced << 2);
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
reg &= ~VSYNC_POLARITY_CFG;
reg |= (dp->video_info.v_sync_polarity << 1);
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
- reg = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
reg &= ~HSYNC_POLARITY_CFG;
reg |= (dp->video_info.h_sync_polarity << 0);
- writel(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_10);
reg = AUDIO_MODE_SPDIF_MODE | VIDEO_MODE_SLAVE_MODE;
- writel(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_SOC_GENERAL_CTL);
}
void analogix_dp_enable_scrambling(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
reg &= ~SCRAMBLING_DISABLE;
- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
}
void analogix_dp_disable_scrambling(struct analogix_dp_device *dp)
{
u32 reg;
- reg = readl(dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
reg |= SCRAMBLING_DISABLE;
- writel(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_TRAINING_PTN_SET);
}
void analogix_dp_enable_psr_crc(struct analogix_dp_device *dp)
{
- writel(PSR_VID_CRC_ENABLE, dp->reg_base + ANALOGIX_DP_CRC_CON);
+ writel_relaxed(PSR_VID_CRC_ENABLE, dp->reg_base + ANALOGIX_DP_CRC_CON);
}
void analogix_dp_send_psr_spd(struct analogix_dp_device *dp,
@@ -998,44 +998,44 @@ void analogix_dp_send_psr_spd(struct analogix_dp_device *dp,
unsigned int val;
/* don't send info frame */
- val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
+ val = readl_relaxed(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
val &= ~IF_EN;
- writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
+ writel_relaxed(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
/* configure single frame update mode */
- writel(PSR_FRAME_UP_TYPE_BURST | PSR_CRC_SEL_HARDWARE,
+ writel_relaxed(PSR_FRAME_UP_TYPE_BURST | PSR_CRC_SEL_HARDWARE,
dp->reg_base + ANALOGIX_DP_PSR_FRAME_UPDATE_CTRL);
/* configure VSC HB0~HB3 */
- writel(vsc->sdp_header.HB0, dp->reg_base + ANALOGIX_DP_SPD_HB0);
- writel(vsc->sdp_header.HB1, dp->reg_base + ANALOGIX_DP_SPD_HB1);
- writel(vsc->sdp_header.HB2, dp->reg_base + ANALOGIX_DP_SPD_HB2);
- writel(vsc->sdp_header.HB3, dp->reg_base + ANALOGIX_DP_SPD_HB3);
+ writel_relaxed(vsc->sdp_header.HB0, dp->reg_base + ANALOGIX_DP_SPD_HB0);
+ writel_relaxed(vsc->sdp_header.HB1, dp->reg_base + ANALOGIX_DP_SPD_HB1);
+ writel_relaxed(vsc->sdp_header.HB2, dp->reg_base + ANALOGIX_DP_SPD_HB2);
+ writel_relaxed(vsc->sdp_header.HB3, dp->reg_base + ANALOGIX_DP_SPD_HB3);
/* configure reused VSC PB0~PB3, magic number from vendor */
- writel(0x00, dp->reg_base + ANALOGIX_DP_SPD_PB0);
- writel(0x16, dp->reg_base + ANALOGIX_DP_SPD_PB1);
- writel(0xCE, dp->reg_base + ANALOGIX_DP_SPD_PB2);
- writel(0x5D, dp->reg_base + ANALOGIX_DP_SPD_PB3);
+ writel_relaxed(0x00, dp->reg_base + ANALOGIX_DP_SPD_PB0);
+ writel_relaxed(0x16, dp->reg_base + ANALOGIX_DP_SPD_PB1);
+ writel_relaxed(0xCE, dp->reg_base + ANALOGIX_DP_SPD_PB2);
+ writel_relaxed(0x5D, dp->reg_base + ANALOGIX_DP_SPD_PB3);
/* configure DB0 / DB1 values */
- writel(vsc->DB0, dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB0);
- writel(vsc->DB1, dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB1);
+ writel_relaxed(vsc->DB0, dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB0);
+ writel_relaxed(vsc->DB1, dp->reg_base + ANALOGIX_DP_VSC_SHADOW_DB1);
/* set reuse spd inforframe */
- val = readl(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
+ val = readl_relaxed(dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
val |= REUSE_SPD_EN;
- writel(val, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
+ writel_relaxed(val, dp->reg_base + ANALOGIX_DP_VIDEO_CTL_3);
/* mark info frame update */
- val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
+ val = readl_relaxed(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
val = (val | IF_UP) & ~IF_EN;
- writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
+ writel_relaxed(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
/* send info frame */
- val = readl(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
+ val = readl_relaxed(dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
val |= IF_EN;
- writel(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
+ writel_relaxed(val, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL);
}
ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
@@ -1053,7 +1053,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
/* Clear AUX CH data buffer */
reg = BUF_CLR;
- writel(reg, dp->reg_base + ANALOGIX_DP_BUFFER_DATA_CTL);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_BUFFER_DATA_CTL);
switch (msg->request & ~DP_AUX_I2C_MOT) {
case DP_AUX_I2C_WRITE:
@@ -1081,20 +1081,20 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
}
reg |= AUX_LENGTH(msg->size);
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_1);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_1);
/* Select DPCD device address */
reg = AUX_ADDR_7_0(msg->address);
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_7_0);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_7_0);
reg = AUX_ADDR_15_8(msg->address);
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_15_8);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_15_8);
reg = AUX_ADDR_19_16(msg->address);
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_19_16);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_ADDR_19_16);
if (!(msg->request & DP_AUX_I2C_READ)) {
for (i = 0; i < msg->size; i++) {
reg = buffer[i];
- writel(reg, dp->reg_base + ANALOGIX_DP_BUF_DATA_0 +
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_BUF_DATA_0 +
4 * i);
num_transferred++;
}
@@ -1107,33 +1107,33 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
if (msg->size < 1)
reg |= ADDR_ONLY;
- writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
+ writel_relaxed(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
/* Is AUX CH command reply received? */
/* TODO: Wait for an interrupt instead of looping? */
- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_INT_STA);
while (!(reg & RPLY_RECEIV)) {
timeout_loop++;
if (timeout_loop > DP_TIMEOUT_LOOP_COUNT) {
dev_err(dp->dev, "AUX CH command reply failed!\n");
return -ETIMEDOUT;
}
- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_INT_STA);
usleep_range(10, 11);
}
/* Clear interrupt source for AUX CH command reply */
- writel(RPLY_RECEIV, dp->reg_base + ANALOGIX_DP_INT_STA);
+ writel_relaxed(RPLY_RECEIV, dp->reg_base + ANALOGIX_DP_INT_STA);
/* Clear interrupt source for AUX CH access error */
- reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_INT_STA);
if (reg & AUX_ERR) {
- writel(AUX_ERR, dp->reg_base + ANALOGIX_DP_INT_STA);
+ writel_relaxed(AUX_ERR, dp->reg_base + ANALOGIX_DP_INT_STA);
return -EREMOTEIO;
}
/* Check AUX CH error access status */
- reg = readl(dp->reg_base + ANALOGIX_DP_AUX_CH_STA);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_AUX_CH_STA);
if ((reg & AUX_STATUS_MASK)) {
dev_err(dp->dev, "AUX CH error happened: %d\n\n",
reg & AUX_STATUS_MASK);
@@ -1142,7 +1142,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
if (msg->request & DP_AUX_I2C_READ) {
for (i = 0; i < msg->size; i++) {
- reg = readl(dp->reg_base + ANALOGIX_DP_BUF_DATA_0 +
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_BUF_DATA_0 +
4 * i);
buffer[i] = (unsigned char)reg;
num_transferred++;
@@ -1150,7 +1150,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
}
/* Check if Rx sends defer */
- reg = readl(dp->reg_base + ANALOGIX_DP_AUX_RX_COMM);
+ reg = readl_relaxed(dp->reg_base + ANALOGIX_DP_AUX_RX_COMM);
if (reg == AUX_RX_COMM_AUX_DEFER)
msg->reply = DP_AUX_NATIVE_REPLY_DEFER;
else if (reg == AUX_RX_COMM_I2C_DEFER)
--
2.14.2