From 545fdf0fbb15846c71de6da846b33e14846bbdef Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 20 Mar 2023 14:58:19 -0700 Subject: [PATCH] Revert "Revert "ANDROID: scsi: ufs: Disable zoned write pipelining"" The attempts so far to make write pipelining work are unsuccessful. Revert commit 10d6ef4ce0a0d41f7e25d39a8108d32250bc0999 until write pipelining works reliably. Bug: 274474142 Change-Id: Ie7fd92c40ddefd1803b15329a3b1bd1d94012365 Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 7e8ea20f99d8..2c5bd9d814c6 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -5177,7 +5177,9 @@ static int ufshcd_slave_configure(struct scsi_device *sdev) ufshcd_hpb_configure(hba, sdev); +#if 0 blk_queue_flag_set(QUEUE_FLAG_PIPELINE_ZONED_WRITES, q); +#endif blk_queue_update_dma_pad(q, PRDT_DATA_BYTE_COUNT_PAD - 1); if (hba->quirks & UFSHCD_QUIRK_4KB_DMA_ALIGNMENT) blk_queue_update_dma_alignment(q, 4096 - 1);