Commit graph

875,531 commits

Author SHA1 Message Date
Mark Salyzyn
6f3278abc5 ANDROID: gki_defconfig: FW_CACHE to no
Set the default for FW_CACHE to n to match Android expectations.

Signed-off-by: Mark Salyzyn <[email protected]>
Bug: 32180327
Bug: 137566496
Change-Id: I86a28040be07fb2f30125d28f7f379798727785c
(cherry picked from commit 8331ce00073074134a283a72a5731cb4689a28e6)
2019-11-26 17:20:14 +00:00
Mark Salyzyn
82967fe174 FROMGIT: firmware_class: make firmware caching configurable
Because firmware caching generates uevent messages that are sent over
a netlink socket, it can prevent suspend on many platforms.  It's
also not always useful, so make it a configurable option.

Signed-off-by: Mark Salyzyn <[email protected]>
Cc: Tim Murray <[email protected]>
Cc: Venkata Narendra Kumar Gutta <[email protected]>
Cc: Luis Chamberlain <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
Cc: [email protected]
Cc: [email protected]
Acked-by: Luis Chamberlain <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

(cherry picked from commit c74f8056621738f5be9f5d3d7e0caa927b21aef6 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core-testing)
Signed-off-by: Mark Salyzyn <[email protected]>
Bug: 32180327
Bug: 137566496
Change-Id: I1250512b27edb56caa78d536e5ccf1fb669476ad
(cherry picked from commit cd403ef6a75c38bc126b1b7f2362ab6426062df0)
2019-11-26 17:18:17 +00:00
Edgar Flores
c5ee9ea3a2 msm: adsprpc: Making adsprpc gki compliant
Making adsprpc module gki compliant

Change-Id: I99518342f676c3ce3f02f1d1d23279ba83b682be
Signed-off-by: Edgar Flores <[email protected]>
2019-11-25 22:55:12 -08:00
Ram Muthiah
6d88dbc147 ANDROID: gki_defconfig: removed CONFIG_PM_WAKELOCKS
Change-Id: I9ff74aea38ee20815d9e0cb2b81ebbb2dae6dd7b
Signed-off-by: Ram Muthiah <[email protected]>
Bug: 143710295
Bug: 115946999
Test: Treehugger
2019-11-26 00:01:36 +00:00
Ram Muthiah
dae312aa80 ANDROID: gki_defconfig: enable CONFIG_IKHEADERS as m
Change-Id: I584b09e1565a1453567e692fdff9e92790b4a29e
Signed-off-by: Ram Muthiah <[email protected]>
Bug: 143710295
Test: Treehugger
2019-11-25 22:22:43 +00:00
Matthias Maennich
fa4d49ae74 ANDROID: update ABI representation
3 Removed functions:

  [D] 'function int of_phandle_iterator_args(of_phandle_iterator*, uint32_t*, int)'
  [D] 'function int pci_for_each_dma_alias(pci_dev*, void ()*, void*)'
  [D] 'function void pci_request_acs()'

Fixes: e739da6595 ("Revert "FROMLIST: PCI: Export PCI ACS and DMA searching functions to modules"")
Fixes: ef78faff0a ("Revert "FROMLIST: of: Export of_phandle_iterator_args() to modules"")
Change-Id: Ib39f875c120ec9241fd971fa7877ede48ec33437
Signed-off-by: Matthias Maennich <[email protected]>
2019-11-25 22:07:34 +00:00
Elliot Berman
adcba6dd6d FROMLIST: reboot: Export reboot_mode
Export reboot_mode to support kernel modules wishing to modify reboot_mode.

