Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <667a64ef-5121-ba92-964e-a9c075fc2375@intel.com>
Date:   Wed, 19 Jan 2022 08:35:52 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Firefox/91.0 Thunderbird/91.5.0
Subject: Re: [PATCH v2] phy: dphy: Correct clk_pre parameter
Content-Language: en-US
To:     Liu Ying <victor.liu@nxp.com>, <dri-devel@lists.freedesktop.org>,
        <linux-kernel@vger.kernel.org>, <linux-phy@lists.infradead.org>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-amlogic@lists.infradead.org>,
        <linux-rockchip@lists.infradead.org>
CC:     <linux-imx@nxp.com>, Neil Armstrong <narmstrong@baylibre.com>,
        Robert Foss <robert.foss@linaro.org>,
        Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
        Jonas Karlman <jonas@kwiboo.se>,
        "Jernej Skrabec" <jernej.skrabec@gmail.com>,
        David Airlie <airlied@linux.ie>,
        "Daniel Vetter" <daniel@ffwll.ch>,
        Kishon Vijay Abraham I <kishon@ti.com>,
        Vinod Koul <vkoul@kernel.org>,
        Kevin Hilman <khilman@baylibre.com>,
        Jerome Brunet <jbrunet@baylibre.com>,
        Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
        Heiko Stuebner <heiko@sntech.de>,
        Maxime Ripard <mripard@kernel.org>,
        =?UTF-8?Q?Guido_G=c3=bcnther?= <agx@sigxcpu.org>
References: <20220119023714.1498508-1-victor.liu@nxp.com>
From:   Andrzej Hajda <andrzej.hajda@intel.com>
Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298
 Gdansk - KRS 101882 - NIP 957-07-52-316
