summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2017-05-11 21:01:02 +0000
committermarius <marius@FreeBSD.org>2017-05-11 21:01:02 +0000
commitc701869fbe57103d989ecdcee36818554e30f583 (patch)
treeb7fa73d84826e78becd01ea18e768cb6a06d12cf /sys/modules
parentbcbb98b9c60ca454bf9b59a4837b04e698b6ca94 (diff)
downloadFreeBSD-src-c701869fbe57103d989ecdcee36818554e30f583.zip
FreeBSD-src-c701869fbe57103d989ecdcee36818554e30f583.tar.gz
MFC: r292180 (partial), r297127 (partial), r311911, r311923, r312939,
r313250, r313712, r314811 (partial), r314887 (partial), r315430, r317981, r315466 o Move the DRIVER_MODULE() statements that declare mmc(4) to be a child of the various bridge drivers out of dev/mmc.c and into the bridge drivers. o Add ACPI platform support for SDHCI driver. o Fix some overly long lines, whitespace and other bugs according to style(9) as well as spelling etc. in mmc(4), mmcsd(4) and sdhci(4). o In the mmc(4) bridges and sdhci(4) (bus) front-ends: - Remove redundant assignments of the default bus_generic_print_child device method, - use DEVMETHOD_END, - use NULL instead of 0 for pointers. o Trim/adjust includes. o Add and use a MMC_DECLARE_BRIDGE macro for declaring mmc(4) bridges as kernel drivers and their dependency onto mmc(4). o Add support for eMMC "partitions". Besides the user data area, i. e. the default partition, eMMC v4.41 and later devices can additionally provide up to: 1 enhanced user data area partition 2 boot partitions 1 RPMB (Replay Protected Memory Block) partition 4 general purpose partitions (optionally with a enhanced or extended attribute) Besides simply subdividing eMMC devices, some Intel NUCs having UEFI code in the boot partitions etc., another use case for the partition support is the activation of pseudo-SLC mode, which manufacturers of eMMC chips typically associate with the enhanced user data area and/ or the enhanced attribute of general purpose partitions. CAVEAT EMPTOR: Partitioning eMMC devices is a one-time operation. o Now that properly issuing CMD6 is crucial (so data isn't written to the wrong partition for example), make a step into the direction of correctly handling the timeout for these commands in the MMC layer. Also, do a SEND_STATUS when CMD6 is invoked with an R1B response as recommended by relevant specifications. o Add an IOCTL interface to mmcsd(4); this is sufficiently compatible with Linux so that the GNU mmc-utils can be ported to and used with FreeBSD (note that due to the remaining deficiencies outlined above SANITIZE operations issued by/with `mmc` currently most likely will fail). These latter have been added to ports as sysutils/mmc-utils. Among others, the `mmc` tool of mmc-utils allows for partitioning eMMC devices (tested working). o For devices following the eMMC specification v4.41 or later, year 0 is 2013 rather than 1997; so correct this for assembling the device ID string properly. o Let mmcsd.ko depend on mmc.ko. Additionally, bump MMC_VERSION as at least for some of the above a matching pair is required.
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile2
-rw-r--r--sys/modules/mmc/Makefile2
-rw-r--r--sys/modules/sdhci_acpi/Makefile9
3 files changed, 12 insertions, 1 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 8b926a8..e183bf0 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -311,6 +311,7 @@ SUBDIR= \
scd \
${_scsi_low} \
sdhci \
+ ${_sdhci_acpi} \
sdhci_pci \
sem \
send \
@@ -657,6 +658,7 @@ _wpifw= wpifw
_padlock= padlock
.endif
_s3= s3
+_sdhci_acpi= sdhci_acpi
_twa= twa
_vesa= vesa
_virtio= virtio
diff --git a/sys/modules/mmc/Makefile b/sys/modules/mmc/Makefile
index b97e2a3..507b45e 100644
--- a/sys/modules/mmc/Makefile
+++ b/sys/modules/mmc/Makefile
@@ -3,6 +3,6 @@
.PATH: ${.CURDIR}/../../dev/mmc
KMOD= mmc
-SRCS= mmc.c mmcbr_if.h mmcbus_if.h device_if.h bus_if.h
+SRCS= bus_if.h device_if.h mmc_subr.c mmc.c mmcbr_if.h mmcbus_if.h
.include <bsd.kmod.mk>
diff --git a/sys/modules/sdhci_acpi/Makefile b/sys/modules/sdhci_acpi/Makefile
new file mode 100644
index 0000000..0d34805
--- /dev/null
+++ b/sys/modules/sdhci_acpi/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/sdhci
+
+KMOD= sdhci_acpi
+SRCS= sdhci_acpi.c sdhci.h sdhci_if.h
+SRCS+= acpi_if.h device_if.h bus_if.h opt_acpi.h pci_if.h mmcbr_if.h
+
+.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud