Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <1d0826ed-97e7-9571-b5e5-9da12286a626@nvidia.com>
Date:   Thu, 7 Jul 2022 11:40:02 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.1
Subject: Re: [PATCH 1/2] dmaengine: tegra: Add terminate() for Tegra234
Content-Language: en-US
To:     Akhil R <akhilrajeev@nvidia.com>, dmaengine@vger.kernel.org,
        ldewangan@nvidia.com, linux-kernel@vger.kernel.org,
        linux-tegra@vger.kernel.org, p.zabel@pengutronix.de,
        thierry.reding@gmail.com, vkoul@kernel.org, robh+dt@kernel.org,
        devicetree@vger.kernel.org
References: <20220707102725.41383-1-akhilrajeev@nvidia.com>
 <20220707102725.41383-2-akhilrajeev@nvidia.com>
From:   Jon Hunter <jonathanh@nvidia.com>
In-Reply-To: <20220707102725.41383-2-akhilrajeev@nvidia.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OW9kZGRWWUJrMktmSjZ6ZUNBRE9tNFo2WGxuWmJaZytESHl1NjNsTU5IK09I?=
 =?utf-8?B?azB5bGtPM1Rtb2g5MCtZUmhZL1lTenRmZmRHN2srakU2VkpHK3YwNGdMQ1py?=
 =?utf-8?B?L2ExUmg5d3c3TXUwMXQ1cTV0bEhncE56b01Jd0NBdTN2ejF4czJ6SGFyN3V0?=
 =?utf-8?B?TzRiVUFFQ25HOHk5OUhkNTFiTkNNNG0vdldZQnljMDVOK1l1bW9ZZXo1bHZ6?=
 =?utf-8?B?Y21KMHB6VXdBSGc0cSsxR0F6ZERheWdOU0ZMTWk4MGRkclRma2VtUGhYMWgy?=
 =?utf-8?B?em1pT3VnUmNYNERPZlJPcG5YTUYyNWlqbzN4TENWL1dXVzEzRXBkY1BWQ1hn?=
 =?utf-8?B?eXY5SklZL0pZUDNwVjN6Uy94SlkyeCtTNTNvQU9yT25YN3dGVDA5NmlBL1Nj?=
 =?utf-8?B?UFRFR29GVGU2cDg5K3ZTaXllelo2dFdYeitISWN6TXRzUldMd1owanFJNjBC?=
 =?utf-8?B?eVlZT1FwbjY3eDA1ODhad1FwQzVQOVZ0Wnczd2dXV3FVZ0wxa2FnLzJUT3VN?=
 =?utf-8?B?T3k0Y05kVElDT1EzR0hiaEdobC85dDAyLzljcGlmUitjUE9iZWRmZ0liOHBi?=
 =?utf-8?B?SllsdjdoNjdUMHZTQkM1TGtuSFA5dVg4YW1RTU1reitoZlNvUCt0dTQ1N25G?=
 =?utf-8?B?aGdFUk9ZRzBaUm1INmE4ckZ2Qmt6Q3VsSmhMQXlIa2pzdXpGcnZ4OW1OZUdl?=
 =?utf-8?B?TE0rWW9FaCtvNDlRenNQeFV6TitTOUxVam40Q2lIVCtzWUtsSjVuLys4WVNl?=
 =?utf-8?B?MlNHU2c1OWhja2gyWjdvMFBFVTdseC8yRyttanAxeFR4NHQrdWJZbW9jSFpz?=
 =?utf-8?B?NW1UblRsRGIyZitrVnp3VmNEM1lRYlBOaHYyWjhMU0hid2hHNlZrY2ZGRnNW?=
 =?utf-8?B?ai9jZGxCcHZFZ0xnT09QZnAvRUVkWHd2Y1R4Nm9qK2lwaWRMam8xV2w3Wno5?=
 =?utf-8?B?OVlmejBsWXcxWVk5UFVrdFY1WUdEUjVGUHB3UzNyZUdIK0VOZmQwRDRrRGZN?=
 =?utf-8?B?ZU1XTkx6U0g0RE1VRCsvV0RSWVVYUzA2VTJXZDNXWVlzd0xaeTFaNHMrNU5L?=
 =?utf-8?B?OTAwcEZVc3JUZURYQmsxM1paZks3UWR0eWNoNmU1ek1GQ1RGOU5seUJEcEZY?=
 =?utf-8?B?YW4yMlVUT0RyNlJlSjJJU0hpZlFuNEtNbnU3d0dBcUVTVHZDUnQ1UjRxb1JC?=
 =?utf-8?B?Y29oQVVEQU9HYlNjTngrWlFtN0llc3RuVWtuTnlqUzIrM3VURkc0MkxhMG5W?=
 =?utf-8?B?TWwycmVlL0FiTHFqVHNCN0hMMTAwenJNZXRCTnM0MWQvb0wwY1VaOS94RWl4?=
 =?utf-8?B?MDYzUHlTT0FQbllSRTlCcW5aOFBzWWFuekdycjE1clhqNys5ZCtsRWVJeGRT?=
 =?utf-8?B?ZUVOSTB1NnY2ampCT2dSK0tHTUVJS0V1ZnB5WGJDbWxXcGNLdDZxaGRkY0lN?=
 =?utf-8?B?SVhLeW1tSkJidVhHNDhRUFkyQ1hvYVREOGVuL0RNYWNBTUxMMlRzdm00dU5n?=
 =?utf-8?B?TmorM0s1Z2RSdFI3a2dPTWM3NGRPcmJpT2pkYnRNNVFrSENNUlNUZkVaY2cw?=
 =?utf-8?B?VW5qSWlnb2NHK0E4ZmY1MmpsRi9wdGx3R1pHR0M3YUc1Uk1yNC9BQnNzK1ND?=
 =?utf-8?B?STVtelBZb3g1SllXblBoYmV1K0IzZEpBNjNGMTNjcGR5TGNqUFdoYUNPS0tl?=
 =?utf-8?B?YzBJeXR0M3MxUEFSN2Y2blVjK0dFTUVHUm80VEd6NWxjZDhmcFFDVHJkR3Rv?=
 =?utf-8?B?VlAyUS9YTDVEaUlQTTB3bFpCSytxZnlqd1h4OUpCT0M5bTcvdkkyWUdSRGRH?=
 =?utf-8?B?VUUxd2p3b3F1WC9WNFNOTzQ1N0VzVXBhSFVtR3ZKZnMyWEVtSnZaTTRzVVZa?=
 =?utf-8?B?dEo5aGplNG1WNW9NS3MyL0ZmeVV1Q0xwLy9zeEsreWh1bGtjTnlHVXB3WVlt?=
 =?utf-8?B?dGZkNkZVTGphZVhiSFIwaVpoQWROc0tDZWdZMFVybEl6Wk42V2NlOWdid0do?=
 =?utf-8?B?T3JtMGxsTHdtcDY2MitvNC8vV0tNUHR6cllNNmQ1Mk11c2hpb0Z2YkRjN0VZ?=
 =?utf-8?B?SWo5OE5CR0pJRldCemZiSW5EU0sxMVdKVlhVaVdDQTF2b2EvVzRuK0c5WFJx?=
 =?utf-8?B?T2VVZktaYmRlbnREMXY5UzZxc2RoYmZyUldWOWkyVTIvSjc2SHhOVjZLdnVD?=
 =?utf-8?B?NXc9PQ==?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 79a87674-fe1b-4e48-e3ef-08da6005102f