Change-Id: I8d25aec75331a57fab85c12b8527a329e2a4f19d
Bug: 143964928
Link: https://lore.kernel.org/patchwork/patch/1151092/
Signed-off-by: Elliot Berman <[email protected]>
Reviewed-by: Bjorn Andersson <[email protected]>
Reviewed-by: Greg Kroah-Hartman <[email protected]>
2019-11-25 11:46:31 -08:00
Will Deacon
6b1859f66a FROMLIST: iommu/arm-smmu: Update my email address in MODULE_AUTHOR()
I no longer work for Arm, so update the stale reference to my old email
address.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: I7676e5f736fcb31376444bbfee419bc49ef17287
2019-11-25 11:36:23 -08:00
Will Deacon
c0b8722cbd FROMLIST: iommu/arm-smmu: Allow building as a module
By conditionally dropping support for the legacy binding and exporting
the newly introduced 'arm_smmu_impl_init()' function we can allow the
ARM SMMU driver to be built as a module.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: Id42da5829cb180966a0d051ec636be0c9f90efed
2019-11-25 11:36:23 -08:00
Will Deacon
80523d05db FROMLIST: iommu/arm-smmu: Unregister IOMMU and bus ops on device removal
When removing the SMMU driver, we need to clear any state that we
registered during probe. This includes our bus ops, sysfs entries and
the IOMMU device registered for early firmware probing of masters.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: I5dd6e68a609ac60bc704f9f916acc0f31dc1bd67
2019-11-25 11:36:22 -08:00
Will Deacon
6d83d361e7 FROMLIST: iommu/arm-smmu-v3: Allow building as a module
By removing the redundant call to 'pci_request_acs()' we can allow the
ARM SMMUv3 driver to be built as a module.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: I1d8fbe26ab7114af6409ea13a68fff8afed49703
2019-11-25 11:36:22 -08:00
Will Deacon
3a50680709 FROMLIST: iommu/arm-smmu-v3: Unregister IOMMU and bus ops on device removal
When removing the SMMUv3 driver, we need to clear any state that we
registered during probe. This includes our bus ops, sysfs entries and
the IOMMU device registered for early firmware probing of masters.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: I54372d917c871231ced86250498fe2e45cf39246
2019-11-25 11:36:22 -08:00
Will Deacon
e83861a6a0 FROMLIST: iommu/arm-smmu: Prevent forced unbinding of Arm SMMU drivers
Forcefully unbinding the Arm SMMU drivers is a pretty dangerous operation,
since it will likely lead to catastrophic failure for any DMA devices
mastering through the SMMU being unbound. When the driver then attempts
to "handle" the fatal faults, it's very easy to trip over dead data
structures, leading to use-after-free.

On John's machine, he reports that the machine was "unusable" due to
loss of the storage controller following a forced unbind of the SMMUv3
driver:

  | # cd ./bus/platform/drivers/arm-smmu-v3
  | # echo arm-smmu-v3.0.auto > unbind
  | hisi_sas_v2_hw HISI0162:01: CQE_AXI_W_ERR (0x800) found!
  | platform arm-smmu-v3.0.auto: CMD_SYNC timeout at 0x00000146
  | [hwprod 0x00000146, hwcons 0x00000000]

Prevent this forced unbinding of the drivers by setting "suppress_bind_attrs"
to true.

Link: https://lore.kernel.org/lkml/[email protected]
Reported-by: John Garry <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: I8b1c439f7ba11d6fc38cdf686948ef5909871dfb
2019-11-25 11:36:22 -08:00
Will Deacon
1100adc953 FROMLIST: Revert "iommu/arm-smmu: Make arm-smmu explicitly non-modular"
This reverts commit addb672f20.

Let's get the SMMU driver building as a module, which means putting
back some dead code that we used to carry.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: I9779ffa7befa8535a0d7196ef5f728e40ae7d7f7
2019-11-25 11:36:21 -08:00
Will Deacon
b4c5814630 FROMLIST: Revert "iommu/arm-smmu: Make arm-smmu-v3 explicitly non-modular"
This reverts commit c07b6426df.

Let's get the SMMUv3 driver building as a module, which means putting
back some dead code that we used to carry.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: Ifde3c5dc81a0db600532b305906c67aa065d2f47
2019-11-25 11:36:21 -08:00
Will Deacon
3acf4223bd FROMLIST: drivers/iommu: Allow IOMMU bus ops to be unregistered
'bus_set_iommu()' allows IOMMU drivers to register their ops for a given
bus type. Unfortunately, it then doesn't allow them to be removed, which
is necessary for modular drivers to shutdown cleanly so that they can be
reloaded later on.

