Update to FreeBSD head 2018-09-17

Git mirror commit 6c2192b1ef8c50788c751f878552526800b1e319.

Update #3472.

3 files changed, 46 insertions, 44 deletions

diff --git a/freebsd/sys/dev/mmc/mmc.c b/freebsd/sys/dev/mmc/mmc.c
index 2c3cba3d..cfbce2a5 100644
--- a/freebsd/sys/dev/mmc/mmc.c
+++ b/freebsd/sys/dev/mmc/mmc.c
@@ -1600,10 +1600,13 @@ mmc_discover_cards(struct mmc_softc *sc)
 	uint32_t raw_cid[4];
 	struct mmc_ivars *ivar = NULL;
 	const struct mmc_quirk *quirk;
+	const uint8_t *ext_csd;
 	device_t child;
 	int err, host_caps, i, newcard;
 	uint32_t resp, sec_count, status;
 	uint16_t rca = 2;
+	int16_t rev;
+	uint8_t card_type;
 
 	host_caps = mmcbr_get_caps(sc->dev);
 	if (bootverbose || mmc_debug)
@@ -1791,6 +1794,7 @@ mmc_discover_cards(struct mmc_softc *sc)
 			goto free_ivar;
 		}
 
+		rev = -1;
 		/* Only MMC >= 4.x devices support EXT_CSD. */
 		if (ivar->csd.spec_vers >= 4) {
 			err = mmc_send_ext_csd(sc->dev, sc->dev,
@@ -1800,11 +1804,10 @@ mmc_discover_cards(struct mmc_softc *sc)
 				    "Error reading EXT_CSD %d\n", err);
 				goto free_ivar;
 			}
+			ext_csd = ivar->raw_ext_csd;
+			rev = ext_csd[EXT_CSD_REV];
 			/* Handle extended capacity from EXT_CSD */