X-MS-Exchange-CrossTenant-AuthSource: CO6PR12MB5444.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2022 10:40:09.1679
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: qHXrLHBUYwYnr0aKGxUHrtU/HObq/iT2nbdMYfPQa1YYeHtrMd4F1Jq2f6zT2TXJapTJJ0vv9YqfA4cGrNZapQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1438
X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 07/07/2022 11:27, Akhil R wrote:
> In certain cases where the DMA client bus gets corrupted or if the
> end device ceases to send/receive data, DMA can wait indefinitely
> for the data to be received/sent. Attempting to terminate the transfer
> will put the DMA in pause flush mode and it remains there.
> 
> The channel is irrecoverable once this pause times out in Tegra194 and
> earlier chips. Whereas, from Tegra234, it can be recovered by disabling
> the channel and reprograming it.
> 
> Hence add a new terminate() function that ignores the outcome of
> dma_pause() and disables the channel.
> 
> Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
> ---
>   arch/arm64/boot/dts/nvidia/tegra234.dtsi |  5 +++--
>   drivers/dma/tegra186-gpc-dma.c           | 26 ++++++++++++++++++++++--
>   2 files changed, 27 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> index cf611eff7f6b..83d1ad7d3c8c 100644
> --- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
> @@ -22,8 +22,9 @@
>   		ranges = <0x0 0x0 0x0 0x40000000>;
>   
>   		gpcdma: dma-controller@2600000 {
> -			compatible = "nvidia,tegra194-gpcdma",
> -				      "nvidia,tegra186-gpcdma";
> +			compatible = "nvidia,tegra234-gpcdma",
> +				     "nvidia,tegra194-gpcdma",
> +				     "nvidia,tegra186-gpcdma";
>   			reg = <0x2600000 0x210000>;
>   			resets = <&bpmp TEGRA234_RESET_GPCDMA>;
>   			reset-names = "gpcdma";

I think that this should be split into two patches.

> diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c
> index 05cd451f541d..fa9bda4a2bc6 100644
> --- a/drivers/dma/tegra186-gpc-dma.c
> +++ b/drivers/dma/tegra186-gpc-dma.c
> @@ -157,8 +157,8 @@
>    * If any burst is in flight and DMA paused then this is the time to complete
>    * on-flight burst and update DMA status register.
>    */
> -#define TEGRA_GPCDMA_BURST_COMPLETE_TIME	20
> -#define TEGRA_GPCDMA_BURST_COMPLETION_TIMEOUT	100
> +#define TEGRA_GPCDMA_BURST_COMPLETE_TIME	10
> +#define TEGRA_GPCDMA_BURST_COMPLETION_TIMEOUT	5000 /* 5 msec */
>   
>   /* Channel base address offset from GPCDMA base address */
>   #define TEGRA_GPCDMA_CHANNEL_BASE_ADD_OFFSET	0x20000
> @@ -432,6 +432,17 @@ static int tegra_dma_device_resume(struct dma_chan *dc)
>   	return 0;
>   }
>   
> +static inline int tegra_dma_pause_noerr(struct tegra_dma_channel *tdc)
> +{
> +	/* Return 0 irrespective of PAUSE status.
> +	 * This is useful to recover channels that can exit out of flush
> +	 * state when the channel is disabled.
> +	 */
> +
> +	tegra_dma_pause(tdc);
> +	return 0;
> +}