In-Reply-To: <20220119023714.1498508-1-victor.liu@nxp.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NGErU00vMDhtK1RoQWZPV2FjNDhFZ0JBRGpIMFROblJFTGFMKzNoNHBrTFQ4?=
 =?utf-8?B?UVZOTTc1cWlVdnJReXBGcnp0S1hLdkhiWUdUczBUb1BlYUxHRnRwZk01cDFl?=
 =?utf-8?B?eXJDdmYzZHRNeVF3THpOU09VOU5EZkkyYjRNamNXNzBSYmVIY0ptOUdwMm40?=
 =?utf-8?B?ZlBjc0owbDk0ZXphTFBwaGZkQU1IQWNVUUhmSlVWb3NIdUk1Zk9XcjEyNGdD?=
 =?utf-8?B?RmNuRS9jN3IrbXpyS0N3Z0tnUVE5c1NzWXRPT3M2T0pzbVJIbDB0UmNwdFBn?=
 =?utf-8?B?TCswSE9vcXh1dXpQMGRXK3BQTE4zTVZIdEhUWWR5VFAzSTczZzR5aDZlY2l2?=
 =?utf-8?B?dHk5TFJFOU90NTBzOUJuM29lQnpHcGJtV0cyLzdKamhJK2s5UCtYOForVUx0?=
 =?utf-8?B?SXpwb1hHSkNNVXJJZGlpcHJmSEVMK2JWQVQ4NGwvTVl3R2NWZmdjeThjWVdX?=
 =?utf-8?B?cHUweG9oc3dablhzU2MyeWhnNk5jYmJQclloYk9icCt5ZlhEVXQrZzVuMFZp?=
 =?utf-8?B?clRTK1RtNHNuVjRNWFMvZ1NjSVdUNm9OcHV2MDArYjZIN0haOXQ1SmxCbDhx?=
 =?utf-8?B?NjVJcHc4Q0RRakk4NlBrL0lUa0hsNUxCSWp0eEczcGxRR0x4bmE3ejMvQlBI?=
 =?utf-8?B?M1l2ajJzOTVtazJaZWNVOTFnZHBGemJMQXh6WGJxeU1pVDZJdXFodU16WTNF?=
 =?utf-8?B?Y3ZNUEpVRDNXa2hHRHkySUpPUXBYcTBmcDVNUTRNTXBnRFQ2WG5WNFNFMWVn?=
 =?utf-8?B?a2NIZnpsUDFaNVlESm1PTXh5aXZrZVZPV0NaMXhZNnJvOTZST0ltaERFVnJz?=
 =?utf-8?B?UzEzaEh1UnFyQjZGb01YMTI3RDUvZ290QTdyR2toTEowVmNvaUw2bmlCTW8v?=
 =?utf-8?B?SkIySlNSdnRCalRadUhBcEEreUd6bjRXa3ppcmdnVkI1UjQxbjJhQW9JL2d5?=
 =?utf-8?B?NWNnMjloOTV6a01aVUVCV3paS1NzclZRVHd1WHRCSFBnZ3Zmd3AvYmZPL1ZU?=
 =?utf-8?B?MGdjc3ByeExhZ0hxL25pTURYMHJ4RFlNQXdTOGdOQWJXNmRmTUNnN3ZidnJz?=
 =?utf-8?B?QVFjN0xuS0ovbzd3cVRZc3ZhRSs1MDdBSnlYYmtnRGhwelVIcW9ZSlVzQ291?=
 =?utf-8?B?cFNwUG55YVY1MkMwVXdhdGU4L2VVcGE5UTR4U1ZJMDc1RmlXcTNCQ055VXhk?=
 =?utf-8?B?ZndkSmhhblhCVG1JWEE5Z2pqOG1GdGNCREJtT2M4RnhiNFZXaXNabmFxTEU5?=
 =?utf-8?B?YldsTjkwdTR6OSt6eG9EMzNDT1FLVEp4NkthR2F0ZUhnSzZDMVg4YWZ5Uy9v?=
 =?utf-8?B?ZDRNbCtYWndwYUZhcjF1dVg0SnBHK3pGQk1RQjlQWGI5TVZEdHY0a3ZZSktq?=
 =?utf-8?B?dUQzQjY1OTNKUlpUMVluMU45blI3ZFZIbmJvZUROZlhlb0tJUCtXeklTbEp2?=
 =?utf-8?B?ZXlzK0lmeHBtYytLZWVjNXd3VGpZUkd0bnBlc2YzTGdZeHNOZ3phQmlkSTUy?=
 =?utf-8?B?bzNDem9CS29sN01DRTYyN2VHb253ZC82cjdPZDZmMVdTbXUwNkhKM0trelJG?=
 =?utf-8?B?RXBicVhpZXRXaU05M2ZzcWR1b202TUtWdUUvbGZBWFNHb0FFelBJWU1Wek9D?=
 =?utf-8?B?UW4wQUR4K1VqMCs2Q2R0ZnFGZVBnVit0KzhtQ0QvdDNhemRoYkdla3oxaW5i?=
 =?utf-8?B?aGt4dG51QU1HYmVVRmdXNHVOUkQ5TzlEU21WbkFWYmFjV0J6cXI1N1BiVmJG?=
 =?utf-8?B?QlRvdkZnTlpMM0NnVGdERlQxYXl6Uis3MmhlOEFtYU43eklpTEhtMEdnQnRN?=
 =?utf-8?B?dDUrWFEzMVExZlg4YmVNZlFqd21uMmZrdGRveDdtckJiTnd1ODZrT0UrWUVp?=
 =?utf-8?B?MW00Tm5GYkl3YjAyYUI2L3RVOFZIM08xRy9wdk4wOWFlN1NWUkJ6NWhyUFcw?=
 =?utf-8?B?SGdmT1BRUDJCSGt5bVEvY01qdFFTWHl2cDQySnlYa2pPNnVESEYzcm9OYUhI?=
 =?utf-8?B?V2hDNkZyL1dtVEU1Uk5RQzFTUHUwWkRLZ2tORVRUSFphY0pBU0QxV1o0MlJT?=
 =?utf-8?B?dG1Wb0xYdVZ0ZWVVcjR5dVJpR01rQnVKMWUraU1vSHhwdFoyWHBoUmFYcjVX?=
 =?utf-8?B?UzlyUFpta1ZRenhKbkdJNVVBVzluR0tUUWorZUtTZENBUkh6ek1SMW5mSktt?=
 =?utf-8?Q?T/pNZT/Mp6jzy574/LtiJvg=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 57d999d8-15f3-409d-f1cf-08d9db1e56d5
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3180.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2022 07:36:00.4967
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /3wVYM4QOpcPFwVEnPo5UBG06bXswj556DeIecNHeV5a7KwIiX6eDEqd1ZBO/wlRrkbBzR+bumlLhmq12M9E5w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4468
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 19.01.2022 03:37, Liu Ying wrote:
> The D-PHY specification (v1.2) explicitly mentions that the T-CLK-PRE
> parameter's unit is Unit Interval(UI) and the minimum value is 8.  Also,
> kernel doc of the 'clk_pre' member of struct phy_configure_opts_mipi_dphy
> mentions that it should be in UI.  However, the dphy core driver wrongly
> sets 'clk_pre' to 8000, which seems to hint that it's in picoseconds.
> And, the kernel doc of the 'clk_pre' member wrongly says the minimum value
> is '8 UI', instead of 8.
>
> So, let's fix both the dphy core driver and the kernel doc of the 'clk_pre'
> member to correctly reflect the T-CLK-PRE parameter's unit and the minimum
> value according to the D-PHY specification.
>
> I'm assuming that all impacted custom drivers shall program values in
> TxByteClkHS cycles into hardware for the T-CLK-PRE parameter.  The D-PHY
> specification mentions that the frequency of TxByteClkHS is exactly 1/8
> the High-Speed(HS) bit rate(each HS bit consumes one UI).  So, relevant
> custom driver code is changed to program those values as
> DIV_ROUND_UP(cfg->clk_pre, BITS_PER_BYTE), then.
>
> Note that I've only tested the patch with RM67191 DSI panel on i.MX8mq EVK.
> Help is needed to test with other i.MX8mq, Meson and Rockchip platforms,
> as I don't have the hardwares.
>
> Fixes: 2ed869990e14 ("phy: Add MIPI D-PHY configuration options")
> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Robert Foss <robert.foss@linaro.org>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Jonas Karlman <jonas@kwiboo.se>
> Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Kishon Vijay Abraham I <kishon@ti.com>
> Cc: Vinod Koul <vkoul@kernel.org>
> Cc: Kevin Hilman <khilman@baylibre.com>
> Cc: Jerome Brunet <jbrunet@baylibre.com>
> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> Cc: Heiko Stuebner <heiko@sntech.de>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Guido Günther <agx@sigxcpu.org>
> Tested-by: Liu Ying <victor.liu@nxp.com> # RM67191 DSI panel on i.MX8mq EVK
> Signed-off-by: Liu Ying <victor.liu@nxp.com>

Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>