Allow 'bus_set_iommu()' to take a NULL 'ops' argument, which clear the
ops pointer for the selected bus_type.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: Ia89fa2df61d2a9ad04901d4c2e71e293c4c6171d
2019-11-25 11:36:21 -08:00
Will Deacon
ce9777db25 FROMLIST: iommu/of: Take a ref to the IOMMU driver during ->of_xlate()
Ensure that we hold a reference to the IOMMU driver module while calling
the '->of_xlate()' callback during early device probing.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: Ica9ef2d5ed172c2451c0a19538dc28852c2270d5
2019-11-25 11:36:21 -08:00
Will Deacon
dfb7124564 FROMLIST: drivers/iommu: Take a ref to the IOMMU driver prior to ->add_device()
To avoid accidental removal of an active IOMMU driver module, take a
reference to the driver module in 'iommu_probe_device()' immediately
prior to invoking the '->add_device()' callback and hold it until the
after the device has been removed by '->remove_device()'.

Suggested-by: Joerg Roedel <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: I8f6a8aad8c41faa51df9c3a440c8b80c74e3ce8a
2019-11-25 11:36:20 -08:00
Will Deacon
5f67aa9980 FROMLIST: PCI: Export pci_ats_disabled() as a GPL symbol to modules
Building drivers for ATS-aware IOMMUs as modules requires access to
pci_ats_disabled(). Export it as a GPL symbol to get things working.

Acked-by: Bjorn Helgaas <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: Ia5457fd6c4593565799b97f40c0def3558a97696
2019-11-25 11:36:20 -08:00
Will Deacon
c5ce06fdc0 FROMLIST: iommu/of: Request ACS from the PCI core when configuring IOMMU linkage
To avoid having to export 'pci_request_acs()' to modular IOMMU drivers,
move the call into the 'of_dma_configure()' path in a similar manner to
the way in which ACS is configured when probing via ACPI/IORT.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: I3c689845ca493fbe037a2def2050a089036fb7d3
2019-11-25 11:36:20 -08:00
Will Deacon
91740f1937 FROMLIST: drivers/iommu: Export core IOMMU API symbols to permit modular drivers
Building IOMMU drivers as modules requires that the core IOMMU API
symbols are exported as GPL symbols.

Signed-off-by: Will Deacon <[email protected]>
Bug: 140290589
Link: https://lore.kernel.org/lkml/[email protected]/
Signed-off-by: Will Deacon <[email protected]>
Change-Id: Ic1b3b5e6e92c5852af1e3473dd230c506b8d7865
2019-11-25 11:36:19 -08:00
Will Deacon
b0367de0dd FROMGIT: of: property: Add device link support for "iommu-map"
Commit 8e12257dead7 ("of: property: Add device link support for iommus,
mboxes and io-channels") added device link support for IOMMU linkages
described using the "iommus" property. For PCI devices, this property
is not present and instead the "iommu-map" property is used on the host
bridge node to map the endpoint RequesterIDs to their corresponding
IOMMU instance.

Add support for "iommu-map" to the device link supplier bindings so that
probing of PCI devices can be deferred until after the IOMMU is
available.

Cc: Rob Herring <[email protected]>
Cc: Robin Murphy <[email protected]>
Signed-off-by: Will Deacon <[email protected]>
Acked-by: Saravana Kannan <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry-picked from commit e149573b2f84d0517648dafc0db625afa681ed54
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core-next)
Signed-off-by: Will Deacon <[email protected]>
Change-Id: Ife0cf1ed0256af47ed0cae7156f3184de355c42c
2019-11-25 11:36:19 -08:00
Will Deacon
a5fe6fd6ae Revert "FROMLIST: iommu: Export core IOMMU functions to kernel modules"
This reverts commit 82047fdd5d.

Superseded by arm-smmu changes posted upstream.

Change-Id: If4c2c29195ed2350803c5ca2b4d63d9a84682ed8
Signed-off-by: Will Deacon <[email protected]>
2019-11-25 11:36:19 -08:00
Will Deacon
e739da6595 Revert "FROMLIST: PCI: Export PCI ACS and DMA searching functions to modules"
This reverts commit c32fef399d.

Superseded by arm-smmu changes posted upstream.

Change-Id: Ib582a4f4da27fe9297e61a0228e14a7929cea6ef
Signed-off-by: Will Deacon <[email protected]>
2019-11-25 11:36:19 -08:00
Will Deacon
ef78faff0a Revert "FROMLIST: of: Export of_phandle_iterator_args() to modules"
This reverts commit ebc7824f47.

