A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "(CR): mmc/sd: Add sys entry to read card speed"

Browse source 
This reverts commit ed5f0747d0723d8fd5ac93aea375d503642a5537.

Change-Id: I9ea66b3e6d66098466e0a4bad547ae9935452943

Mot-CRs-fixed:(CR)

[3.312547] init: Failed to insmod '/lib/modules/5.4-gki/cqhci.ko' with args ''
[3.319900] init: LoadWithAliases was unable to load /lib/modules/5.4-gki/cqhci.ko
[3.327496] init: LoadWithAliases was unable to load sdhci_msm
[3.333348] init: moto LoadListedModules failed sdhci_msm

Change-Id: I9ea66b3e6d66098466e0a4bad547ae9935452943
Reviewed-on: https://gerrit.mot.com/1824484
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiaojun Ji <jixj@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Chuanchun Zhu 2020-12-10 04:19:33 -06:00 • committed by Xiaojun Ji
commit e4ecf9469c
2 changed files with 6 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

33
drivers/mmc/core/sd.c
View file

@ -52,10 +52,6 @@ static const unsigned int sd_au_size[] = {
SZ_16M / 512, (SZ_16M + SZ_8M) / 512, SZ_32M / 512, SZ_64M / 512,
};
static const unsigned int sd_speed_class[] = {
0, 2, 4, 6, 10,
};
#define UNSTUFF_BITS(resp,start,size) \
({ \
const int __size = size; \
@ -301,12 +297,6 @@ static int mmc_read_ssr(struct mmc_card *card)
card->erase_arg = (card->scr.sda_specx && discard_support) ?
SD_DISCARD_ARG : SD_ERASE_ARG;
card->ssr.speed_class = sd_speed_class[UNSTUFF_BITS(card->raw_ssr, 440 - 384, 8)];
card->ssr.uhs_speed_grade = UNSTUFF_BITS(card->raw_ssr, 396 - 384, 4);
pr_info("%s: card speed is C%d. uhs grade is %d\n",
mmc_hostname(card->host),
card->ssr.speed_class,
card->ssr.uhs_speed_grade);
return 0;
}
@ -449,34 +439,28 @@ static void sd_update_bus_speed_mode(struct mmc_card *card)
*/
if (!mmc_host_uhs(card->host)) {
card->sd_bus_speed = 0;
pr_info("%s: not UHS\n", mmc_hostname(card->host));
return;
}
if ((card->host->caps & MMC_CAP_UHS_SDR104) &&
(card->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR104)) {
card->sd_bus_speed = UHS_SDR104_BUS_SPEED;
pr_info("%s: selected SDR104\n", mmc_hostname(card->host));
card->sd_bus_speed = UHS_SDR104_BUS_SPEED;
} else if ((card->host->caps & MMC_CAP_UHS_DDR50) &&
(card->sw_caps.sd3_bus_mode & SD_MODE_UHS_DDR50)) {
card->sd_bus_speed = UHS_DDR50_BUS_SPEED;
pr_info("%s: selected DDR50\n", mmc_hostname(card->host));
card->sd_bus_speed = UHS_DDR50_BUS_SPEED;
} else if ((card->host->caps & (MMC_CAP_UHS_SDR104 |
MMC_CAP_UHS_SDR50)) && (card->sw_caps.sd3_bus_mode &
SD_MODE_UHS_SDR50)) {
card->sd_bus_speed = UHS_SDR50_BUS_SPEED;
pr_info("%s: selected SDR50\n", mmc_hostname(card->host));
card->sd_bus_speed = UHS_SDR50_BUS_SPEED;
} else if ((card->host->caps & (MMC_CAP_UHS_SDR104 |
MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR25)) &&
(card->sw_caps.sd3_bus_mode & SD_MODE_UHS_SDR25)) {
card->sd_bus_speed = UHS_SDR25_BUS_SPEED;
pr_info("%s: selected SDR25\n", mmc_hostname(card->host));
card->sd_bus_speed = UHS_SDR25_BUS_SPEED;
} else if ((card->host->caps & (MMC_CAP_UHS_SDR104 |
MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR25 |
MMC_CAP_UHS_SDR12)) && (card->sw_caps.sd3_bus_mode &
SD_MODE_UHS_SDR12)) {
card->sd_bus_speed = UHS_SDR12_BUS_SPEED;
pr_info("%s: selected SDR12\n", mmc_hostname(card->host));
card->sd_bus_speed = UHS_SDR12_BUS_SPEED;
}
}
@ -765,8 +749,7 @@ MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial);
MMC_DEV_ATTR(ocr, "0x%08x\n", card->ocr);
MMC_DEV_ATTR(rca, "0x%04x\n", card->rca);
MMC_DEV_ATTR(speed_class, "%u\n", card->ssr.speed_class);
MMC_DEV_ATTR(uhs_speed_grade, "%u\n", card->ssr.uhs_speed_grade);
static ssize_t mmc_dsr_show(struct device *dev,
struct device_attribute *attr,
@ -801,8 +784,6 @@ static struct attribute *sd_std_attrs[] = {
&dev_attr_ocr.attr,
&dev_attr_rca.attr,
&dev_attr_dsr.attr,
&dev_attr_speed_class.attr,
&dev_attr_uhs_speed_grade.attr,
NULL,
};
ATTRIBUTE_GROUPS(sd_std);
@ -1144,12 +1125,10 @@ retry:
/* Initialization sequence for UHS-I cards */
if (rocr & SD_ROCR_S18A && mmc_host_uhs(host)) {
pr_info("%s: card is UHS\n", mmc_hostname(card->host));
err = mmc_sd_init_uhs_card(card);
if (err)
goto free_card;
} else {
pr_info("%s: card is legacy\n", mmc_hostname(card->host));
/*
* Attempt to change to high-speed (if supported)
*/

2
include/linux/mmc/card.h
View file

@ -154,8 +154,6 @@ struct sd_ssr {
unsigned int au; /* In sectors */
unsigned int erase_timeout; /* In milliseconds */
unsigned int erase_offset; /* In milliseconds */
unsigned int speed_class;
unsigned int uhs_speed_grade;
};
struct sd_switch_caps {