Commit graph

691,473 commits

Author SHA1 Message Date
Thierry Escande
af66df0f53 NFC: digital: Set the command pending flag
There is a flag in the command structure indicating that this command is
pending. It was checked before sending the command to not send the same
command twice but it was actually never set. This is now fixed.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:10:34 +02:00
Thierry Escande
82e5795286 NFC: digital: Call pending command callbacks at device unregister
With this patch, when freeing the command queue in the module unregister
function, the callbacks of the commands still queued are called with a
ENODEV error. This gives a chance to the command issuer to free any
memory it could have allocate.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:09:47 +02:00
Thierry Escande
3f89fea35f NFC: digital: Rework error handling in DEP_RES response
The Digital Protocol stack used to send a NACK frame whatever the error
type it receives in digital_in_recv_dep_res(). It actually should only
send a NACK frame on CRC or parity check errors or on any transmission
error if a NACK frame was previously sent. Existing drivers used to send
EIO error for this kind of issues so this patch limits sending of NACK
frames on EIO errors. All other errors will be reported to the upper
layers.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:08:57 +02:00
Thierry Escande
b77693447d NFC: digital: Fix a memory leak in NFC-F listening mode
When configured as a target listening for a SENSF_REQ poll command, a
nfcid2 array was allocated for no reason leading to a memory leak. The
nfcid2 is sent by the target in the SENSF_RES reply.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:03:08 +02:00
Thierry Escande
8f49bec6c3 NFC: nfcsim: Fix missing dependency on NFC_DIGITAL
The nfcsim driver now depends on the Digital layer. This patch adds the
missing dependency on NFC_DIGITAL for NFC_SIM config.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:02:09 +02:00
Thierry Escande
9f0c4542c4 NFC: port100: Abort current command before switching RF off
If a command is still being processed by the device, the switch RF off
command will be rejected. With this patch, the port100 driver calls
port100_abort_cmd() before sending the switch RF off command.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:02:08 +02:00
Thierry Escande
a52bd7d275 NFC: port100: Make port100_abort_cmd() synchronous
This patch makes the abort_cmd function synchronous. This allows the
caller to immediately send a new command after abort_cmd() returns.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:02:08 +02:00
Thierry Escande
b74584c1a6 NFC: port100: Fix the command cancellation process
The USB out_urb used to send commands to the device can be submitted
through the standard command processing queue coming from the Digital
Protocol layer but it can also be submitted from port100_abort_cmd().

To not submit the URB while already active, a mutex is now used to
protect it and a cmd_cancel flag is used to not send command while
canceling the previous one.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:02:07 +02:00
Thierry Escande
e3e0258839 NFC: port100: Don't send a new command if one is still pending
This patch ensures that a command is not still in process before sending
a new one to the device. This can happen when neard is in constant
polling mode: the configure_hw command can be sent when neard restarts
polling after a LLCP SYMM timeout but before the device has returned in
timeout from the last DEP frame sent.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:02:07 +02:00
Thierry Escande
256f3ee3d1 NFC: llcp: Fix 2 memory leaks
Once copied into the sk_buff data area using llcp_add_tlv(), the
allocated TLVs must be freed.

With this patch nfc_llcp_send_connect() and nfc_llcp_send_cc() don't
return immediately on success and now free the allocated TLVs.

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:02:06 +02:00
Thierry Escande
de9e5aeb4f NFC: llcp: Fix usage of llcp_add_tlv()
In functions using llcp_add_tlv(), a skb pointer could be set to NULL
and then reuse afterward.

With this patch, the skb pointer returned by llcp_add_tlv() is ignored
since it can only be the passed skb pointer or NULL when the passed TLV
is NULL. There is also no need to check for the TLV pointer as this is
done by llcp_add_tlv().

Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-07-06 10:02:06 +02:00
Abhilash Kesavan
a1924466b7 arm64: dts: exynos: Modify the voltage range for BUCK2 for exynos7
Change the BUCK2 (vdd_atlas) voltage range to '500 - 1200mv' since
CPU DVFS requires it.

Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
2016-07-06 09:43:42 +02:00
Sara Sharon
6f482e37b7 iwlwifi: move iwl_drv to be shared across transports
All transports has this structure. By moving it to be
shared, we can get rid of casting to the specific transport
in probe and remove.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:37:44 +03:00
Sara Sharon
38398efb74 iwlwifi: pcie: centralize SCD status logging
Centralize the logging of SCD status. The motivation is
that for a000 devices we will have new SCD HW, but this
code was duplicate anyway, so it is a proper cleanup.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:32:34 +03:00
Luca Coelho
55bfa4b9d4 iwlwifi: mvm: support v4 of the TX power command
Add support for the v4 version of the TX power command.  Just add a
new version and do the same sizing tricks that were done when support
for v3 was introduced.