Superseded by arm-smmu changes posted upstream.

Change-Id: I7710d1fde8afd91e05d911c87e3443e8301593d0
Signed-off-by: Will Deacon <[email protected]>
2019-11-25 11:36:18 -08:00
Heikki Krogerus
e435184967 usb: typec: ucsi: Optimise ucsi_unregister()
There is no need to reset the PPM when the interface is
unregistered. Quietly silencing the notifications and then
unregistering everything is enough. This speeds up
ucsi_unregister() a lot.

Change-Id: Ib309aa79ee12ebd6a0e299b64046073bd7866a24
Signed-off-by: Heikki Krogerus <[email protected]>
Tested-by: Ajay Gupta <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 74ce3e41274805e4a5598f4d98ee4d5160466d07
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:08 -08:00
Heikki Krogerus
d78a8b48c5 usb: typec: ucsi: New error codes
Adding new error codes to the driver that were introduced in
UCSI specification v1.1.

Change-Id: Ia9ed45ada8514866ee1a9fc474df7748eb86b10d
Signed-off-by: Heikki Krogerus <[email protected]>
Tested-by: Ajay Gupta <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: e716bb38edb44b6a7dd9b825f57450118b3066ae
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:07 -08:00
Heikki Krogerus
df76aa0442 usb: typec: ucsi: Remove all bit-fields
We can't use bit fields with data that is received or send
to/from the device.

Change-Id: I20467156173540cb8306ec15bdbb5ed7f17e1959
Signed-off-by: Heikki Krogerus <[email protected]>
Tested-by: Ajay Gupta <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 3cf657f07918bc2d9295bf896a71bd31e407bb0c
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:07 -08:00
Heikki Krogerus
43c6e4c137 usb: typec: ucsi: Remove struct ucsi_control
That data structure was used for constructing the commands
before executing them, but it was never really useful. Using
the structure just complicated the driver. The commands are
64-bit wide, so it is enough to simply fill a u64 variable.
No data structures needed.

This simplifies the driver considerable and makes it much
easier to for example add support for big endian systems
later on.

Change-Id: I3533a2c24c3a91ea51e2ebdefe6bc2351223ca0b
Signed-off-by: Heikki Krogerus <[email protected]>
Tested-by: Ajay Gupta <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 470ce43a1a810117f09aa4bcad6ca2be6b29c8d1
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:07 -08:00
Heikki Krogerus
0765951ca1 usb: typec: ucsi: Remove the old API
The drivers now only use the new API, so removing the old one.

Change-Id: I716f18549d9f3efcbd47ef51ca371d37e4a5f3df
Signed-off-by: Heikki Krogerus <[email protected]>
Tested-by: Ajay Gupta <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 2ede55468ca8cc236da66579359c2c406d4c1cba
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:07 -08:00
Heikki Krogerus
3884275a90 usb: typec: ucsi: ccg: Move to the new API
Replacing the old "cmd" and "sync" callbacks with an
implementation of struct ucsi_operations. The interrupt
handler will from now on read the CCI (Command Status and
Connector Change Indication) register, and call
ucsi_connector_change() function and/or complete pending
command completions based on it.

Change-Id: I9dfdc70b10544d6e65a0d289491be7cd9232e4af
Signed-off-by: Heikki Krogerus <[email protected]>
Tested-by: Ajay Gupta <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: e32fd989ac1c45f993fbe89ad0a89aa9ea6993d2
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:06 -08:00
Heikki Krogerus
d0d25f124e usb: typec: ucsi: acpi: Move to the new API
Replacing the old "cmd" and "sync" callbacks with an
implementation of struct ucsi_operations. The ACPI
notification (interrupt) handler will from now on read the
CCI (Command Status and Connector Change Indication)
register, and call ucsi_connector_change() function and/or
complete pending command completions based on it.

Change-Id: Ia7c8e9e87f23ce6a70a657bf0e053345caf543cc
Signed-off-by: Heikki Krogerus <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: f56de278e8ec963637995944156527162dcf3021
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:06 -08:00
Heikki Krogerus
9609b59d23 usb: typec: ucsi: Simplified registration and I/O API
Adding more simplified API for interface registration and
read and write operations.

The registration is split into separate creation and
registration phases. That allows the drivers to properly
initialize the interface before registering it if necessary.

