scsi: ufs: exynos: Fix DMA alignment for PAGE_SIZE != 4096

[ Upstream commit 86bd0c4a2a5dc4265884648cb92c681646509692 ]

The Exynos UFS controller only supports scatter/gather list elements that
are aligned on a 4 KiB boundary. Fix DMA alignment in case PAGE_SIZE !=
4096. Rename UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE into
UFSHCD_QUIRK_4KB_DMA_ALIGNMENT.

Cc: Kiwoong Kim <kwmad.kim@samsung.com>
Fixes: 2b2bfc8aa519 ("scsi: ufs: Introduce a quirk to allow only page-aligned sg entries")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Tested-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index fb5c9e2fc534831e03f82f39f335c0ce3d1979d1..e08ce7f2ff3affa3aae302418ac245887a1a57f0 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -5068,8 +5068,8 @@ static int ufshcd_slave_configure(struct scsi_device *sdev)
        ufshcd_hpb_configure(hba, sdev);
 
        blk_queue_update_dma_pad(q, PRDT_DATA_BYTE_COUNT_PAD - 1);
-       if (hba->quirks & UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE)
-               blk_queue_update_dma_alignment(q, PAGE_SIZE - 1);
+       if (hba->quirks & UFSHCD_QUIRK_4KB_DMA_ALIGNMENT)
+               blk_queue_update_dma_alignment(q, 4096 - 1);
        /*
         * Block runtime-pm until all consumers are added.
         * Refer ufshcd_setup_links().

diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c
index c3628a8645a565a2e373a46d16bf2aa13c2cc012..3cdac89a28b811a60d5c774225bf07195dd3948f 100644 (file)
--- a/drivers/ufs/host/ufs-exynos.c
+++ b/drivers/ufs/host/ufs-exynos.c
@@ -1673,7 +1673,7 @@ static const struct exynos_ufs_drv_data exynos_ufs_drvs = {
                                  UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR |
                                  UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL |
                                  UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING |
-                                 UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE,
+                                 UFSHCD_QUIRK_4KB_DMA_ALIGNMENT,
        .opts                   = EXYNOS_UFS_OPT_HAS_APB_CLK_CTRL |
                                  EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |
                                  EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX |

diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 2bb89290da63c0b6eafe41f07dc9dc97e18075f3..b54f22840dabf82ceeaca0f4821abe0e503f2a92 100644 (file)
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -566,9 +566,9 @@ enum ufshcd_quirks {
        UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING = 1 << 13,
 
        /*
-        * This quirk allows only sg entries aligned with page size.
+        * Align DMA SG entries on a 4 KiB boundary.
         */
-       UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE            = 1 << 14,
+       UFSHCD_QUIRK_4KB_DMA_ALIGNMENT                  = 1 << 14,
 
        /*
         * This quirk needs to be enabled if the host controller does not