This patch doesn't support the new functionality introduced, but makes
the driver work with the new size of the command.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:30:06 +03:00
Sara Sharon
564cdce735 iwlwifi: pcie: load FW chunk for a000 devices
Update the firmware load flow for TFH hardware.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:23:35 +03:00
Sara Sharon
e22744af3b iwlwifi: pcie: initialize a000 device's TFD table
For a000 device the FH was replaced by the TFH.
This is the first patch in a series introducing the
changes stemming from this change.
This patch initializes the TFQ queue table with the new
64 bit register and the relevant TFH configuration
registers.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:23:02 +03:00
Sara Sharon
12a17458a2 iwlwifi: centralize 64 bit HW registers write
Move the write_prph_64 of pcie to be transport agnostic.
Add direct write as well, as it is needed for a000 HW.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:22:08 +03:00
Sara Sharon
8de437c71e iwlwifi: pcie: generalize and increase the size of scratchbuf
Currently the scratch buffer is set to 16 bytes and indicates
the size of the bi-directional DMA.
However, next HW generation will perform additional offloading,
and will write the result in the key location of the TX command,
so the size of the bi-directional consistent memory should grow
accordingly - increase it to 40.
Generalize the code to get rid of now irrelevant scratch references.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:21:29 +03:00
Sara Sharon
b1753c62c7 iwlwifi: pcie: track rxb status
In MQ environment and new architecture in early stages
we may encounter DMA issues. Track RXB status and bail
out in case we receive index to an RXB that was not
mapped and handed over to HW.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:18:20 +03:00
Emmanuel Grumbach
f16c3ebfa6 iwlwifi: pcie: fix a race in firmware loading flow
Upon firmware load interrupt (FH_TX), the ISR re-enables the
firmware load interrupt only to avoid races with other
flows as described in the commit below. When the firmware
is completely loaded, the thread that is loading the
firmware will enable all the interrupts to make sure that
the driver gets the ALIVE interrupt.
The problem with that is that the thread that is loading
the firmware is actually racing against the ISR and we can
get to the following situation:

CPU0					CPU1
iwl_pcie_load_given_ucode
	...
	iwl_pcie_load_firmware_chunk
		wait_for_interrupt
					<interrupt>
					ISR handles CSR_INT_BIT_FH_TX
					ISR wakes up the thread on CPU0
	/* enable all the interrupts
	 * to get the ALIVE interrupt
	 */
	iwl_enable_interrupts
					ISR re-enables CSR_INT_BIT_FH_TX only
	/* start the firmware */
	iwl_write32(trans, CSR_RESET, 0);

BUG! ALIVE interrupt will never arrive since it has been
masked by CPU1.

In order to fix that, change the ISR to first check if
STATUS_INT_ENABLED is set. If so, re-enable all the
interrupts. If STATUS_INT_ENABLED is clear, then we can
check what specific interrupt happened and re-enable only
that specific interrupt (RFKILL or FH_TX).

All the credit for the analysis goes to Kirtika who did the
actual debugging work.

Cc: <stable@vger.kernel.org> [4.5+]
Fixes: a6bd005fe9 ("iwlwifi: pcie: fix RF-Kill vs. firmware load race")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:16:12 +03:00
Johannes Berg
21cb3222fe iwlwifi: decouple PCIe transport from mac80211
The PCIe transport needs to store two pointers in each TX SKB, and
currently assumes mac80211's ieee80211_tx_info is present in the CB
to do that.

In order to remove that assumption, have the opmodes pass in the
offset to where the pointers can be stored in the CB and use the
offset in the PCIe code.

To make the disentanglement complete, remove mac80211.h includes
from everywhere in the generic iwlwifi code. This required adding
an include of cfg80211.h in one place.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:09:56 +03:00
Johannes Berg
0c4cb7314d iwlwifi: tracing: decouple from mac80211
In order to be able to properly record SKBs that didn't come through
mac80211, don't rely on the IEEE80211_TX_CTRL_PORT_CTRL_PROTO flag
but instead check for ETH_P_PAE directly.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:08:56 +03:00
Johannes Berg
24ddddf367 iwlwifi: store cipher scheme independent of mac80211
In order to reduce reliance on mac80211 structs in the core
iwlwifi code, store the cipher schemes in the format given
by the firmware and convert it later, rather than storing it
in the mac80211 format.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:08:25 +03:00
Sara Sharon
60dec5233c iwlwifi: mvm: free RX reorder buffer on restart
Restart flow zeroes the rx_ba_sessions counter. Mac80211 asks
driver to tear down of the session only afterwards, and as a
result driver didn't free the data. Fix it.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Fixes: 10b2b2019d ("iwlwifi: mvm: add infrastructure for tracking BA session in driver")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:06:01 +03:00
Sara Sharon
35263a0311 iwlwifi: mvm: add RX aggregation prints
Add some prints to track BAID assignment.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:05:37 +03:00
Liad Kaufman
58f2cc57dc iwlwifi: mvm: support dqa-mode scd queue redirection
Make sure that in DQA mode, the SCD's configuration of a
queue is redirected to the lower AC of the streams of the
queue.