The commit message says that "add a new terminate() function that 
ignores the outcome of dma_pause() and disables the channel". But I only 
see pause being done here.

> +
>   static void tegra_dma_disable(struct tegra_dma_channel *tdc)
>   {
>   	u32 csr, status;
> @@ -1292,6 +1303,14 @@ static const struct tegra_dma_chip_data tegra194_dma_chip_data = {
>   	.terminate = tegra_dma_pause,
>   };
>   
> +static const struct tegra_dma_chip_data tegra234_dma_chip_data = {
> +	.nr_channels = 31,
> +	.channel_reg_size = SZ_64K,
> +	.max_dma_count = SZ_1G,
> +	.hw_support_pause = true,
> +	.terminate = tegra_dma_pause_noerr,
> +};
> +
>   static const struct of_device_id tegra_dma_of_match[] = {
>   	{
>   		.compatible = "nvidia,tegra186-gpcdma",
> @@ -1299,6 +1318,9 @@ static const struct of_device_id tegra_dma_of_match[] = {
>   	}, {
>   		.compatible = "nvidia,tegra194-gpcdma",
>   		.data = &tegra194_dma_chip_data,
> +	}, {
> +		.compatible = "nvidia,tegra234-gpcdma",
> +		.data = &tegra234_dma_chip_data,
>   	}, {
>   	},
>   };

-- 
nvpublic