Commit 78bc671b authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Make DMA mask configuration more flexible 



Replace UFSHCD_QUIRK_BROKEN_64BIT_ADDRESS with
ufs_hba_variant_ops::set_dma_mask.  Update the Renesas driver
accordingly.  This patch enables supporting other configurations than
32-bit or 64-bit DMA addresses, e.g. 36-bit DMA addresses.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20241018194753.775074-1-bvanassche@acm.org


Reviewed-by: default avatarAvri Altman <Avri.Altman@wdc.com>
Reviewed-by: default avatarPeter Wang <peter.wang@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6c1143bb

drivers/ufs/core/ufshcd.c

+2 −2
Original line number Diff line number Diff line
@@ -2401,8 +2401,6 @@ static inline int ufshcd_hba_capabilities(struct ufs_hba *hba) 
	int err;



	hba->capabilities = ufshcd_readl(hba, REG_CONTROLLER_CAPABILITIES);

	if (hba->quirks & UFSHCD_QUIRK_BROKEN_64BIT_ADDRESS)

		hba->capabilities &= ~MASK_64_ADDRESSING_SUPPORT;



	/* nutrs and nutmrs are 0 based values */

	hba->nutrs = (hba->capabilities & MASK_TRANSFER_REQUESTS_SLOTS_SDB) + 1;
@@ -10315,6 +10313,8 @@ EXPORT_SYMBOL_GPL(ufshcd_dealloc_host); 
 */

static int ufshcd_set_dma_mask(struct ufs_hba *hba)

{

	if (hba->vops && hba->vops->set_dma_mask)

		return hba->vops->set_dma_mask(hba);

	if (hba->capabilities & MASK_64_ADDRESSING_SUPPORT) {

		if (!dma_set_mask_and_coherent(hba->dev, DMA_BIT_MASK(64)))

			return 0;

drivers/ufs/host/ufs-renesas.c

+8 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/iopoll.h>

#include <linux/kernel.h>
@@ -364,14 +365,20 @@ static int ufs_renesas_init(struct ufs_hba *hba) 
		return -ENOMEM;

	ufshcd_set_variant(hba, priv);



	hba->quirks |= UFSHCD_QUIRK_BROKEN_64BIT_ADDRESS | UFSHCD_QUIRK_HIBERN_FASTAUTO;

	hba->quirks |= UFSHCD_QUIRK_HIBERN_FASTAUTO;



	return 0;

}



static int ufs_renesas_set_dma_mask(struct ufs_hba *hba)

{

	return dma_set_mask_and_coherent(hba->dev, DMA_BIT_MASK(32));

}



static const struct ufs_hba_variant_ops ufs_renesas_vops = {

	.name		= "renesas",

	.init		= ufs_renesas_init,

	.set_dma_mask	= ufs_renesas_set_dma_mask,

	.setup_clocks	= ufs_renesas_setup_clocks,

	.hce_enable_notify = ufs_renesas_hce_enable_notify,

	.dbg_register_dump = ufs_renesas_dbg_register_dump,

include/ufs/ufshcd.h

+3 −6
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ struct ufs_pwr_mode_info { 
 * @max_num_rtt: maximum RTT supported by the host

 * @init: called when the driver is initialized

 * @exit: called to cleanup everything done in init

 * @set_dma_mask: For setting another DMA mask than indicated by the 64AS

 *	capability bit.

 * @get_ufs_hci_version: called to get UFS HCI version

 * @clk_scale_notify: notifies that clks are scaled up/down

 * @setup_clocks: called before touching any of the controller registers
@@ -341,6 +343,7 @@ struct ufs_hba_variant_ops { 
	int	(*init)(struct ufs_hba *);

	void    (*exit)(struct ufs_hba *);

	u32	(*get_ufs_hci_version)(struct ufs_hba *);

	int	(*set_dma_mask)(struct ufs_hba *);

	int	(*clk_scale_notify)(struct ufs_hba *, bool,

				    enum ufs_notify_change_status);

	int	(*setup_clocks)(struct ufs_hba *, bool,
@@ -623,12 +626,6 @@ enum ufshcd_quirks { 
	 */

	UFSHCD_QUIRK_SKIP_PH_CONFIGURATION		= 1 << 16,



	/*

	 * This quirk needs to be enabled if the host controller has

	 * 64-bit addressing supported capability but it doesn't work.

	 */

	UFSHCD_QUIRK_BROKEN_64BIT_ADDRESS		= 1 << 17,



	/*

	 * This quirk needs to be enabled if the host controller has

	 * auto-hibernate capability but it's FASTAUTO only.