Make sure that this queue is redirected to the lowest AC
when adding a new RA/TID to an existing queue. If it isn't -
redirect the queue.

Also, as redirection revealed a bug in the marking of a
shared queue, this patch contains a small fix to make
sure a shared queue maintains the appropriate "shared queue
marking".

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 10:00:21 +03:00
Liad Kaufman
e3118ad74d iwlwifi: mvm: support tdls in dqa mode
Support TDLS when working in DQA mode.

This is done mainly by NOT doing any special things
for TDLS, as the queues are dynamically created anyway,
so no need to allocate them ahead of time.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:59:55 +03:00
Sara Sharon
e25d65f267 iwlwifi: pcie: don't use vid 0
In cases of hardware or DMA error, the vid read from
a zeroed location will be 0, and we will access the rxb
at index 0 in the global table, while it may be NULL or
owned by hardware.
Invalidate vid 0 in order to detect the situation and
bail out.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:59:28 +03:00
Emmanuel Grumbach
3edbc7daba iwlwifi: mvm: unmap the paging memory before freeing it
This led to a DMA splat.

Fixes: a6c4fb4441 ("iwlwifi: mvm: Add FW paging mechanism for the UMAC on PCI")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:58:33 +03:00
Johannes Berg
5e7d7eb9cc iwlwifi: remove iwl_ht_params.smps_mode
This struct member is never set, so remove it.

Since this is the last thing that needs mac80211.h, also change
the includes to no longer use mac80211.h

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:57:10 +03:00
Emmanuel Grumbach
ad17b1d953 iwlwifi: mvm: fix the channel inhibition table for Channel 14
The value for Channel 14 was wrong. Fix it.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:56:32 +03:00
Emmanuel Grumbach
c934bce9de iwlwifi: mvm: fix coex related comments
Those comments were wrong, fix them.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:55:47 +03:00
Golan Ben-Ami
e7c9bd1cc6 iwlwifi: mvm: write the correct internal TXF index
The TX fifos are arranged consecutively in the SMEM, beginning
with the regular fifos, and tailed by the internal fifos.
In the current code, while trying to read the internal fifos,
we read the fifos beginning with the index zero.
By doing this we actually re-read the regular fifos.

In order to read the internal fifos, start the reading index
from the number of regular fifos configured by the fw.

Signed-off-by: Golan Ben-Ami <golan.ben.ami@intel.com>
Fixes: 39654cb3a6 ("iwlwifi: don't access a nonexistent register upon assert")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:52:44 +03:00
Gerald Schaefer
d08de8e2d8 s390/mm: add support for 2GB hugepages
This adds support for 2GB hugetlbfs pages on s390.

Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2016-07-06 08:46:43 +02:00
Sara Sharon
d5d0689aef iwlwifi: pcie: fix access to scratch buffer
This fixes a pretty ancient bug that hasn't manifested itself
until now.
The scratchbuf for command queue is allocated only for 32 slots
but is accessed with the queue write pointer - which can be
up to 256.
Since the scratch buf size was 16 and there are up to 256 TFDs
we never passed a page boundary when accessing the scratch buffer,
but when attempting to increase the size of the scratch buffer a
panic was quick to follow when trying to access the address resulted
in a page boundary.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Fixes: 38c0f334b3 ("iwlwifi: use coherent DMA memory for command header")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:40:33 +03:00
Ido Yariv
54f315cb08 iwlwifi: pcie: Enable MSI mode when using MSI interrupts
On some of the chipsets MSI & INTA interrupts are disabled by default in
the HW registers, and need to be explicitly enabled to be used.

In case MSI-X isn't used, make sure MSI mode is enabled by setting
the relevant HW register.