The read and write operations are supplied in a completely
separate struct ucsi_operations that is passed to the
ucsi_register() function during registration. The new read
and write operations will work more traditionally so that
the read callback function reads a requested amount of data
from an offset, and the write callback functions write the
given data to the offset. The drivers will have to support
both non-blocking writing and blocking writing. In blocking
writing the driver itself is responsible of waiting for the
completion event.

The new API makes it possible for the drivers to perform
tasks also independently of the core ucsi.c, and that should
allow for example quirks to be handled completely in the
drivers without the need to touch ucsi.c.

The old API is kept until all drivers have been converted to
the new API.

Change-Id: Ica25b44b228a96adbc2bd397d74978db6074c82e
Signed-off-by: Heikki Krogerus <[email protected]>
Tested-by: Ajay Gupta <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: bdc62f2bae8fb0e8e99574de5232f0a3c54a27df
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:06 -08:00
Heikki Krogerus
088f52f15f usb: typec: Remove the callback members from struct typec_capability
There are no more users for them.

Change-Id: Ia8f006d7c052326188a1249117daf243066aaeaa
Signed-off-by: Heikki Krogerus <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 8c038ea8b65fc803cd35423b8a1ff7057dd52f8b
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:05 -08:00
Heikki Krogerus
929d75d207 usb: typec: ucsi: Start using struct typec_operations
Supplying the operation callbacks as part of a struct
typec_operations instead of as part of struct
typec_capability during port registration.

Change-Id: I51ad090a7551096558f921cf5f347d4871ea769f
Signed-off-by: Heikki Krogerus <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 6df475f804e62887f5d2132832ecabe6e596cd1c
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:05 -08:00
Heikki Krogerus
06d4ed6096 usb: typec: tps6598x: Start using struct typec_operations
Supplying the operation callbacks as part of a struct
typec_operations instead of as part of struct
typec_capability during port registration. After this there
is not need to keep the capabilities stored anywhere in the
driver.

Change-Id: Ib7bd4d899925522dbea297e25a50d8bdd3aa79e2
Signed-off-by: Heikki Krogerus <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 1007dda3be1c9f924746f892c094219be250928e
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:05 -08:00
Heikki Krogerus
84ef8818a8 usb: typec: tcpm: Start using struct typec_operations
Supplying the operation callbacks as part of a struct
typec_operations instead of as part of struct
typec_capability during port registration.

Change-Id: I6eb7c3e87c8704e4d9ccae1d6e615bb1e492fd81
Signed-off-by: Heikki Krogerus <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 00ec21e58dc63dd899a1e1cb3f1d44fa18ca22dd
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:04 -08:00
Heikki Krogerus
328c602a09 usb: typec: Separate the operations vector
Introducing struct typec_operations which has the same
callbacks as struct typec_capability. The old callbacks are
kept for now, but after all users have been converted, they
will be removed.

Change-Id: Idfad5265f42ee2fcf6dbd0e109ed4f98b7563cb0
Signed-off-by: Heikki Krogerus <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 46310e4dade2bc3b574d540e421e3aa9f32cfd5f
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:04 -08:00
Heikki Krogerus
9b784e3a10 usb: typec: Introduce typec_get_drvdata()
Leaving the private driver_data pointer of the port device
to the port drivers.

Change-Id: Ib38c66e69a15904d5a8160312af6532f28712b67
Signed-off-by: Heikki Krogerus <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: 8c127a42af89c39560a8c5bd5accadaaa5741f8c
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:04 -08:00
Heikki Krogerus
6591b48228 usb: typec: Copy everything from struct typec_capability during registration
Copying everything from struct typec_capability to struct
typec_port during port registration. This will make sure
that under no circumstances the driver can change the values
in the struct typec_capability that the port uses.

Change-Id: I6e94623300837afe5eedfc5a7d7214d61c147cff
Signed-off-by: Heikki Krogerus <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Git-commit: ad772c39b2fbb24ff6104d73d14fc125d8f02711
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Signed-off-by: Jack Pham <[email protected]>
2019-11-25 10:07:04 -08:00
Matthias Maennich
99721e2f1a ANDROID: initial branch preparations for 5.4
Adjust defconfigs, build.config and initial ABI representation.

