Commit 5ca0faf9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Martin K. Petersen
Browse files

scsi: ufs: qcom: Drop custom Android boot parameters 

The QCOM UFS driver requires an androidboot.bootdevice command line
argument matching the UFS device name.  If the name is different, it
refuses to probe.  This androidboot.bootdevice is provided by stock/vendor
(from an Android-based device) bootloader.

This does not make sense from Linux point of view.  Driver should be able
to boot regardless of bootloader.  Driver should not depend on some Android
custom environment data.

Link: https://lore.kernel.org/r/20220321151853.24138-1-krzk@kernel.org


Tested-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Tested-by: default avatarLuca Weiss <luca.weiss@fairphone.com>
Reviewed-by: default avatarBrian Masney <bmasney@redhat.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 99241e11

drivers/scsi/ufs/ufs-qcom.c

+0 −15
Original line number Diff line number Diff line
@@ -957,18 +957,6 @@ static const struct reset_control_ops ufs_qcom_reset_ops = { 
	.deassert = ufs_qcom_reset_deassert,

};



#define	ANDROID_BOOT_DEV_MAX	30

static char android_boot_dev[ANDROID_BOOT_DEV_MAX];



#ifndef MODULE

static int __init get_android_boot_dev(char *str)

{

	strlcpy(android_boot_dev, str, ANDROID_BOOT_DEV_MAX);

	return 1;

}

__setup("androidboot.bootdevice=", get_android_boot_dev);

#endif



/**

 * ufs_qcom_init - bind phy with controller

 * @hba: host controller instance
@@ -988,9 +976,6 @@ static int ufs_qcom_init(struct ufs_hba *hba) 
	struct resource *res;

	struct ufs_clk_info *clki;



	if (strlen(android_boot_dev) && strcmp(android_boot_dev, dev_name(dev)))

		return -ENODEV;



	host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);

	if (!host) {

		err = -ENOMEM;