Signed-off-by: Ido Yariv <idox.yariv@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
2016-07-06 09:39:16 +03:00
Seung-Woo Kim
24c4b47829 memory: samsung: exynos-srom: Fix wrong count of registers
This patch fixes wrong count of array for SROM registers from probe
function.

Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
2016-07-06 08:16:56 +02:00
Krzysztof Kozlowski
9251e1d634 ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
The iomem passed to s5p_init_cpu is used as read-only.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
2016-07-06 08:12:27 +02:00
Alim Akhtar
46926e27d8 arm64: defconfig: Enable S2MPS11 clock and S3C RTC driver
The S3C RTC controller on Exynos7 platform uses RTC source clock
from S2MPS11 PMIC. This patch enables the required drivers to make
RTC work on Exynos7 Espresso board.

Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
2016-07-06 08:00:47 +02:00
Olof Johansson
2941895aa0 Samsung defconfig update for v4.8, part 2:
1. Enable Virtual Video Test Driver on nulti_v7 and exynos defconfigs.
    Useful for testing.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdL4UAAoJEME3ZuaGi4PX/MQP/3dUeUXT83Yg3dQMEZJXLI8Z
 aciTCgUeozP+LYQGn5XzRPl0dOePZGLU+n8AcWsKBxIFfMl0lYYrdk9Y78Wd22dT
 1V2dpHkVy6zC88WCEzK7abjiaq0g5PA4jdnLfog4t6fgKHF/EwrWYqGAics9RDZ+
 yGoOy/KOAS8bYHg2MZ8GDH/9AIahQ1u1s+2/rJDgWM+ioJgmRqd17eVj7HlI9A5d
 TZMXHGOz+ToJH87i1Yd/U5tIdQ82TWmSrBszKfRcs7R0Ayqnx+s4WcPklj8xOSz9
 P0wkl3F39ihqDHO/MJScjRuD/Di92PVjLsGBLWqicuQIQ4fzRh5cv/bxnR7kQLnW
 7c4CVcyzkEz42HQ3QxnmfFNTzzr2yz/XLjg+mLPEXqOBs4ZSa9rMzUjfWatlZk0e
 SjogdR5Pxhcei2XMarxG2dFISVKEsTggmjW8hlO/xuukSG/0wEKwBFDqe1PsPA6K
 j1yJcA9FfoIE4x1hM5OJopot8sXLG7KZWqqK0VRsQIOU9XvMjNAyRP/PPju6MLHs
 D6Uwm4QXk0DS4GFrD+mI4neI1X92e/yDzX/Jjou8dcqPNO2zlZtJJWFQh+MdWjyK
 q/V8OjdjFxRfIjx4ddj5i5ESPL5rwWd7KUkmiQJGi36s1vKCVCn5HD/Y1Kn1j1gv
 EDwyrUCgpbGKElmJcV2V
 =9A1f
 -----END PGP SIGNATURE-----

Merge tag 'samsung-defconfig-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Samsung defconfig update for v4.8, part 2:
1. Enable Virtual Video Test Driver on nulti_v7 and exynos defconfigs.
   Useful for testing.

* tag 'samsung-defconfig-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable vivid driver as a module
  ARM: exynos_defconfig: Enable vivid driver as a module

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:49:00 -07:00
Olof Johansson
8fe9c8b750 Topic branch for Exynos MFC changes for v4.8, part 2:
Replace hardcoded reserved memory ranges with auto-allocated ones
 and enable MFC for all boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdL1gAAoJEME3ZuaGi4PXDgEP/1iPrO92izin4BTql9CxJQ5L
 LlSHwWeE6JTd/qaMcs8bbRrP1mROLkZozyqkj7QUgxoZxeyXrVpzhjerUp9QSLz4
 Pq9Ql57cc4F03mns1uNaZ9Bz9c3vhtoohwkLRHvC4n7yQ4zvjCoyRDXGZ4+osz+K
 vrlRpm3ZZrkr/MM4QuW9E7O2vL8/1kuPjn10vgCGEyWTSsMHHJe1+m4mpz5p/uPb
 RB8I1ZIdrvXyBJeNAhgCxWJ27nw2xpotqjAO5h2z/XZ8VSOIktd2iiouu199knso
 jPrVdJWuY0vv8YBXdJG/3/86T3S8w+HN1ULtaVIcYAbG44TLkzz1YCku3UUWB2yK
 INZ2J4dreXZ8NvcQPQffcE3B25w+hNx6mDlrAmRaapstLlPIkeNWeiYMI4CaoxTa
 1lOGqUuw6gc9JlBrEkJilBS18A9ExzNlquiBJa3EiP/74axe2AriSxbZZCpQ6na0
 mOkuW/0xO9iSE56+j1pUuz/GCmoJt4rCMTCRVp17eE6WUM6OW+oUWm0ArVefBCy/
 Er5E3WwXNA4nhEuWU6Y1oh/ji2SNzr9eNU3eja254xgOGsHIW1iqaCappUBi4+VC
 cm6TaXSlzDBv3v/1kQT947LiHkc+5A4/mldizDSaujF9vjIyQvHzG+yGpHEbyWAT
 qf37rI3BB2GJgs13U5Jf
 =sS8p
 -----END PGP SIGNATURE-----

Merge tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Topic branch for Exynos MFC changes for v4.8, part 2:

Replace hardcoded reserved memory ranges with auto-allocated ones
and enable MFC for all boards.

* tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: enable MFC device for all boards
  ARM: dts: exynos: move MFC reserved memory regions from boards to .dtsi
  ARM: dts: exynos: replace hardcoded reserved memory ranges with auto-allocated ones
  ARM: dts: exynos: Enable MFC device on Exynos4412 Odroid boards
  ARM: dts: exynos: Convert MFC device to generic reserved memory bindings
  ARM: EXYNOS: Remove code for MFC custom reserved memory handling
  media: s5p-mfc: add iommu support
  media: s5p-mfc: replace custom reserved memory handling code with generic one
  media: s5p-mfc: use generic reserved memory bindings
  of: reserved_mem: add support for using more than one region for given device
  media: set proper max seg size for devices on Exynos SoCs
  media: vb2-dma-contig: add helper for setting dma max seg size
  s5p-mfc: Fix race between s5p_mfc_probe() and s5p_mfc_open()
  s5p-mfc: Add release callback for memory region devs
  s5p-mfc: Set device name for reserved memory region devs

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:46:39 -07:00
Olof Johansson
f19786f95c Samsung drivers/soc update for v4.8, part 2:
1. Endian-friendly fixes.
 2. Make SROMC driver explicitly non-module.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdL5/AAoJEME3ZuaGi4PXmMMP/2vwmIKiog/AwKYma0WLRkwW
 HL1Dm5JQxlGLLdiJTQnbYRdkdbnkJkY0d7TXAV01FnMrs44cm5RmeEkotlE43ljD
 am+qcxLltLZ86KU+O5wzrqPaLbgTbHDglJ8f0b8+YK/rafer6sR+rIvJk7HpiHW0
 rmWuefNNcGQr29GwqeoUZbeqPCfsMUWxHH4j9P4U+tV3+qdU38kQ9592p+OESeYa
 wnDV+je6JTbKXFnwkfSFlCbPeFBZ3r3YXNIOctBo7CBEgPYpDwQjZlsHORqLNYNh
 tXjNfOyZSGgX9U+0NwwIPKV8E/WexImVZssu3ZLCA1h95nRF4RzkXttWG69pPnBr
 9rv2zu38tT/HBznQnPlTQu5f9hjDuNAMsjE2HnYKLwa4MVu3BcqapnMWPhhmJP9K
 4H0BaGlJHNUHt6ZrkPxDRNY2k2PhPUs/lwkMLUD1UWB4woS+TTaWrqgF4EWGX24r
 /r5Ppf75ABJp0CRX7h2lnoYtRifwyR8E+K2VnNXy1LvOCbBdNpZSrT4RBCNzuOPy
 PHwSzwU11eR/xA010vvfJVvCEBIl33DmXj8EaEVkomPxafGT3q6wTcKGEeohafQ+
 ZJzO2zIdrEQenWjgfP/YP/5E2V8SJwW07JWMD/n23sBrtL8BgryWqra6a0E8BPaK
 kGY7kNhRRO6KVyvWs887
 =zgda
 -----END PGP SIGNATURE-----

Merge tag 'samsung-drivers-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers

Samsung drivers/soc update for v4.8, part 2:
1. Endian-friendly fixes.
2. Make SROMC driver explicitly non-module.

* tag 'samsung-drivers-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  cpufreq: s5pv210: use relaxed IO accesors
  memory: samsung: exynos-srom: make it explicitly non-modular
  memory: samsung: endian fixes for IO

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:43:41 -07:00
Olof Johansson
553228d073 Samsung mach/soc update for v4.8, part 2:
1. Endian-friendly fixes.
 2. Maintainers update.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdL7uAAoJEME3ZuaGi4PX9E0P/2XqWeRT2Ln1hrySGefz1zN+
 xIW7bsYaHWiFp0/ol4uWdDcyKTyN+Y8ROcsJmdnPjXrPRb/7Vicg9bMj4KziQGtG
 uQBJ7vu1sInf6ocMv0JaXagGiN9UbegXrJ/+HrS41NeQ4le75i//QleKppgY5cJ9
 1ymXfeKLPYAtuL7jVXh7+kvMEtrTpbH6JiIwSHk3pLUsxhTkiMI2nIcoe/NTGxkL
 Dr1yvtcXwOcWT8Bkn4cyb+hOculqwnc2jTvfUeWhqDEtGqAn8YJDFhMfJNxGd7bt
 EafSWVbdhG0KEOIvTSrHk7qek6exLXl9Kx5P0yRyE4D3/+CyO9Ya2rRi5WlGrGHI
 w9TSOoPzqHYt3aZ1XAY66yYhgfsaIk6TxbGaPtPjt1nZ6E86KqnK0821CF1HZiRL
 ySp2lO7PlGPtqNT9cVwZDSVBgeoYDhkiQUIQnJwAKauCZirmS6TRordnbBKU39SW
 bLUKzSFKHnPBa/u4NOJhflWIy4fg4ARJYDycCH7m/P01JvxNb4OJ6ycz/XeO90oS
 k1HKXOFjFNbklloC/sjyLRP71+ZkJuogH6uzYwuhShwRKyCXdfoI4yLS024mGejM
 u5r6MGVVKI9ZxZ9ImK8gfhgQ705AfxkhKFHu9BjHCLIsLg/F+PgdiNObI9FoA7Ym
 6sgq5xOhnhjjGaENvHFD
 =/T5k
 -----END PGP SIGNATURE-----

