Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
On gen3 PCI-Express we should send command one by one.
If sending many commands in one packet will lead to a failure.
Signed-off-by: rui_feng <rui_feng@realsil.com.cn>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Factor out some common code that will also be used with blk-mq.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Enhance mmc_blk_data_prep() to support CQE requests. That means adding
some things that for non-CQE requests would be encoded into the command
arguments - such as the block address, reliable-write flag, and data tag
flag. Also the request tag is needed to provide the command queue task id,
and a comment is added to explain the future possibility of defining a
priority.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Use local variables in mmc_blk_data_prep() in preparation for adding CQE
support which doesn't use the output variables.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Enable or disable CQE when a card is added or removed respectively.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Enable the Command Queue if the host controller supports a command queue
engine. It is not compatible with Packed Commands, so make a note of that in the
comment.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Add core support for handling CQE requests, including starting, completing
and recovering.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Currently the host can be claimed by a task. Change this so that the host
can be claimed by a context that may or may not be a task. This provides
for the host to be claimed by a block driver queue to support blk-mq, while
maintaining compatibility with the existing use of mmc_claim_host().
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Callers already have the host claimed, so remove the unnecessary
calls to mmc_claim_host() and mmc_release_host().
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
I forgot to account for the fact that the device core holds a
reference to a device added with device_initialize() that need
to be released with a corresponding put_device() to reach a 0
refcount at the end of the lifecycle.
This led to a NULL pointer reference when freeing the device
when e.g. unbidning the host device in sysfs.
Fix this and use the device .release() callback to free the
IDA and free:ing the memory used by the RPMB device.
Before this patch:
/sys/bus/amba/drivers/mmci-pl18x$ echo 80114000.sdi4_per2 > unbind
[ 29.797332] mmc3: card 0001 removed
[ 29.810791] Unable to handle kernel NULL pointer dereference at
virtual address 00000050
[ 29.818878] pgd = de70c000
[ 29.821624] [00000050] *pgd=1e70a831, *pte=00000000, *ppte=00000000
[ 29.827911] Internal error: Oops: 17 [#1] PREEMPT SMP ARM
[ 29.833282] Modules linked in:
[ 29.836334] CPU: 1 PID: 154 Comm: sh Not tainted
4.14.0-rc3-00039-g83318e309566-dirty #736
[ 29.844604] Hardware name: ST-Ericsson Ux5x0 platform (Device Tree Support)
[ 29.851562] task: de572700 task.stack: de742000
[ 29.856079] PC is at kernfs_find_ns+0x8/0x100
[ 29.860443] LR is at kernfs_find_and_get_ns+0x30/0x48
After this patch:
/sys/bus/amba/drivers/mmci-pl18x$ echo 80005000.sdi4_per2 > unbind
[ 20.623382] mmc3: card 0001 removed
Fixes: 97548575be ("mmc: block: Convert RPMB to a character device")
Reported-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This function is used by the block layer queue to bail out of
requests if the current request is towards an RPMB
"block device".
This was done to avoid boot time scanning of this "block
device" which was never really a block device, thus duct-taping
over the fact that it was badly engineered.
This problem is now gone as we removed the offending RPMB block
device in another patch and replaced it with a character
device.
Cc: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
The RPMB partition on the eMMC devices is a special area used
for storing cryptographically safe information signed by a
special secret key. To write and read records from this special
area, authentication is needed.
The RPMB area is *only* and *exclusively* accessed using
ioctl():s from userspace. It is not really a block device,
as blocks cannot be read or written from the device, also
the signed chunks that can be stored on the RPMB are actually
256 bytes, not 512 making a block device a real bad fit.
Currently the RPMB partition spawns a separate block device
named /dev/mmcblkNrpmb for each device with an RPMB partition,
including the creation of a block queue with its own kernel
thread and all overhead associated with this. On the Ux500
HREFv60 platform, for example, the two eMMCs means that two
block queues with separate threads are created for no use
whatsoever.
I have concluded that this block device design for RPMB is
actually pretty wrong. The RPMB area should have been designed
to be accessed from /dev/mmcblkN directly, using ioctl()s on
the main block device. It is however way too late to change
that, since userspace expects to open an RPMB device in
/dev/mmcblkNrpmb and we cannot break userspace.
This patch tries to amend the situation using the following
strategy:
- Stop creating a block device for the RPMB partition/area
- Instead create a custom, dynamic character device with
the same name.
- Make this new character device support exactly the same
set of ioctl()s as the old block device.
- Wrap the requests back to the same ioctl() handlers, but
issue them on the block queue of the main partition/area,
i.e. /dev/mmcblkN
We need to create a special "rpmb" bus type in order to get
udev and/or busybox hot/coldplug to instantiate the device
node properly.
Before the patch, this appears in 'ps aux':
101 root 0:00 [mmcqd/2rpmb]
123 root 0:00 [mmcqd/3rpmb]
After applying the patch these surplus block queue threads
are gone, but RPMB is as usable as ever using the userspace
MMC tools, such as 'mmc rpmb read-counter'.
We get instead those dynamice devices in /dev:
brw-rw---- 1 root root 179, 0 Jan 1 2000 mmcblk0
brw-rw---- 1 root root 179, 1 Jan 1 2000 mmcblk0p1
brw-rw---- 1 root root 179, 2 Jan 1 2000 mmcblk0p2
brw-rw---- 1 root root 179, 5 Jan 1 2000 mmcblk0p5
brw-rw---- 1 root root 179, 8 Jan 1 2000 mmcblk2
brw-rw---- 1 root root 179, 16 Jan 1 2000 mmcblk2boot0
brw-rw---- 1 root root 179, 24 Jan 1 2000 mmcblk2boot1
crw-rw---- 1 root root 248, 0 Jan 1 2000 mmcblk2rpmb
brw-rw---- 1 root root 179, 32 Jan 1 2000 mmcblk3
brw-rw---- 1 root root 179, 40 Jan 1 2000 mmcblk3boot0
brw-rw---- 1 root root 179, 48 Jan 1 2000 mmcblk3boot1
brw-rw---- 1 root root 179, 33 Jan 1 2000 mmcblk3p1
crw-rw---- 1 root root 248, 1 Jan 1 2000 mmcblk3rpmb
Notice the (248,0) and (248,1) character devices for RPMB.
Cc: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
SD clock should be disabled for clock value 0. It's not
right to just return. This may cause failure of signal
voltage switching.
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
The function was removed half a year ago, so this declaration can go,
too.
Fixes: 51ced59cc0 ("mmc: sdhci-pci: Use ACPI DSM to get driver strength for some Intel devices")
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
The delay circuit used to support HS400 is calibrated based on two
additional clocks. When these clocks are not available and
FF_CLK_SW_RST_DIS is not set in CORE_HC_MODE, reset might fail. But on
some platforms this doesn't work properly and below dump can be seen in
the kernel log.
mmc0: Reset 0x1 never completed.
mmc0: sdhci: ============ SDHCI REGISTER DUMP ===========
mmc0: sdhci: Sys addr: 0x00000000 | Version: 0x00001102
mmc0: sdhci: Blk size: 0x00004000 | Blk cnt: 0x00000000
mmc0: sdhci: Argument: 0x00000000 | Trn mode: 0x00000000
mmc0: sdhci: Present: 0x01f80000 | Host ctl: 0x00000000
mmc0: sdhci: Power: 0x00000000 | Blk gap: 0x00000000
mmc0: sdhci: Wake-up: 0x00000000 | Clock: 0x00000002
mmc0: sdhci: Timeout: 0x00000000 | Int stat: 0x00000000
mmc0: sdhci: Int enab: 0x00000000 | Sig enab: 0x00000000
mmc0: sdhci: AC12 err: 0x00000000 | Slot int: 0x00000000
mmc0: sdhci: Caps: 0x742dc8b2 | Caps_1: 0x00008007
mmc0: sdhci: Cmd: 0x00000000 | Max curr: 0x00000000
mmc0: sdhci: Resp[0]: 0x00000000 | Resp[1]: 0x00000000
mmc0: sdhci: Resp[2]: 0x00000000 | Resp[3]: 0x00000000
mmc0: sdhci: Host ctl2: 0x00000000
mmc0: sdhci: ============================================
Add support for the additional calibration clocks to allow these
platforms to be configured appropriately.
Cc: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Cc: Ritesh Harjani <riteshh@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Tested-by: Jeremy McNicoll <jeremymc@redhat.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
By stuffing the runtime controlled clocks into a clk_bulk_data array we
can utilize the newly introduced bulk clock operations and clean up the
error paths. This allow us to handle additional clocks in subsequent
patch, without the added complexity.
Cc: Ritesh Harjani <riteshh@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: Jeremy McNicoll <jeremymc@redhat.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
SDHCI controllers on Tegra186 support 40 bit addressing.
IOVA addresses are 48-bit wide on Tegra186.
SDHCI host common code sets dma mask as either 32-bit or 64-bit.
To avoid access issues when SMMU is enabled, disable 64-bit dma.
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
The format of Intel Bluetooth firmware for bootloader product is
ibt-<hw_variant>-<device_revision_id>.sfi and .ddc.
But for the SKU's 9x60, there a 3 variants of FW, which cannot be
differentiated just with hw_variant and devision_revision_id.
So to pick the appropriate FW file for 9x60 SKU's, it will be
differentiated using hw_variant, hw_revision and fw_revision rather
than hw_variant and device_revision_id only.
Format will be like this:
ibt-<hw_variant>-<hw_revision>-<fw_revision>.sfi and .ddc
Signed-off-by: Jaya P G <jaya.p.g@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
In case of using BT_ERR and BT_INFO, convert to bt_dev_err and
bt_dev_info when possible. This allows for controller specific
reporting.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
- add SMP support to Meson8/8b
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAln2AfgACgkQWTcYmtP7
xmXP+A//U3cBORd3lkmaVxGzcul/IB0czVH1XJp+WgMi2ksuin3UjveANFFxIUtL
cqBBNV23+PDjgFZF+SAbuEMIyWKoxvuxJ6ktKoP3N9MQsyb2yM9t2ITDfGCcHQ/E
xu5vjuYDqfjpowLcDE2yFTZbDV980gc7QyJvhwX9Bcxod+KfXz7C60J57qxRar0C
F5ViskncTvka3NlQGcCvZz0Wd1J5rMcBncmWpqQPKTyKg22gqbYgISHOWay6h6G4
otNhcnN4FeVgem9v/k1BUe6edIO9CQrhIITFdnT6B6NxmpQ2rFvK/hwboqOFRoL/
6v8nHtV3SIkxHiT06slkNeXvLKDGBr/3pFzswz/pPDXKiIJpeVbwFrFBv6L6V2Bz
P0MdbRFEO8KODud8Z+ZTl3Gwqlv/8ISb18dOuxaPtK/cbNzffrmZqwvNe6IfkVGW
zQrxnknxoLHb07lQ1lRHQiwHvmOdlK5l/9VVVE07fRUbIvR05JdX0KhU/1rs3dPv
Gsu25nb5Jn59rWTlRzw0O9P5ER/AMObfjsMMhF/Fj8bzcLGSJVhrNXGtWQ/+D20I
zsDJOfoWiwIa1ezoY7S8nIj0sNz5Xp14+MMOw2Wz0L1lXGla9qJsUNQANlI933Uz
zXwDSGLEhLkaNwvOXLXNVPnnTkenNeDPPeaBJ7FuJo5o/1UxQOs=
=1tXJ
-----END PGP SIGNATURE-----
Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc
Pull "Amlogic SoC updates for v4.15" from Kevin Hilman:
- add SMP support to Meson8/8b
* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM: meson: enable MESON_IRQ_GPIO in Kconfig for meson8b
ARM: meson: Add SMP bringup code for Meson8 and Meson8b
ARM: smp_scu: allow the platform code to read the SCU CPU status
ARM: smp_scu: add a helper for powering on a specific CPU
dt-bindings: Amlogic: Add Meson8 and Meson8b SMP related documentation
- A series from Marco Franchi from to clean up build warnings see with
W=1 in arch/arm/mach-imx/.
- Move i.MX6 speed grading check from i.MX platform code to cpufreq
driver. The patch is suggested by cpufreq folks to go through
arm-soc tree.
- Enable cpuidle support on i.MX6DL starting from IMX_CHIP_REVISION_1_1.
- Constify platform_suspend_ops for MXS platform.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJZ7yAPAAoJEFBXWFqHsHzO2/AH/jLMgZBJgOG/EhKeocAcvuGH
UO6ST/Cj+R/2X0Yof4toiCfksflsDj8rGdGMchNjUsoPdApHcsyjJgGrDfo0j4uV
3eBn9tw0YmgEIA68R5QyTXbmm79cq0JmiJtzKMoKkX+fzNjrkNur0gfZYkiNNL+z
DEEufvv2HbTbgqTVKK+/DjDySsN/Ez8vVZwJMNY43zx6T4RB7TSvsAyRa6nTAOTM
Em4pC28IztGLk4uZYJspsKS4qx5FK9kskheUpMqbv1ra6PwHslYklvswSD36kPcw
xpAFQ35XuAGpsvjqgXN+4ACL8H7SyTXEZwbHbiJVps86S5C4FyOvNUfm1QIPqzs=
=tPmd
-----END PGP SIGNATURE-----
Merge tag 'imx-soc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
Pull "i.MX SoC changes for 4.15" from Shawn Guo:
- A series from Marco Franchi from to clean up build warnings see with
W=1 in arch/arm/mach-imx/.
- Move i.MX6 speed grading check from i.MX platform code to cpufreq
driver. The patch is suggested by cpufreq folks to go through
arm-soc tree.
- Enable cpuidle support on i.MX6DL starting from IMX_CHIP_REVISION_1_1.
- Constify platform_suspend_ops for MXS platform.
* tag 'imx-soc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
cpufreq: imx6q: Move speed grading check to cpufreq driver
ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1
ARM: imx: mach-mx31lite: Make mx31lite_map_io static
ARM: imx: cpuidle-imx5: Include "cpuidle.h" header file
ARM: imx: 3ds-debugboard: Include "3ds_debugboard.h" header file
ARM: imx: imx31moboard: Include "board-mx31moboard.h" header file
ARM: mxs: constify platform_suspend_ops
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJZ8ZgsAAoJEBOhurvWBoCKjngP/i2JpmeALCNBAOFR9OS4nrWJ
/iZcQ6N0QG2hv9rzp/JUiAfkjlZ+ZvN2J6ms4Qm4XsWl9LLe/tMwxHTu2eVwYraU
25KD1QmFT1mCb6bkq0861Jm4ahLn7Df7R5nAUwZXE0nrE29IsTRXYmnt4kXyDUrO
W8tfMem+RfYdGV6VMdxCiR+0o4qUuUBlieh+HSP2imP8yfT2dIi7hnJnEBSs8Eev
5ebqJgWcPf7Wf4NQD9OX/xvA1TdX8jEce2i0c2t6N/KfmhH6aYfismgj3UcgKU4G
KyErWg71JnIinMmr+a9ok5ic0YJ7NGdS9sxaKMKmbCzsDEjMi9zCqnjUB+fpWoDs
jNipjU2upKelWtgrcV5PArKwMU5IjV4y7cdAyxCQ0DFAycfzr1VjVXpj854cce2F
85H8NNHW+kkVvE+ZOCeTl2XUXzjcyvlBZHAJH5W3r8C17lF8cBraRfV1bBgV/FfL
aRuzTWLcwELjvBj1vqVZhw21BEmPq6085EAPQ4t5bGbh7nztFl+vUeFWPCtrlPlw
fyXNhRPPBHlrHdTckX45cV58sbsAV5v7/w6pOhgel9TWprFXHfWDYEdUGaJxDq6D
wTjDcSSqhr8pIfQ+FpATgNk0bidD1xF0Pk6BPZdOtV9eK5C5NAQ7yE72PW2ThGYb
wFNozatFrt+UnmXVHQx6
=kKeC
-----END PGP SIGNATURE-----
Merge tag 'pullreq_20171026' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq
Pull devfreq changes for v4.15 from MyungJoo Ham.
* tag 'pullreq_20171026' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
PM / devfreq: Define the constant governor name
PM / devfreq: Remove unneeded conditional statement
PM / devfreq: Show the all available frequencies
PM / devfreq: Change return type of devfreq_set_freq_table()
PM / devfreq: Use the available min/max frequency
Revert "PM / devfreq: Add show_one macro to delete the duplicate code"
PM / devfreq: Set min/max_freq when adding the devfreq device
4.15, please pull the following:
- Florian updates the MAINTAINERS entry for Broadcom SoCs with the Hurricane 2 regexp
to match new files being added
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJZ6o1KAAoJEIfQlpxEBwcEUO4QAK1r7Xrfs6bZLoa/HxT3aGHo
kE11ZzEFcTGhDIgSDosxxZ4FjveVcJcdUdVJZ7jka1tUjqsTUJzGtpBMqEfkiEtE
rGEVIYdKPBkHkXn/QNkaRJvVJQOpDOb9mZx3CPdo52+UrCCmcWGxINhcf6J9awjk
oJgUXDWF0XlM+paif2wVcW9UhIAO3ByqGloooqDTIocZmX59t0V48z0TKt+Ga0T6
4lUGVFwCco5oYSkoN3ffC/qI0c3PERDayW/Jrc40inuna8PpEaIr1mvhzRSA9rLL
q5lz81Zb38VBdCdzauhnTDVLkR+xktlR3rwLz1O5AGSRWDZwiVhK2QIQLbCwbryU
RniCCuSLna7gNQt+aaLp8a60CV0Zzu8fbhO645aRRWF36zshM/D5FFPyI+LXePeX
NyPuEEdt/4NUvPSnOf4H7ygmPtBSzDCFIJKVaGL5ebhugY/OpkhgqHoy8dSmv6n+
XGE3iTe6oPy+lJN+HnkWsWnZ0smCAGeZEsPOxIAkH1n6KmW3r+FX1N64gX95I9DM
U5tCD+4fffnLCEtvUabc/2eSo1TQukzQJ6e2h7Nehr2JKP7g58uj1EqiCCgsplOh
Ze3bRBPORYvf0da+PhzIN2hzyL9Zo42R6jrnSnjYa2+hYGBPARIi5u0zd5zsqlSK
J13y4CM/bsaiRBW5Nooy
=86lP
-----END PGP SIGNATURE-----
Merge tag 'arm-soc/for-4.15/maintainers' of http://github.com/Broadcom/stblinux into next/soc
Pull "Broadcom maintainers changes for 4.15" from Florian Fainelli:
This pull request contains Broadcom ARM-based SoCs MAINTAINERS file update for
4.15, please pull the following:
- Florian updates the MAINTAINERS entry for Broadcom SoCs with the Hurricane 2 regexp
to match new files being added
part), please pull the following:
- Florian adds support for the Broadcom Hurricane 2 SoC machine entry point
and defines the debug UART address for use with earlyprintk/DEBUG_LL
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJZ6otTAAoJEIfQlpxEBwcEO8MP/31sG8GF6YLjezPZI4VGdJMN
n9Fgvy0DjNTXExq158fx+DllP3ecpWF8yimXuE/FO3LBauOfVKFpLKwh10GJFTmS
3TsI37sKQj5MgaTuVGW1otnQIoupX3Teze9MyquHooEY69Xwsehyo1rfagfXNllb
1STRE1uluChwlLIoLV3fY74U+bij9gxROMRU5MaG87z4tGgYXuO5nYCl7oaJCNZ1
gPKUsUj5OZD5OTDnE4qXyPEgR7bUr6wemLYYlfu0LOKOCHTfALV7pfJmXmeLF70z
5G65BT5eSBa8nAb28Z7LjUiwipSiHiam9jnmiiG5LRoXQ8NKeQmfyrF++ljUlk19
MurzmZIEdCVRk+Htxohf2PyBc+TvgDJ0Wy9rp6h8k18KeJvmlT4z4CHg1QFTyr4F
u6PC8i1TCtb53iqbXixu1ax60X5L/ygRyNfvk7R7VU45VIjnMb9IoAZdoqYYj5Gh
yXNuyEXDRMLfvc5niE9lSTeDw+2Hby1ZO3+M6l15cIJ4z4s/kzQOnbpzxnOFwK5n
0xLhOTsMFNuvJImU6v/slzX8pM2JFgEebKImzBq2ybF3Gnh+sv9kZf+RmZtAhiH0
h56BIN5v2lSv8EkT64t6cfwm58HqXI6bAKuUHTdwe+vbDeW4CkT1NJaF7KzlYULy
mmLleC8JdOWrBNFUC2Tn
=OjEl
-----END PGP SIGNATURE-----
Merge tag 'arm-soc/for-4.15/soc-part2' of http://github.com/Broadcom/stblinux into next/soc
Pull "Broadcom soc changes for 4.15 (part 2)" from Florian Fainelli:
This pull request contains Broadcom ARM-based SoC changes for 4.15 (second
part), please pull the following:
- Florian adds support for the Broadcom Hurricane 2 SoC machine entry point
and defines the debug UART address for use with earlyprintk/DEBUG_LL
* tag 'arm-soc/for-4.15/soc-part2' of http://github.com/Broadcom/stblinux:
ARM: debug: Add Hurricane 2 UART2 debug addresses
ARM: bcm: Add support for Broadcom Hurricane 2 SoC
DRM core uses reference/unreference suffixes for refcounting
functions, but kernel uses get/put (e.g. kref_get/put()).
Replace reference/unreference with get/put for consistency
and also it's shorter.
The following cocci script was used to generate the patch:
@@
expression e;
@@
(
-drm_gem_object_reference(e);
+drm_gem_object_get(e);
|
-drm_gem_object_unreference(e);
+drm_gem_object_put(e);
|
-drm_gem_object_unreference_unlocked(e);
+drm_gem_object_put_unlocked(e);
)
Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1508776686-29664-1-git-send-email-aastha.gupta4104@gmail.com
The recent change to the PM QoS framework to introduce a proper
no constraint value overlooked to handle the devices which don't
implement PM QoS OPS. Runtime PM is one of the more severely
impacted subsystems, failing every attempt to runtime suspend
a device. This leads into some nasty second level issues like
probe failures and increased power consumption among other
things.
Fix this by adding a proper return value for devices that don't
implement PM QoS.
Fixes: 0cc2b4e5a0 (PM / QoS: Fix device resume latency PM QoS)
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
- Turn on DRM_DW_HDMI_CEC option to get HDMI CEC support.
- Enable MUX_MMIO to get ADV7180 probe on Gateworks GW51xx boards.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJZ7y5xAAoJEFBXWFqHsHzOnuIH/0ftbQ5pKFdWZ4y/UiR5JpYA
hYz2RlgS4m3DbrC8xC8b6MGRBeLr7clSxXlnXfpyASZVmfYhDNaoMFdKtTJpSYxe
rnvhi1ePhb2oq4orjPFzM212eFoIhKEzvwdNyMyLlHM9xqoBGLkcHDJ/6pt96car
JkCoFtQgpy4i0FAV+HNtuE//n0hQAWzXJ7E8Nc00pkwuzWA1HQC1GyAOzsSaIGyR
dQxCxiL9AZGVD8awUnFb39Hme1FIZaP+taz+JFFuTLNE+c/0xQDUi4BTpJxiyWKK
rQrZ1ZUHMOJZ7h55G46paahSqVwN/bxq8nTXoPnaVPHQc+pFOS9X5aUzZKczOJU=
=8Xwg
-----END PGP SIGNATURE-----
Merge tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
Pull "i.MX defconfig updates for 4.15" from Shawn Guo:
- Turn on DRM_DW_HDMI_CEC option to get HDMI CEC support.
- Enable MUX_MMIO to get ADV7180 probe on Gateworks GW51xx boards.
* tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: Select the CEC driver
ARM: imx_v6_v7_defconfig: Select CONFIG_MUX_MMIO
For Armada 7K/8K, enable NAND, RTC, comphy and 10G PHY in the
defconfig
-----BEGIN PGP SIGNATURE-----
iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWeoQjSMcZ3JlZ29yeS5j
bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71SAGAJwN7iJ6Xywi
3DGgmYy/KtEm0/ZxcwCfZ6dFcGrSWo4IsPictpUL+x4TETk=
=Gmg4
-----END PGP SIGNATURE-----
Merge tag 'mvebu-arm64-4.15-1' of git://git.infradead.org/linux-mvebu into next/soc
Pull "mvebu arm64 for 4.15 (part 1)" from Gregory CLEMENT:
For Armada 7K/8K, enable NAND, RTC, comphy and 10G PHY in the
defconfig
* tag 'mvebu-arm64-4.15-1' of git://git.infradead.org/linux-mvebu:
arm64: defconfig: enable RTC on Armada 7K/8K SoCs
arm64: defconfig: enable NAND on Armada 7K/8K SoCs
arm64: defconfig: enable Marvell CP110 comphy
arm64: defconfig: enable the Marvell 10G PHY as a module
This enables the PCI host controller on 64-bit ARM. It is supported and
enabled via device tree on Tegra210 and Tegra186.
-----BEGIN PGP SIGNATURE-----
iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAlnp4n4THHRyZWRpbmdA
bnZpZGlhLmNvbQAKCRDdI6zXfz6zoZQSD/9MJu8m9Qhg6kdN7qiHjry7pTMW5GVV
EO6L1jSQQo4VedEZbOh9ot46Aj0HGGDVvi9YuQi7UHoV3y2SeWJ/WmFN3sf0FNm5
PR37c8lOxp3Oj6dGfMGHrpz4P8a0FPiKqqFlI4x/sahKgSta4z7ac1lmGcnYRGEs
X69zZxEHjvDkkataAkScmSexEZvCvVVORKU/odTtrIAGYE56docCkY4uI34EWJF7
igT0ammthwCJZIy3Nhbt+5Bvd03PKtAXdmurMrAsX0/DXVjKtUqzSDuN0CBdVPtl
wzHRO0cKx1m+EEDl4MdxfXfoo92klBRMc0I2Oj0b3+vTZMED1xvieo7vfSeflxRJ
/hs76EOyUQvgTLuwqrd5v6p916aGu7T4FT1YQchViq/d77BRIjPtR2x8leipKtU+
d5Am5qHEUdVF8EapEo/4wEzpRdZCCAQ8ZU3p0hq7YM3U5vWbmmnGGgumxNkzYj4e
7XECrc29BHEBE5Lcn+yUeHbCoED7RjrUXkT/mQ6wzG7dhLb1FQ1VF2lcQKCPVaV0
8Qt4cY3rSHZXEmKDkeJSzpkNd1cr4W7sXVQkeePgXov7aOrVnW1XYlN+4HWBPrk3
Or0LBhR84AaB5R01PG5QAdFX/A5pfSCLZlZiCbyk1rRoN26JxX6tHk6ehCAFbrZ2
eBCNv96QrpCMGw==
=nDdS
-----END PGP SIGNATURE-----
Merge tag 'tegra-for-4.15-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
Pull "arm64: tegra: Default configuration updates for v4.15-rc1" from Thierry Reding:
This enables the PCI host controller on 64-bit ARM. It is supported and
enabled via device tree on Tegra210 and Tegra186.
* tag 'tegra-for-4.15-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
arm64: defconfig: Enable Tegra PCI controller
register_page_bootmem_memmap()'s 3rd 'size' parameter is named
in a somewhat misleading fashion - rename it to 'nr_pages' which
makes the units of it much clearer.
Meanwhile rename the existing local variable 'nr_pages' to
'nr_pmd_pages', a more expressive name, to avoid conflict with
new function parameter 'nr_pages'.
(Also clean up the unnecessary parentheses in which get_order() is called.)
Signed-off-by: Baoquan He <bhe@redhat.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: akpm@linux-foundation.org
Link: http://lkml.kernel.org/r/1509154238-23250-1-git-send-email-bhe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
A bunch of patches for the sunxi documentation and mach-sunxi. The most
notable feature is the introduction of the R40 support.
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJZ6alxAAoJEBx+YmzsjxAg518P/2GKSpQu/vnttFl4ofOYGGhR
2D3avz5fuCBeZxVtYi0Iqc6YSMR8yuh9UUNdCMqJWmHhF8ULd61MeliK9MCQ5EDe
zini3rwQuI1XX2k7ICXhdORjtyZzaf5go/OZ3jIurrEGYlzSW8HPXBh2X3OyjoNr
xThbXC5oC6VHIFLOYQd6OoRR85ssP0yN/V8c8WlWBMyNnC/K8NhGFK0vdt2b7HEp
1C01/DVmduVOhCsAGVoIYYxBNi662IYrSPbh1TKMiPIjnrVkyxDZBkBADCOFFImb
CCcyUNz44+XnToYCHNKblOmNnh6HQ6heggXZa2761+hYAgULA/6W/nYjYJCzHfT3
uFT4sVG3uXM0O4g+TDqL26Qatc/Lmitv/tIe2tpVvRX9UJhXopqk414GUf4upYc+
cIRKvNmUvhV5QkyGFdiJZpNmGK5uTzWpFO6RJjpGx78uswcISASa+lgZ2jEmNmjP
a7l8mat4YvI+DIwcPnpQ7hneB2wRaGOFjO6U9OD+CcyhOC1c52G6yiHNZlZCp/si
ZOSOf+1OWB4qWhsB+BGp5t8sVRhvyQe6brC+PAkhnrvQs8AKp9i/f772f0n+nsPj
btFuE7zKygSA0cLdUty0eu6gPv+LM7p+SR3T/2v8MJHLWcQW9Q6m/r4hqHf2LXF+
JME22AEp2AZ9IED/YmlB
=2O2j
-----END PGP SIGNATURE-----
Merge tag 'sunxi-core-for-4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc
Pull "Allwinner core changes for 4.15" from Maxime Ripard:
A bunch of patches for the sunxi documentation and mach-sunxi. The most
notable feature is the introduction of the R40 support.
* tag 'sunxi-core-for-4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: sunxi: add support for R40 SoC
ARM: sunxi: fix the core number of V3s in sunxi README
dt-bindings: add compatible string for Allwinner V3s SoC
In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.
Addresses-Coverity-ID: 1397608
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
There is some registers defined in da8xx.c though they are not used.
These registers are also defined and used in musb_cppi41.c
Remove these defines from da8xx.c.
Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
vbus is there using new USB charger API.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJZ9ojfAAoJEEhZKYFQ1nG70g4IAJNeDnpWkzNVsM5Y8yQyWZSm
sAULcX1hRSu71RzCRsXEnJ4Ur5XGrHdA67wJFyJV5JMlh2l1b+3pZfd22zv5XQJS
3KPUQ4D89ZMEVzoaH6/mNM7TbIlGBS5f8g1HO+duevkVxoL2Fk1/4N04VousPhj9
HZgdZzUft+5HMsosqMCH2s2KixwzNsmtq3pz5sadXI0yt3j4pqQwboKfOjUX+BRP
Wh/ATvL+MpyqBn9TYGXRVXY4JKtA7h626OUPjqj6eM0lreXIcANA1eraOed79zR1
hyTvz+GG7c+bHWOBnntuGsZp0UHUeAqpLEsV321PIqhpkqkFcGPl3a+t9mgLaJ4=
=efLD
-----END PGP SIGNATURE-----
Merge tag 'usb-ci-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
Peter writes:
The main change for this rc is notify USB charger present when
vbus is there using new USB charger API.
Thorsten reported on <fa6e3ee2-91b5-a54b-afe3-87f30aac7a48@leemhuis.info> that
commit c9353bf483 made ath10k unstable with QCA6174 on his Dell XPS13 (9360)
with an error message:
ath10k_pci 0000:3a:00.0: failed to extract amsdu: -11
It only seemed to happen with certain APs, not all, but when it happened the
only way to get ath10k working was to switch the wifi off and on with a hotkey.
As this commit made things even worse (a warning vs breaking the whole
connection) let's revert the commit for now and while the issue is being fixed.
Link: http://lists.infradead.org/pipermail/ath10k/2017-October/010227.html
Reported-by: Thorsten Leemhuis <linux@leemhuis.info>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Rx data frames notified through HTT_T2H_MSG_TYPE_RX_IND and
HTT_T2H_MSG_TYPE_RX_FRAG_IND expect PN/TSC check to be done
on host (mac80211) rather than firmware. Rebuild cipher header
in every received data frames (that are notified through those
HTT interfaces) from the rx_hdr_status tlv available in the
rx descriptor of the first msdu. Skip setting RX_FLAG_IV_STRIPPED
flag for the packets which requires mac80211 PN/TSC check support
and set appropriate RX_FLAG for stripped crypto tail. Hw QCA988X,
QCA9887, QCA99X0, QCA9984, QCA9888 and QCA4019 currently need the
rebuilding of cipher header to perform PN/TSC check for replay
attack.
Please note that removing crypto tail for CCMP-256, GCMP and GCMP-256 ciphers
in raw mode needs to be fixed. Since Rx with these ciphers in raw
mode does not work in the current form even without this patch and
removing crypto tail for these chipers needs clean up, raw mode related
issues in CCMP-256, GCMP and GCMP-256 can be addressed in follow up
patches.
Tested-by: Manikanta Pubbisetty <mpubbise@qti.qualcomm.com>
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
For MT2701 NAND Controller, there may generate infinite ECC decode IRQ
during long time burn test on some platforms. Once this issue occurred,
the ECC decode IRQ status cannot be cleared in the IRQ handler function,
and threads cannot be scheduled.
ECC HW generates decode IRQ each sector, so there will have more than one
decode IRQ if read one page of large page NAND.
Currently, ECC IRQ handle flow is that we will check whether it is decode
IRQ at first by reading the register ECC_DECIRQ_STA. This is a read-clear
type register. If this IRQ is decode IRQ, then the ECC IRQ signal will be
cleared at the same time.
Secondly, we will check whether all sectors are decoded by reading the
register ECC_DECDONE. This is because the current IRQ may be not dealed
in time, and the next sectors have been decoded before reading the
register ECC_DECIRQ_STA. Then, the next sectors's decode IRQs will not
be generated.
Thirdly, if all sectors are decoded by comparing with ecc->sectors, then we
will complete ecc->done, set ecc->sectors as 0, and disable ECC IRQ by
programming the register ECC_IRQ_REG(op) as 0. Otherwise, wait for the
next ECC IRQ.
But, there is a timing issue between step one and two. When we read the
reigster ECC_DECIRQ_STA, all sectors are decoded except the last sector,
and the ECC IRQ signal is cleared. But the last sector is decoded before
reading ECC_DECDONE, so the ECC IRQ signal is enabled again by ECC HW, and
it means we will receive one extra ECC IRQ later. In step three, we will
find that all sectors were decoded, then disable ECC IRQ and return.
When deal with the extra ECC IRQ, the ECC IRQ status cannot be cleared
anymore. That is because the register ECC_DECIRQ_STA can only be cleared
when the register ECC_IRQ_REG(op) is enabled. But actually we have
disabled ECC IRQ in the previous ECC IRQ handle. So, there will
keep receiving ECC decode IRQ.
Now, we read the register ECC_DECIRQ_STA once again before completing the
ecc done event. This ensures that there will be no extra ECC decode IRQ.
Also, remove writel(0, ecc->regs + ECC_IRQ_REG(op)) from irq handler,
because ECC IRQ is disabled in mtk_ecc_disable(). And clear ECC_DECIRQ_STA
in mtk_ecc_disable() in case there is a timeout to wait decode IRQ.
Fixes: 1d6b1e4649 ("mtd: mediatek: driver for MTK Smart Device")
Cc: <stable@vger.kernel.org>
Signed-off-by: Xiaolei Li <xiaolei.li@mediatek.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Commit:
9043442b43 ("locking/paravirt: Use new static key for controlling call of virt_spin_lock()")
sets the static virt_spin_lock_key to a value before jump_label_init()
has been called, which will result in a WARN().
Reorder the initialization sequence:
- Move the native_pv_lock_init() into native_smp_prepare_cpus()
- set the value in xen_init_lock_cpu()
to avoid calling into the not yet initialized static keys subsystem.
Suggested-by: Juergen Gross <jgross@suse.com>
Reported-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: boris.ostrovsky@oracle.com
Cc: bp@suse.de
Cc: luto@kernel.org
Cc: vkuznets@redhat.com
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/1509170804-3813-1-git-send-email-douly.fnst@cn.fujitsu.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>