9 Commits

Author SHA1 Message Date
Nathan Chancellor
43380b4983 Merge 4.4.227 into android-msm-wahoo-4.4
Changes in 4.4.227: (37 commits)
        scsi: scsi_devinfo: fixup string compare
        usb: gadget: f_uac2: fix error handling in afunc_bind (again)
        platform/x86: acer-wmi: setup accelerometer when ACPI device was found
        esp6: fix memleak on error path in esp6_input
        IB/mlx4: Fix an error handling path in 'mlx4_ib_rereg_user_mr()'
        ALSA: hda - No loopback on ALC299 codec
        spi: dw: use "smp_mb()" to avoid sending spi data error
        s390/ftrace: save traced function caller
        ARC: Fix ICCM & DCCM runtime size checks
        x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables
        net: bmac: Fix read of MAC address from ROM
        net/ethernet/freescale: rework quiesce/activate for ucc_geth
        net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x
        pppoe: only process PADT targeted at local interfaces
        mmc: fix compilation of user API
        slcan: Fix double-free on slcan_open() error path
        slip: not call free_netdev before rtnl_unlock in slip_open
        scsi: ufs: Release clock if DMA map fails
        devinet: fix memleak in inetdev_init()
        NFC: st21nfca: add missed kfree_skb() in an error path
        vsock: fix timeout in vsock_accept()
        l2tp: add sk_family checks to l2tp_validate_socket
        l2tp: do not use inet_hash()/inet_unhash()
        USB: serial: qcserial: add DW5816e QDL support
        USB: serial: usb_wwan: do not resubmit rx urb on fatal errors
        USB: serial: option: add Telit LE910C1-EUX compositions
        vt: keyboard: avoid signed integer overflow in k_ascii
        staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK
        x86/cpu: Rename cpu_data.x86_mask to cpu_data.x86_stepping
        x86/cpu: Add a steppings field to struct x86_cpu_id
        x86/cpu: Add 'table' argument to cpu_matches()
        x86/speculation: Add Special Register Buffer Data Sampling (SRBDS) mitigation
        x86/speculation: Add SRBDS vulnerability and mitigation documentation
        x86/speculation: Add Ivy Bridge to affected list
        iio: vcnl4000: Fix i2c swapped word reading.
        uprobes: ensure that uprobe->offset and ->ref_ctr_offset are properly aligned
        Linux 4.4.227

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
2020-06-11 08:44:31 -07:00
Jérôme Pouiller
6997070078 mmc: fix compilation of user API
commit 83fc5dd57f86c3ec7d6d22565a6ff6c948853b64 upstream.

The definitions of MMC_IOC_CMD  and of MMC_IOC_MULTI_CMD rely on
MMC_BLOCK_MAJOR:

    #define MMC_IOC_CMD       _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)
    #define MMC_IOC_MULTI_CMD _IOWR(MMC_BLOCK_MAJOR, 1, struct mmc_ioc_multi_cmd)

However, MMC_BLOCK_MAJOR is defined in linux/major.h and
linux/mmc/ioctl.h did not include it.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200511161902.191405-1-Jerome.Pouiller@silabs.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2020-06-11 09:21:38 +02:00
Ritesh Harjani
2e35d27728 mmc: sdhci: Dont enable CDR for tuning commands
Currently we enable CDR for every read command including
for tuning procedure which is not correct (as CDR if
enabled might correct the phase during tuning and we
wont be able to detect the correct phase during tuning).

So, disable CDR for read tuning commands.

CRs-fixed: 759398
Change-Id: I051b6e3b204dde22cdc973759c3e32d0a81c369a
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Signed-off-by: Pavan Anamula <pavana@codeaurora.org>
2016-05-31 15:27:21 -07:00
Venkat Gopalakrishnan
5dddfdcab8 include: mmc: Export sanitized mmc headers
Export sanitized mmc.h and core.h for userspace.

Change-Id: I3a6eadde2023d974b0ce260a77082b01d8ba0b5d
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
[subhashj@codeaurora.org: fixed trivial merge conflicts]
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2016-05-31 15:26:19 -07:00
Venkat Gopalakrishnan
b9fcf56406 include: mmc: Export sanitized mmc headers
Export sanitized mmc.h and core.h for userspace.

Change-Id: I3a6eadde2023d974b0ce260a77082b01d8ba0b5d
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
2016-03-23 20:51:28 -07:00
Krishna Konda
8a3d5e6ab0 mmc: card: Fix RPMB IOCTL to handle all cards
The eMMC 4.5 spec for RPMB accesses is not very clear on whether
user parition accesses can be allowed in the middle of RPMB accesses.
Due to this ambiguity, it turns out this is implementation defined
and certain cards support it while others do not.

In order to allow this feature to function across a wide variety of
cards, this patch takes the pessimistic approach and ensures that any
RPMB access is completed before user partition can be accessed.

Change-Id: I77959f462c874771a0a854d9a2bc48df446eff56
Signed-off-by: Krishna Konda <kkonda@codeaurora.org>
Signed-off-by: Oluwafemi Adeyemi <aadeyemi@codeaurora.org>
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
[merez@codeaurora: fix conflicts due to changes in 3.14]
Signed-off-by: Maya Erez <merez@codeaurora.org>
[venkatg@codeaurora: pick only ioctl header changes and drop rest]
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
2016-03-23 20:51:27 -07:00
Jon Hunter
a5f5774c55 mmc: block: Add new ioctl to send multi commands
Certain eMMC devices allow vendor specific device information to be read
via a sequence of vendor commands. These vendor commands must be issued
in sequence and an atomic fashion. One way to support this would be to
add an ioctl function for sending a sequence of commands to the device
atomically as proposed here. These multi commands are simple array of
the existing mmc_ioc_cmd structure.

The structure passed via the ioctl uses a __u64 type to specify the number
of commands (so that the structure is aligned on a 64-bit boundary) and a
zero length array as a header for list of commands to be issued. The
maximum number of commands that can be sent is determined by
MMC_IOC_MAX_CMDS (which defaults to 255 and should be more than
sufficient).

This based upon work by Seshagiri Holi <sholi@nvidia.com>.

Signed-off-by: Seshagiri Holi <sholi@nvidia.com>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2015-10-26 16:00:00 +01:00
David Howells
60fe5771be UAPI: (Scripted) Disintegrate include/linux/mmc
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
2012-10-11 17:27:54 -04:00
David Howells
4413e16d9d UAPI: (Scripted) Set up UAPI Kbuild files
Set up empty UAPI Kbuild files to be populated by the header splitter.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
2012-10-02 18:01:35 +01:00