Merge tag 'samsung-soc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc update for v4.8, part 2:
1. Endian-friendly fixes.
2. Maintainers update.

* tag 'samsung-soc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  MAINTAINERS: Extend Samsung SoC entry with S3C/S5P drivers
  ARM: SAMSUNG: Fix missing s5p_init_cpu() declaration
  ARM: EXYNOS: Fix UART address selection for DEBUG_LL
  ARM: EXYNOS: Fixup for __raw operations in suspend.c
  ARM: SAMSUNG: Fixup usage of __raw IO in PM
  ARM: EXYNOS: Fixup endian in pm/pmu
  ARM: EXYNOS: Fixups for big-endian operation
  ARM: SAMSUNG: Fixup endian issues in CPU detection
  ARM: EXYNOS: Fixup debug macros for big-endian
  ARM: s3c24xx: Sort cpufreq tables
  ARM: SAMSUNG: Fix typos

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:41:01 -07:00
Olof Johansson
355e5ce71f Second set of device tree updates for omaps for v4.8 merge window.
This is a series of dtc warning fixes when compiled with make W=2
 from Javier Martinez Canillas <javier@osg.samsung.com>.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdMKhAAoJEBvUPslcq6Vz9d0P/Redrumw0+JuFTBIUyJNtILX
 6u+TXabPgPvkxEZ/eFPLv6b8EcZBkOVXPfbTnvUKzsT+VXjD1QnufYm1fw+qzmBA
 Fijii54z5EyhnOMEm8Zr962rExwL7rMr/lHi62Dfs/d8zG9AEMq8UU9hO1vn3vkr
 JDsK2BdyoFTDq+PVYXpjKCaVpXPV0+FS8YDH5uoXzCF1vYD7fSCGRnM4HwaNEA65
 RukMtafx0Kv9euS8fpjeZ+dHQI+tcrp72hokhmGkSAN1zAVWGLllvwxHudwvYHSi
 ZHhSIr6m5REF2JC7PekYMA8nsf0WfdoYwLB52fckissrIzXllW3MgFxgXrqbH4iZ
 sx3aXZvM6grZmn0Ou8jbUsaGd8ri1wRCb5SAJx9yYMuywWVKUO+D5ViLhLHUSmva
 XeiXLw7cBZQyBJv00lR66H6G5ABcNjdnvuwpRUHIWWH+6/DGXnzM1ZejHQjR6phZ
 1XEF3Mo7ZgTUXARTEBNgu7KGyMhx1YH1OVLF4Ri8eM77qZ84CQbP3AeqAQxsSJPi
 7YDqhZZJ4bVHeEy7RQdf/OSz5Gf7jgRreqYpfenZc/3OlfYsnewbu9Fo3w87L81E
 EzE5Jdwq/vyjEs5EBwEP7uvKzYh64qVfp+puCxUBpPZmPiD2zMkCndt3O849Sm6x
 qHfIDkk9XN6fPXlQRiwW
 =ikLv
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Second set of device tree updates for omaps for v4.8 merge window.
This is a series of dtc warning fixes when compiled with make W=2
from Javier Martinez Canillas <javier@osg.samsung.com>.