-			sec_count = ivar->raw_ext_csd[EXT_CSD_SEC_CNT] +
-			    (ivar->raw_ext_csd[EXT_CSD_SEC_CNT + 1] << 8) +
-			    (ivar->raw_ext_csd[EXT_CSD_SEC_CNT + 2] << 16) +
-			    (ivar->raw_ext_csd[EXT_CSD_SEC_CNT + 3] << 24);
+			sec_count = le32dec(&ext_csd[EXT_CSD_SEC_CNT]);
 			if (sec_count != 0) {
 				ivar->sec_count = sec_count;
 				ivar->high_cap = 1;
@@ -1812,65 +1815,56 @@ mmc_discover_cards(struct mmc_softc *sc)
 			/* Find maximum supported bus width. */
 			ivar->bus_width = mmc_test_bus_width(sc);
 			/* Get device speeds beyond normal mode. */
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_HS_52) != 0) {
+			card_type = ext_csd[EXT_CSD_CARD_TYPE];
+			if ((card_type & EXT_CSD_CARD_TYPE_HS_52) != 0) {
 				setbit(&ivar->timings, bus_timing_hs);
 				ivar->hs_tran_speed = MMC_TYPE_HS_52_MAX;
-			} else if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_HS_26) != 0) {
+			} else if ((card_type & EXT_CSD_CARD_TYPE_HS_26) != 0) {
 				setbit(&ivar->timings, bus_timing_hs);
 				ivar->hs_tran_speed = MMC_TYPE_HS_26_MAX;
 			}
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_DDR_52_1_2V) != 0 &&
+			if ((card_type & EXT_CSD_CARD_TYPE_DDR_52_1_2V) != 0 &&
 			    (host_caps & MMC_CAP_SIGNALING_120) != 0) {
 				setbit(&ivar->timings, bus_timing_mmc_ddr52);
 				setbit(&ivar->vccq_120, bus_timing_mmc_ddr52);
 			}
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_DDR_52_1_8V) != 0 &&
+			if ((card_type & EXT_CSD_CARD_TYPE_DDR_52_1_8V) != 0 &&
 			    (host_caps & MMC_CAP_SIGNALING_180) != 0) {
 				setbit(&ivar->timings, bus_timing_mmc_ddr52);
 				setbit(&ivar->vccq_180, bus_timing_mmc_ddr52);
 			}
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_HS200_1_2V) != 0 &&
+			if ((card_type & EXT_CSD_CARD_TYPE_HS200_1_2V) != 0 &&
 			    (host_caps & MMC_CAP_SIGNALING_120) != 0) {
 				setbit(&ivar->timings, bus_timing_mmc_hs200);
 				setbit(&ivar->vccq_120, bus_timing_mmc_hs200);
 			}
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_HS200_1_8V) != 0 &&
+			if ((card_type & EXT_CSD_CARD_TYPE_HS200_1_8V) != 0 &&
 			    (host_caps & MMC_CAP_SIGNALING_180) != 0) {
 				setbit(&ivar->timings, bus_timing_mmc_hs200);
 				setbit(&ivar->vccq_180, bus_timing_mmc_hs200);
 			}
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_HS400_1_2V) != 0 &&
+			if ((card_type & EXT_CSD_CARD_TYPE_HS400_1_2V) != 0 &&
 			    (host_caps & MMC_CAP_SIGNALING_120) != 0 &&
 			    ivar->bus_width == bus_width_8) {
 				setbit(&ivar->timings, bus_timing_mmc_hs400);
 				setbit(&ivar->vccq_120, bus_timing_mmc_hs400);
 			}
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_HS400_1_8V) != 0 &&
+			if ((card_type & EXT_CSD_CARD_TYPE_HS400_1_8V) != 0 &&
 			    (host_caps & MMC_CAP_SIGNALING_180) != 0 &&
 			    ivar->bus_width == bus_width_8) {
 				setbit(&ivar->timings, bus_timing_mmc_hs400);
 				setbit(&ivar->vccq_180, bus_timing_mmc_hs400);
 			}
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_HS400_1_2V) != 0 &&
-			    (ivar->raw_ext_csd[EXT_CSD_STROBE_SUPPORT] &
+			if ((card_type & EXT_CSD_CARD_TYPE_HS400_1_2V) != 0 &&
+			    (ext_csd[EXT_CSD_STROBE_SUPPORT] &
 			    EXT_CSD_STROBE_SUPPORT_EN) != 0 &&
 			    (host_caps & MMC_CAP_SIGNALING_120) != 0 &&
 			    ivar->bus_width == bus_width_8) {
 				setbit(&ivar->timings, bus_timing_mmc_hs400es);
 				setbit(&ivar->vccq_120, bus_timing_mmc_hs400es);
 			}
-			if ((ivar->raw_ext_csd[EXT_CSD_CARD_TYPE] &
-			    EXT_CSD_CARD_TYPE_HS400_1_8V) != 0 &&
-			    (ivar->raw_ext_csd[EXT_CSD_STROBE_SUPPORT] &
+			if ((card_type & EXT_CSD_CARD_TYPE_HS400_1_8V) != 0 &&
+			    (ext_csd[EXT_CSD_STROBE_SUPPORT] &
 			    EXT_CSD_STROBE_SUPPORT_EN) != 0 &&
 			    (host_caps & MMC_CAP_SIGNALING_180) != 0 &&
 			    ivar->bus_width == bus_width_8) {
@@ -1882,13 +1876,13 @@ mmc_discover_cards(struct mmc_softc *sc)
 			 * units of 10 ms), defaulting to 500 ms.
 			 */
 			ivar->cmd6_time = 500 * 1000;
-			if (ivar->raw_ext_csd[EXT_CSD_REV] >= 6)
+			if (rev >= 6)
 				ivar->cmd6_time = 10 *
-				    ivar->raw_ext_csd[EXT_CSD_GEN_CMD6_TIME];
+				    ext_csd[EXT_CSD_GEN_CMD6_TIME];
 			/* Handle HC erase sector size. */
-			if (ivar->raw_ext_csd[EXT_CSD_ERASE_GRP_SIZE] != 0) {
+			if (ext_csd[EXT_CSD_ERASE_GRP_SIZE] != 0) {
 				ivar->erase_sector = 1024 *
-				    ivar->raw_ext_csd[EXT_CSD_ERASE_GRP_SIZE];
+				    ext_csd[EXT_CSD_ERASE_GRP_SIZE];
 				err = mmc_switch(sc->dev, sc->dev, ivar->rca,
 				    EXT_CSD_CMD_SET_NORMAL,
 				    EXT_CSD_ERASE_GRP_DEF,
@@ -1903,8 +1897,7 @@ mmc_discover_cards(struct mmc_softc *sc)
 			}
 		}
 
-		mmc_decode_cid_mmc(ivar->raw_cid, &ivar->cid,
-		    ivar->raw_ext_csd[EXT_CSD_REV] >= 5);
+		mmc_decode_cid_mmc(ivar->raw_cid, &ivar->cid, rev >= 5);
 
 child_common:
 		for (quirk = &mmc_quirks[0]; quirk->mid != 0x0; quirk++) {
diff --git a/freebsd/sys/dev/mmc/mmcbrvar.h b/freebsd/sys/dev/mmc/mmcbrvar.h
index 6e4bec70..acddd3a3 100644
--- a/freebsd/sys/dev/mmc/mmcbrvar.h
+++ b/freebsd/sys/dev/mmc/mmcbrvar.h
@@ -97,7 +97,6 @@ MMCBR_ACCESSOR(host_ocr, HOST_OCR, int)
 MMCBR_ACCESSOR(mode, MODE, int)
 MMCBR_ACCESSOR(ocr, OCR, int)
 MMCBR_ACCESSOR(power_mode, POWER_MODE, int)
-MMCBR_ACCESSOR(retune_req, RETUNE_REQ, int)
 MMCBR_ACCESSOR(vdd, VDD, int)
 MMCBR_ACCESSOR(vccq, VCCQ, int)
 MMCBR_ACCESSOR(caps, CAPS, int)
@@ -106,6 +105,20 @@ MMCBR_ACCESSOR(max_data, MAX_DATA, int)
 MMCBR_ACCESSOR(max_busy_timeout, MAX_BUSY_TIMEOUT, u_int)
 
 static int __inline
+mmcbr_get_retune_req(device_t dev)
+{
+	uintptr_t v;
+
+	if (__predict_false(BUS_READ_IVAR(device_get_parent(dev), dev,
+	    MMCBR_IVAR_RETUNE_REQ, &v) != 0))
+		return (retune_req_none);
+	return ((int)v);
+}
+
+/*
+ * Convenience wrappers for the mmcbr interface
+ */
+static int __inline
 mmcbr_update_ios(device_t dev)
 {
 
diff --git a/freebsd/sys/dev/mmc/mmcsd.c b/freebsd/sys/dev/mmc/mmcsd.c
index 263da55d..e469c1d5 100644
--- a/freebsd/sys/dev/mmc/mmcsd.c
+++ b/freebsd/sys/dev/mmc/mmcsd.c
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+#include <sys/endian.h>
 #include <sys/fcntl.h>
 #include <sys/ioccom.h>
 #include <sys/kernel.h>
@@ -477,7 +478,7 @@ mmcsd_attach(device_t dev)
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 	sc->mmcbus = mmcbus = device_get_parent(dev);
-	sc->mode = mmcbr_get_mode(mmcbus);
+	sc->mode = mmc_get_card_type(dev);
 	/*
 	 * Note that in principle with an SDHCI-like re-tuning implementation,
 	 * the maximum data size can change at runtime due to a device removal/
@@ -542,10 +543,7 @@ mmcsd_attach(device_t dev)
 	 * disabled.
 	 */
 	if (rev >= 6 && mmcsd_cache != 0) {
-		size = ext_csd[EXT_CSD_CACHE_SIZE] |
-		    ext_csd[EXT_CSD_CACHE_SIZE + 1] << 8 |
-		    ext_csd[EXT_CSD_CACHE_SIZE + 2] << 16 |
-		    ext_csd[EXT_CSD_CACHE_SIZE + 3] << 24;
+		size = le32dec(&ext_csd[EXT_CSD_CACHE_SIZE]);
 		if (bootverbose)
 			device_printf(dev, "cache size %juKB\n", size);
 		if (size > 0) {
@@ -591,10 +589,8 @@ mmcsd_attach(device_t dev)
 		size *= erase_size * wp_size;
 		if (size != mmc_get_media_size(dev) * sector_size) {
 			sc->enh_size = size;
-			sc->enh_base = (ext_csd[EXT_CSD_ENH_START_ADDR] +
-			    (ext_csd[EXT_CSD_ENH_START_ADDR + 1] << 8) +
-			    (ext_csd[EXT_CSD_ENH_START_ADDR + 2] << 16) +
-			    (ext_csd[EXT_CSD_ENH_START_ADDR + 3] << 24)) *
+			sc->enh_base =
+			    le32dec(&ext_csd[EXT_CSD_ENH_START_ADDR]) *
 			    (sc->high_cap == 0 ? MMC_SECTOR_SIZE : 1);
 		} else if (bootverbose)
 			device_printf(dev,
@@ -1578,7 +1574,7 @@ mmcsd_delete(struct mmcsd_part *part, struct bio *bp)
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.mrq = &req;
 	req.cmd = &cmd;
-	if (mmc_get_card_type(dev) == mode_sd)
+	if (sc->mode == mode_sd)
 		cmd.opcode = SD_ERASE_WR_BLK_START;
 	else
 		cmd.opcode = MMC_ERASE_GROUP_START;
@@ -1597,7 +1593,7 @@ mmcsd_delete(struct mmcsd_part *part, struct bio *bp)
 	memset(&req, 0, sizeof(req));
 	memset(&cmd, 0, sizeof(cmd));
 	req.cmd = &cmd;
-	if (mmc_get_card_type(dev) == mode_sd)
+	if (sc->mode == mode_sd)
 		cmd.opcode = SD_ERASE_WR_BLK_END;
 	else
 		cmd.opcode = MMC_ERASE_GROUP_END;