From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adrian Ratiu <adrian.ratiu@collabora.com>
Subject: Re: [PATCH 1/4] drm: bridge: dw_mipi_dsi: access registers via a
 regmap
Date: Mon, 04 Nov 2019 14:03:56 +0200
Message-ID: <87v9rz97bn.fsf@collabora.com>
References: <20191031142633.12460-1-adrian.ratiu@collabora.com>
 <20191031142633.12460-2-adrian.ratiu@collabora.com>
 <974be8e9-fcb4-4457-8831-40b2fa834ae2@baylibre.com>
Mime-Version: 1.0
Content-Type: text/plain; format=flowed
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <974be8e9-fcb4-4457-8831-40b2fa834ae2@baylibre.com>
Sender: linux-kernel-owner@vger.kernel.org
To: Neil Armstrong <narmstrong@baylibre.com>, Adrian Ratiu <adrian.ratiu@collabora.com>, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-rockchip@lists.infradead.org
Cc: kernel@collabora.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Boris Brezillon <boris.brezillon@collabora.com>
List-Id: linux-rockchip.vger.kernel.org

On Mon, 04 Nov 2019, Neil Armstrong <narmstrong@baylibre.com> 
wrote:
> On 31/10/2019 15:26, Adrian Ratiu wrote: 
>> Convert the common bridge code and the two rockchip & stm 
>> drivers which currently use it to the regmap API in 
>> anticipation for further changes to make it more generic and 
>> add older DSI host controller support as found on i.mx6 based 
>> devices.   No functional changes other than requiring the 
>> platform drivers to provide a regmap via their plat_data. Going 
>> further each platform driver can also add its own regmap 
>> configuration like for maximum write offsets, r/w callbacks or 
>> different register layouts.   Suggested-by: Boris Brezillon 
>> <boris.brezillon@collabora.com> Signed-off-by: Adrian Ratiu 
>> <adrian.ratiu@collabora.com> --- 
>>  drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 189 
>>  +++++++++--------- .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c 
>>  |  36 +++- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c         |  44 
>>  ++-- include/drm/bridge/dw_mipi_dsi.h              |   2 +- 4 
>>  files changed, 155 insertions(+), 116 deletions(-) 
>>  diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c 
>> b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c index 
>> b6e793bb653c..4ef3e9038cc2 100644 --- 
>> a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ 
>> b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -15,6 +15,7 
>> @@ 
>>  #include <linux/module.h> #include <linux/of_device.h> 
>>  #include <linux/pm_runtime.h> 
>> +#include <linux/regmap.h> 
>>  #include <linux/reset.h>  #include <video/mipi_display.h> 
>> @@ -226,7 +227,7 @@ struct dw_mipi_dsi { 
>>  	struct mipi_dsi_host dsi_host; struct drm_bridge 
>>  *panel_bridge; struct device *dev; 
>> -	void __iomem *base; +	struct regmap *regs; 
>>   struct clk *pclk;  
>> @@ -280,16 +281,6 @@ static inline struct dw_mipi_dsi 
>> *bridge_to_dsi(struct drm_bridge *bridge) 
>>  	return container_of(bridge, struct dw_mipi_dsi, bridge); }  
>> -static inline void dsi_write(struct dw_mipi_dsi *dsi, u32 reg, 
>> u32 val) -{ -	writel(val, dsi->base + reg); -} - -static 
>> inline u32 dsi_read(struct dw_mipi_dsi *dsi, u32 reg) -{ - 
>> return readl(dsi->base + reg); -} - 
>>  static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, 
>>  struct mipi_dsi_device *device) { 
>> @@ -366,29 +357,29 @@ static void dw_mipi_message_config(struct 
>> dw_mipi_dsi *dsi, 
>>  	if (lpm) val |= CMD_MODE_ALL_LP;  
>> -	dsi_write(dsi, DSI_LPCLK_CTRL, lpm ? 0 : 
>> PHY_TXREQUESTCLKHS); -	dsi_write(dsi, DSI_CMD_MODE_CFG, 
>> val); +	regmap_write(dsi->regs, DSI_LPCLK_CTRL, lpm ? 0 : 
>> PHY_TXREQUESTCLKHS); +	regmap_write(dsi->regs, 
>> DSI_CMD_MODE_CFG, val); 
>>  }  static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi 
>>  *dsi, u32 hdr_val) { int ret; 
>> -	u32 val, mask; +	u32 val = 0, mask; 
>>   
>> -	ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, - 
>> val, !(val & GEN_CMD_FULL), 1000, - 
>> CMD_PKT_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, !(val & GEN_CMD_FULL), 1000, + 
>> CMD_PKT_STATUS_TIMEOUT_US); 
>>  	if (ret) { dev_err(dsi->dev, "failed to get available 
>>  command FIFO\n"); return ret; }  
>> -	dsi_write(dsi, DSI_GEN_HDR, hdr_val); + 
>> regmap_write(dsi->regs, DSI_GEN_HDR, hdr_val); 
>>   mask = GEN_CMD_EMPTY | GEN_PLD_W_EMPTY; 
>> -	ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, - 
>> val, (val & mask) == mask, -				 1000, 
>> CMD_PKT_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, (val & mask) == mask, + 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); 
>>  	if (ret) { dev_err(dsi->dev, "failed to write command 
>>  FIFO\n"); return ret; 
>> @@ -403,24 +394,26 @@ static int dw_mipi_dsi_write(struct 
>> dw_mipi_dsi *dsi, 
>>  	const u8 *tx_buf = packet->payload; int len = 
>>  packet->payload_length, pld_data_bytes = sizeof(u32), ret; 
>>  __le32 word; 
>> -	u32 val; +	u32 val = 0; 
>>   while (len) { if (len < pld_data_bytes) { word = 0; 
>>  memcpy(&word, tx_buf, len); 
>> -			dsi_write(dsi, DSI_GEN_PLD_DATA, 
>> le32_to_cpu(word)); + 
>> regmap_write(dsi->regs, DSI_GEN_PLD_DATA, + 
>> le32_to_cpu(word)); 
>>  			len = 0; } else { memcpy(&word, tx_buf, 
>>  pld_data_bytes); 
>> -			dsi_write(dsi, DSI_GEN_PLD_DATA, 
>> le32_to_cpu(word)); + 
>> regmap_write(dsi->regs, DSI_GEN_PLD_DATA, + 
>> le32_to_cpu(word)); 
>>  			tx_buf += pld_data_bytes; len -= 
>>  pld_data_bytes; }  
>> -		ret = readl_poll_timeout(dsi->base + 
>> DSI_CMD_PKT_STATUS, - 
>> val, !(val & GEN_PLD_W_FULL), 1000, - 
>> CMD_PKT_STATUS_TIMEOUT_US); +		ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, !(val & GEN_PLD_W_FULL), + 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); 
>>  		if (ret) { dev_err(dsi->dev, "failed to get 
>>  available write payload FIFO\n"); 
>> @@ -438,12 +431,12 @@ static int dw_mipi_dsi_read(struct 
>> dw_mipi_dsi *dsi, 
>>  { int i, j, ret, len = msg->rx_len; u8 *buf = msg->rx_buf; 
>> -	u32 val; +	u32 val = 0; 
>>   /* Wait end of the read operation */ 
>> -	ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, - 
>> val, !(val & GEN_RD_CMD_BUSY), - 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, !(val & GEN_RD_CMD_BUSY), + 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); 
>>  	if (ret) { dev_err(dsi->dev, "Timeout during read 
>>  operation\n"); return ret; 
>> @@ -451,15 +444,15 @@ static int dw_mipi_dsi_read(struct 
>> dw_mipi_dsi *dsi, 
>>   for (i = 0; i < len; i += 4) { /* Read fifo must not be empty 
>>  before all bytes are read */ 
>> -		ret = readl_poll_timeout(dsi->base + 
>> DSI_CMD_PKT_STATUS, - 
>> val, !(val & GEN_PLD_R_EMPTY), - 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); +		ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, !(val & GEN_PLD_R_EMPTY), + 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); 
>>  		if (ret) { dev_err(dsi->dev, "Read payload FIFO is 
>>  empty\n"); return ret; }  
>> -		val = dsi_read(dsi, DSI_GEN_PLD_DATA); + 
>> regmap_read(dsi->regs, DSI_GEN_PLD_DATA, &val); 
>>  		for (j = 0; j < 4 && j + i < len; j++) buf[i + j] 
>>  = val >> (8 * j); } 
>> @@ -536,29 +529,29 @@ static void 
>> dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi) 
>>  	} #endif /* CONFIG_DEBUG_FS */  
>> -	dsi_write(dsi, DSI_VID_MODE_CFG, val); + 
>> regmap_write(dsi->regs, DSI_VID_MODE_CFG, val); 
>>  }  static void dw_mipi_dsi_set_mode(struct dw_mipi_dsi *dsi, 
>>  unsigned long mode_flags) { 
>> -	dsi_write(dsi, DSI_PWR_UP, RESET); + 
>> regmap_write(dsi->regs, DSI_PWR_UP, RESET); 
>>   if (mode_flags & MIPI_DSI_MODE_VIDEO) { 
>> -		dsi_write(dsi, DSI_MODE_CFG, ENABLE_VIDEO_MODE); + 
>> regmap_write(dsi->regs, DSI_MODE_CFG, ENABLE_VIDEO_MODE); 
>>  		dw_mipi_dsi_video_mode_config(dsi); 
>> -		dsi_write(dsi, DSI_LPCLK_CTRL, 
>> PHY_TXREQUESTCLKHS); +		regmap_write(dsi->regs, 
>> DSI_LPCLK_CTRL, PHY_TXREQUESTCLKHS); 
>>  	} else { 
>> -		dsi_write(dsi, DSI_MODE_CFG, ENABLE_CMD_MODE); + 
>> regmap_write(dsi->regs, DSI_MODE_CFG, ENABLE_CMD_MODE); 
>>  	}  
>> -	dsi_write(dsi, DSI_PWR_UP, POWERUP); + 
>> regmap_write(dsi->regs, DSI_PWR_UP, POWERUP); 
>>  }  static void dw_mipi_dsi_disable(struct dw_mipi_dsi *dsi) { 
>> -	dsi_write(dsi, DSI_PWR_UP, RESET); -	dsi_write(dsi, 
>> DSI_PHY_RSTZ, PHY_RSTZ); +	regmap_write(dsi->regs, 
>> DSI_PWR_UP, RESET); +	regmap_write(dsi->regs, 
>> DSI_PHY_RSTZ, PHY_RSTZ); 
>>  }  static void dw_mipi_dsi_init(struct dw_mipi_dsi *dsi) 
>> @@ -573,14 +566,14 @@ static void dw_mipi_dsi_init(struct 
>> dw_mipi_dsi *dsi) 
>>  	 */ u32 esc_clk_division = (dsi->lane_mbps >> 3) / 20 + 1;  
>> -	dsi_write(dsi, DSI_PWR_UP, RESET); + 
>> regmap_write(dsi->regs, DSI_PWR_UP, RESET); 
>>   /* * TODO dw drv improvements * timeout clock division should 
>>  be computed with the * high speed transmission counter timeout 
>>  and byte lane...  */ 
>> -	dsi_write(dsi, DSI_CLKMGR_CFG, TO_CLK_DIVISION(10) | + 
>> regmap_write(dsi->regs, DSI_CLKMGR_CFG, TO_CLK_DIVISION(10) | 
>>  		  TX_ESC_CLK_DIVISION(esc_clk_division)); }  
>> @@ -609,22 +602,22 @@ static void dw_mipi_dsi_dpi_config(struct 
>> dw_mipi_dsi *dsi, 
>>  	if (mode->flags & DRM_MODE_FLAG_NHSYNC) val |= 
>>  HSYNC_ACTIVE_LOW;  
>> -	dsi_write(dsi, DSI_DPI_VCID, DPI_VCID(dsi->channel)); - 
>> dsi_write(dsi, DSI_DPI_COLOR_CODING, color); - 
>> dsi_write(dsi, DSI_DPI_CFG_POL, val); + 
>> regmap_write(dsi->regs, DSI_DPI_VCID, DPI_VCID(dsi->channel)); 
>> +	regmap_write(dsi->regs, DSI_DPI_COLOR_CODING, color); + 
>> regmap_write(dsi->regs, DSI_DPI_CFG_POL, val); 
>>  	/* * TODO dw drv improvements * largest packet sizes 
>>  during hfp or during vsa/vpb/vfp * should be computed 
>>  according to byte lane, lane number and only * if sending lp 
>>  cmds in high speed is enable (PHY_TXREQUESTCLKHS) */ 
>> -	dsi_write(dsi, DSI_DPI_LP_CMD_TIM, OUTVACT_LPCMD_TIME(4) + 
>> regmap_write(dsi->regs, DSI_DPI_LP_CMD_TIM, 
>> OUTVACT_LPCMD_TIME(4) 
>>  		  | INVACT_LPCMD_TIME(4)); }  static void 
>>  dw_mipi_dsi_packet_handler_config(struct dw_mipi_dsi *dsi) { 
>> -	dsi_write(dsi, DSI_PCKHDL_CFG, CRC_RX_EN | ECC_RX_EN | 
>> BTA_EN); +	regmap_write(dsi->regs, DSI_PCKHDL_CFG, CRC_RX_EN 
>> | ECC_RX_EN | BTA_EN); 
>>  }  static void dw_mipi_dsi_video_packet_config(struct 
>>  dw_mipi_dsi *dsi, 
>> @@ -638,7 +631,7 @@ static void 
>> dw_mipi_dsi_video_packet_config(struct dw_mipi_dsi *dsi, 
>>  	 * non-burst video modes, see 
>>  dw_mipi_dsi_video_mode_config()...  */  
>> -	dsi_write(dsi, DSI_VID_PKT_SIZE, + 
>> regmap_write(dsi->regs, DSI_VID_PKT_SIZE, 
>>  		       dw_mipi_is_dual_mode(dsi) ? 
>>  VID_PKT_SIZE(mode->hdisplay / 2) : 
>>  VID_PKT_SIZE(mode->hdisplay)); 
>> @@ -651,14 +644,15 @@ static void 
>> dw_mipi_dsi_command_mode_config(struct dw_mipi_dsi *dsi) 
>>  	 * compute high speed transmission counter timeout 
>>  according * to the timeout clock division (TO_CLK_DIVISION) 
>>  and byte lane...  */ 
>> -	dsi_write(dsi, DSI_TO_CNT_CFG, HSTX_TO_CNT(1000) | 
>> LPRX_TO_CNT(1000)); +	regmap_write(dsi->regs, 
>> DSI_TO_CNT_CFG, +		     HSTX_TO_CNT(1000) | 
>> LPRX_TO_CNT(1000)); 
>>  	/* * TODO dw drv improvements * the Bus-Turn-Around 
>>  Timeout Counter should be computed * according to byte lane... 
>>  */ 
>> -	dsi_write(dsi, DSI_BTA_TO_CNT, 0xd00); - 
>> dsi_write(dsi, DSI_MODE_CFG, ENABLE_CMD_MODE); + 
>> regmap_write(dsi->regs, DSI_BTA_TO_CNT, 0xd00); + 
>> regmap_write(dsi->regs, DSI_MODE_CFG, ENABLE_CMD_MODE); 
>>  }  /* Get lane byte clock cycles. */ 
>> @@ -692,13 +686,13 @@ static void 
>> dw_mipi_dsi_line_timer_config(struct dw_mipi_dsi *dsi, 
>>  	 * computations below may be improved...  */ lbcc = 
>>  dw_mipi_dsi_get_hcomponent_lbcc(dsi, mode, htotal); 
>> -	dsi_write(dsi, DSI_VID_HLINE_TIME, lbcc); + 
>> regmap_write(dsi->regs, DSI_VID_HLINE_TIME, lbcc); 
>>   lbcc = dw_mipi_dsi_get_hcomponent_lbcc(dsi, mode, hsa); 
>> -	dsi_write(dsi, DSI_VID_HSA_TIME, lbcc); + 
>> regmap_write(dsi->regs, DSI_VID_HSA_TIME, lbcc); 
>>   lbcc = dw_mipi_dsi_get_hcomponent_lbcc(dsi, mode, hbp); 
>> -	dsi_write(dsi, DSI_VID_HBP_TIME, lbcc); + 
>> regmap_write(dsi->regs, DSI_VID_HBP_TIME, lbcc); 
>>  }  static void dw_mipi_dsi_vertical_timing_config(struct 
>>  dw_mipi_dsi *dsi, 
>> @@ -711,10 +705,10 @@ static void 
>> dw_mipi_dsi_vertical_timing_config(struct dw_mipi_dsi *dsi, 
>>  	vfp = mode->vsync_start - mode->vdisplay; vbp = 
>>  mode->vtotal - mode->vsync_end;  
>> -	dsi_write(dsi, DSI_VID_VACTIVE_LINES, vactive); - 
>> dsi_write(dsi, DSI_VID_VSA_LINES, vsa); -	dsi_write(dsi, 
>> DSI_VID_VFP_LINES, vfp); -	dsi_write(dsi, DSI_VID_VBP_LINES, 
>> vbp); +	regmap_write(dsi->regs, DSI_VID_VACTIVE_LINES, 
>> vactive); +	regmap_write(dsi->regs, DSI_VID_VSA_LINES, vsa); + 
>> regmap_write(dsi->regs, DSI_VID_VFP_LINES, vfp); + 
>> regmap_write(dsi->regs, DSI_VID_VBP_LINES, vbp); 
>>  }  static void dw_mipi_dsi_dphy_timing_config(struct 
>>  dw_mipi_dsi *dsi) 
>> @@ -729,19 +723,24 @@ static void 
>> dw_mipi_dsi_dphy_timing_config(struct dw_mipi_dsi *dsi) 
>>  	 * DSI_CMD_MODE_CFG.MAX_RD_PKT_SIZE_LP (see 
>>  CMD_MODE_ALL_LP) */  
>> -	hw_version = dsi_read(dsi, DSI_VERSION) & VERSION; + 
>> regmap_read(dsi->regs, DSI_VERSION, &hw_version); +	hw_version 
>> &= VERSION; 
>>   if (hw_version >= HWVER_131) { 
>> -		dsi_write(dsi, DSI_PHY_TMR_CFG, 
>> PHY_HS2LP_TIME_V131(0x40) | - 
>> PHY_LP2HS_TIME_V131(0x40)); -		dsi_write(dsi, 
>> DSI_PHY_TMR_RD_CFG, MAX_RD_TIME_V131(10000)); + 
>> regmap_write(dsi->regs, DSI_PHY_TMR_CFG, + 
>> PHY_HS2LP_TIME_V131(0x40) | + 
>> PHY_LP2HS_TIME_V131(0x40)); + 
>> regmap_write(dsi->regs, DSI_PHY_TMR_RD_CFG, + 
>> MAX_RD_TIME_V131(10000)); 
>>  	} else { 
>> -		dsi_write(dsi, DSI_PHY_TMR_CFG, 
>> PHY_HS2LP_TIME(0x40) | - 
>> PHY_LP2HS_TIME(0x40) | MAX_RD_TIME(10000)); + 
>> regmap_write(dsi->regs, DSI_PHY_TMR_CFG, + 
>> PHY_HS2LP_TIME(0x40) | + 
>> PHY_LP2HS_TIME(0x40) | + 
>> MAX_RD_TIME(10000)); 
>>  	}  
>> -	dsi_write(dsi, DSI_PHY_TMR_LPCLK_CFG, 
>> PHY_CLKHS2LP_TIME(0x40) -		  | 
>> PHY_CLKLP2HS_TIME(0x40)); +	regmap_write(dsi->regs, 
>> DSI_PHY_TMR_LPCLK_CFG, + 
>> PHY_CLKHS2LP_TIME(0x40) | PHY_CLKLP2HS_TIME(0x40)); 
>>  }  static void dw_mipi_dsi_dphy_interface_config(struct 
>>  dw_mipi_dsi *dsi) 
>> @@ -751,46 +750,49 @@ static void 
>> dw_mipi_dsi_dphy_interface_config(struct dw_mipi_dsi *dsi) 
>>  	 * stop wait time should be the maximum between host dsi * 
>>  and panel stop wait times */ 
>> -	dsi_write(dsi, DSI_PHY_IF_CFG, PHY_STOP_WAIT_TIME(0x20) | 
>> -		  N_LANES(dsi->lanes)); + 
>> regmap_write(dsi->regs, DSI_PHY_IF_CFG, + 
>> PHY_STOP_WAIT_TIME(0x20) | N_LANES(dsi->lanes)); 
>>  }  static void dw_mipi_dsi_dphy_init(struct dw_mipi_dsi *dsi) 
>>  { /* Clear PHY state */ 
>> -	dsi_write(dsi, DSI_PHY_RSTZ, PHY_DISFORCEPLL | 
>> PHY_DISABLECLK -		  | PHY_RSTZ | PHY_SHUTDOWNZ); - 
>> dsi_write(dsi, DSI_PHY_TST_CTRL0, PHY_UNTESTCLR); - 
>> dsi_write(dsi, DSI_PHY_TST_CTRL0, PHY_TESTCLR); - 
>> dsi_write(dsi, DSI_PHY_TST_CTRL0, PHY_UNTESTCLR); + 
>> regmap_write(dsi->regs, DSI_PHY_RSTZ, PHY_DISFORCEPLL | 
>> PHY_DISABLECLK +		     | PHY_RSTZ | PHY_SHUTDOWNZ); 
>> +	regmap_write(dsi->regs, DSI_PHY_TST_CTRL0, PHY_UNTESTCLR); 
>> +	regmap_write(dsi->regs, DSI_PHY_TST_CTRL0, PHY_TESTCLR); + 
>> regmap_write(dsi->regs, DSI_PHY_TST_CTRL0, PHY_UNTESTCLR); 
>>  }  static void dw_mipi_dsi_dphy_enable(struct dw_mipi_dsi 
>>  *dsi) { 
>> -	u32 val; +	u32 val = 0; 
>>  	int ret;  
>> -	dsi_write(dsi, DSI_PHY_RSTZ, PHY_ENFORCEPLL | 
>> PHY_ENABLECLK | -		  PHY_UNRSTZ | PHY_UNSHUTDOWNZ); + 
>> regmap_write(dsi->regs, DSI_PHY_RSTZ, PHY_ENFORCEPLL | 
>> PHY_ENABLECLK | +		     PHY_UNRSTZ | 
>> PHY_UNSHUTDOWNZ); 
>>   
>> -	ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, val, 
>> -				 val & PHY_LOCK, 1000, 
>> PHY_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_PHY_STATUS, + 
>> val, val & PHY_LOCK, + 
>> 1000, PHY_STATUS_TIMEOUT_US); 
>>  	if (ret) DRM_DEBUG_DRIVER("failed to wait phy lock 
>>  state\n");  
>> -	ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, - 
>> val, val & PHY_STOP_STATE_CLK_LANE, 1000, - 
>> PHY_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_PHY_STATUS, + 
>> val, val & PHY_STOP_STATE_CLK_LANE, 1000, + 
>> PHY_STATUS_TIMEOUT_US); 
>>  	if (ret) DRM_DEBUG_DRIVER("failed to wait phy clk lane 
>>  stop state\n"); }  static void dw_mipi_dsi_clear_err(struct 
>>  dw_mipi_dsi *dsi) { 
>> -	dsi_read(dsi, DSI_INT_ST0); -	dsi_read(dsi, 
>> DSI_INT_ST1); -	dsi_write(dsi, DSI_INT_MSK0, 0); - 
>> dsi_write(dsi, DSI_INT_MSK1, 0); +	u32 val; + + 
>> regmap_read(dsi->regs, DSI_INT_ST0, &val); + 
>> regmap_read(dsi->regs, DSI_INT_ST1, &val); + 
>> regmap_write(dsi->regs, DSI_INT_MSK0, 0); + 
>> regmap_write(dsi->regs, DSI_INT_MSK1, 0); 
>>  }  static void dw_mipi_dsi_bridge_post_disable(struct 
>>  drm_bridge *bridge) 
>> @@ -996,13 +998,10 @@ __dw_mipi_dsi_probe(struct 
>> platform_device *pdev, 
>>  		return ERR_PTR(-ENODEV); }  
>> -	if (!plat_data->base) { -		dsi->base = 
>> devm_platform_ioremap_resource(pdev, 0); -		if 
>> (IS_ERR(dsi->base)) -			return 
>> ERR_PTR(-ENODEV); - -	} else { -		dsi->base 
>> = plat_data->base; +	dsi->regs = plat_data->regs; +	if 
>> (!dsi->regs) { +		DRM_ERROR("DSI regmap not supplied 
>> by platform driver\n"); +		return ERR_PTR(-ENODEV); 
>>  	}  dsi->pclk = devm_clk_get(dev, "pclk"); 
>> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c 
>> b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c index 
>> bc073ec5c183..3c33ed1fa805 100644 --- 
>> a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ 
>> b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -24,6 
>> +24,8 @@ 
>>  #include "rockchip_drm_drv.h" #include "rockchip_drm_vop.h"  
>> +#define DRIVER_NAME "dw-mipi-dsi-rockchip" + 
>>  #define DSI_PHY_RSTZ			0xa0 #define 
>>  PHY_DISFORCEPLL			0 #define PHY_ENFORCEPLL 
>>  BIT(3) 
>> @@ -212,7 +214,7 @@ struct rockchip_dw_dsi_chip_data { 
>>  struct dw_mipi_dsi_rockchip { struct device *dev; struct 
>>  drm_encoder encoder; 
>> -	void __iomem *base; +	struct regmap *regs; 
>>   struct regmap *grf_regmap; struct clk *pllref_clk; 
>> @@ -297,12 +299,15 @@ static int max_mbps_to_parameter(unsigned 
>> int max_mbps) 
>>   static inline void dsi_write(struct dw_mipi_dsi_rockchip 
>>  *dsi, u32 reg, u32 val) { 
>> -	writel(val, dsi->base + reg); +	regmap_write(dsi->regs, 
>> reg, val); 
>>  }  static inline u32 dsi_read(struct dw_mipi_dsi_rockchip 
>>  *dsi, u32 reg) { 
>> -	return readl(dsi->base + reg); +	u32 val; + + 
>> regmap_read(dsi->regs, reg, &val); +	return val; 
>>  }  static inline void dsi_set(struct dw_mipi_dsi_rockchip 
>>  *dsi, u32 reg, u32 mask) 
>> @@ -884,6 +889,13 @@ static const struct dw_mipi_dsi_host_ops 
>> dw_mipi_dsi_rockchip_host_ops = { 
>>  	.detach = dw_mipi_dsi_rockchip_host_detach, };  
>> +static const struct regmap_config rockchip_dsi_regmap_config = 
>> { +	.reg_bits = 32, +	.val_bits = 32, + 
>> .reg_stride = 4, +	.name = DRIVER_NAME, +}; + 
>>  static int dw_mipi_dsi_rockchip_probe(struct platform_device 
>>  *pdev) { struct device *dev = &pdev->dev; 
>> @@ -892,6 +904,7 @@ static int 
>> dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) 
>>  	struct resource *res; const struct 
>>  rockchip_dw_dsi_chip_data *cdata = 
>>  of_device_get_match_data(dev); 
>> +	void __iomem *regs; 
>>  	int ret, i;  dsi = devm_kzalloc(dev, sizeof(*dsi), 
>>  GFP_KERNEL); 
>> @@ -899,10 +912,17 @@ static int 
>> dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) 
>>  		return -ENOMEM;  res = platform_get_resource(pdev, 
>>  IORESOURCE_MEM, 0); 
>> -	dsi->base = devm_ioremap_resource(dev, res); -	if 
>> (IS_ERR(dsi->base)) { +	regs = devm_ioremap_resource(dev, 
>> res); +	if (IS_ERR(regs)) { 
>>  		DRM_DEV_ERROR(dev, "Unable to get dsi 
>>  registers\n"); 
>> -		return PTR_ERR(dsi->base); +		return 
>> PTR_ERR(regs); +	} + +	dsi->regs = 
>> devm_regmap_init_mmio(dev, regs, + 
>> &rockchip_dsi_regmap_config); +	if (IS_ERR(dsi->regs)) { + 
>> DRM_DEV_ERROR(dev, "Unable to create DSI regmap\n"); + 
>> return PTR_ERR(dsi->regs); 
>>  	}  i = 0; 
>> @@ -954,7 +974,7 @@ static int 
>> dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) 
>>  	}  dsi->dev = dev; 
>> -	dsi->pdata.base = dsi->base; +	dsi->pdata.regs = 
>> dsi->regs; 
>>  	dsi->pdata.max_data_lanes = dsi->cdata->max_data_lanes; 
>>  dsi->pdata.phy_ops = &dw_mipi_dsi_rockchip_phy_ops; 
>>  dsi->pdata.host_ops = &dw_mipi_dsi_rockchip_host_ops; 
>> @@ -1072,6 +1092,6 @@ struct platform_driver 
>> dw_mipi_dsi_rockchip_driver = { 
>>  	.remove		= dw_mipi_dsi_rockchip_remove, .driver 
>>  = { .of_match_table = dw_mipi_dsi_rockchip_dt_ids, 
>> -		.name	= "dw-mipi-dsi-rockchip", + 
>> .name	= DRIVER_NAME, 
>>  	}, }; 
>> diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c 
>> b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c index 
>> 514efefb0016..cc233271347b 100644 --- 
>> a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +++ 
>> b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c @@ -12,6 +12,7 @@ 
>>  #include <linux/module.h> #include <linux/platform_device.h> 
>>  #include <linux/regulator/consumer.h> 
>> +#include <linux/regmap.h> 
>>   #include <video/mipi_display.h>  
>> @@ -19,6 +20,8 @@ 
>>  #include <drm/drm_mipi_dsi.h> #include <drm/drm_print.h>  
>> +#define DRIVER_NAME "stm32-display-dsi" + 
>>  #define HWVER_130			0x31333000	/* IP 
>>  version 1.30 */ #define HWVER_131			0x31333100 
>>  /* IP version 1.31 */  
>> @@ -75,7 +78,7 @@ enum dsi_color { 
>>  #define TIMEOUT_US	200000  struct dw_mipi_dsi_stm { 
>> -	void __iomem *base; +	struct regmap *regs; 
>>  	struct clk *pllref_clk; struct dw_mipi_dsi *dsi; u32 
>>  hw_version; 
>> @@ -86,12 +89,15 @@ struct dw_mipi_dsi_stm { 
>>   static inline void dsi_write(struct dw_mipi_dsi_stm *dsi, u32 
>>  reg, u32 val) { 
>> -	writel(val, dsi->base + reg); +	regmap_write(dsi->regs, 
>> reg, val); 
>>  }  static inline u32 dsi_read(struct dw_mipi_dsi_stm *dsi, u32 
>>  reg) { 
>> -	return readl(dsi->base + reg); +	u32 val; + + 
>> regmap_read(dsi->regs, reg, &val); +	return val; 
>>  }  static inline void dsi_set(struct dw_mipi_dsi_stm *dsi, u32 
>>  reg, u32 mask) 
>> @@ -202,15 +208,15 @@ static int dw_mipi_dsi_phy_init(void 
>> *priv_data) 
>>   /* Enable the regulator */ dsi_set(dsi, DSI_WRPCR, 
>>  WRPCR_REGEN | WRPCR_BGREN); 
>> -	ret = readl_poll_timeout(dsi->base + DSI_WISR, val, val & 
>> WISR_RRS, -				 SLEEP_US, TIMEOUT_US); + 
>> ret = regmap_read_poll_timeout(dsi->regs, DSI_WISR, val, val & 
>> WISR_RRS, +				       SLEEP_US, 
>> TIMEOUT_US); 
>>  	if (ret) DRM_DEBUG_DRIVER("!TIMEOUT! waiting REGU, let's 
>>  continue\n");  /* Enable the DSI PLL & wait for its lock */ 
>>  dsi_set(dsi, DSI_WRPCR, WRPCR_PLLEN); 
>> -	ret = readl_poll_timeout(dsi->base + DSI_WISR, val, val & 
>> WISR_PLLLS, -				 SLEEP_US, 
>> TIMEOUT_US); +	ret = regmap_read_poll_timeout(dsi->regs, 
>> DSI_WISR, val, +				       val & 
>> WISR_PLLLS, SLEEP_US, TIMEOUT_US); 
>>  	if (ret) DRM_DEBUG_DRIVER("!TIMEOUT! waiting PLL, let's 
>>  continue\n");  
>> @@ -327,12 +333,20 @@ static const struct of_device_id 
>> dw_mipi_dsi_stm_dt_ids[] = { 
>>  }; MODULE_DEVICE_TABLE(of, dw_mipi_dsi_stm_dt_ids);  
>> +static const struct regmap_config stm_dsi_regmap_config = { + 
>> .reg_bits = 32, +	.val_bits = 32, +	.reg_stride = 4, + 
>> .name = DRIVER_NAME, +}; + 
>>  static int dw_mipi_dsi_stm_probe(struct platform_device *pdev) 
>>  { struct device *dev = &pdev->dev; struct dw_mipi_dsi_stm 
>>  *dsi; struct clk *pclk; struct resource *res; 
>> +	void __iomem *regs; 
>>  	int ret;  dsi = devm_kzalloc(dev, sizeof(*dsi), 
>>  GFP_KERNEL); 
>> @@ -340,13 +354,19 @@ static int dw_mipi_dsi_stm_probe(struct 
>> platform_device *pdev) 
>>  		return -ENOMEM;  res = platform_get_resource(pdev, 
>>  IORESOURCE_MEM, 0); 
>> -	dsi->base = devm_ioremap_resource(dev, res); -	if 
>> (IS_ERR(dsi->base)) { -		ret = PTR_ERR(dsi->base); 
>> +	regs = devm_ioremap_resource(dev, res); +	if 
>> (IS_ERR(regs)) { +		ret = PTR_ERR(regs); 
>>  		DRM_ERROR("Unable to get dsi registers %d\n", 
>>  ret); return ret; }  
>> +	dsi->regs = devm_regmap_init_mmio(dev, regs, 
>> &stm_dsi_regmap_config); +	if (IS_ERR(dsi->regs)) { + 
>> DRM_DEV_ERROR(dev, "Unable to create DSI regmap\n"); + 
>> return PTR_ERR(dsi->regs); +	} + 
>>  	dsi->vdd_supply = devm_regulator_get(dev, "phy-dsi"); if 
>>  (IS_ERR(dsi->vdd_supply)) { ret = PTR_ERR(dsi->vdd_supply); 
>> @@ -396,7 +416,7 @@ static int dw_mipi_dsi_stm_probe(struct 
>> platform_device *pdev) 
>>  		goto err_dsi_probe; }  
>> -	dw_mipi_dsi_stm_plat_data.base = dsi->base; + 
>> dw_mipi_dsi_stm_plat_data.regs = dsi->regs; 
>>  	dw_mipi_dsi_stm_plat_data.priv_data = dsi; 
>>  platform_set_drvdata(pdev, dsi); 
>> @@ -474,7 +494,7 @@ static struct platform_driver 
>> dw_mipi_dsi_stm_driver = { 
>>  	.remove		= dw_mipi_dsi_stm_remove, .driver 
>>  = { .of_match_table = dw_mipi_dsi_stm_dt_ids, 
>> -		.name	= "stm32-display-dsi", + 
>> .name	= DRIVER_NAME, 
>>  		.pm = &dw_mipi_dsi_stm_pm_ops, }, }; 
>> diff --git a/include/drm/bridge/dw_mipi_dsi.h 
>> b/include/drm/bridge/dw_mipi_dsi.h index 
>> 94cc64a342e1..ecc1897efa62 100644 --- 
>> a/include/drm/bridge/dw_mipi_dsi.h +++ 
>> b/include/drm/bridge/dw_mipi_dsi.h @@ -37,7 +37,7 @@ struct 
>> dw_mipi_dsi_host_ops { 
>>  };  struct dw_mipi_dsi_plat_data { 
>> -	void __iomem *base; +	struct regmap *regs; 
>>  	unsigned int max_data_lanes;  enum drm_mode_status 
>>  (*mode_valid)(void *priv_data, 
>>  
> 
> OK for the dw-mipi-dsi changes, but why should the 
> dw_mipi_dsi-stm be changed aswell ? 
> 
> AFAIK these are independent.

I don't understand how they are independent. Isn't the stm driver 
also using the same dw-mipi-dsi bridge as rockchip and now imx 
since it was first added in commit
c1c026dbc183 ("drm/stm: Add STM32 DSI controller driver") ?

I don't have the hardware to test the stm driver on a live boot, 
but compilation certainly fails if I don't modify it :)

>
> Neil

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=/Of/=Y4=lists.infradead.org=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,
	SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,UNWANTED_LANGUAGE_BODY,
	URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id DCFD7CA9EA0
	for <infradead-linux-arm-kernel@archiver.kernel.org>; Mon,  4 Nov 2019 12:04:58 +0000 (UTC)
Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mail.kernel.org (Postfix) with ESMTPS id AC1E7217F4
	for <infradead-linux-arm-kernel@archiver.kernel.org>; Mon,  4 Nov 2019 12:04:58 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sinjwdm6"
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AC1E7217F4
Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com
Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
	d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:
	Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive:
	List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References:In-Reply-To:
	Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:
	Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner;
	 bh=e0hQyUl+oXoeabVJB56xIX6B03KtsAsF0UpxFxPZqBM=; b=sinjwdm6xhM/BXUFNHrmUZF70
	Dug38p5lAj9lF7eVtU80RZp3qHlZkZBgvB9UR1caft5iWfpRvrSF1BJsQNuWuikoWcBhxOXzy/zHS
	SjvddDEF03xIqto/qIPRq9pF04wtqjJR1pyqb6dApgMNsmOMtkPYiG3QFW/QrkT4KZZSce1KFgy9B
	YlFDXW4LWj6wfUf0Un00BVUS2thgwaHneUT9leFYGpvKsSLgGFhY8bAtDE7V3QzZNYJsg76UREfJD
	R1zpDDm2jp4Msqu8gzFtLaBpVMrlzfHuW4km/UR7jITBN/ASfXZxr3JJduJ5s3QXW2IZoVg6XJZ/C
	MfdPFOlPg==;
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
	by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
	id 1iRb6M-0008JD-Fd; Mon, 04 Nov 2019 12:04:54 +0000
Received: from bhuna.collabora.co.uk ([46.235.227.227])
 by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
 id 1iRb5F-00070T-S6; Mon, 04 Nov 2019 12:03:49 +0000
Received: from [127.0.0.1] (localhost [127.0.0.1])
 (Authenticated sender: aratiu) with ESMTPSA id D406F28021A
From: Adrian Ratiu <adrian.ratiu@collabora.com>
To: Neil Armstrong <narmstrong@baylibre.com>, Adrian Ratiu
 <adrian.ratiu@collabora.com>, linux-arm-kernel@lists.infradead.org,
 linux-stm32@st-md-mailman.stormreply.com,
 linux-rockchip@lists.infradead.org
Subject: Re: [PATCH 1/4] drm: bridge: dw_mipi_dsi: access registers via a
 regmap
In-Reply-To: <974be8e9-fcb4-4457-8831-40b2fa834ae2@baylibre.com>
References: <20191031142633.12460-1-adrian.ratiu@collabora.com>
 <20191031142633.12460-2-adrian.ratiu@collabora.com>
 <974be8e9-fcb4-4457-8831-40b2fa834ae2@baylibre.com>
Date: Mon, 04 Nov 2019 14:03:56 +0200
Message-ID: <87v9rz97bn.fsf@collabora.com>
MIME-Version: 1.0
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
X-CRM114-CacheID: sfid-20191104_040346_186401_1C020FFD 
X-CRM114-Status: GOOD (  13.48  )
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <linux-arm-kernel.lists.infradead.org>
List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, 
 <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, 
 <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
Cc: kernel@collabora.com, linux-kernel@vger.kernel.org,
 dri-devel@lists.freedesktop.org,
 Boris Brezillon <boris.brezillon@collabora.com>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org

On Mon, 04 Nov 2019, Neil Armstrong <narmstrong@baylibre.com> 
wrote:
> On 31/10/2019 15:26, Adrian Ratiu wrote: 
>> Convert the common bridge code and the two rockchip & stm 
>> drivers which currently use it to the regmap API in 
>> anticipation for further changes to make it more generic and 
>> add older DSI host controller support as found on i.mx6 based 
>> devices.   No functional changes other than requiring the 
>> platform drivers to provide a regmap via their plat_data. Going 
>> further each platform driver can also add its own regmap 
>> configuration like for maximum write offsets, r/w callbacks or 
>> different register layouts.   Suggested-by: Boris Brezillon 
>> <boris.brezillon@collabora.com> Signed-off-by: Adrian Ratiu 
>> <adrian.ratiu@collabora.com> --- 
>>  drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 189 
>>  +++++++++--------- .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c 
>>  |  36 +++- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c         |  44 
>>  ++-- include/drm/bridge/dw_mipi_dsi.h              |   2 +- 4 
>>  files changed, 155 insertions(+), 116 deletions(-) 
>>  diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c 
>> b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c index 
>> b6e793bb653c..4ef3e9038cc2 100644 --- 
>> a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ 
>> b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -15,6 +15,7 
>> @@ 
>>  #include <linux/module.h> #include <linux/of_device.h> 
>>  #include <linux/pm_runtime.h> 
>> +#include <linux/regmap.h> 
>>  #include <linux/reset.h>  #include <video/mipi_display.h> 
>> @@ -226,7 +227,7 @@ struct dw_mipi_dsi { 
>>  	struct mipi_dsi_host dsi_host; struct drm_bridge 
>>  *panel_bridge; struct device *dev; 
>> -	void __iomem *base; +	struct regmap *regs; 
>>   struct clk *pclk;  
>> @@ -280,16 +281,6 @@ static inline struct dw_mipi_dsi 
>> *bridge_to_dsi(struct drm_bridge *bridge) 
>>  	return container_of(bridge, struct dw_mipi_dsi, bridge); }  
>> -static inline void dsi_write(struct dw_mipi_dsi *dsi, u32 reg, 
>> u32 val) -{ -	writel(val, dsi->base + reg); -} - -static 
>> inline u32 dsi_read(struct dw_mipi_dsi *dsi, u32 reg) -{ - 
>> return readl(dsi->base + reg); -} - 
>>  static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, 
>>  struct mipi_dsi_device *device) { 
>> @@ -366,29 +357,29 @@ static void dw_mipi_message_config(struct 
>> dw_mipi_dsi *dsi, 
>>  	if (lpm) val |= CMD_MODE_ALL_LP;  
>> -	dsi_write(dsi, DSI_LPCLK_CTRL, lpm ? 0 : 
>> PHY_TXREQUESTCLKHS); -	dsi_write(dsi, DSI_CMD_MODE_CFG, 
>> val); +	regmap_write(dsi->regs, DSI_LPCLK_CTRL, lpm ? 0 : 
>> PHY_TXREQUESTCLKHS); +	regmap_write(dsi->regs, 
>> DSI_CMD_MODE_CFG, val); 
>>  }  static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi 
>>  *dsi, u32 hdr_val) { int ret; 
>> -	u32 val, mask; +	u32 val = 0, mask; 
>>   
>> -	ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, - 
>> val, !(val & GEN_CMD_FULL), 1000, - 
>> CMD_PKT_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, !(val & GEN_CMD_FULL), 1000, + 
>> CMD_PKT_STATUS_TIMEOUT_US); 
>>  	if (ret) { dev_err(dsi->dev, "failed to get available 
>>  command FIFO\n"); return ret; }  
>> -	dsi_write(dsi, DSI_GEN_HDR, hdr_val); + 
>> regmap_write(dsi->regs, DSI_GEN_HDR, hdr_val); 
>>   mask = GEN_CMD_EMPTY | GEN_PLD_W_EMPTY; 
>> -	ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, - 
>> val, (val & mask) == mask, -				 1000, 
>> CMD_PKT_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, (val & mask) == mask, + 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); 
>>  	if (ret) { dev_err(dsi->dev, "failed to write command 
>>  FIFO\n"); return ret; 
>> @@ -403,24 +394,26 @@ static int dw_mipi_dsi_write(struct 
>> dw_mipi_dsi *dsi, 
>>  	const u8 *tx_buf = packet->payload; int len = 
>>  packet->payload_length, pld_data_bytes = sizeof(u32), ret; 
>>  __le32 word; 
>> -	u32 val; +	u32 val = 0; 
>>   while (len) { if (len < pld_data_bytes) { word = 0; 
>>  memcpy(&word, tx_buf, len); 
>> -			dsi_write(dsi, DSI_GEN_PLD_DATA, 
>> le32_to_cpu(word)); + 
>> regmap_write(dsi->regs, DSI_GEN_PLD_DATA, + 
>> le32_to_cpu(word)); 
>>  			len = 0; } else { memcpy(&word, tx_buf, 
>>  pld_data_bytes); 
>> -			dsi_write(dsi, DSI_GEN_PLD_DATA, 
>> le32_to_cpu(word)); + 
>> regmap_write(dsi->regs, DSI_GEN_PLD_DATA, + 
>> le32_to_cpu(word)); 
>>  			tx_buf += pld_data_bytes; len -= 
>>  pld_data_bytes; }  
>> -		ret = readl_poll_timeout(dsi->base + 
>> DSI_CMD_PKT_STATUS, - 
>> val, !(val & GEN_PLD_W_FULL), 1000, - 
>> CMD_PKT_STATUS_TIMEOUT_US); +		ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, !(val & GEN_PLD_W_FULL), + 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); 
>>  		if (ret) { dev_err(dsi->dev, "failed to get 
>>  available write payload FIFO\n"); 
>> @@ -438,12 +431,12 @@ static int dw_mipi_dsi_read(struct 
>> dw_mipi_dsi *dsi, 
>>  { int i, j, ret, len = msg->rx_len; u8 *buf = msg->rx_buf; 
>> -	u32 val; +	u32 val = 0; 
>>   /* Wait end of the read operation */ 
>> -	ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, - 
>> val, !(val & GEN_RD_CMD_BUSY), - 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, !(val & GEN_RD_CMD_BUSY), + 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); 
>>  	if (ret) { dev_err(dsi->dev, "Timeout during read 
>>  operation\n"); return ret; 
>> @@ -451,15 +444,15 @@ static int dw_mipi_dsi_read(struct 
>> dw_mipi_dsi *dsi, 
>>   for (i = 0; i < len; i += 4) { /* Read fifo must not be empty 
>>  before all bytes are read */ 
>> -		ret = readl_poll_timeout(dsi->base + 
>> DSI_CMD_PKT_STATUS, - 
>> val, !(val & GEN_PLD_R_EMPTY), - 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); +		ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_CMD_PKT_STATUS, + 
>> val, !(val & GEN_PLD_R_EMPTY), + 
>> 1000, CMD_PKT_STATUS_TIMEOUT_US); 
>>  		if (ret) { dev_err(dsi->dev, "Read payload FIFO is 
>>  empty\n"); return ret; }  
>> -		val = dsi_read(dsi, DSI_GEN_PLD_DATA); + 
>> regmap_read(dsi->regs, DSI_GEN_PLD_DATA, &val); 
>>  		for (j = 0; j < 4 && j + i < len; j++) buf[i + j] 
>>  = val >> (8 * j); } 
>> @@ -536,29 +529,29 @@ static void 
>> dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi) 
>>  	} #endif /* CONFIG_DEBUG_FS */  
>> -	dsi_write(dsi, DSI_VID_MODE_CFG, val); + 
>> regmap_write(dsi->regs, DSI_VID_MODE_CFG, val); 
>>  }  static void dw_mipi_dsi_set_mode(struct dw_mipi_dsi *dsi, 
>>  unsigned long mode_flags) { 
>> -	dsi_write(dsi, DSI_PWR_UP, RESET); + 
>> regmap_write(dsi->regs, DSI_PWR_UP, RESET); 
>>   if (mode_flags & MIPI_DSI_MODE_VIDEO) { 
>> -		dsi_write(dsi, DSI_MODE_CFG, ENABLE_VIDEO_MODE); + 
>> regmap_write(dsi->regs, DSI_MODE_CFG, ENABLE_VIDEO_MODE); 
>>  		dw_mipi_dsi_video_mode_config(dsi); 
>> -		dsi_write(dsi, DSI_LPCLK_CTRL, 
>> PHY_TXREQUESTCLKHS); +		regmap_write(dsi->regs, 
>> DSI_LPCLK_CTRL, PHY_TXREQUESTCLKHS); 
>>  	} else { 
>> -		dsi_write(dsi, DSI_MODE_CFG, ENABLE_CMD_MODE); + 
>> regmap_write(dsi->regs, DSI_MODE_CFG, ENABLE_CMD_MODE); 
>>  	}  
>> -	dsi_write(dsi, DSI_PWR_UP, POWERUP); + 
>> regmap_write(dsi->regs, DSI_PWR_UP, POWERUP); 
>>  }  static void dw_mipi_dsi_disable(struct dw_mipi_dsi *dsi) { 
>> -	dsi_write(dsi, DSI_PWR_UP, RESET); -	dsi_write(dsi, 
>> DSI_PHY_RSTZ, PHY_RSTZ); +	regmap_write(dsi->regs, 
>> DSI_PWR_UP, RESET); +	regmap_write(dsi->regs, 
>> DSI_PHY_RSTZ, PHY_RSTZ); 
>>  }  static void dw_mipi_dsi_init(struct dw_mipi_dsi *dsi) 
>> @@ -573,14 +566,14 @@ static void dw_mipi_dsi_init(struct 
>> dw_mipi_dsi *dsi) 
>>  	 */ u32 esc_clk_division = (dsi->lane_mbps >> 3) / 20 + 1;  
>> -	dsi_write(dsi, DSI_PWR_UP, RESET); + 
>> regmap_write(dsi->regs, DSI_PWR_UP, RESET); 
>>   /* * TODO dw drv improvements * timeout clock division should 
>>  be computed with the * high speed transmission counter timeout 
>>  and byte lane...  */ 
>> -	dsi_write(dsi, DSI_CLKMGR_CFG, TO_CLK_DIVISION(10) | + 
>> regmap_write(dsi->regs, DSI_CLKMGR_CFG, TO_CLK_DIVISION(10) | 
>>  		  TX_ESC_CLK_DIVISION(esc_clk_division)); }  
>> @@ -609,22 +602,22 @@ static void dw_mipi_dsi_dpi_config(struct 
>> dw_mipi_dsi *dsi, 
>>  	if (mode->flags & DRM_MODE_FLAG_NHSYNC) val |= 
>>  HSYNC_ACTIVE_LOW;  
>> -	dsi_write(dsi, DSI_DPI_VCID, DPI_VCID(dsi->channel)); - 
>> dsi_write(dsi, DSI_DPI_COLOR_CODING, color); - 
>> dsi_write(dsi, DSI_DPI_CFG_POL, val); + 
>> regmap_write(dsi->regs, DSI_DPI_VCID, DPI_VCID(dsi->channel)); 
>> +	regmap_write(dsi->regs, DSI_DPI_COLOR_CODING, color); + 
>> regmap_write(dsi->regs, DSI_DPI_CFG_POL, val); 
>>  	/* * TODO dw drv improvements * largest packet sizes 
>>  during hfp or during vsa/vpb/vfp * should be computed 
>>  according to byte lane, lane number and only * if sending lp 
>>  cmds in high speed is enable (PHY_TXREQUESTCLKHS) */ 
>> -	dsi_write(dsi, DSI_DPI_LP_CMD_TIM, OUTVACT_LPCMD_TIME(4) + 
>> regmap_write(dsi->regs, DSI_DPI_LP_CMD_TIM, 
>> OUTVACT_LPCMD_TIME(4) 
>>  		  | INVACT_LPCMD_TIME(4)); }  static void 
>>  dw_mipi_dsi_packet_handler_config(struct dw_mipi_dsi *dsi) { 
>> -	dsi_write(dsi, DSI_PCKHDL_CFG, CRC_RX_EN | ECC_RX_EN | 
>> BTA_EN); +	regmap_write(dsi->regs, DSI_PCKHDL_CFG, CRC_RX_EN 
>> | ECC_RX_EN | BTA_EN); 
>>  }  static void dw_mipi_dsi_video_packet_config(struct 
>>  dw_mipi_dsi *dsi, 
>> @@ -638,7 +631,7 @@ static void 
>> dw_mipi_dsi_video_packet_config(struct dw_mipi_dsi *dsi, 
>>  	 * non-burst video modes, see 
>>  dw_mipi_dsi_video_mode_config()...  */  
>> -	dsi_write(dsi, DSI_VID_PKT_SIZE, + 
>> regmap_write(dsi->regs, DSI_VID_PKT_SIZE, 
>>  		       dw_mipi_is_dual_mode(dsi) ? 
>>  VID_PKT_SIZE(mode->hdisplay / 2) : 
>>  VID_PKT_SIZE(mode->hdisplay)); 
>> @@ -651,14 +644,15 @@ static void 
>> dw_mipi_dsi_command_mode_config(struct dw_mipi_dsi *dsi) 
>>  	 * compute high speed transmission counter timeout 
>>  according * to the timeout clock division (TO_CLK_DIVISION) 
>>  and byte lane...  */ 
>> -	dsi_write(dsi, DSI_TO_CNT_CFG, HSTX_TO_CNT(1000) | 
>> LPRX_TO_CNT(1000)); +	regmap_write(dsi->regs, 
>> DSI_TO_CNT_CFG, +		     HSTX_TO_CNT(1000) | 
>> LPRX_TO_CNT(1000)); 
>>  	/* * TODO dw drv improvements * the Bus-Turn-Around 
>>  Timeout Counter should be computed * according to byte lane... 
>>  */ 
>> -	dsi_write(dsi, DSI_BTA_TO_CNT, 0xd00); - 
>> dsi_write(dsi, DSI_MODE_CFG, ENABLE_CMD_MODE); + 
>> regmap_write(dsi->regs, DSI_BTA_TO_CNT, 0xd00); + 
>> regmap_write(dsi->regs, DSI_MODE_CFG, ENABLE_CMD_MODE); 
>>  }  /* Get lane byte clock cycles. */ 
>> @@ -692,13 +686,13 @@ static void 
>> dw_mipi_dsi_line_timer_config(struct dw_mipi_dsi *dsi, 
>>  	 * computations below may be improved...  */ lbcc = 
>>  dw_mipi_dsi_get_hcomponent_lbcc(dsi, mode, htotal); 
>> -	dsi_write(dsi, DSI_VID_HLINE_TIME, lbcc); + 
>> regmap_write(dsi->regs, DSI_VID_HLINE_TIME, lbcc); 
>>   lbcc = dw_mipi_dsi_get_hcomponent_lbcc(dsi, mode, hsa); 
>> -	dsi_write(dsi, DSI_VID_HSA_TIME, lbcc); + 
>> regmap_write(dsi->regs, DSI_VID_HSA_TIME, lbcc); 
>>   lbcc = dw_mipi_dsi_get_hcomponent_lbcc(dsi, mode, hbp); 
>> -	dsi_write(dsi, DSI_VID_HBP_TIME, lbcc); + 
>> regmap_write(dsi->regs, DSI_VID_HBP_TIME, lbcc); 
>>  }  static void dw_mipi_dsi_vertical_timing_config(struct 
>>  dw_mipi_dsi *dsi, 
>> @@ -711,10 +705,10 @@ static void 
>> dw_mipi_dsi_vertical_timing_config(struct dw_mipi_dsi *dsi, 
>>  	vfp = mode->vsync_start - mode->vdisplay; vbp = 
>>  mode->vtotal - mode->vsync_end;  
>> -	dsi_write(dsi, DSI_VID_VACTIVE_LINES, vactive); - 
>> dsi_write(dsi, DSI_VID_VSA_LINES, vsa); -	dsi_write(dsi, 
>> DSI_VID_VFP_LINES, vfp); -	dsi_write(dsi, DSI_VID_VBP_LINES, 
>> vbp); +	regmap_write(dsi->regs, DSI_VID_VACTIVE_LINES, 
>> vactive); +	regmap_write(dsi->regs, DSI_VID_VSA_LINES, vsa); + 
>> regmap_write(dsi->regs, DSI_VID_VFP_LINES, vfp); + 
>> regmap_write(dsi->regs, DSI_VID_VBP_LINES, vbp); 
>>  }  static void dw_mipi_dsi_dphy_timing_config(struct 
>>  dw_mipi_dsi *dsi) 
>> @@ -729,19 +723,24 @@ static void 
>> dw_mipi_dsi_dphy_timing_config(struct dw_mipi_dsi *dsi) 
>>  	 * DSI_CMD_MODE_CFG.MAX_RD_PKT_SIZE_LP (see 
>>  CMD_MODE_ALL_LP) */  
>> -	hw_version = dsi_read(dsi, DSI_VERSION) & VERSION; + 
>> regmap_read(dsi->regs, DSI_VERSION, &hw_version); +	hw_version 
>> &= VERSION; 
>>   if (hw_version >= HWVER_131) { 
>> -		dsi_write(dsi, DSI_PHY_TMR_CFG, 
>> PHY_HS2LP_TIME_V131(0x40) | - 
>> PHY_LP2HS_TIME_V131(0x40)); -		dsi_write(dsi, 
>> DSI_PHY_TMR_RD_CFG, MAX_RD_TIME_V131(10000)); + 
>> regmap_write(dsi->regs, DSI_PHY_TMR_CFG, + 
>> PHY_HS2LP_TIME_V131(0x40) | + 
>> PHY_LP2HS_TIME_V131(0x40)); + 
>> regmap_write(dsi->regs, DSI_PHY_TMR_RD_CFG, + 
>> MAX_RD_TIME_V131(10000)); 
>>  	} else { 
>> -		dsi_write(dsi, DSI_PHY_TMR_CFG, 
>> PHY_HS2LP_TIME(0x40) | - 
>> PHY_LP2HS_TIME(0x40) | MAX_RD_TIME(10000)); + 
>> regmap_write(dsi->regs, DSI_PHY_TMR_CFG, + 
>> PHY_HS2LP_TIME(0x40) | + 
>> PHY_LP2HS_TIME(0x40) | + 
>> MAX_RD_TIME(10000)); 
>>  	}  
>> -	dsi_write(dsi, DSI_PHY_TMR_LPCLK_CFG, 
>> PHY_CLKHS2LP_TIME(0x40) -		  | 
>> PHY_CLKLP2HS_TIME(0x40)); +	regmap_write(dsi->regs, 
>> DSI_PHY_TMR_LPCLK_CFG, + 
>> PHY_CLKHS2LP_TIME(0x40) | PHY_CLKLP2HS_TIME(0x40)); 
>>  }  static void dw_mipi_dsi_dphy_interface_config(struct 
>>  dw_mipi_dsi *dsi) 
>> @@ -751,46 +750,49 @@ static void 
>> dw_mipi_dsi_dphy_interface_config(struct dw_mipi_dsi *dsi) 
>>  	 * stop wait time should be the maximum between host dsi * 
>>  and panel stop wait times */ 
>> -	dsi_write(dsi, DSI_PHY_IF_CFG, PHY_STOP_WAIT_TIME(0x20) | 
>> -		  N_LANES(dsi->lanes)); + 
>> regmap_write(dsi->regs, DSI_PHY_IF_CFG, + 
>> PHY_STOP_WAIT_TIME(0x20) | N_LANES(dsi->lanes)); 
>>  }  static void dw_mipi_dsi_dphy_init(struct dw_mipi_dsi *dsi) 
>>  { /* Clear PHY state */ 
>> -	dsi_write(dsi, DSI_PHY_RSTZ, PHY_DISFORCEPLL | 
>> PHY_DISABLECLK -		  | PHY_RSTZ | PHY_SHUTDOWNZ); - 
>> dsi_write(dsi, DSI_PHY_TST_CTRL0, PHY_UNTESTCLR); - 
>> dsi_write(dsi, DSI_PHY_TST_CTRL0, PHY_TESTCLR); - 
>> dsi_write(dsi, DSI_PHY_TST_CTRL0, PHY_UNTESTCLR); + 
>> regmap_write(dsi->regs, DSI_PHY_RSTZ, PHY_DISFORCEPLL | 
>> PHY_DISABLECLK +		     | PHY_RSTZ | PHY_SHUTDOWNZ); 
>> +	regmap_write(dsi->regs, DSI_PHY_TST_CTRL0, PHY_UNTESTCLR); 
>> +	regmap_write(dsi->regs, DSI_PHY_TST_CTRL0, PHY_TESTCLR); + 
>> regmap_write(dsi->regs, DSI_PHY_TST_CTRL0, PHY_UNTESTCLR); 
>>  }  static void dw_mipi_dsi_dphy_enable(struct dw_mipi_dsi 
>>  *dsi) { 
>> -	u32 val; +	u32 val = 0; 
>>  	int ret;  
>> -	dsi_write(dsi, DSI_PHY_RSTZ, PHY_ENFORCEPLL | 
>> PHY_ENABLECLK | -		  PHY_UNRSTZ | PHY_UNSHUTDOWNZ); + 
>> regmap_write(dsi->regs, DSI_PHY_RSTZ, PHY_ENFORCEPLL | 
>> PHY_ENABLECLK | +		     PHY_UNRSTZ | 
>> PHY_UNSHUTDOWNZ); 
>>   
>> -	ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, val, 
>> -				 val & PHY_LOCK, 1000, 
>> PHY_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_PHY_STATUS, + 
>> val, val & PHY_LOCK, + 
>> 1000, PHY_STATUS_TIMEOUT_US); 
>>  	if (ret) DRM_DEBUG_DRIVER("failed to wait phy lock 
>>  state\n");  
>> -	ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, - 
>> val, val & PHY_STOP_STATE_CLK_LANE, 1000, - 
>> PHY_STATUS_TIMEOUT_US); +	ret = 
>> regmap_read_poll_timeout(dsi->regs, DSI_PHY_STATUS, + 
>> val, val & PHY_STOP_STATE_CLK_LANE, 1000, + 
>> PHY_STATUS_TIMEOUT_US); 
>>  	if (ret) DRM_DEBUG_DRIVER("failed to wait phy clk lane 
>>  stop state\n"); }  static void dw_mipi_dsi_clear_err(struct 
>>  dw_mipi_dsi *dsi) { 
>> -	dsi_read(dsi, DSI_INT_ST0); -	dsi_read(dsi, 
>> DSI_INT_ST1); -	dsi_write(dsi, DSI_INT_MSK0, 0); - 
>> dsi_write(dsi, DSI_INT_MSK1, 0); +	u32 val; + + 
>> regmap_read(dsi->regs, DSI_INT_ST0, &val); + 
>> regmap_read(dsi->regs, DSI_INT_ST1, &val); + 
>> regmap_write(dsi->regs, DSI_INT_MSK0, 0); + 
>> regmap_write(dsi->regs, DSI_INT_MSK1, 0); 
>>  }  static void dw_mipi_dsi_bridge_post_disable(struct 
>>  drm_bridge *bridge) 
>> @@ -996,13 +998,10 @@ __dw_mipi_dsi_probe(struct 
>> platform_device *pdev, 
>>  		return ERR_PTR(-ENODEV); }  
>> -	if (!plat_data->base) { -		dsi->base = 
>> devm_platform_ioremap_resource(pdev, 0); -		if 
>> (IS_ERR(dsi->base)) -			return 
>> ERR_PTR(-ENODEV); - -	} else { -		dsi->base 
>> = plat_data->base; +	dsi->regs = plat_data->regs; +	if 
>> (!dsi->regs) { +		DRM_ERROR("DSI regmap not supplied 
>> by platform driver\n"); +		return ERR_PTR(-ENODEV); 
>>  	}  dsi->pclk = devm_clk_get(dev, "pclk"); 
>> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c 
>> b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c index 
>> bc073ec5c183..3c33ed1fa805 100644 --- 
>> a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ 
>> b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -24,6 
>> +24,8 @@ 
>>  #include "rockchip_drm_drv.h" #include "rockchip_drm_vop.h"  
>> +#define DRIVER_NAME "dw-mipi-dsi-rockchip" + 
>>  #define DSI_PHY_RSTZ			0xa0 #define 
>>  PHY_DISFORCEPLL			0 #define PHY_ENFORCEPLL 
>>  BIT(3) 
>> @@ -212,7 +214,7 @@ struct rockchip_dw_dsi_chip_data { 
>>  struct dw_mipi_dsi_rockchip { struct device *dev; struct 
>>  drm_encoder encoder; 
>> -	void __iomem *base; +	struct regmap *regs; 
>>   struct regmap *grf_regmap; struct clk *pllref_clk; 
>> @@ -297,12 +299,15 @@ static int max_mbps_to_parameter(unsigned 
>> int max_mbps) 
>>   static inline void dsi_write(struct dw_mipi_dsi_rockchip 
>>  *dsi, u32 reg, u32 val) { 
>> -	writel(val, dsi->base + reg); +	regmap_write(dsi->regs, 
>> reg, val); 
>>  }  static inline u32 dsi_read(struct dw_mipi_dsi_rockchip 
>>  *dsi, u32 reg) { 
>> -	return readl(dsi->base + reg); +	u32 val; + + 
>> regmap_read(dsi->regs, reg, &val); +	return val; 
>>  }  static inline void dsi_set(struct dw_mipi_dsi_rockchip 
>>  *dsi, u32 reg, u32 mask) 
>> @@ -884,6 +889,13 @@ static const struct dw_mipi_dsi_host_ops 
>> dw_mipi_dsi_rockchip_host_ops = { 
>>  	.detach = dw_mipi_dsi_rockchip_host_detach, };  
>> +static const struct regmap_config rockchip_dsi_regmap_config = 
>> { +	.reg_bits = 32, +	.val_bits = 32, + 
>> .reg_stride = 4, +	.name = DRIVER_NAME, +}; + 
>>  static int dw_mipi_dsi_rockchip_probe(struct platform_device 
>>  *pdev) { struct device *dev = &pdev->dev; 
>> @@ -892,6 +904,7 @@ static int 
>> dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) 
>>  	struct resource *res; const struct 
>>  rockchip_dw_dsi_chip_data *cdata = 
>>  of_device_get_match_data(dev); 
>> +	void __iomem *regs; 
>>  	int ret, i;  dsi = devm_kzalloc(dev, sizeof(*dsi), 
>>  GFP_KERNEL); 
>> @@ -899,10 +912,17 @@ static int 
>> dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) 
>>  		return -ENOMEM;  res = platform_get_resource(pdev, 
>>  IORESOURCE_MEM, 0); 
>> -	dsi->base = devm_ioremap_resource(dev, res); -	if 
>> (IS_ERR(dsi->base)) { +	regs = devm_ioremap_resource(dev, 
>> res); +	if (IS_ERR(regs)) { 
>>  		DRM_DEV_ERROR(dev, "Unable to get dsi 
>>  registers\n"); 
>> -		return PTR_ERR(dsi->base); +		return 
>> PTR_ERR(regs); +	} + +	dsi->regs = 
>> devm_regmap_init_mmio(dev, regs, + 
>> &rockchip_dsi_regmap_config); +	if (IS_ERR(dsi->regs)) { + 
>> DRM_DEV_ERROR(dev, "Unable to create DSI regmap\n"); + 
>> return PTR_ERR(dsi->regs); 
>>  	}  i = 0; 
>> @@ -954,7 +974,7 @@ static int 
>> dw_mipi_dsi_rockchip_probe(struct platform_device *pdev) 
>>  	}  dsi->dev = dev; 
>> -	dsi->pdata.base = dsi->base; +	dsi->pdata.regs = 
>> dsi->regs; 
>>  	dsi->pdata.max_data_lanes = dsi->cdata->max_data_lanes; 
>>  dsi->pdata.phy_ops = &dw_mipi_dsi_rockchip_phy_ops; 
>>  dsi->pdata.host_ops = &dw_mipi_dsi_rockchip_host_ops; 
>> @@ -1072,6 +1092,6 @@ struct platform_driver 
>> dw_mipi_dsi_rockchip_driver = { 
>>  	.remove		= dw_mipi_dsi_rockchip_remove, .driver 
>>  = { .of_match_table = dw_mipi_dsi_rockchip_dt_ids, 
>> -		.name	= "dw-mipi-dsi-rockchip", + 
>> .name	= DRIVER_NAME, 
>>  	}, }; 
>> diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c 
>> b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c index 
>> 514efefb0016..cc233271347b 100644 --- 
>> a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +++ 
>> b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c @@ -12,6 +12,7 @@ 
>>  #include <linux/module.h> #include <linux/platform_device.h> 
>>  #include <linux/regulator/consumer.h> 
>> +#include <linux/regmap.h> 
>>   #include <video/mipi_display.h>  
>> @@ -19,6 +20,8 @@ 
>>  #include <drm/drm_mipi_dsi.h> #include <drm/drm_print.h>  
>> +#define DRIVER_NAME "stm32-display-dsi" + 
>>  #define HWVER_130			0x31333000	/* IP 
>>  version 1.30 */ #define HWVER_131			0x31333100 
>>  /* IP version 1.31 */  
>> @@ -75,7 +78,7 @@ enum dsi_color { 
>>  #define TIMEOUT_US	200000  struct dw_mipi_dsi_stm { 
>> -	void __iomem *base; +	struct regmap *regs; 
>>  	struct clk *pllref_clk; struct dw_mipi_dsi *dsi; u32 
>>  hw_version; 
>> @@ -86,12 +89,15 @@ struct dw_mipi_dsi_stm { 
>>   static inline void dsi_write(struct dw_mipi_dsi_stm *dsi, u32 
>>  reg, u32 val) { 
>> -	writel(val, dsi->base + reg); +	regmap_write(dsi->regs, 
>> reg, val); 
>>  }  static inline u32 dsi_read(struct dw_mipi_dsi_stm *dsi, u32 
>>  reg) { 
>> -	return readl(dsi->base + reg); +	u32 val; + + 
>> regmap_read(dsi->regs, reg, &val); +	return val; 
>>  }  static inline void dsi_set(struct dw_mipi_dsi_stm *dsi, u32 
>>  reg, u32 mask) 
>> @@ -202,15 +208,15 @@ static int dw_mipi_dsi_phy_init(void 
>> *priv_data) 
>>   /* Enable the regulator */ dsi_set(dsi, DSI_WRPCR, 
>>  WRPCR_REGEN | WRPCR_BGREN); 
>> -	ret = readl_poll_timeout(dsi->base + DSI_WISR, val, val & 
>> WISR_RRS, -				 SLEEP_US, TIMEOUT_US); + 
>> ret = regmap_read_poll_timeout(dsi->regs, DSI_WISR, val, val & 
>> WISR_RRS, +				       SLEEP_US, 
>> TIMEOUT_US); 
>>  	if (ret) DRM_DEBUG_DRIVER("!TIMEOUT! waiting REGU, let's 
>>  continue\n");  /* Enable the DSI PLL & wait for its lock */ 
>>  dsi_set(dsi, DSI_WRPCR, WRPCR_PLLEN); 
>> -	ret = readl_poll_timeout(dsi->base + DSI_WISR, val, val & 
>> WISR_PLLLS, -				 SLEEP_US, 
>> TIMEOUT_US); +	ret = regmap_read_poll_timeout(dsi->regs, 
>> DSI_WISR, val, +				       val & 
>> WISR_PLLLS, SLEEP_US, TIMEOUT_US); 
>>  	if (ret) DRM_DEBUG_DRIVER("!TIMEOUT! waiting PLL, let's 
>>  continue\n");  
>> @@ -327,12 +333,20 @@ static const struct of_device_id 
>> dw_mipi_dsi_stm_dt_ids[] = { 
>>  }; MODULE_DEVICE_TABLE(of, dw_mipi_dsi_stm_dt_ids);  
>> +static const struct regmap_config stm_dsi_regmap_config = { + 
>> .reg_bits = 32, +	.val_bits = 32, +	.reg_stride = 4, + 
>> .name = DRIVER_NAME, +}; + 
>>  static int dw_mipi_dsi_stm_probe(struct platform_device *pdev) 
>>  { struct device *dev = &pdev->dev; struct dw_mipi_dsi_stm 
>>  *dsi; struct clk *pclk; struct resource *res; 
>> +	void __iomem *regs; 
>>  	int ret;  dsi = devm_kzalloc(dev, sizeof(*dsi), 
>>  GFP_KERNEL); 
>> @@ -340,13 +354,19 @@ static int dw_mipi_dsi_stm_probe(struct 
>> platform_device *pdev) 
>>  		return -ENOMEM;  res = platform_get_resource(pdev, 
>>  IORESOURCE_MEM, 0); 
>> -	dsi->base = devm_ioremap_resource(dev, res); -	if 
>> (IS_ERR(dsi->base)) { -		ret = PTR_ERR(dsi->base); 
>> +	regs = devm_ioremap_resource(dev, res); +	if 
>> (IS_ERR(regs)) { +		ret = PTR_ERR(regs); 
>>  		DRM_ERROR("Unable to get dsi registers %d\n", 
>>  ret); return ret; }  
>> +	dsi->regs = devm_regmap_init_mmio(dev, regs, 
>> &stm_dsi_regmap_config); +	if (IS_ERR(dsi->regs)) { + 
>> DRM_DEV_ERROR(dev, "Unable to create DSI regmap\n"); + 
>> return PTR_ERR(dsi->regs); +	} + 
>>  	dsi->vdd_supply = devm_regulator_get(dev, "phy-dsi"); if 
>>  (IS_ERR(dsi->vdd_supply)) { ret = PTR_ERR(dsi->vdd_supply); 
>> @@ -396,7 +416,7 @@ static int dw_mipi_dsi_stm_probe(struct 
>> platform_device *pdev) 
>>  		goto err_dsi_probe; }  
>> -	dw_mipi_dsi_stm_plat_data.base = dsi->base; + 
>> dw_mipi_dsi_stm_plat_data.regs = dsi->regs; 
>>  	dw_mipi_dsi_stm_plat_data.priv_data = dsi; 
>>  platform_set_drvdata(pdev, dsi); 
>> @@ -474,7 +494,7 @@ static struct platform_driver 
>> dw_mipi_dsi_stm_driver = { 
>>  	.remove		= dw_mipi_dsi_stm_remove, .driver 
>>  = { .of_match_table = dw_mipi_dsi_stm_dt_ids, 
>> -		.name	= "stm32-display-dsi", + 
>> .name	= DRIVER_NAME, 
>>  		.pm = &dw_mipi_dsi_stm_pm_ops, }, }; 
>> diff --git a/include/drm/bridge/dw_mipi_dsi.h 
>> b/include/drm/bridge/dw_mipi_dsi.h index 
>> 94cc64a342e1..ecc1897efa62 100644 --- 
>> a/include/drm/bridge/dw_mipi_dsi.h +++ 
>> b/include/drm/bridge/dw_mipi_dsi.h @@ -37,7 +37,7 @@ struct 
>> dw_mipi_dsi_host_ops { 
>>  };  struct dw_mipi_dsi_plat_data { 
>> -	void __iomem *base; +	struct regmap *regs; 
>>  	unsigned int max_data_lanes;  enum drm_mode_status 
>>  (*mode_valid)(void *priv_data, 
>>  
> 
> OK for the dw-mipi-dsi changes, but why should the 
> dw_mipi_dsi-stm be changed aswell ? 
> 
> AFAIK these are independent.

I don't understand how they are independent. Isn't the stm driver 
also using the same dw-mipi-dsi bridge as rockchip and now imx 
since it was first added in commit
c1c026dbc183 ("drm/stm: Add STM32 DSI controller driver") ?

I don't have the hardware to test the stm driver on a live boot, 
but compilation certainly fails if I don't modify it :)

>
> Neil

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=6Lac=Y4=lists.freedesktop.org=dri-devel-bounces@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-3.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,
	UNPARSEABLE_RELAY,UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 845EACA9EA0
	for <dri-devel@archiver.kernel.org>; Mon,  4 Nov 2019 12:03:45 +0000 (UTC)
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mail.kernel.org (Postfix) with ESMTPS id 60C75217F4
	for <dri-devel@archiver.kernel.org>; Mon,  4 Nov 2019 12:03:45 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60C75217F4
Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com
Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id AC8156E30C;
	Mon,  4 Nov 2019 12:03:44 +0000 (UTC)
Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])
 by gabe.freedesktop.org (Postfix) with ESMTPS id B79EA6E30C
 for <dri-devel@lists.freedesktop.org>; Mon,  4 Nov 2019 12:03:43 +0000 (UTC)
Received: from [127.0.0.1] (localhost [127.0.0.1])
 (Authenticated sender: aratiu) with ESMTPSA id D406F28021A
From: Adrian Ratiu <adrian.ratiu@collabora.com>
To: Neil Armstrong <narmstrong@baylibre.com>, Adrian Ratiu
 <adrian.ratiu@collabora.com>, linux-arm-kernel@lists.infradead.org,
 linux-stm32@st-md-mailman.stormreply.com,
 linux-rockchip@lists.infradead.org
Subject: Re: [PATCH 1/4] drm: bridge: dw_mipi_dsi: access registers via a
 regmap
In-Reply-To: <974be8e9-fcb4-4457-8831-40b2fa834ae2@baylibre.com>
References: <20191031142633.12460-1-adrian.ratiu@collabora.com>
 <20191031142633.12460-2-adrian.ratiu@collabora.com>
 <974be8e9-fcb4-4457-8831-40b2fa834ae2@baylibre.com>
Date: Mon, 04 Nov 2019 14:03:56 +0200
Message-ID: <87v9rz97bn.fsf@collabora.com>
MIME-Version: 1.0
X-BeenThere: dri-devel@lists.freedesktop.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: Direct Rendering Infrastructure - Development
 <dri-devel.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Cc: kernel@collabora.com, linux-kernel@vger.kernel.org,
 dri-devel@lists.freedesktop.org,
 Boris Brezillon <boris.brezillon@collabora.com>
Content-Transfer-Encoding: base64
Content-Type: text/plain; charset="utf-8"; Format="flowed"
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Message-ID: <20191104120356.scltuVuhl0bcuCsJ4JDPk31NeoYbXENhdfgVRnbHvD0@z>

T24gTW9uLCAwNCBOb3YgMjAxOSwgTmVpbCBBcm1zdHJvbmcgPG5hcm1zdHJvbmdAYmF5bGlicmUu
Y29tPiAKd3JvdGU6Cj4gT24gMzEvMTAvMjAxOSAxNToyNiwgQWRyaWFuIFJhdGl1IHdyb3RlOiAK
Pj4gQ29udmVydCB0aGUgY29tbW9uIGJyaWRnZSBjb2RlIGFuZCB0aGUgdHdvIHJvY2tjaGlwICYg
c3RtIAo+PiBkcml2ZXJzIHdoaWNoIGN1cnJlbnRseSB1c2UgaXQgdG8gdGhlIHJlZ21hcCBBUEkg
aW4gCj4+IGFudGljaXBhdGlvbiBmb3IgZnVydGhlciBjaGFuZ2VzIHRvIG1ha2UgaXQgbW9yZSBn
ZW5lcmljIGFuZCAKPj4gYWRkIG9sZGVyIERTSSBob3N0IGNvbnRyb2xsZXIgc3VwcG9ydCBhcyBm
b3VuZCBvbiBpLm14NiBiYXNlZCAKPj4gZGV2aWNlcy4gICBObyBmdW5jdGlvbmFsIGNoYW5nZXMg
b3RoZXIgdGhhbiByZXF1aXJpbmcgdGhlIAo+PiBwbGF0Zm9ybSBkcml2ZXJzIHRvIHByb3ZpZGUg
YSByZWdtYXAgdmlhIHRoZWlyIHBsYXRfZGF0YS4gR29pbmcgCj4+IGZ1cnRoZXIgZWFjaCBwbGF0
Zm9ybSBkcml2ZXIgY2FuIGFsc28gYWRkIGl0cyBvd24gcmVnbWFwIAo+PiBjb25maWd1cmF0aW9u
IGxpa2UgZm9yIG1heGltdW0gd3JpdGUgb2Zmc2V0cywgci93IGNhbGxiYWNrcyBvciAKPj4gZGlm
ZmVyZW50IHJlZ2lzdGVyIGxheW91dHMuICAgU3VnZ2VzdGVkLWJ5OiBCb3JpcyBCcmV6aWxsb24g
Cj4+IDxib3Jpcy5icmV6aWxsb25AY29sbGFib3JhLmNvbT4gU2lnbmVkLW9mZi1ieTogQWRyaWFu
IFJhdGl1IAo+PiA8YWRyaWFuLnJhdGl1QGNvbGxhYm9yYS5jb20+IC0tLSAKPj4gIGRyaXZlcnMv
Z3B1L2RybS9icmlkZ2Uvc3lub3BzeXMvZHctbWlwaS1kc2kuYyB8IDE4OSAKPj4gICsrKysrKysr
Ky0tLS0tLS0tLSAuLi4vZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS1yb2NrY2hpcC5jIAo+
PiAgfCAgMzYgKysrLSBkcml2ZXJzL2dwdS9kcm0vc3RtL2R3X21pcGlfZHNpLXN0bS5jICAgICAg
ICAgfCAgNDQgCj4+ICArKy0tIGluY2x1ZGUvZHJtL2JyaWRnZS9kd19taXBpX2RzaS5oICAgICAg
ICAgICAgICB8ICAgMiArLSA0IAo+PiAgZmlsZXMgY2hhbmdlZCwgMTU1IGluc2VydGlvbnMoKyks
IDExNiBkZWxldGlvbnMoLSkgCj4+ICBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRn
ZS9zeW5vcHN5cy9kdy1taXBpLWRzaS5jIAo+PiBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lu
b3BzeXMvZHctbWlwaS1kc2kuYyBpbmRleCAKPj4gYjZlNzkzYmI2NTNjLi40ZWYzZTkwMzhjYzIg
MTAwNjQ0IC0tLSAKPj4gYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL3N5bm9wc3lzL2R3LW1pcGkt
ZHNpLmMgKysrIAo+PiBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lub3BzeXMvZHctbWlwaS1k
c2kuYyBAQCAtMTUsNiArMTUsNyAKPj4gQEAgCj4+ICAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+
ICNpbmNsdWRlIDxsaW51eC9vZl9kZXZpY2UuaD4gCj4+ICAjaW5jbHVkZSA8bGludXgvcG1fcnVu
dGltZS5oPiAKPj4gKyNpbmNsdWRlIDxsaW51eC9yZWdtYXAuaD4gCj4+ICAjaW5jbHVkZSA8bGlu
dXgvcmVzZXQuaD4gICNpbmNsdWRlIDx2aWRlby9taXBpX2Rpc3BsYXkuaD4gCj4+IEBAIC0yMjYs
NyArMjI3LDcgQEAgc3RydWN0IGR3X21pcGlfZHNpIHsgCj4+ICAJc3RydWN0IG1pcGlfZHNpX2hv
c3QgZHNpX2hvc3Q7IHN0cnVjdCBkcm1fYnJpZGdlIAo+PiAgKnBhbmVsX2JyaWRnZTsgc3RydWN0
IGRldmljZSAqZGV2OyAKPj4gLQl2b2lkIF9faW9tZW0gKmJhc2U7ICsJc3RydWN0IHJlZ21hcCAq
cmVnczsgCj4+ICAgc3RydWN0IGNsayAqcGNsazsgIAo+PiBAQCAtMjgwLDE2ICsyODEsNiBAQCBz
dGF0aWMgaW5saW5lIHN0cnVjdCBkd19taXBpX2RzaSAKPj4gKmJyaWRnZV90b19kc2koc3RydWN0
IGRybV9icmlkZ2UgKmJyaWRnZSkgCj4+ICAJcmV0dXJuIGNvbnRhaW5lcl9vZihicmlkZ2UsIHN0
cnVjdCBkd19taXBpX2RzaSwgYnJpZGdlKTsgfSAgCj4+IC1zdGF0aWMgaW5saW5lIHZvaWQgZHNp
X3dyaXRlKHN0cnVjdCBkd19taXBpX2RzaSAqZHNpLCB1MzIgcmVnLCAKPj4gdTMyIHZhbCkgLXsg
LQl3cml0ZWwodmFsLCBkc2ktPmJhc2UgKyByZWcpOyAtfSAtIC1zdGF0aWMgCj4+IGlubGluZSB1
MzIgZHNpX3JlYWQoc3RydWN0IGR3X21pcGlfZHNpICpkc2ksIHUzMiByZWcpIC17IC0gCj4+IHJl
dHVybiByZWFkbChkc2ktPmJhc2UgKyByZWcpOyAtfSAtIAo+PiAgc3RhdGljIGludCBkd19taXBp
X2RzaV9ob3N0X2F0dGFjaChzdHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaG9zdCwgCj4+ICBzdHJ1Y3Qg
bWlwaV9kc2lfZGV2aWNlICpkZXZpY2UpIHsgCj4+IEBAIC0zNjYsMjkgKzM1NywyOSBAQCBzdGF0
aWMgdm9pZCBkd19taXBpX21lc3NhZ2VfY29uZmlnKHN0cnVjdCAKPj4gZHdfbWlwaV9kc2kgKmRz
aSwgCj4+ICAJaWYgKGxwbSkgdmFsIHw9IENNRF9NT0RFX0FMTF9MUDsgIAo+PiAtCWRzaV93cml0
ZShkc2ksIERTSV9MUENMS19DVFJMLCBscG0gPyAwIDogCj4+IFBIWV9UWFJFUVVFU1RDTEtIUyk7
IC0JZHNpX3dyaXRlKGRzaSwgRFNJX0NNRF9NT0RFX0NGRywgCj4+IHZhbCk7ICsJcmVnbWFwX3dy
aXRlKGRzaS0+cmVncywgRFNJX0xQQ0xLX0NUUkwsIGxwbSA/IDAgOiAKPj4gUEhZX1RYUkVRVUVT
VENMS0hTKTsgKwlyZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCAKPj4gRFNJX0NNRF9NT0RFX0NGRywg
dmFsKTsgCj4+ICB9ICBzdGF0aWMgaW50IGR3X21pcGlfZHNpX2dlbl9wa3RfaGRyX3dyaXRlKHN0
cnVjdCBkd19taXBpX2RzaSAKPj4gICpkc2ksIHUzMiBoZHJfdmFsKSB7IGludCByZXQ7IAo+PiAt
CXUzMiB2YWwsIG1hc2s7ICsJdTMyIHZhbCA9IDAsIG1hc2s7IAo+PiAgIAo+PiAtCXJldCA9IHJl
YWRsX3BvbGxfdGltZW91dChkc2ktPmJhc2UgKyBEU0lfQ01EX1BLVF9TVEFUVVMsIC0gCj4+IHZh
bCwgISh2YWwgJiBHRU5fQ01EX0ZVTEwpLCAxMDAwLCAtIAo+PiBDTURfUEtUX1NUQVRVU19USU1F
T1VUX1VTKTsgKwlyZXQgPSAKPj4gcmVnbWFwX3JlYWRfcG9sbF90aW1lb3V0KGRzaS0+cmVncywg
RFNJX0NNRF9QS1RfU1RBVFVTLCArIAo+PiB2YWwsICEodmFsICYgR0VOX0NNRF9GVUxMKSwgMTAw
MCwgKyAKPj4gQ01EX1BLVF9TVEFUVVNfVElNRU9VVF9VUyk7IAo+PiAgCWlmIChyZXQpIHsgZGV2
X2Vycihkc2ktPmRldiwgImZhaWxlZCB0byBnZXQgYXZhaWxhYmxlIAo+PiAgY29tbWFuZCBGSUZP
XG4iKTsgcmV0dXJuIHJldDsgfSAgCj4+IC0JZHNpX3dyaXRlKGRzaSwgRFNJX0dFTl9IRFIsIGhk
cl92YWwpOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfR0VOX0hEUiwgaGRyX3Zh
bCk7IAo+PiAgIG1hc2sgPSBHRU5fQ01EX0VNUFRZIHwgR0VOX1BMRF9XX0VNUFRZOyAKPj4gLQly
ZXQgPSByZWFkbF9wb2xsX3RpbWVvdXQoZHNpLT5iYXNlICsgRFNJX0NNRF9QS1RfU1RBVFVTLCAt
IAo+PiB2YWwsICh2YWwgJiBtYXNrKSA9PSBtYXNrLCAtCQkJCSAxMDAwLCAKPj4gQ01EX1BLVF9T
VEFUVVNfVElNRU9VVF9VUyk7ICsJcmV0ID0gCj4+IHJlZ21hcF9yZWFkX3BvbGxfdGltZW91dChk
c2ktPnJlZ3MsIERTSV9DTURfUEtUX1NUQVRVUywgKyAKPj4gdmFsLCAodmFsICYgbWFzaykgPT0g
bWFzaywgKyAKPj4gMTAwMCwgQ01EX1BLVF9TVEFUVVNfVElNRU9VVF9VUyk7IAo+PiAgCWlmIChy
ZXQpIHsgZGV2X2Vycihkc2ktPmRldiwgImZhaWxlZCB0byB3cml0ZSBjb21tYW5kIAo+PiAgRklG
T1xuIik7IHJldHVybiByZXQ7IAo+PiBAQCAtNDAzLDI0ICszOTQsMjYgQEAgc3RhdGljIGludCBk
d19taXBpX2RzaV93cml0ZShzdHJ1Y3QgCj4+IGR3X21pcGlfZHNpICpkc2ksIAo+PiAgCWNvbnN0
IHU4ICp0eF9idWYgPSBwYWNrZXQtPnBheWxvYWQ7IGludCBsZW4gPSAKPj4gIHBhY2tldC0+cGF5
bG9hZF9sZW5ndGgsIHBsZF9kYXRhX2J5dGVzID0gc2l6ZW9mKHUzMiksIHJldDsgCj4+ICBfX2xl
MzIgd29yZDsgCj4+IC0JdTMyIHZhbDsgKwl1MzIgdmFsID0gMDsgCj4+ICAgd2hpbGUgKGxlbikg
eyBpZiAobGVuIDwgcGxkX2RhdGFfYnl0ZXMpIHsgd29yZCA9IDA7IAo+PiAgbWVtY3B5KCZ3b3Jk
LCB0eF9idWYsIGxlbik7IAo+PiAtCQkJZHNpX3dyaXRlKGRzaSwgRFNJX0dFTl9QTERfREFUQSwg
Cj4+IGxlMzJfdG9fY3B1KHdvcmQpKTsgKyAKPj4gcmVnbWFwX3dyaXRlKGRzaS0+cmVncywgRFNJ
X0dFTl9QTERfREFUQSwgKyAKPj4gbGUzMl90b19jcHUod29yZCkpOyAKPj4gIAkJCWxlbiA9IDA7
IH0gZWxzZSB7IG1lbWNweSgmd29yZCwgdHhfYnVmLCAKPj4gIHBsZF9kYXRhX2J5dGVzKTsgCj4+
IC0JCQlkc2lfd3JpdGUoZHNpLCBEU0lfR0VOX1BMRF9EQVRBLCAKPj4gbGUzMl90b19jcHUod29y
ZCkpOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfR0VOX1BMRF9EQVRBLCArIAo+
PiBsZTMyX3RvX2NwdSh3b3JkKSk7IAo+PiAgCQkJdHhfYnVmICs9IHBsZF9kYXRhX2J5dGVzOyBs
ZW4gLT0gCj4+ICBwbGRfZGF0YV9ieXRlczsgfSAgCj4+IC0JCXJldCA9IHJlYWRsX3BvbGxfdGlt
ZW91dChkc2ktPmJhc2UgKyAKPj4gRFNJX0NNRF9QS1RfU1RBVFVTLCAtIAo+PiB2YWwsICEodmFs
ICYgR0VOX1BMRF9XX0ZVTEwpLCAxMDAwLCAtIAo+PiBDTURfUEtUX1NUQVRVU19USU1FT1VUX1VT
KTsgKwkJcmV0ID0gCj4+IHJlZ21hcF9yZWFkX3BvbGxfdGltZW91dChkc2ktPnJlZ3MsIERTSV9D
TURfUEtUX1NUQVRVUywgKyAKPj4gdmFsLCAhKHZhbCAmIEdFTl9QTERfV19GVUxMKSwgKyAKPj4g
MTAwMCwgQ01EX1BLVF9TVEFUVVNfVElNRU9VVF9VUyk7IAo+PiAgCQlpZiAocmV0KSB7IGRldl9l
cnIoZHNpLT5kZXYsICJmYWlsZWQgdG8gZ2V0IAo+PiAgYXZhaWxhYmxlIHdyaXRlIHBheWxvYWQg
RklGT1xuIik7IAo+PiBAQCAtNDM4LDEyICs0MzEsMTIgQEAgc3RhdGljIGludCBkd19taXBpX2Rz
aV9yZWFkKHN0cnVjdCAKPj4gZHdfbWlwaV9kc2kgKmRzaSwgCj4+ICB7IGludCBpLCBqLCByZXQs
IGxlbiA9IG1zZy0+cnhfbGVuOyB1OCAqYnVmID0gbXNnLT5yeF9idWY7IAo+PiAtCXUzMiB2YWw7
ICsJdTMyIHZhbCA9IDA7IAo+PiAgIC8qIFdhaXQgZW5kIG9mIHRoZSByZWFkIG9wZXJhdGlvbiAq
LyAKPj4gLQlyZXQgPSByZWFkbF9wb2xsX3RpbWVvdXQoZHNpLT5iYXNlICsgRFNJX0NNRF9QS1Rf
U1RBVFVTLCAtIAo+PiB2YWwsICEodmFsICYgR0VOX1JEX0NNRF9CVVNZKSwgLSAKPj4gMTAwMCwg
Q01EX1BLVF9TVEFUVVNfVElNRU9VVF9VUyk7ICsJcmV0ID0gCj4+IHJlZ21hcF9yZWFkX3BvbGxf
dGltZW91dChkc2ktPnJlZ3MsIERTSV9DTURfUEtUX1NUQVRVUywgKyAKPj4gdmFsLCAhKHZhbCAm
IEdFTl9SRF9DTURfQlVTWSksICsgCj4+IDEwMDAsIENNRF9QS1RfU1RBVFVTX1RJTUVPVVRfVVMp
OyAKPj4gIAlpZiAocmV0KSB7IGRldl9lcnIoZHNpLT5kZXYsICJUaW1lb3V0IGR1cmluZyByZWFk
IAo+PiAgb3BlcmF0aW9uXG4iKTsgcmV0dXJuIHJldDsgCj4+IEBAIC00NTEsMTUgKzQ0NCwxNSBA
QCBzdGF0aWMgaW50IGR3X21pcGlfZHNpX3JlYWQoc3RydWN0IAo+PiBkd19taXBpX2RzaSAqZHNp
LCAKPj4gICBmb3IgKGkgPSAwOyBpIDwgbGVuOyBpICs9IDQpIHsgLyogUmVhZCBmaWZvIG11c3Qg
bm90IGJlIGVtcHR5IAo+PiAgYmVmb3JlIGFsbCBieXRlcyBhcmUgcmVhZCAqLyAKPj4gLQkJcmV0
ID0gcmVhZGxfcG9sbF90aW1lb3V0KGRzaS0+YmFzZSArIAo+PiBEU0lfQ01EX1BLVF9TVEFUVVMs
IC0gCj4+IHZhbCwgISh2YWwgJiBHRU5fUExEX1JfRU1QVFkpLCAtIAo+PiAxMDAwLCBDTURfUEtU
X1NUQVRVU19USU1FT1VUX1VTKTsgKwkJcmV0ID0gCj4+IHJlZ21hcF9yZWFkX3BvbGxfdGltZW91
dChkc2ktPnJlZ3MsIERTSV9DTURfUEtUX1NUQVRVUywgKyAKPj4gdmFsLCAhKHZhbCAmIEdFTl9Q
TERfUl9FTVBUWSksICsgCj4+IDEwMDAsIENNRF9QS1RfU1RBVFVTX1RJTUVPVVRfVVMpOyAKPj4g
IAkJaWYgKHJldCkgeyBkZXZfZXJyKGRzaS0+ZGV2LCAiUmVhZCBwYXlsb2FkIEZJRk8gaXMgCj4+
ICBlbXB0eVxuIik7IHJldHVybiByZXQ7IH0gIAo+PiAtCQl2YWwgPSBkc2lfcmVhZChkc2ksIERT
SV9HRU5fUExEX0RBVEEpOyArIAo+PiByZWdtYXBfcmVhZChkc2ktPnJlZ3MsIERTSV9HRU5fUExE
X0RBVEEsICZ2YWwpOyAKPj4gIAkJZm9yIChqID0gMDsgaiA8IDQgJiYgaiArIGkgPCBsZW47IGor
KykgYnVmW2kgKyBqXSAKPj4gID0gdmFsID4+ICg4ICogaik7IH0gCj4+IEBAIC01MzYsMjkgKzUy
OSwyOSBAQCBzdGF0aWMgdm9pZCAKPj4gZHdfbWlwaV9kc2lfdmlkZW9fbW9kZV9jb25maWcoc3Ry
dWN0IGR3X21pcGlfZHNpICpkc2kpIAo+PiAgCX0gI2VuZGlmIC8qIENPTkZJR19ERUJVR19GUyAq
LyAgCj4+IC0JZHNpX3dyaXRlKGRzaSwgRFNJX1ZJRF9NT0RFX0NGRywgdmFsKTsgKyAKPj4gcmVn
bWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX1ZJRF9NT0RFX0NGRywgdmFsKTsgCj4+ICB9ICBzdGF0
aWMgdm9pZCBkd19taXBpX2RzaV9zZXRfbW9kZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwgCj4+
ICB1bnNpZ25lZCBsb25nIG1vZGVfZmxhZ3MpIHsgCj4+IC0JZHNpX3dyaXRlKGRzaSwgRFNJX1BX
Ul9VUCwgUkVTRVQpOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfUFdSX1VQLCBS
RVNFVCk7IAo+PiAgIGlmIChtb2RlX2ZsYWdzICYgTUlQSV9EU0lfTU9ERV9WSURFTykgeyAKPj4g
LQkJZHNpX3dyaXRlKGRzaSwgRFNJX01PREVfQ0ZHLCBFTkFCTEVfVklERU9fTU9ERSk7ICsgCj4+
IHJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIERTSV9NT0RFX0NGRywgRU5BQkxFX1ZJREVPX01PREUp
OyAKPj4gIAkJZHdfbWlwaV9kc2lfdmlkZW9fbW9kZV9jb25maWcoZHNpKTsgCj4+IC0JCWRzaV93
cml0ZShkc2ksIERTSV9MUENMS19DVFJMLCAKPj4gUEhZX1RYUkVRVUVTVENMS0hTKTsgKwkJcmVn
bWFwX3dyaXRlKGRzaS0+cmVncywgCj4+IERTSV9MUENMS19DVFJMLCBQSFlfVFhSRVFVRVNUQ0xL
SFMpOyAKPj4gIAl9IGVsc2UgeyAKPj4gLQkJZHNpX3dyaXRlKGRzaSwgRFNJX01PREVfQ0ZHLCBF
TkFCTEVfQ01EX01PREUpOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfTU9ERV9D
RkcsIEVOQUJMRV9DTURfTU9ERSk7IAo+PiAgCX0gIAo+PiAtCWRzaV93cml0ZShkc2ksIERTSV9Q
V1JfVVAsIFBPV0VSVVApOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfUFdSX1VQ
LCBQT1dFUlVQKTsgCj4+ICB9ICBzdGF0aWMgdm9pZCBkd19taXBpX2RzaV9kaXNhYmxlKHN0cnVj
dCBkd19taXBpX2RzaSAqZHNpKSB7IAo+PiAtCWRzaV93cml0ZShkc2ksIERTSV9QV1JfVVAsIFJF
U0VUKTsgLQlkc2lfd3JpdGUoZHNpLCAKPj4gRFNJX1BIWV9SU1RaLCBQSFlfUlNUWik7ICsJcmVn
bWFwX3dyaXRlKGRzaS0+cmVncywgCj4+IERTSV9QV1JfVVAsIFJFU0VUKTsgKwlyZWdtYXBfd3Jp
dGUoZHNpLT5yZWdzLCAKPj4gRFNJX1BIWV9SU1RaLCBQSFlfUlNUWik7IAo+PiAgfSAgc3RhdGlj
IHZvaWQgZHdfbWlwaV9kc2lfaW5pdChzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSkgCj4+IEBAIC01
NzMsMTQgKzU2NiwxNCBAQCBzdGF0aWMgdm9pZCBkd19taXBpX2RzaV9pbml0KHN0cnVjdCAKPj4g
ZHdfbWlwaV9kc2kgKmRzaSkgCj4+ICAJICovIHUzMiBlc2NfY2xrX2RpdmlzaW9uID0gKGRzaS0+
bGFuZV9tYnBzID4+IDMpIC8gMjAgKyAxOyAgCj4+IC0JZHNpX3dyaXRlKGRzaSwgRFNJX1BXUl9V
UCwgUkVTRVQpOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfUFdSX1VQLCBSRVNF
VCk7IAo+PiAgIC8qICogVE9ETyBkdyBkcnYgaW1wcm92ZW1lbnRzICogdGltZW91dCBjbG9jayBk
aXZpc2lvbiBzaG91bGQgCj4+ICBiZSBjb21wdXRlZCB3aXRoIHRoZSAqIGhpZ2ggc3BlZWQgdHJh
bnNtaXNzaW9uIGNvdW50ZXIgdGltZW91dCAKPj4gIGFuZCBieXRlIGxhbmUuLi4gICovIAo+PiAt
CWRzaV93cml0ZShkc2ksIERTSV9DTEtNR1JfQ0ZHLCBUT19DTEtfRElWSVNJT04oMTApIHwgKyAK
Pj4gcmVnbWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX0NMS01HUl9DRkcsIFRPX0NMS19ESVZJU0lP
TigxMCkgfCAKPj4gIAkJICBUWF9FU0NfQ0xLX0RJVklTSU9OKGVzY19jbGtfZGl2aXNpb24pKTsg
fSAgCj4+IEBAIC02MDksMjIgKzYwMiwyMiBAQCBzdGF0aWMgdm9pZCBkd19taXBpX2RzaV9kcGlf
Y29uZmlnKHN0cnVjdCAKPj4gZHdfbWlwaV9kc2kgKmRzaSwgCj4+ICAJaWYgKG1vZGUtPmZsYWdz
ICYgRFJNX01PREVfRkxBR19OSFNZTkMpIHZhbCB8PSAKPj4gIEhTWU5DX0FDVElWRV9MT1c7ICAK
Pj4gLQlkc2lfd3JpdGUoZHNpLCBEU0lfRFBJX1ZDSUQsIERQSV9WQ0lEKGRzaS0+Y2hhbm5lbCkp
OyAtIAo+PiBkc2lfd3JpdGUoZHNpLCBEU0lfRFBJX0NPTE9SX0NPRElORywgY29sb3IpOyAtIAo+
PiBkc2lfd3JpdGUoZHNpLCBEU0lfRFBJX0NGR19QT0wsIHZhbCk7ICsgCj4+IHJlZ21hcF93cml0
ZShkc2ktPnJlZ3MsIERTSV9EUElfVkNJRCwgRFBJX1ZDSUQoZHNpLT5jaGFubmVsKSk7IAo+PiAr
CXJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIERTSV9EUElfQ09MT1JfQ09ESU5HLCBjb2xvcik7ICsg
Cj4+IHJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIERTSV9EUElfQ0ZHX1BPTCwgdmFsKTsgCj4+ICAJ
LyogKiBUT0RPIGR3IGRydiBpbXByb3ZlbWVudHMgKiBsYXJnZXN0IHBhY2tldCBzaXplcyAKPj4g
IGR1cmluZyBoZnAgb3IgZHVyaW5nIHZzYS92cGIvdmZwICogc2hvdWxkIGJlIGNvbXB1dGVkIAo+
PiAgYWNjb3JkaW5nIHRvIGJ5dGUgbGFuZSwgbGFuZSBudW1iZXIgYW5kIG9ubHkgKiBpZiBzZW5k
aW5nIGxwIAo+PiAgY21kcyBpbiBoaWdoIHNwZWVkIGlzIGVuYWJsZSAoUEhZX1RYUkVRVUVTVENM
S0hTKSAqLyAKPj4gLQlkc2lfd3JpdGUoZHNpLCBEU0lfRFBJX0xQX0NNRF9USU0sIE9VVFZBQ1Rf
TFBDTURfVElNRSg0KSArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfRFBJX0xQX0NN
RF9USU0sIAo+PiBPVVRWQUNUX0xQQ01EX1RJTUUoNCkgCj4+ICAJCSAgfCBJTlZBQ1RfTFBDTURf
VElNRSg0KSk7IH0gIHN0YXRpYyB2b2lkIAo+PiAgZHdfbWlwaV9kc2lfcGFja2V0X2hhbmRsZXJf
Y29uZmlnKHN0cnVjdCBkd19taXBpX2RzaSAqZHNpKSB7IAo+PiAtCWRzaV93cml0ZShkc2ksIERT
SV9QQ0tIRExfQ0ZHLCBDUkNfUlhfRU4gfCBFQ0NfUlhfRU4gfCAKPj4gQlRBX0VOKTsgKwlyZWdt
YXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfUENLSERMX0NGRywgQ1JDX1JYX0VOIAo+PiB8IEVDQ19S
WF9FTiB8IEJUQV9FTik7IAo+PiAgfSAgc3RhdGljIHZvaWQgZHdfbWlwaV9kc2lfdmlkZW9fcGFj
a2V0X2NvbmZpZyhzdHJ1Y3QgCj4+ICBkd19taXBpX2RzaSAqZHNpLCAKPj4gQEAgLTYzOCw3ICs2
MzEsNyBAQCBzdGF0aWMgdm9pZCAKPj4gZHdfbWlwaV9kc2lfdmlkZW9fcGFja2V0X2NvbmZpZyhz
dHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwgCj4+ICAJICogbm9uLWJ1cnN0IHZpZGVvIG1vZGVzLCBz
ZWUgCj4+ICBkd19taXBpX2RzaV92aWRlb19tb2RlX2NvbmZpZygpLi4uICAqLyAgCj4+IC0JZHNp
X3dyaXRlKGRzaSwgRFNJX1ZJRF9QS1RfU0laRSwgKyAKPj4gcmVnbWFwX3dyaXRlKGRzaS0+cmVn
cywgRFNJX1ZJRF9QS1RfU0laRSwgCj4+ICAJCSAgICAgICBkd19taXBpX2lzX2R1YWxfbW9kZShk
c2kpID8gCj4+ICBWSURfUEtUX1NJWkUobW9kZS0+aGRpc3BsYXkgLyAyKSA6IAo+PiAgVklEX1BL
VF9TSVpFKG1vZGUtPmhkaXNwbGF5KSk7IAo+PiBAQCAtNjUxLDE0ICs2NDQsMTUgQEAgc3RhdGlj
IHZvaWQgCj4+IGR3X21pcGlfZHNpX2NvbW1hbmRfbW9kZV9jb25maWcoc3RydWN0IGR3X21pcGlf
ZHNpICpkc2kpIAo+PiAgCSAqIGNvbXB1dGUgaGlnaCBzcGVlZCB0cmFuc21pc3Npb24gY291bnRl
ciB0aW1lb3V0IAo+PiAgYWNjb3JkaW5nICogdG8gdGhlIHRpbWVvdXQgY2xvY2sgZGl2aXNpb24g
KFRPX0NMS19ESVZJU0lPTikgCj4+ICBhbmQgYnl0ZSBsYW5lLi4uICAqLyAKPj4gLQlkc2lfd3Jp
dGUoZHNpLCBEU0lfVE9fQ05UX0NGRywgSFNUWF9UT19DTlQoMTAwMCkgfCAKPj4gTFBSWF9UT19D
TlQoMTAwMCkpOyArCXJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIAo+PiBEU0lfVE9fQ05UX0NGRywg
KwkJICAgICBIU1RYX1RPX0NOVCgxMDAwKSB8IAo+PiBMUFJYX1RPX0NOVCgxMDAwKSk7IAo+PiAg
CS8qICogVE9ETyBkdyBkcnYgaW1wcm92ZW1lbnRzICogdGhlIEJ1cy1UdXJuLUFyb3VuZCAKPj4g
IFRpbWVvdXQgQ291bnRlciBzaG91bGQgYmUgY29tcHV0ZWQgKiBhY2NvcmRpbmcgdG8gYnl0ZSBs
YW5lLi4uIAo+PiAgKi8gCj4+IC0JZHNpX3dyaXRlKGRzaSwgRFNJX0JUQV9UT19DTlQsIDB4ZDAw
KTsgLSAKPj4gZHNpX3dyaXRlKGRzaSwgRFNJX01PREVfQ0ZHLCBFTkFCTEVfQ01EX01PREUpOyAr
IAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfQlRBX1RPX0NOVCwgMHhkMDApOyArIAo+
PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfTU9ERV9DRkcsIEVOQUJMRV9DTURfTU9ERSk7
IAo+PiAgfSAgLyogR2V0IGxhbmUgYnl0ZSBjbG9jayBjeWNsZXMuICovIAo+PiBAQCAtNjkyLDEz
ICs2ODYsMTMgQEAgc3RhdGljIHZvaWQgCj4+IGR3X21pcGlfZHNpX2xpbmVfdGltZXJfY29uZmln
KHN0cnVjdCBkd19taXBpX2RzaSAqZHNpLCAKPj4gIAkgKiBjb21wdXRhdGlvbnMgYmVsb3cgbWF5
IGJlIGltcHJvdmVkLi4uICAqLyBsYmNjID0gCj4+ICBkd19taXBpX2RzaV9nZXRfaGNvbXBvbmVu
dF9sYmNjKGRzaSwgbW9kZSwgaHRvdGFsKTsgCj4+IC0JZHNpX3dyaXRlKGRzaSwgRFNJX1ZJRF9I
TElORV9USU1FLCBsYmNjKTsgKyAKPj4gcmVnbWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX1ZJRF9I
TElORV9USU1FLCBsYmNjKTsgCj4+ICAgbGJjYyA9IGR3X21pcGlfZHNpX2dldF9oY29tcG9uZW50
X2xiY2MoZHNpLCBtb2RlLCBoc2EpOyAKPj4gLQlkc2lfd3JpdGUoZHNpLCBEU0lfVklEX0hTQV9U
SU1FLCBsYmNjKTsgKyAKPj4gcmVnbWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX1ZJRF9IU0FfVElN
RSwgbGJjYyk7IAo+PiAgIGxiY2MgPSBkd19taXBpX2RzaV9nZXRfaGNvbXBvbmVudF9sYmNjKGRz
aSwgbW9kZSwgaGJwKTsgCj4+IC0JZHNpX3dyaXRlKGRzaSwgRFNJX1ZJRF9IQlBfVElNRSwgbGJj
Yyk7ICsgCj4+IHJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIERTSV9WSURfSEJQX1RJTUUsIGxiY2Mp
OyAKPj4gIH0gIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX3ZlcnRpY2FsX3RpbWluZ19jb25maWco
c3RydWN0IAo+PiAgZHdfbWlwaV9kc2kgKmRzaSwgCj4+IEBAIC03MTEsMTAgKzcwNSwxMCBAQCBz
dGF0aWMgdm9pZCAKPj4gZHdfbWlwaV9kc2lfdmVydGljYWxfdGltaW5nX2NvbmZpZyhzdHJ1Y3Qg
ZHdfbWlwaV9kc2kgKmRzaSwgCj4+ICAJdmZwID0gbW9kZS0+dnN5bmNfc3RhcnQgLSBtb2RlLT52
ZGlzcGxheTsgdmJwID0gCj4+ICBtb2RlLT52dG90YWwgLSBtb2RlLT52c3luY19lbmQ7ICAKPj4g
LQlkc2lfd3JpdGUoZHNpLCBEU0lfVklEX1ZBQ1RJVkVfTElORVMsIHZhY3RpdmUpOyAtIAo+PiBk
c2lfd3JpdGUoZHNpLCBEU0lfVklEX1ZTQV9MSU5FUywgdnNhKTsgLQlkc2lfd3JpdGUoZHNpLCAK
Pj4gRFNJX1ZJRF9WRlBfTElORVMsIHZmcCk7IC0JZHNpX3dyaXRlKGRzaSwgRFNJX1ZJRF9WQlBf
TElORVMsIAo+PiB2YnApOyArCXJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIERTSV9WSURfVkFDVElW
RV9MSU5FUywgCj4+IHZhY3RpdmUpOyArCXJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIERTSV9WSURf
VlNBX0xJTkVTLCB2c2EpOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfVklEX1ZG
UF9MSU5FUywgdmZwKTsgKyAKPj4gcmVnbWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX1ZJRF9WQlBf
TElORVMsIHZicCk7IAo+PiAgfSAgc3RhdGljIHZvaWQgZHdfbWlwaV9kc2lfZHBoeV90aW1pbmdf
Y29uZmlnKHN0cnVjdCAKPj4gIGR3X21pcGlfZHNpICpkc2kpIAo+PiBAQCAtNzI5LDE5ICs3MjMs
MjQgQEAgc3RhdGljIHZvaWQgCj4+IGR3X21pcGlfZHNpX2RwaHlfdGltaW5nX2NvbmZpZyhzdHJ1
Y3QgZHdfbWlwaV9kc2kgKmRzaSkgCj4+ICAJICogRFNJX0NNRF9NT0RFX0NGRy5NQVhfUkRfUEtU
X1NJWkVfTFAgKHNlZSAKPj4gIENNRF9NT0RFX0FMTF9MUCkgKi8gIAo+PiAtCWh3X3ZlcnNpb24g
PSBkc2lfcmVhZChkc2ksIERTSV9WRVJTSU9OKSAmIFZFUlNJT047ICsgCj4+IHJlZ21hcF9yZWFk
KGRzaS0+cmVncywgRFNJX1ZFUlNJT04sICZod192ZXJzaW9uKTsgKwlod192ZXJzaW9uIAo+PiAm
PSBWRVJTSU9OOyAKPj4gICBpZiAoaHdfdmVyc2lvbiA+PSBIV1ZFUl8xMzEpIHsgCj4+IC0JCWRz
aV93cml0ZShkc2ksIERTSV9QSFlfVE1SX0NGRywgCj4+IFBIWV9IUzJMUF9USU1FX1YxMzEoMHg0
MCkgfCAtIAo+PiBQSFlfTFAySFNfVElNRV9WMTMxKDB4NDApKTsgLQkJZHNpX3dyaXRlKGRzaSwg
Cj4+IERTSV9QSFlfVE1SX1JEX0NGRywgTUFYX1JEX1RJTUVfVjEzMSgxMDAwMCkpOyArIAo+PiBy
ZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfUEhZX1RNUl9DRkcsICsgCj4+IFBIWV9IUzJMUF9U
SU1FX1YxMzEoMHg0MCkgfCArIAo+PiBQSFlfTFAySFNfVElNRV9WMTMxKDB4NDApKTsgKyAKPj4g
cmVnbWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX1BIWV9UTVJfUkRfQ0ZHLCArIAo+PiBNQVhfUkRf
VElNRV9WMTMxKDEwMDAwKSk7IAo+PiAgCX0gZWxzZSB7IAo+PiAtCQlkc2lfd3JpdGUoZHNpLCBE
U0lfUEhZX1RNUl9DRkcsIAo+PiBQSFlfSFMyTFBfVElNRSgweDQwKSB8IC0gCj4+IFBIWV9MUDJI
U19USU1FKDB4NDApIHwgTUFYX1JEX1RJTUUoMTAwMDApKTsgKyAKPj4gcmVnbWFwX3dyaXRlKGRz
aS0+cmVncywgRFNJX1BIWV9UTVJfQ0ZHLCArIAo+PiBQSFlfSFMyTFBfVElNRSgweDQwKSB8ICsg
Cj4+IFBIWV9MUDJIU19USU1FKDB4NDApIHwgKyAKPj4gTUFYX1JEX1RJTUUoMTAwMDApKTsgCj4+
ICAJfSAgCj4+IC0JZHNpX3dyaXRlKGRzaSwgRFNJX1BIWV9UTVJfTFBDTEtfQ0ZHLCAKPj4gUEhZ
X0NMS0hTMkxQX1RJTUUoMHg0MCkgLQkJICB8IAo+PiBQSFlfQ0xLTFAySFNfVElNRSgweDQwKSk7
ICsJcmVnbWFwX3dyaXRlKGRzaS0+cmVncywgCj4+IERTSV9QSFlfVE1SX0xQQ0xLX0NGRywgKyAK
Pj4gUEhZX0NMS0hTMkxQX1RJTUUoMHg0MCkgfCBQSFlfQ0xLTFAySFNfVElNRSgweDQwKSk7IAo+
PiAgfSAgc3RhdGljIHZvaWQgZHdfbWlwaV9kc2lfZHBoeV9pbnRlcmZhY2VfY29uZmlnKHN0cnVj
dCAKPj4gIGR3X21pcGlfZHNpICpkc2kpIAo+PiBAQCAtNzUxLDQ2ICs3NTAsNDkgQEAgc3RhdGlj
IHZvaWQgCj4+IGR3X21pcGlfZHNpX2RwaHlfaW50ZXJmYWNlX2NvbmZpZyhzdHJ1Y3QgZHdfbWlw
aV9kc2kgKmRzaSkgCj4+ICAJICogc3RvcCB3YWl0IHRpbWUgc2hvdWxkIGJlIHRoZSBtYXhpbXVt
IGJldHdlZW4gaG9zdCBkc2kgKiAKPj4gIGFuZCBwYW5lbCBzdG9wIHdhaXQgdGltZXMgKi8gCj4+
IC0JZHNpX3dyaXRlKGRzaSwgRFNJX1BIWV9JRl9DRkcsIFBIWV9TVE9QX1dBSVRfVElNRSgweDIw
KSB8IAo+PiAtCQkgIE5fTEFORVMoZHNpLT5sYW5lcykpOyArIAo+PiByZWdtYXBfd3JpdGUoZHNp
LT5yZWdzLCBEU0lfUEhZX0lGX0NGRywgKyAKPj4gUEhZX1NUT1BfV0FJVF9USU1FKDB4MjApIHwg
Tl9MQU5FUyhkc2ktPmxhbmVzKSk7IAo+PiAgfSAgc3RhdGljIHZvaWQgZHdfbWlwaV9kc2lfZHBo
eV9pbml0KHN0cnVjdCBkd19taXBpX2RzaSAqZHNpKSAKPj4gIHsgLyogQ2xlYXIgUEhZIHN0YXRl
ICovIAo+PiAtCWRzaV93cml0ZShkc2ksIERTSV9QSFlfUlNUWiwgUEhZX0RJU0ZPUkNFUExMIHwg
Cj4+IFBIWV9ESVNBQkxFQ0xLIC0JCSAgfCBQSFlfUlNUWiB8IFBIWV9TSFVURE9XTlopOyAtIAo+
PiBkc2lfd3JpdGUoZHNpLCBEU0lfUEhZX1RTVF9DVFJMMCwgUEhZX1VOVEVTVENMUik7IC0gCj4+
IGRzaV93cml0ZShkc2ksIERTSV9QSFlfVFNUX0NUUkwwLCBQSFlfVEVTVENMUik7IC0gCj4+IGRz
aV93cml0ZShkc2ksIERTSV9QSFlfVFNUX0NUUkwwLCBQSFlfVU5URVNUQ0xSKTsgKyAKPj4gcmVn
bWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX1BIWV9SU1RaLCBQSFlfRElTRk9SQ0VQTEwgfCAKPj4g
UEhZX0RJU0FCTEVDTEsgKwkJICAgICB8IFBIWV9SU1RaIHwgUEhZX1NIVVRET1dOWik7IAo+PiAr
CXJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIERTSV9QSFlfVFNUX0NUUkwwLCBQSFlfVU5URVNUQ0xS
KTsgCj4+ICsJcmVnbWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX1BIWV9UU1RfQ1RSTDAsIFBIWV9U
RVNUQ0xSKTsgKyAKPj4gcmVnbWFwX3dyaXRlKGRzaS0+cmVncywgRFNJX1BIWV9UU1RfQ1RSTDAs
IFBIWV9VTlRFU1RDTFIpOyAKPj4gIH0gIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX2RwaHlfZW5h
YmxlKHN0cnVjdCBkd19taXBpX2RzaSAKPj4gICpkc2kpIHsgCj4+IC0JdTMyIHZhbDsgKwl1MzIg
dmFsID0gMDsgCj4+ICAJaW50IHJldDsgIAo+PiAtCWRzaV93cml0ZShkc2ksIERTSV9QSFlfUlNU
WiwgUEhZX0VORk9SQ0VQTEwgfCAKPj4gUEhZX0VOQUJMRUNMSyB8IC0JCSAgUEhZX1VOUlNUWiB8
IFBIWV9VTlNIVVRET1dOWik7ICsgCj4+IHJlZ21hcF93cml0ZShkc2ktPnJlZ3MsIERTSV9QSFlf
UlNUWiwgUEhZX0VORk9SQ0VQTEwgfCAKPj4gUEhZX0VOQUJMRUNMSyB8ICsJCSAgICAgUEhZX1VO
UlNUWiB8IAo+PiBQSFlfVU5TSFVURE9XTlopOyAKPj4gICAKPj4gLQlyZXQgPSByZWFkbF9wb2xs
X3RpbWVvdXQoZHNpLT5iYXNlICsgRFNJX1BIWV9TVEFUVVMsIHZhbCwgCj4+IC0JCQkJIHZhbCAm
IFBIWV9MT0NLLCAxMDAwLCAKPj4gUEhZX1NUQVRVU19USU1FT1VUX1VTKTsgKwlyZXQgPSAKPj4g
cmVnbWFwX3JlYWRfcG9sbF90aW1lb3V0KGRzaS0+cmVncywgRFNJX1BIWV9TVEFUVVMsICsgCj4+
IHZhbCwgdmFsICYgUEhZX0xPQ0ssICsgCj4+IDEwMDAsIFBIWV9TVEFUVVNfVElNRU9VVF9VUyk7
IAo+PiAgCWlmIChyZXQpIERSTV9ERUJVR19EUklWRVIoImZhaWxlZCB0byB3YWl0IHBoeSBsb2Nr
IAo+PiAgc3RhdGVcbiIpOyAgCj4+IC0JcmV0ID0gcmVhZGxfcG9sbF90aW1lb3V0KGRzaS0+YmFz
ZSArIERTSV9QSFlfU1RBVFVTLCAtIAo+PiB2YWwsIHZhbCAmIFBIWV9TVE9QX1NUQVRFX0NMS19M
QU5FLCAxMDAwLCAtIAo+PiBQSFlfU1RBVFVTX1RJTUVPVVRfVVMpOyArCXJldCA9IAo+PiByZWdt
YXBfcmVhZF9wb2xsX3RpbWVvdXQoZHNpLT5yZWdzLCBEU0lfUEhZX1NUQVRVUywgKyAKPj4gdmFs
LCB2YWwgJiBQSFlfU1RPUF9TVEFURV9DTEtfTEFORSwgMTAwMCwgKyAKPj4gUEhZX1NUQVRVU19U
SU1FT1VUX1VTKTsgCj4+ICAJaWYgKHJldCkgRFJNX0RFQlVHX0RSSVZFUigiZmFpbGVkIHRvIHdh
aXQgcGh5IGNsayBsYW5lIAo+PiAgc3RvcCBzdGF0ZVxuIik7IH0gIHN0YXRpYyB2b2lkIGR3X21p
cGlfZHNpX2NsZWFyX2VycihzdHJ1Y3QgCj4+ICBkd19taXBpX2RzaSAqZHNpKSB7IAo+PiAtCWRz
aV9yZWFkKGRzaSwgRFNJX0lOVF9TVDApOyAtCWRzaV9yZWFkKGRzaSwgCj4+IERTSV9JTlRfU1Qx
KTsgLQlkc2lfd3JpdGUoZHNpLCBEU0lfSU5UX01TSzAsIDApOyAtIAo+PiBkc2lfd3JpdGUoZHNp
LCBEU0lfSU5UX01TSzEsIDApOyArCXUzMiB2YWw7ICsgKyAKPj4gcmVnbWFwX3JlYWQoZHNpLT5y
ZWdzLCBEU0lfSU5UX1NUMCwgJnZhbCk7ICsgCj4+IHJlZ21hcF9yZWFkKGRzaS0+cmVncywgRFNJ
X0lOVF9TVDEsICZ2YWwpOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfSU5UX01T
SzAsIDApOyArIAo+PiByZWdtYXBfd3JpdGUoZHNpLT5yZWdzLCBEU0lfSU5UX01TSzEsIDApOyAK
Pj4gIH0gIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX2JyaWRnZV9wb3N0X2Rpc2FibGUoc3RydWN0
IAo+PiAgZHJtX2JyaWRnZSAqYnJpZGdlKSAKPj4gQEAgLTk5NiwxMyArOTk4LDEwIEBAIF9fZHdf
bWlwaV9kc2lfcHJvYmUoc3RydWN0IAo+PiBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsIAo+PiAgCQly
ZXR1cm4gRVJSX1BUUigtRU5PREVWKTsgfSAgCj4+IC0JaWYgKCFwbGF0X2RhdGEtPmJhc2UpIHsg
LQkJZHNpLT5iYXNlID0gCj4+IGRldm1fcGxhdGZvcm1faW9yZW1hcF9yZXNvdXJjZShwZGV2LCAw
KTsgLQkJaWYgCj4+IChJU19FUlIoZHNpLT5iYXNlKSkgLQkJCXJldHVybiAKPj4gRVJSX1BUUigt
RU5PREVWKTsgLSAtCX0gZWxzZSB7IC0JCWRzaS0+YmFzZSAKPj4gPSBwbGF0X2RhdGEtPmJhc2U7
ICsJZHNpLT5yZWdzID0gcGxhdF9kYXRhLT5yZWdzOyArCWlmIAo+PiAoIWRzaS0+cmVncykgeyAr
CQlEUk1fRVJST1IoIkRTSSByZWdtYXAgbm90IHN1cHBsaWVkIAo+PiBieSBwbGF0Zm9ybSBkcml2
ZXJcbiIpOyArCQlyZXR1cm4gRVJSX1BUUigtRU5PREVWKTsgCj4+ICAJfSAgZHNpLT5wY2xrID0g
ZGV2bV9jbGtfZ2V0KGRldiwgInBjbGsiKTsgCj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vcm9ja2NoaXAvZHctbWlwaS1kc2ktcm9ja2NoaXAuYyAKPj4gYi9kcml2ZXJzL2dwdS9kcm0v
cm9ja2NoaXAvZHctbWlwaS1kc2ktcm9ja2NoaXAuYyBpbmRleCAKPj4gYmMwNzNlYzVjMTgzLi4z
YzMzZWQxZmE4MDUgMTAwNjQ0IC0tLSAKPj4gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHct
bWlwaS1kc2ktcm9ja2NoaXAuYyArKysgCj4+IGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3
LW1pcGktZHNpLXJvY2tjaGlwLmMgQEAgLTI0LDYgCj4+ICsyNCw4IEBAIAo+PiAgI2luY2x1ZGUg
InJvY2tjaGlwX2RybV9kcnYuaCIgI2luY2x1ZGUgInJvY2tjaGlwX2RybV92b3AuaCIgIAo+PiAr
I2RlZmluZSBEUklWRVJfTkFNRSAiZHctbWlwaS1kc2ktcm9ja2NoaXAiICsgCj4+ICAjZGVmaW5l
IERTSV9QSFlfUlNUWgkJCTB4YTAgI2RlZmluZSAKPj4gIFBIWV9ESVNGT1JDRVBMTAkJCTAgI2Rl
ZmluZSBQSFlfRU5GT1JDRVBMTCAKPj4gIEJJVCgzKSAKPj4gQEAgLTIxMiw3ICsyMTQsNyBAQCBz
dHJ1Y3Qgcm9ja2NoaXBfZHdfZHNpX2NoaXBfZGF0YSB7IAo+PiAgc3RydWN0IGR3X21pcGlfZHNp
X3JvY2tjaGlwIHsgc3RydWN0IGRldmljZSAqZGV2OyBzdHJ1Y3QgCj4+ICBkcm1fZW5jb2RlciBl
bmNvZGVyOyAKPj4gLQl2b2lkIF9faW9tZW0gKmJhc2U7ICsJc3RydWN0IHJlZ21hcCAqcmVnczsg
Cj4+ICAgc3RydWN0IHJlZ21hcCAqZ3JmX3JlZ21hcDsgc3RydWN0IGNsayAqcGxscmVmX2Nsazsg
Cj4+IEBAIC0yOTcsMTIgKzI5OSwxNSBAQCBzdGF0aWMgaW50IG1heF9tYnBzX3RvX3BhcmFtZXRl
cih1bnNpZ25lZCAKPj4gaW50IG1heF9tYnBzKSAKPj4gICBzdGF0aWMgaW5saW5lIHZvaWQgZHNp
X3dyaXRlKHN0cnVjdCBkd19taXBpX2RzaV9yb2NrY2hpcCAKPj4gICpkc2ksIHUzMiByZWcsIHUz
MiB2YWwpIHsgCj4+IC0Jd3JpdGVsKHZhbCwgZHNpLT5iYXNlICsgcmVnKTsgKwlyZWdtYXBfd3Jp
dGUoZHNpLT5yZWdzLCAKPj4gcmVnLCB2YWwpOyAKPj4gIH0gIHN0YXRpYyBpbmxpbmUgdTMyIGRz
aV9yZWFkKHN0cnVjdCBkd19taXBpX2RzaV9yb2NrY2hpcCAKPj4gICpkc2ksIHUzMiByZWcpIHsg
Cj4+IC0JcmV0dXJuIHJlYWRsKGRzaS0+YmFzZSArIHJlZyk7ICsJdTMyIHZhbDsgKyArIAo+PiBy
ZWdtYXBfcmVhZChkc2ktPnJlZ3MsIHJlZywgJnZhbCk7ICsJcmV0dXJuIHZhbDsgCj4+ICB9ICBz
dGF0aWMgaW5saW5lIHZvaWQgZHNpX3NldChzdHJ1Y3QgZHdfbWlwaV9kc2lfcm9ja2NoaXAgCj4+
ICAqZHNpLCB1MzIgcmVnLCB1MzIgbWFzaykgCj4+IEBAIC04ODQsNiArODg5LDEzIEBAIHN0YXRp
YyBjb25zdCBzdHJ1Y3QgZHdfbWlwaV9kc2lfaG9zdF9vcHMgCj4+IGR3X21pcGlfZHNpX3JvY2tj
aGlwX2hvc3Rfb3BzID0geyAKPj4gIAkuZGV0YWNoID0gZHdfbWlwaV9kc2lfcm9ja2NoaXBfaG9z
dF9kZXRhY2gsIH07ICAKPj4gK3N0YXRpYyBjb25zdCBzdHJ1Y3QgcmVnbWFwX2NvbmZpZyByb2Nr
Y2hpcF9kc2lfcmVnbWFwX2NvbmZpZyA9IAo+PiB7ICsJLnJlZ19iaXRzID0gMzIsICsJLnZhbF9i
aXRzID0gMzIsICsgCj4+IC5yZWdfc3RyaWRlID0gNCwgKwkubmFtZSA9IERSSVZFUl9OQU1FLCAr
fTsgKyAKPj4gIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfcm9ja2NoaXBfcHJvYmUoc3RydWN0IHBs
YXRmb3JtX2RldmljZSAKPj4gICpwZGV2KSB7IHN0cnVjdCBkZXZpY2UgKmRldiA9ICZwZGV2LT5k
ZXY7IAo+PiBAQCAtODkyLDYgKzkwNCw3IEBAIHN0YXRpYyBpbnQgCj4+IGR3X21pcGlfZHNpX3Jv
Y2tjaGlwX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpIAo+PiAgCXN0cnVjdCBy
ZXNvdXJjZSAqcmVzOyBjb25zdCBzdHJ1Y3QgCj4+ICByb2NrY2hpcF9kd19kc2lfY2hpcF9kYXRh
ICpjZGF0YSA9IAo+PiAgb2ZfZGV2aWNlX2dldF9tYXRjaF9kYXRhKGRldik7IAo+PiArCXZvaWQg
X19pb21lbSAqcmVnczsgCj4+ICAJaW50IHJldCwgaTsgIGRzaSA9IGRldm1fa3phbGxvYyhkZXYs
IHNpemVvZigqZHNpKSwgCj4+ICBHRlBfS0VSTkVMKTsgCj4+IEBAIC04OTksMTAgKzkxMiwxNyBA
QCBzdGF0aWMgaW50IAo+PiBkd19taXBpX2RzaV9yb2NrY2hpcF9wcm9iZShzdHJ1Y3QgcGxhdGZv
cm1fZGV2aWNlICpwZGV2KSAKPj4gIAkJcmV0dXJuIC1FTk9NRU07ICByZXMgPSBwbGF0Zm9ybV9n
ZXRfcmVzb3VyY2UocGRldiwgCj4+ICBJT1JFU09VUkNFX01FTSwgMCk7IAo+PiAtCWRzaS0+YmFz
ZSA9IGRldm1faW9yZW1hcF9yZXNvdXJjZShkZXYsIHJlcyk7IC0JaWYgCj4+IChJU19FUlIoZHNp
LT5iYXNlKSkgeyArCXJlZ3MgPSBkZXZtX2lvcmVtYXBfcmVzb3VyY2UoZGV2LCAKPj4gcmVzKTsg
KwlpZiAoSVNfRVJSKHJlZ3MpKSB7IAo+PiAgCQlEUk1fREVWX0VSUk9SKGRldiwgIlVuYWJsZSB0
byBnZXQgZHNpIAo+PiAgcmVnaXN0ZXJzXG4iKTsgCj4+IC0JCXJldHVybiBQVFJfRVJSKGRzaS0+
YmFzZSk7ICsJCXJldHVybiAKPj4gUFRSX0VSUihyZWdzKTsgKwl9ICsgKwlkc2ktPnJlZ3MgPSAK
Pj4gZGV2bV9yZWdtYXBfaW5pdF9tbWlvKGRldiwgcmVncywgKyAKPj4gJnJvY2tjaGlwX2RzaV9y
ZWdtYXBfY29uZmlnKTsgKwlpZiAoSVNfRVJSKGRzaS0+cmVncykpIHsgKyAKPj4gRFJNX0RFVl9F
UlJPUihkZXYsICJVbmFibGUgdG8gY3JlYXRlIERTSSByZWdtYXBcbiIpOyArIAo+PiByZXR1cm4g
UFRSX0VSUihkc2ktPnJlZ3MpOyAKPj4gIAl9ICBpID0gMDsgCj4+IEBAIC05NTQsNyArOTc0LDcg
QEAgc3RhdGljIGludCAKPj4gZHdfbWlwaV9kc2lfcm9ja2NoaXBfcHJvYmUoc3RydWN0IHBsYXRm
b3JtX2RldmljZSAqcGRldikgCj4+ICAJfSAgZHNpLT5kZXYgPSBkZXY7IAo+PiAtCWRzaS0+cGRh
dGEuYmFzZSA9IGRzaS0+YmFzZTsgKwlkc2ktPnBkYXRhLnJlZ3MgPSAKPj4gZHNpLT5yZWdzOyAK
Pj4gIAlkc2ktPnBkYXRhLm1heF9kYXRhX2xhbmVzID0gZHNpLT5jZGF0YS0+bWF4X2RhdGFfbGFu
ZXM7IAo+PiAgZHNpLT5wZGF0YS5waHlfb3BzID0gJmR3X21pcGlfZHNpX3JvY2tjaGlwX3BoeV9v
cHM7IAo+PiAgZHNpLT5wZGF0YS5ob3N0X29wcyA9ICZkd19taXBpX2RzaV9yb2NrY2hpcF9ob3N0
X29wczsgCj4+IEBAIC0xMDcyLDYgKzEwOTIsNiBAQCBzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVyIAo+
PiBkd19taXBpX2RzaV9yb2NrY2hpcF9kcml2ZXIgPSB7IAo+PiAgCS5yZW1vdmUJCT0gZHdfbWlw
aV9kc2lfcm9ja2NoaXBfcmVtb3ZlLCAuZHJpdmVyIAo+PiAgPSB7IC5vZl9tYXRjaF90YWJsZSA9
IGR3X21pcGlfZHNpX3JvY2tjaGlwX2R0X2lkcywgCj4+IC0JCS5uYW1lCT0gImR3LW1pcGktZHNp
LXJvY2tjaGlwIiwgKyAKPj4gLm5hbWUJPSBEUklWRVJfTkFNRSwgCj4+ICAJfSwgfTsgCj4+IGRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vc3RtL2R3X21pcGlfZHNpLXN0bS5jIAo+PiBiL2Ry
aXZlcnMvZ3B1L2RybS9zdG0vZHdfbWlwaV9kc2ktc3RtLmMgaW5kZXggCj4+IDUxNGVmZWZiMDAx
Ni4uY2MyMzMyNzEzNDdiIDEwMDY0NCAtLS0gCj4+IGEvZHJpdmVycy9ncHUvZHJtL3N0bS9kd19t
aXBpX2RzaS1zdG0uYyArKysgCj4+IGIvZHJpdmVycy9ncHUvZHJtL3N0bS9kd19taXBpX2RzaS1z
dG0uYyBAQCAtMTIsNiArMTIsNyBAQCAKPj4gICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4gI2lu
Y2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPiAKPj4gICNpbmNsdWRlIDxsaW51eC9yZWd1
bGF0b3IvY29uc3VtZXIuaD4gCj4+ICsjaW5jbHVkZSA8bGludXgvcmVnbWFwLmg+IAo+PiAgICNp
bmNsdWRlIDx2aWRlby9taXBpX2Rpc3BsYXkuaD4gIAo+PiBAQCAtMTksNiArMjAsOCBAQCAKPj4g
ICNpbmNsdWRlIDxkcm0vZHJtX21pcGlfZHNpLmg+ICNpbmNsdWRlIDxkcm0vZHJtX3ByaW50Lmg+
ICAKPj4gKyNkZWZpbmUgRFJJVkVSX05BTUUgInN0bTMyLWRpc3BsYXktZHNpIiArIAo+PiAgI2Rl
ZmluZSBIV1ZFUl8xMzAJCQkweDMxMzMzMDAwCS8qIElQIAo+PiAgdmVyc2lvbiAxLjMwICovICNk
ZWZpbmUgSFdWRVJfMTMxCQkJMHgzMTMzMzEwMCAKPj4gIC8qIElQIHZlcnNpb24gMS4zMSAqLyAg
Cj4+IEBAIC03NSw3ICs3OCw3IEBAIGVudW0gZHNpX2NvbG9yIHsgCj4+ICAjZGVmaW5lIFRJTUVP
VVRfVVMJMjAwMDAwICBzdHJ1Y3QgZHdfbWlwaV9kc2lfc3RtIHsgCj4+IC0Jdm9pZCBfX2lvbWVt
ICpiYXNlOyArCXN0cnVjdCByZWdtYXAgKnJlZ3M7IAo+PiAgCXN0cnVjdCBjbGsgKnBsbHJlZl9j
bGs7IHN0cnVjdCBkd19taXBpX2RzaSAqZHNpOyB1MzIgCj4+ICBod192ZXJzaW9uOyAKPj4gQEAg
LTg2LDEyICs4OSwxNSBAQCBzdHJ1Y3QgZHdfbWlwaV9kc2lfc3RtIHsgCj4+ICAgc3RhdGljIGlu
bGluZSB2b2lkIGRzaV93cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2lfc3RtICpkc2ksIHUzMiAKPj4g
IHJlZywgdTMyIHZhbCkgeyAKPj4gLQl3cml0ZWwodmFsLCBkc2ktPmJhc2UgKyByZWcpOyArCXJl
Z21hcF93cml0ZShkc2ktPnJlZ3MsIAo+PiByZWcsIHZhbCk7IAo+PiAgfSAgc3RhdGljIGlubGlu
ZSB1MzIgZHNpX3JlYWQoc3RydWN0IGR3X21pcGlfZHNpX3N0bSAqZHNpLCB1MzIgCj4+ICByZWcp
IHsgCj4+IC0JcmV0dXJuIHJlYWRsKGRzaS0+YmFzZSArIHJlZyk7ICsJdTMyIHZhbDsgKyArIAo+
PiByZWdtYXBfcmVhZChkc2ktPnJlZ3MsIHJlZywgJnZhbCk7ICsJcmV0dXJuIHZhbDsgCj4+ICB9
ICBzdGF0aWMgaW5saW5lIHZvaWQgZHNpX3NldChzdHJ1Y3QgZHdfbWlwaV9kc2lfc3RtICpkc2ks
IHUzMiAKPj4gIHJlZywgdTMyIG1hc2spIAo+PiBAQCAtMjAyLDE1ICsyMDgsMTUgQEAgc3RhdGlj
IGludCBkd19taXBpX2RzaV9waHlfaW5pdCh2b2lkIAo+PiAqcHJpdl9kYXRhKSAKPj4gICAvKiBF
bmFibGUgdGhlIHJlZ3VsYXRvciAqLyBkc2lfc2V0KGRzaSwgRFNJX1dSUENSLCAKPj4gIFdSUENS
X1JFR0VOIHwgV1JQQ1JfQkdSRU4pOyAKPj4gLQlyZXQgPSByZWFkbF9wb2xsX3RpbWVvdXQoZHNp
LT5iYXNlICsgRFNJX1dJU1IsIHZhbCwgdmFsICYgCj4+IFdJU1JfUlJTLCAtCQkJCSBTTEVFUF9V
UywgVElNRU9VVF9VUyk7ICsgCj4+IHJldCA9IHJlZ21hcF9yZWFkX3BvbGxfdGltZW91dChkc2kt
PnJlZ3MsIERTSV9XSVNSLCB2YWwsIHZhbCAmIAo+PiBXSVNSX1JSUywgKwkJCQkgICAgICAgU0xF
RVBfVVMsIAo+PiBUSU1FT1VUX1VTKTsgCj4+ICAJaWYgKHJldCkgRFJNX0RFQlVHX0RSSVZFUigi
IVRJTUVPVVQhIHdhaXRpbmcgUkVHVSwgbGV0J3MgCj4+ICBjb250aW51ZVxuIik7ICAvKiBFbmFi
bGUgdGhlIERTSSBQTEwgJiB3YWl0IGZvciBpdHMgbG9jayAqLyAKPj4gIGRzaV9zZXQoZHNpLCBE
U0lfV1JQQ1IsIFdSUENSX1BMTEVOKTsgCj4+IC0JcmV0ID0gcmVhZGxfcG9sbF90aW1lb3V0KGRz
aS0+YmFzZSArIERTSV9XSVNSLCB2YWwsIHZhbCAmIAo+PiBXSVNSX1BMTExTLCAtCQkJCSBTTEVF
UF9VUywgCj4+IFRJTUVPVVRfVVMpOyArCXJldCA9IHJlZ21hcF9yZWFkX3BvbGxfdGltZW91dChk
c2ktPnJlZ3MsIAo+PiBEU0lfV0lTUiwgdmFsLCArCQkJCSAgICAgICB2YWwgJiAKPj4gV0lTUl9Q
TExMUywgU0xFRVBfVVMsIFRJTUVPVVRfVVMpOyAKPj4gIAlpZiAocmV0KSBEUk1fREVCVUdfRFJJ
VkVSKCIhVElNRU9VVCEgd2FpdGluZyBQTEwsIGxldCdzIAo+PiAgY29udGludWVcbiIpOyAgCj4+
IEBAIC0zMjcsMTIgKzMzMywyMCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9pZCAK
Pj4gZHdfbWlwaV9kc2lfc3RtX2R0X2lkc1tdID0geyAKPj4gIH07IE1PRFVMRV9ERVZJQ0VfVEFC
TEUob2YsIGR3X21pcGlfZHNpX3N0bV9kdF9pZHMpOyAgCj4+ICtzdGF0aWMgY29uc3Qgc3RydWN0
IHJlZ21hcF9jb25maWcgc3RtX2RzaV9yZWdtYXBfY29uZmlnID0geyArIAo+PiAucmVnX2JpdHMg
PSAzMiwgKwkudmFsX2JpdHMgPSAzMiwgKwkucmVnX3N0cmlkZSA9IDQsICsgCj4+IC5uYW1lID0g
RFJJVkVSX05BTUUsICt9OyArIAo+PiAgc3RhdGljIGludCBkd19taXBpX2RzaV9zdG1fcHJvYmUo
c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikgCj4+ICB7IHN0cnVjdCBkZXZpY2UgKmRldiA9
ICZwZGV2LT5kZXY7IHN0cnVjdCBkd19taXBpX2RzaV9zdG0gCj4+ICAqZHNpOyBzdHJ1Y3QgY2xr
ICpwY2xrOyBzdHJ1Y3QgcmVzb3VyY2UgKnJlczsgCj4+ICsJdm9pZCBfX2lvbWVtICpyZWdzOyAK
Pj4gIAlpbnQgcmV0OyAgZHNpID0gZGV2bV9remFsbG9jKGRldiwgc2l6ZW9mKCpkc2kpLCAKPj4g
IEdGUF9LRVJORUwpOyAKPj4gQEAgLTM0MCwxMyArMzU0LDE5IEBAIHN0YXRpYyBpbnQgZHdfbWlw
aV9kc2lfc3RtX3Byb2JlKHN0cnVjdCAKPj4gcGxhdGZvcm1fZGV2aWNlICpwZGV2KSAKPj4gIAkJ
cmV0dXJuIC1FTk9NRU07ICByZXMgPSBwbGF0Zm9ybV9nZXRfcmVzb3VyY2UocGRldiwgCj4+ICBJ
T1JFU09VUkNFX01FTSwgMCk7IAo+PiAtCWRzaS0+YmFzZSA9IGRldm1faW9yZW1hcF9yZXNvdXJj
ZShkZXYsIHJlcyk7IC0JaWYgCj4+IChJU19FUlIoZHNpLT5iYXNlKSkgeyAtCQlyZXQgPSBQVFJf
RVJSKGRzaS0+YmFzZSk7IAo+PiArCXJlZ3MgPSBkZXZtX2lvcmVtYXBfcmVzb3VyY2UoZGV2LCBy
ZXMpOyArCWlmIAo+PiAoSVNfRVJSKHJlZ3MpKSB7ICsJCXJldCA9IFBUUl9FUlIocmVncyk7IAo+
PiAgCQlEUk1fRVJST1IoIlVuYWJsZSB0byBnZXQgZHNpIHJlZ2lzdGVycyAlZFxuIiwgCj4+ICBy
ZXQpOyByZXR1cm4gcmV0OyB9ICAKPj4gKwlkc2ktPnJlZ3MgPSBkZXZtX3JlZ21hcF9pbml0X21t
aW8oZGV2LCByZWdzLCAKPj4gJnN0bV9kc2lfcmVnbWFwX2NvbmZpZyk7ICsJaWYgKElTX0VSUihk
c2ktPnJlZ3MpKSB7ICsgCj4+IERSTV9ERVZfRVJST1IoZGV2LCAiVW5hYmxlIHRvIGNyZWF0ZSBE
U0kgcmVnbWFwXG4iKTsgKyAKPj4gcmV0dXJuIFBUUl9FUlIoZHNpLT5yZWdzKTsgKwl9ICsgCj4+
ICAJZHNpLT52ZGRfc3VwcGx5ID0gZGV2bV9yZWd1bGF0b3JfZ2V0KGRldiwgInBoeS1kc2kiKTsg
aWYgCj4+ICAoSVNfRVJSKGRzaS0+dmRkX3N1cHBseSkpIHsgcmV0ID0gUFRSX0VSUihkc2ktPnZk
ZF9zdXBwbHkpOyAKPj4gQEAgLTM5Niw3ICs0MTYsNyBAQCBzdGF0aWMgaW50IGR3X21pcGlfZHNp
X3N0bV9wcm9iZShzdHJ1Y3QgCj4+IHBsYXRmb3JtX2RldmljZSAqcGRldikgCj4+ICAJCWdvdG8g
ZXJyX2RzaV9wcm9iZTsgfSAgCj4+IC0JZHdfbWlwaV9kc2lfc3RtX3BsYXRfZGF0YS5iYXNlID0g
ZHNpLT5iYXNlOyArIAo+PiBkd19taXBpX2RzaV9zdG1fcGxhdF9kYXRhLnJlZ3MgPSBkc2ktPnJl
Z3M7IAo+PiAgCWR3X21pcGlfZHNpX3N0bV9wbGF0X2RhdGEucHJpdl9kYXRhID0gZHNpOyAKPj4g
IHBsYXRmb3JtX3NldF9kcnZkYXRhKHBkZXYsIGRzaSk7IAo+PiBAQCAtNDc0LDcgKzQ5NCw3IEBA
IHN0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVyIAo+PiBkd19taXBpX2RzaV9zdG1fZHJpdmVy
ID0geyAKPj4gIAkucmVtb3ZlCQk9IGR3X21pcGlfZHNpX3N0bV9yZW1vdmUsIC5kcml2ZXIgCj4+
ICA9IHsgLm9mX21hdGNoX3RhYmxlID0gZHdfbWlwaV9kc2lfc3RtX2R0X2lkcywgCj4+IC0JCS5u
YW1lCT0gInN0bTMyLWRpc3BsYXktZHNpIiwgKyAKPj4gLm5hbWUJPSBEUklWRVJfTkFNRSwgCj4+
ICAJCS5wbSA9ICZkd19taXBpX2RzaV9zdG1fcG1fb3BzLCB9LCB9OyAKPj4gZGlmZiAtLWdpdCBh
L2luY2x1ZGUvZHJtL2JyaWRnZS9kd19taXBpX2RzaS5oIAo+PiBiL2luY2x1ZGUvZHJtL2JyaWRn
ZS9kd19taXBpX2RzaS5oIGluZGV4IAo+PiA5NGNjNjRhMzQyZTEuLmVjYzE4OTdlZmE2MiAxMDA2
NDQgLS0tIAo+PiBhL2luY2x1ZGUvZHJtL2JyaWRnZS9kd19taXBpX2RzaS5oICsrKyAKPj4gYi9p
bmNsdWRlL2RybS9icmlkZ2UvZHdfbWlwaV9kc2kuaCBAQCAtMzcsNyArMzcsNyBAQCBzdHJ1Y3Qg
Cj4+IGR3X21pcGlfZHNpX2hvc3Rfb3BzIHsgCj4+ICB9OyAgc3RydWN0IGR3X21pcGlfZHNpX3Bs
YXRfZGF0YSB7IAo+PiAtCXZvaWQgX19pb21lbSAqYmFzZTsgKwlzdHJ1Y3QgcmVnbWFwICpyZWdz
OyAKPj4gIAl1bnNpZ25lZCBpbnQgbWF4X2RhdGFfbGFuZXM7ICBlbnVtIGRybV9tb2RlX3N0YXR1
cyAKPj4gICgqbW9kZV92YWxpZCkodm9pZCAqcHJpdl9kYXRhLCAKPj4gIAo+IAo+IE9LIGZvciB0
aGUgZHctbWlwaS1kc2kgY2hhbmdlcywgYnV0IHdoeSBzaG91bGQgdGhlIAo+IGR3X21pcGlfZHNp
LXN0bSBiZSBjaGFuZ2VkIGFzd2VsbCA/IAo+IAo+IEFGQUlLIHRoZXNlIGFyZSBpbmRlcGVuZGVu
dC4KCkkgZG9uJ3QgdW5kZXJzdGFuZCBob3cgdGhleSBhcmUgaW5kZXBlbmRlbnQuIElzbid0IHRo
ZSBzdG0gZHJpdmVyIAphbHNvIHVzaW5nIHRoZSBzYW1lIGR3LW1pcGktZHNpIGJyaWRnZSBhcyBy
b2NrY2hpcCBhbmQgbm93IGlteCAKc2luY2UgaXQgd2FzIGZpcnN0IGFkZGVkIGluIGNvbW1pdApj
MWMwMjZkYmMxODMgKCJkcm0vc3RtOiBBZGQgU1RNMzIgRFNJIGNvbnRyb2xsZXIgZHJpdmVyIikg
PwoKSSBkb24ndCBoYXZlIHRoZSBoYXJkd2FyZSB0byB0ZXN0IHRoZSBzdG0gZHJpdmVyIG9uIGEg
bGl2ZSBib290LCAKYnV0IGNvbXBpbGF0aW9uIGNlcnRhaW5seSBmYWlscyBpZiBJIGRvbid0IG1v
ZGlmeSBpdCA6KQoKPgo+IE5laWwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v
ZHJpLWRldmVs