* tag 'omap-for-v4.8/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
  ARM: dts: am57xx: sbc-am57x: remove unneded unit name
  ARM: dts: omap5-board-common: remove unneded unit names
  ARM: dts: omap5-cm-t54: remove unneded unit names and add reg properties
  ARM: dts: am437x: cm-t43: remove unneded unit names
  ARM: dts: am437x-gp-evm: remove unneded unit name
  ARM: dts: am43xx-epos-evm: remove unneded unit name
  ARM: dts: omap4-var-om44customboard: remove unneded unit name
  ARM: dts: omap4-sdp: remove unneded unit names
  ARM: dts: omap4-panda-common: remove unneded unit names
  ARM: dts: omap4-duovero-parlor: remove unneded unit name
  ARM: dts: omap3-thunder: remove unneded unit name
  ARM: dts: sbc-t3x30: remove unneded unit names
  ARM: dts: omap3-pandora-common: remove unneded unit name
  ARM: dts: omap3-overo-common-dvi: remove unneded unit names
  ARM: dts: omap3-igep0020-common: remove unneded unit names
  ARM: dts: omap3: overo: remove unneded unit names in display nodes
  ARM: dts: omap3-ha-lcd: remove unneeded unit name
  ARM: dts: omap3-gta04: remove unneeded unit names
  ARM: dts: omap3-devkit8000-lcd-common: remove unneeded unit names
  ARM: dts: omap3-devkit8000: remove unneeded unit names
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:33:16 -07:00
Olof Johansson
df92d2e393 SoC related changes for omaps for v4.8 merge window:
- A series of DSS platform_data fixes to prepare for DSS driver changes
 
 - Add tblck clck aliases for PWM
 
 - A series of trivial spelling corrections
 
 - Remove bogus eQEP, ePWM and eCAP hwmod entries
 
 - A series of McBSP sidetone fixes
 
 - Remove QSPI and DSS addresses from hwmod, these come from dts
 
 - Fix RSTST register offset for pruss
 
 - Make ti81xx_rtc_hwmod static
 
 - Remove wrongly defined RSTST offset for PER Domain, note
   that the subject for this one wrongly has "dts" in the
   subject
 
 - Add support for omap5 and dra7 workaround for 801819
 
 - A series of patches to make kexec work for SMP omaps
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXdMXwAAoJEBvUPslcq6VzL9oQAKfitWelEieWYINsm475xHUL
 DDckxrFtbVzrkI7rsY1wCi8v3i1DKEKBps47pnapy+AoD+js1C+vTKaQA2IXouFi
 CWlwgCuwJpLc4VoYGrbszXSJQeJowFHIH/zVk3CJrqBIwYKqnjH6sGCHRN23KNdN
 U2SPA7qV8XwwCrFR4e2+KWe5ulb7QsxvkCKqLyDrAwyu0wUQml1/4UjX5NYOkr1Y
 G5CyvGy7WBZ/t5MOFMPAR7rhxKQazUdNlgC7rGfVr+JUuYWtsyET6FBZ1kUBVFpa
 xc+usR78C+7gaQps8bbuIr2ymcOYamVlpjVwsvpTCWyFcnseK0hXsrf8KihRHfYh
 5p1yyDlqGg5qS6B16cyNgUqi/jVNa7NuRJWavgS+oWIm1j2WkUe9gdVyqP7WQGUZ
 UGF4OAXoo7aykvSsYEug/5U1d4T5aShESyoukTGsLbtRGhyiSxP3OqsoHzBwyfCM
 bA6OZzVxR/MRinpc/udvOsi/C7erm1iA6C+Fg4Gggk59Xt0yU+e4Scg40khQQ6X9
 1ND/HTG0rQ+ygLttUXPCK0kBg1u+SU/zh0+j9EV3I6CA624JQ2Gm2Bb/6xHk3vkL
 dmQosa5U2wLiXY6EKS2VcjAv7+yuaLdj/MMoOBh7TXz181/SnciNzAb6kEEXRNak
 vA0yKATY6AftMYBMwhPn
 =d4B3
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.8/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC related changes for omaps for v4.8 merge window:

- A series of DSS platform_data fixes to prepare for DSS driver changes
- Add tblck clck aliases for PWM
- A series of trivial spelling corrections
- Remove bogus eQEP, ePWM and eCAP hwmod entries
- A series of McBSP sidetone fixes
- Remove QSPI and DSS addresses from hwmod, these come from dts
- Fix RSTST register offset for pruss
- Make ti81xx_rtc_hwmod static
- Remove wrongly defined RSTST offset for PER Domain, note
  that the subject for this one wrongly has "dts" in the
  subject
- Add support for omap5 and dra7 workaround for 801819
- A series of patches to make kexec work for SMP omaps

