diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-03 22:56:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-03 22:56:00 +0300 |
| commit | 18ec9392929fd87df0aaa12ddb954483114a1073 (patch) | |
| tree | f183ab73f1cb1dc8cf4fac200ad5f51f7d1962bd /include/linux | |
| parent | e6508c7efa90a30999ca6f77e000186784e77929 (diff) | |
| parent | dfda204198848b47bdb98ab83b94dbb7c7692b55 (diff) | |
| download | linux-18ec9392929fd87df0aaa12ddb954483114a1073.tar.xz | |
Merge tag 'thunderbolt-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into char-misc-next
Mika writes:
thunderbolt: Changes for v5.4 merge window
The biggest change is the addition of Intel Ice Lake integrated
Thunderbolt support. There are also a couple of smaller changes like
converting the driver to use better device property interface and use
correct format string in service key attribute.
* tag 'thunderbolt-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
ACPI / property: Add two new Thunderbolt property GUIDs to the list
thunderbolt: Add support for Intel Ice Lake
thunderbolt: Expose active parts of NVM even if upgrade is not supported
thunderbolt: Hide switch attributes that are not set
thunderbolt: Do not fail adding switch if some port is not implemented
thunderbolt: Use 32-bit writes when writing ring producer/consumer
thunderbolt: Move NVM upgrade support flag to struct icm
thunderbolt: Correct path indices for PCIe tunnel
thunderbolt: Show key using %*pE not %*pEp
thunderbolt: Switch to use device_property_count_uXX()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/thunderbolt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h index 2d7e012db03f..ece782ef5466 100644 --- a/include/linux/thunderbolt.h +++ b/include/linux/thunderbolt.h @@ -429,6 +429,7 @@ static inline struct tb_xdomain *tb_service_parent(struct tb_service *svc) * @lock: Must be held during ring creation/destruction. Is acquired by * interrupt_work when dispatching interrupts to individual rings. * @pdev: Pointer to the PCI device + * @ops: NHI specific optional ops * @iobase: MMIO space of the NHI * @tx_rings: All Tx rings available on this host controller * @rx_rings: All Rx rings available on this host controller @@ -442,6 +443,7 @@ static inline struct tb_xdomain *tb_service_parent(struct tb_service *svc) struct tb_nhi { spinlock_t lock; struct pci_dev *pdev; + const struct tb_nhi_ops *ops; void __iomem *iobase; struct tb_ring **tx_rings; struct tb_ring **rx_rings; |