Regards

Andrzej

> ---
> v1->v2:
> * Use BITS_PER_BYTE macro. (Andrzej)
> * Drop dsi argument from ui2bc() in nwl-dsi.c.
>
>   drivers/gpu/drm/bridge/nwl-dsi.c                 | 12 +++++-------
>   drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c    |  3 ++-
>   drivers/phy/phy-core-mipi-dphy.c                 |  4 ++--
>   drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c |  3 ++-
>   include/linux/phy/phy-mipi-dphy.h                |  2 +-
>   5 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c
> index a7389a0facfb..af07eeb47ca0 100644
> --- a/drivers/gpu/drm/bridge/nwl-dsi.c
> +++ b/drivers/gpu/drm/bridge/nwl-dsi.c
> @@ -7,6 +7,7 @@
>    */
>   
>   #include <linux/bitfield.h>
> +#include <linux/bits.h>
>   #include <linux/clk.h>
>   #include <linux/irq.h>
>   #include <linux/math64.h>
> @@ -196,12 +197,9 @@ static u32 ps2bc(struct nwl_dsi *dsi, unsigned long long ps)
>   /*
>    * ui2bc - UI time periods to byte clock cycles
>    */
> -static u32 ui2bc(struct nwl_dsi *dsi, unsigned long long ui)
> +static u32 ui2bc(unsigned int ui)
>   {
> -	u32 bpp = mipi_dsi_pixel_format_to_bpp(dsi->format);
> -
> -	return DIV64_U64_ROUND_UP(ui * dsi->lanes,
> -				  dsi->mode.clock * 1000 * bpp);
> +	return DIV_ROUND_UP(ui, BITS_PER_BYTE);
>   }
>   
>   /*
> @@ -232,12 +230,12 @@ static int nwl_dsi_config_host(struct nwl_dsi *dsi)
>   	}
>   
>   	/* values in byte clock cycles */
> -	cycles = ui2bc(dsi, cfg->clk_pre);
> +	cycles = ui2bc(cfg->clk_pre);
>   	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_t_pre: 0x%x\n", cycles);
>   	nwl_dsi_write(dsi, NWL_DSI_CFG_T_PRE, cycles);
>   	cycles = ps2bc(dsi, cfg->lpx + cfg->clk_prepare + cfg->clk_zero);
>   	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_tx_gap (pre): 0x%x\n", cycles);
> -	cycles += ui2bc(dsi, cfg->clk_pre);
> +	cycles += ui2bc(cfg->clk_pre);
>   	DRM_DEV_DEBUG_DRIVER(dsi->dev, "cfg_t_post: 0x%x\n", cycles);
>   	nwl_dsi_write(dsi, NWL_DSI_CFG_T_POST, cycles);
>   	cycles = ps2bc(dsi, cfg->hs_exit);
> diff --git a/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c b/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c
> index cd2332bf0e31..fdbd64c03e12 100644
> --- a/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c
> +++ b/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c
> @@ -9,6 +9,7 @@
>   
>   #include <linux/bitfield.h>
>   #include <linux/bitops.h>
> +#include <linux/bits.h>
>   #include <linux/clk.h>
>   #include <linux/delay.h>
>   #include <linux/io.h>
> @@ -250,7 +251,7 @@ static int phy_meson_axg_mipi_dphy_power_on(struct phy *phy)
>   		     (DIV_ROUND_UP(priv->config.clk_zero, temp) << 16) |
>   		     (DIV_ROUND_UP(priv->config.clk_prepare, temp) << 24));
>   	regmap_write(priv->regmap, MIPI_DSI_CLK_TIM1,
> -		     DIV_ROUND_UP(priv->config.clk_pre, temp));
> +		     DIV_ROUND_UP(priv->config.clk_pre, BITS_PER_BYTE));
>   
>   	regmap_write(priv->regmap, MIPI_DSI_HS_TIM,
>   		     DIV_ROUND_UP(priv->config.hs_exit, temp) |
> diff --git a/drivers/phy/phy-core-mipi-dphy.c b/drivers/phy/phy-core-mipi-dphy.c
> index 288c9c67aa74..ccb4045685cd 100644
> --- a/drivers/phy/phy-core-mipi-dphy.c
> +++ b/drivers/phy/phy-core-mipi-dphy.c
> @@ -36,7 +36,7 @@ int phy_mipi_dphy_get_default_config(unsigned long pixel_clock,
>   
>   	cfg->clk_miss = 0;
>   	cfg->clk_post = 60000 + 52 * ui;
> -	cfg->clk_pre = 8000;
> +	cfg->clk_pre = 8;
>   	cfg->clk_prepare = 38000;
>   	cfg->clk_settle = 95000;
>   	cfg->clk_term_en = 0;
> @@ -97,7 +97,7 @@ int phy_mipi_dphy_config_validate(struct phy_configure_opts_mipi_dphy *cfg)
>   	if (cfg->clk_post < (60000 + 52 * ui))
>   		return -EINVAL;
>   
> -	if (cfg->clk_pre < 8000)
> +	if (cfg->clk_pre < 8)
>   		return -EINVAL;
>   
>   	if (cfg->clk_prepare < 38000 || cfg->clk_prepare > 95000)
> diff --git a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
> index 347dc79a18c1..630e01b5c19b 100644
> --- a/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
> +++ b/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
> @@ -5,6 +5,7 @@
>    * Author: Wyon Bi <bivvy.bi@rock-chips.com>
>    */
>   
> +#include <linux/bits.h>
>   #include <linux/kernel.h>
>   #include <linux/clk.h>
>   #include <linux/iopoll.h>
> @@ -364,7 +365,7 @@ static void inno_dsidphy_mipi_mode_enable(struct inno_dsidphy *inno)
>   	 * The value of counter for HS Tclk-pre
>   	 * Tclk-pre = Tpin_txbyteclkhs * value
>   	 */
> -	clk_pre = DIV_ROUND_UP(cfg->clk_pre, t_txbyteclkhs);
> +	clk_pre = DIV_ROUND_UP(cfg->clk_pre, BITS_PER_BYTE);
>   
>   	/*
>   	 * The value of counter for HS Tlpx Time
> diff --git a/include/linux/phy/phy-mipi-dphy.h b/include/linux/phy/phy-mipi-dphy.h
> index a877ffee845d..59a5e77ab409 100644
> --- a/include/linux/phy/phy-mipi-dphy.h
> +++ b/include/linux/phy/phy-mipi-dphy.h
> @@ -42,7 +42,7 @@ struct phy_configure_opts_mipi_dphy {
>   	 * the transmitter prior to any associated Data Lane beginning
>   	 * the transition from LP to HS mode.
>   	 *
> -	 * Minimum value: 8 UI
> +	 * Minimum value: 8
>   	 */
>   	unsigned int		clk_pre;
>