* tag 'omap-for-v4.8/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (30 commits)
  ARM: OMAP2+: Fix build if CONFIG_SMP is not set
  ARM: OMAP4+: Allow kexec on SMP variants
  ARM: OMAP4+: Reset CPU1 properly for kexec
  ARM: OMAP4+: Prevent CPU1 related hang with kexec
  ARM: OMAP4+: Initialize SAR RAM base early for proper CPU1 reset for kexec
  ARM: dts: am43xx: Remove wrongly defined RSTST offset for PER Domain
  ARM: OMAP: make ti81xx_rtc_hwmod static
  ARM: AM43XX: hwmod: Fix RSTST register offset for pruss
  ARM: DRA7: hwmod: remove DSS addresses from hwmod
  ARM: DRA7: hwmod: Remove QSPI address space entry from hwmod
  ARM: OMAP2+: McBSP: Remove the old iclk allow/deny idle code
  ASoC: omap-mcbsp: sidetone: Use the new callback for iclk handling
  ASoC: omap-mcbsp: Rename omap_mcbsp_sysfs_remove() to omap_mcbsp_cleanup()
  ARM: OMAP3: pdata-quirks: Add support for McBSP2/3 sidetone handling
  ARM: OMAP3: McBSP: New callback for McBSP2/3 ICLK idle configuration
  ARM: OMAP3: hwmod data: Fix McBSP2/3 sidetone data
  ARM: AM335x/AM437x: hwmod: Remove eQEP, ePWM and eCAP hwmod entries
  ARM: OMAP2+: Fix typo in sdrc.h
  ARM: OMAP2+: Fix typo in omap_device.c
  ARM: OMAP2+: Fix typo in omap4-common.c
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:22:58 -07:00
Neil Armstrong
fa06f54a18 ARM: oxnas: Change OX810SE default driver config
Since the SP804 timer changes will not been merged upstream, switch the
default OX810SE config to the OXNAS RPS Timer driver configuration.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 22:10:11 -07:00
Olof Johansson
7f95b51d54 ARM64: DT: Hisilicon Hi6220 hikey board updates for 4.8
- name the GPIO lines
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXcq9/AAoJEAvIV27ZiWZcuEUQAIjDX8Bq6WNerOSsn/kyWIhb
 0lTNHae6D4mxKax6u9npwiMpBl7JsgVkfzU6es0iZtZe+g6dAOOJMOvjRX/aPZD2
 oiO05vHtU+wKlcCvRPTinTRGK3lAzsPda9xMxEuaztbcg1fmFgflpx4r+n4Gwsy4
 DsPr/Miw3bMPJGtQrx4YFd9Rb7ehkDyyq7PXUBYlRtnZs4Osgxm2LVhoZsw2vQTi
 u7JAA/N8R1bg7jYHEAIW+8GgPGJRcRPesGSmt92ELVVZHROP+7wx6y2PAsP+PDIO
 ZIuVvqGFYWfb5bgzfYS0bApYAzcVdsGLYEzbJHEuHE84ZKzXQ0YGoZmNID3RN5Ns
 2gboC7DJU+e3k6AUoBckn7drpCC7BjkwVJr3NqvyvygztdnhoibdRYxaO8ywfzD+
 TY3ul0GDyUGdWsLcwTdwtbA3azdh3xFmKGzPfJGGhcN7SNfenkTxJsvNroze5PZC
 ilqE5W25tS/ATqqqx2PBPbQQK4wTL0sULbFWSvt6jxYyV0OBekOMyvLnLLux/XOg
 Q4XltZ16nG42ujKv0j/GCz5L0oNIuLBDqt0zF7Wa9pHq0aK+BeDXMmRf3fZ2ZLUu
 4/awoQcXqorxWF8Hc8QTg/iE/I9OkiKpWzzhgIoYwabRPay/WV6Dk0kAO8UjkeAJ
 OK7zJAbKnk1zYAchYxfo
 =bqGx
 -----END PGP SIGNATURE-----

Merge tag 'hi6220-dt-for-4.8' of git://github.com/hisilicon/linux-hisi into next/dt64

ARM64: DT: Hisilicon Hi6220 hikey board updates for 4.8

- name the GPIO lines

* tag 'hi6220-dt-for-4.8' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hikey: name the GPIO lines

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 21:47:46 -07:00
Olof Johansson
01ba96dff1 The i.MX defconfig update for 4.8:
- Enable TOUCHSCREEN_ADS7846, USB_FUNCTIONFS and USB_USBNET support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJXcm6FAAoJEFBXWFqHsHzOdFEH/jF1mfZbRBYDjkLsg6H++MJ1
 q/Yd8GTahIgIQyjAglBbiF5nLnLD6OK03HPu4M5H7fBo/tS6Og5Tk8LshwXzEucZ
 eAC6/5iDRlY1AgdFrdxhXqGwVyG04dgK553PQijCR5GSZ9MMhQO9JFJ49Lf64FuV
 TqZ0VPDUO7fw0qlE7yqd1JWy1SHa5LthRxUpx8gJUk+6nqJVQO26Ciga1BP6uSsB
 5nprCGpWo00Hfn6hMHqWXCyOm4vaWPq+N2E9aHFdo6VNnAIZxbqvYJ3RpfDu1UfV
 PoCoRVaNSfqEIr5yaliMykXI96U8gbLfoWXf/E4K08/Z9uB0gyIqbXCmvHoMhC0=
 =EWUm
 -----END PGP SIGNATURE-----

Merge tag 'imx-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

The i.MX defconfig update for 4.8:
 - Enable TOUCHSCREEN_ADS7846, USB_FUNCTIONFS and USB_USBNET support

* tag 'imx-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select ADS7846 support
  ARM: imx_v6_v7_defconfig: enable USB FFS gadget
  ARM: imx_v6_v7_defconfig: build in usbnet to support NFS for non-ethernet board

Signed-off-by: Olof Johansson <olof@lixom.net>
2016-07-05 21:15:26 -07:00
Peter Chen
d8150d14e9 PM / devfreq: exynos-bus: add missing of_node_put after calling of_parse_phandle
of_node_put needs to be called when the device node which is got
from of_parse_phandle has finished using.

[Commit updated to fix an error by MyungJoo]

Cc: Chanwoo Choi <cw00.choi@samsung.com>
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
2016-07-06 13:11:24 +09:00