Change-Id: I3c859b8a05d35eb3bfd801a04e797ee769f874ee
Signed-off-by: Matthias Maennich <[email protected]>
2019-11-25 17:01:07 +00:00
Konstantin Dorfman
f25439f0d9 soc: qcom: spss_utils: fix emulation logic for lahaina rumi
This change updates bits for testing on emulation platform.
Also, the change fixes spss_utils probe dependency on subsys-pil-tz.

Change-Id: I6924f73b3b69d3d4d57c989a1f8fd2217a2553ef
Signed-off-by: Konstantin Dorfman <[email protected]>
2019-11-25 16:29:14 +02:00
Vipin Deep Kaur
6a89bcb957 i2c: i2c-msm-geni: Add support to make I2C driver GKI compliant
Add support in I2C driver to make it a DLKM.

Change-Id: Ibd82b554c88efa7add8e4dcfd0a9feb609f60fba
Signed-off-by: Vipin Deep Kaur <[email protected]>
2019-11-25 17:29:54 +05:30
Greg Kroah-Hartman
54e301676a Linux 5.4
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl3bIQceHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG8mUIAIjMARdI6Fc6Hrwo
 oVAFQU8BY/OB49NbKYCaXMi1AbMv0+f32jEmdcHj4AQa+Dq8owc1pOB2o+iTLrCq
 PWf6t1wjHtPVmkZ+lWGDFT74IBMCZ8M0dgN9rYBUbno09/B9cqN4ttjTrGjTgkGe
 yw4qTzeflZaMSIzvy+nZD8RM9bXsFJUncD/M759ElPj1p7Tdx29c05+e46pYOh7i
 A6QaSMZT2xKHDIDfU1rQhvyrzAX4cF1LtbSNu7GAG7Ajnn3jfxXqUzZdl5r5j04W
 ee+AXER4VXDlq+2fN7/jlGa4kxiZZDX/FqRnS6dsrb+2sNCKlnETI+6a9/dO0zsI
 wzBh36o=
 =0TWn
 -----END PGP SIGNATURE-----

Merge 5.4 into android-mainline

Linux 5.4

Here we go!

Signed-off-by: Greg Kroah-Hartman <[email protected]>
Change-Id: Iee409f3bbf65b93fa419e5b09818efb8e56569fd
2019-11-25 09:57:21 +01:00
Meng Wang
dc7bb91d61 ALSA: uapi: add new macro SNDRV_AUDIO_QGKI
Add new macro SNDRV_AUDIO_QGKI and userspace can
check if AUDIO_QGKI is enabled or not.

Change-Id: I8c0a8c350c41a5feb616a7ee9895d88f182c91dc
Signed-off-by: Meng Wang <[email protected]>
2019-11-24 23:40:21 -08:00
Dhanalakshmi Siddani
b90fab6f89 ALSA: compress: Add APTX format support in ALSA
Extend ALSA (Advanced Linux Sound Architecture) compress
to support APTX format.

CRs-Fixed: 1106128
Change-Id: I301c3fac1f0e267ca82f20a42437bae86a22413c
Signed-off-by: Dhanalakshmi Siddani <[email protected]>
2019-11-24 23:34:29 -08:00
Vidyakumar Athota
d8477c8409 uapi: sound : update audio decoder format headers
Audio decoder format headers are updated for compress
offload usecases.

Change-Id: Ia68d47ae01209a565c6752c5dc6103040acfe95d
Signed-off-by: Vidyakumar Athota <[email protected]>
2019-11-24 23:32:33 -08:00
Meng Wang
b3f1c1d899 SoC: soc-core: export function to find components
Drivers may need to use the ASoC core function to
find out whether a particular component is already
registered with ALSA core or not.
Export the function so that drivers can use it outside
of the file.

Change-Id: I13e4a053de085974b0b53c392a9453e46f1aa66d
Signed-off-by: Banajit Goswami <[email protected]>
Signed-off-by: Meng Wang <[email protected]>
2019-11-24 23:26:58 -08:00
Linus Torvalds
219d54332a Linux 5.4 2019-11-24 16:32:01 -08:00
Linus Torvalds
b8387f6f34 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull cramfs fix from Al Viro:
 "Regression fix, fallen through the cracks"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  cramfs: fix usage on non-MTD device
2019-11-24 12:36:39 -08:00