Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
d90942e
sh: boards: Fix Sound Simple-Card struct name
morimoto Sep 28, 2023
3d0fc41
powerpc/iommu: Do not do platform domain attach atctions after probe
jgunthorpe Oct 5, 2023
6ea90dc
Documentations: fix net_cachelines documentation build warning
xli98 Dec 4, 2023
19bf3c7
mei: fix vsc dependency
arndb Dec 14, 2023
ec1d13c
platform/x86/intel/pmc: Fix in pmc_core_ssram_get_pmc()
rjingar Dec 16, 2023
17a9f1e
ALSA: hda: cs35l41: Only add SPI CS GPIO if SPI is enabled in kernel
Dec 19, 2023
4665c64
ASoC: SOF: core: Skip firmware test for custom loaders
cristicc Dec 19, 2023
27deca4
fs: remove NTFS classic from docum. index
rddunlap Jan 24, 2024
493da41
drm/tegra: Do not assume that a NULL domain means no DMA IOMMU
jgunthorpe Jan 30, 2024
920e9f6
powerpc: iommu: Bring back table group release_ownership() call
ShivaprasadGBhat Jan 26, 2024
735812a
ntfs3: serve as alias for the legacy ntfs driver
brauner Mar 25, 2024
1b254fc
powerpc: Limit ARCH_HAS_KERNEL_FPU_SUPPORT to PPC64
SiFiveHolland May 29, 2024
fbafeeb
leds: class: Revert: "If no default trigger is given, make hw_control…
jwrdegoede Jun 7, 2024
1931c34
iommufd/iova_bitmap: Check iova_bitmap_done() after set ahead
jpemartins Jun 27, 2024
2d4c3bc
selftests/fpu: add missing MODULE_DESCRIPTION() macro
jeff-t-johnson Jun 22, 2024
634145d
Documentation: qat: fix auto_reset attribute details
dmuszyns Jun 25, 2024
4c8ff1f
sched/deadline: Comment sched_dl_entity::dl_server variable
May 27, 2024
e0fee4a
sched/core: Add clearing of ->dl_server in put_prev_task_balance()
joelagnel May 27, 2024
24e37ad
sched/core: Clear prev->dl_server in CFS pick fast path
May 27, 2024
e1b7b15
iommufd/device: Fix hwpt at err_unresv in iommufd_device_do_replace()
nicolinc Jul 18, 2024
9d62a84
platform/x86: intel-vbtn: Protect ACPI notify handler against recursion
jwrdegoede Jul 29, 2024
6cfe67a
crypto: qat - fix recovery flow for VFs
michalwitwicki Jul 17, 2024
d8c3e75
crypto: qat - ensure correct order in VF restarting handler
michalwitwicki Jul 17, 2024
1ea277a
crypto: iaa - Fix potential use after free bug
Jul 24, 2024
95d45d9
iommufd/selftest: Fix buffer read overrrun in the dirty test
jgunthorpe Aug 22, 2024
eaf4bcd
sched/deadline: Fix schedstats vs deadline servers
HuangShijie2024 Aug 29, 2024
81d26c1
crypto: qat/qat_420xx - fix off by one in uof_get_name()
Sep 28, 2024
f641aac
platform/x86/intel/pmc: Fix pmc_core_iounmap to call iounmap for vali…
vamsikrishna-brahmajosyula Oct 18, 2024
ad16849
crypto: qat - Fix missing destroy_workqueue in adf_init_aer()
Oct 29, 2024
be25fba
accel/ivpu: Fix general protection fault in ivpu_bo_list()
jlawryno Dec 10, 2024
78b796c
accel/ivpu: Fix WARN in ivpu_ipc_send_receive_internal()
jlawryno Dec 10, 2024
cb8303d
crypto: iaa - Fix IAA disabling that occurs when sync_mode is set to …
kparasur Dec 21, 2024
fcb3473
platform/x86: intel/pmc: Fix ioremap() of bad address
debox1 Jan 6, 2025
d1b0748
wifi: mt76: mt7996: fix overflows seen when writing limit attributes
Dec 2, 2024
b9d346d
wifi: mt76: mt7996: fix definition of tx descriptor
Jan 14, 2025
c6b3607
mei: vsc: Use "wakeuphostint" when getting the host wakeup GPIO
jwrdegoede Feb 14, 2025
0e080ee
crypto: iaa - Test the correct request flag
herbertx Feb 27, 2025
9001d8e
mm/hugetlb_vmemmap: fix hugetlb_vmemmap_restore_folios definition
Feb 28, 2025
921758c
gpu: host1x: Do not assume that a NULL domain means no DMA IOMMU
jgunthorpe Feb 4, 2025
5002acb
crypto: qat - set parity error mask for qat_420xx
balagapx Mar 14, 2025
3cee1f2
crypto: qat - remove access to parity register for QAT GEN4
balagapx Mar 14, 2025
b466a48
objtool/loongarch: Add unwind hints in prepare_frametrace()
jpoimboe Apr 1, 2025
84c5473
iommu/exynos: Fix suspend/resume with IDENTITY domain
mszyprow Apr 1, 2025
36f338c
perf/x86/intel: Fix segfault with PEBS-via-PT with sample_freq
ahunter6 May 8, 2025
b27b2d8
wifi: mt76: mt7996: Fix null-ptr-deref in mt7996_mmio_wed_init()
Apr 7, 2025
8f631bf
crypto: qat - fix state restore for banks with exceptions
s-pankratov Jun 4, 2025
623f1de
mei: vsc: Destroy mutex after freeing the IRQ
Jun 23, 2025
6e6d0ac
mei: vsc: Event notifier fixes
Jun 23, 2025
3f4c1f3
mei: vsc: Unset the event callback on remove and probe errors
Jun 23, 2025
ed93254
crypto: qat - disable ZUC-256 capability for QAT GEN5
balagapx Jun 30, 2025
62095c3
platform/x86/intel-uncore-freq: Check write blocked for ELC
spandruvada Jul 27, 2025
8eda8cf
sched/deadline: Fix RT task potential starvation when expiry time passed
Jun 15, 2025
191f1d5
sched/deadline: Don't count nr_running for dl_server proxy tasks
Jun 27, 2025
e0428e1
wifi: mt76: mt7996: Fix RX packets configuration for primary WED device
LorenzoBianconi Sep 9, 2025
855556f
wifi: mt76: mt7996: Convert mt7996_wed_rro_addr to LE
LorenzoBianconi Sep 9, 2025
839716f
iommu/vt-d: Disallow dirty tracking if incoherent page walk
LuBaolu Sep 26, 2025
654f12e
ASoC: SOF: ipc4-topology: Account for different ChainDMA host buffer …
ujfalusi Oct 2, 2025
b19e2b0
ASoC: SOF: Intel: hda-pcm: Place the constraint on period time instea…
ujfalusi Oct 2, 2025
98f8a23
ASoC: SOF: Intel: Read the LLP via the associated Link DMA channel
ujfalusi Oct 2, 2025
e821bf0
crypto: iaa - Fix incorrect return value in save_iaa_wq()
GoodLuck612 Nov 9, 2025
60a51c3
soc/tegra: fuse: Do not register SoC device on ACPI boot
Oct 8, 2025
f89411c
drm/plane: Fix IS_ERR() vs NULL check in drm_plane_create_hotspot_pro…
Dec 3, 2025
9db8916
crypto: iaa - Fix out-of-bounds index in find_empty_iaa_compression_mode
toblux Nov 27, 2025
dd808b2
crypto: qat - fix duplicate restarting msg during AER error
hbhilwar Dec 17, 2025
606a73e
platform/x86: ISST: Add missing write block check
spandruvada Jan 7, 2026
bd2ed37
drm/hisilicon/hibmc: Adding reset colorbar cfg in dp init.
mark1188-ui Dec 10, 2025
07223ca
perf/x86/intel/uncore: Add per-scheduler IMC CAS count events
ZideChen0 Feb 10, 2026
6dc14a1
udp: Unhash auto-bound connected sk from 4-tuple hash table when disc…
q2ven Feb 27, 2026
b636e6c
dmaengine: idxd: fix possible wrong descriptor completion in llist_ab…
lituo1996 Jan 6, 2026
386be30
perf/x86/intel: Add missing branch counters constraint apply
Feb 28, 2026
1815267
platform/x86/intel-uncore-freq: Handle autonomous UFS status bit
spandruvada Mar 25, 2026
3ee54bd
perf/x86: Fix potential bad container_of in intel_pmu_hw_config
captain5050 Mar 12, 2026
07b62b5
crypto: qat - fix type mismatch in RAS sysfs show functions
gcabiddu Mar 24, 2026
b79a5ac
hwmon: (yogafan) various markup improvements
rddunlap Apr 7, 2026
6048428
sched/fair: Clear rel_deadline when initializing forked entities
Apr 24, 2026
b5b6aa7
wifi: rtw89: fix wrong pci_get_drvdata type in AER handlers
chrislongros Mar 29, 2026
6343433
wifi: rtw89: add bounds check on firmware mac_id in link lookup
Apr 21, 2026
47edcda
crypto: qat - fix heartbeat error injection
dmuszyns Apr 7, 2026
5440e0f
perf/x86/intel: Improve validation and configuration of ACR masks
Apr 30, 2026
c6f37b8
ALSA: hda: cs35l41: fix building without CONFIG_SPI
arndb Jan 3, 2024
655b7f4
powerpc/iommu: Fix the missing iommu_group_put() during platform doma…
ShivaprasadGBhat Feb 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Documentation/ABI/testing/sysfs-driver-qat
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ Description:
This attribute is only available for qat_4xxx devices.

What: /sys/bus/pci/devices/<BDF>/qat/auto_reset
Date: March 2024
KernelVersion: 6.8
Date: May 2024
KernelVersion: 6.9
Contact: qat-linux@intel.com
Description: (RW) Reports the current state of the autoreset feature
for a QAT device
Expand Down
9 changes: 8 additions & 1 deletion Documentation/driver-api/crypto/iaa/iaa-crypto.rst
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ The available attributes are:
echo async_irq > /sys/bus/dsa/drivers/crypto/sync_mode

Async mode without interrupts (caller must poll) can be enabled by
writing 'async' to it::
writing 'async' to it (please see Caveat)::

echo async > /sys/bus/dsa/drivers/crypto/sync_mode

Expand All @@ -283,6 +283,13 @@ The available attributes are:

The default mode is 'sync'.

Caveat: since the only mechanism that iaa_crypto currently implements
for async polling without interrupts is via the 'sync' mode as
described earlier, writing 'async' to
'/sys/bus/dsa/drivers/crypto/sync_mode' will internally enable the
'sync' mode. This is to ensure correct iaa_crypto behavior until true
async polling without interrupts is enabled in iaa_crypto.

.. _iaa_default_config:

IAA Default Configuration
Expand Down
1 change: 0 additions & 1 deletion Documentation/filesystems/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ Documentation for filesystem implementations.
isofs
nilfs2
nfs/index
ntfs
ntfs3
ocfs2
ocfs2-online-filecheck
Expand Down
55 changes: 31 additions & 24 deletions Documentation/hwmon/yogafan.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Kernel driver yogafan
Supported chips:

* Lenovo Yoga, Legion, IdeaPad, Slim, Flex, and LOQ Embedded Controllers
Prefix: 'yogafan'
Addresses: ACPI handle (See Database Below)
* Prefix: 'yogafan'
* Addresses: ACPI handle (See Database Below)

Author: Sergio Melas <sergiomelas@gmail.com>

Expand All @@ -31,19 +31,21 @@ deterministically via a DMI Product Family quirk table during the probe phase,
eliminating the need for runtime heuristics.

1. 8-bit EC Architecture (Multiplier: 100)

- **Families:** Yoga, IdeaPad, Slim, Flex.
- **Technical Detail:** These models allocate a single 8-bit register for
tachometer data. Since 8-bit fields are limited to a value of 255, the
BIOS stores fan speed in units of 100 RPM (e.g., 42 = 4200 RPM).
tachometer data. Since 8-bit fields are limited to a value of 255, the
BIOS stores fan speed in units of 100 RPM (e.g., 42 = 4200 RPM).

2. 16-bit EC Architecture (Multiplier: 1)

- **Families:** Legion, LOQ.
- **Technical Detail:** High-performance gaming models require greater
precision for fans exceeding 6000 RPM. These use a 16-bit word (2 bytes)
storing the raw RPM value directly.
precision for fans exceeding 6000 RPM. These use a 16-bit word (2 bytes)
storing the raw RPM value directly.

Filter Details:
---------------
Filter Details
--------------

The RLLag filter is a passive discrete-time first-order lag model that ensures:
- **Smoothing:** Low-resolution step increments are smoothed into 1-RPM increments.
Expand All @@ -66,8 +68,11 @@ Usage
-----

The driver exposes standard hwmon sysfs attributes:

=============== ============================
Attribute Description
fanX_input Filtered fan speed in RPM.
=============== ============================


Note: If the hardware reports 0 RPM, the filter is bypassed and 0 is reported
Expand All @@ -78,22 +83,24 @@ immediately to ensure the user knows the fan has stopped.
LENOVO FAN CONTROLLER: MASTER REFERENCE DATABASE (2026)
====================================================================================================

MODEL (DMI PN) | FAMILY / SERIES | EC OFFSET | FULL ACPI OBJECT PATH | WIDTH | MULTiplier
----------------------------------------------------------------------------------------------------
82N7 | Yoga 14cACN | 0x06 | \_SB.PCI0.LPC0.EC0.FANS | 8-bit | 100
80V2 / 81C3 | Yoga 710/720 | 0x06 | \_SB.PCI0.LPC0.EC0.FAN0 | 8-bit | 100
83E2 / 83DN | Yoga Pro 7/9 | 0xFE | \_SB.PCI0.LPC0.EC0.FANS | 8-bit | 100
82A2 / 82A3 | Yoga Slim 7 | 0x06 | \_SB.PCI0.LPC0.EC0.FANS | 8-bit | 100
81YM / 82FG | IdeaPad 5 | 0x06 | \_SB.PCI0.LPC0.EC0.FAN0 | 8-bit | 100
82JW / 82JU | Legion 5 (AMD) | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FANS (Fan1) | 16-bit | 1
82JW / 82JU | Legion 5 (AMD) | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FA2S (Fan2) | 16-bit | 1
82WQ | Legion 7i (Int) | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FANS (Fan1) | 16-bit | 1
82WQ | Legion 7i (Int) | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FA2S (Fan2) | 16-bit | 1
82XV / 83DV | LOQ 15/16 | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FANS /FA2S | 16-bit | 1
83AK | ThinkBook G6 | 0x06 | \_SB.PCI0.LPC0.EC0.FAN0 | 8-bit | 100
81X1 | Flex 5 | 0x06 | \_SB.PCI0.LPC0.EC0.FAN0 | 8-bit | 100
*Legacy* | Pre-2020 Models | 0x06 | \_SB.PCI0.LPC.EC.FAN0 | 8-bit | 100
----------------------------------------------------------------------------------------------------
::

MODEL (DMI PN) | FAMILY / SERIES | EC OFFSET | FULL ACPI OBJECT PATH | WIDTH | MULTiplier
----------------------------------------------------------------------------------------------------
82N7 | Yoga 14cACN | 0x06 | \_SB.PCI0.LPC0.EC0.FANS | 8-bit | 100
80V2 / 81C3 | Yoga 710/720 | 0x06 | \_SB.PCI0.LPC0.EC0.FAN0 | 8-bit | 100
83E2 / 83DN | Yoga Pro 7/9 | 0xFE | \_SB.PCI0.LPC0.EC0.FANS | 8-bit | 100
82A2 / 82A3 | Yoga Slim 7 | 0x06 | \_SB.PCI0.LPC0.EC0.FANS | 8-bit | 100
81YM / 82FG | IdeaPad 5 | 0x06 | \_SB.PCI0.LPC0.EC0.FAN0 | 8-bit | 100
82JW / 82JU | Legion 5 (AMD) | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FANS (Fan1) | 16-bit | 1
82JW / 82JU | Legion 5 (AMD) | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FA2S (Fan2) | 16-bit | 1
82WQ | Legion 7i (Int) | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FANS (Fan1) | 16-bit | 1
82WQ | Legion 7i (Int) | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FA2S (Fan2) | 16-bit | 1
82XV / 83DV | LOQ 15/16 | 0xFE/0xFF | \_SB.PCI0.LPC0.EC0.FANS /FA2S | 16-bit | 1
83AK | ThinkBook G6 | 0x06 | \_SB.PCI0.LPC0.EC0.FAN0 | 8-bit | 100
81X1 | Flex 5 | 0x06 | \_SB.PCI0.LPC0.EC0.FAN0 | 8-bit | 100
*Legacy* | Pre-2020 Models | 0x06 | \_SB.PCI0.LPC.EC.FAN0 | 8-bit | 100
----------------------------------------------------------------------------------------------------

METHODOLOGY & IDENTIFICATION:

Expand Down
1 change: 1 addition & 0 deletions Documentation/networking/net_cachelines/index.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.. SPDX-License-Identifier: GPL-2.0
.. Copyright (C) 2023 Google LLC

===================================
Common Networking Struct Cachelines
===================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.. SPDX-License-Identifier: GPL-2.0
.. Copyright (C) 2023 Google LLC

=====================================================
inet_connection_sock struct fast path usage breakdown
=====================================================
Expand Down
1 change: 1 addition & 0 deletions Documentation/networking/net_cachelines/inet_sock.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.. SPDX-License-Identifier: GPL-2.0
.. Copyright (C) 2023 Google LLC

=====================================================
inet_connection_sock struct fast path usage breakdown
=====================================================
Expand Down
1 change: 1 addition & 0 deletions Documentation/networking/net_cachelines/net_device.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.. SPDX-License-Identifier: GPL-2.0
.. Copyright (C) 2023 Google LLC

===========================================
net_device struct fast path usage breakdown
===========================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.. SPDX-License-Identifier: GPL-2.0
.. Copyright (C) 2023 Google LLC

===========================================
netns_ipv4 struct fast path usage breakdown
===========================================
Expand Down
1 change: 1 addition & 0 deletions Documentation/networking/net_cachelines/snmp.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.. SPDX-License-Identifier: GPL-2.0
.. Copyright (C) 2023 Google LLC

===========================================
netns_ipv4 enum fast path usage breakdown
===========================================
Expand Down
1 change: 1 addition & 0 deletions Documentation/networking/net_cachelines/tcp_sock.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.. SPDX-License-Identifier: GPL-2.0
.. Copyright (C) 2023 Google LLC

=========================================
tcp_sock struct fast path usage breakdown
=========================================
Expand Down
3 changes: 3 additions & 0 deletions arch/loongarch/include/asm/stacktrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <asm/asm.h>
#include <asm/ptrace.h>
#include <asm/loongarch.h>
#include <asm/unwind_hints.h>
#include <linux/stringify.h>

enum stack_type {
Expand Down Expand Up @@ -43,6 +44,7 @@ int get_stack_info(unsigned long stack, struct task_struct *task, struct stack_i
static __always_inline void prepare_frametrace(struct pt_regs *regs)
{
__asm__ __volatile__(
UNWIND_HINT_SAVE
/* Save $ra */
STORE_ONE_REG(1)
/* Use $ra to save PC */
Expand Down Expand Up @@ -80,6 +82,7 @@ static __always_inline void prepare_frametrace(struct pt_regs *regs)
STORE_ONE_REG(29)
STORE_ONE_REG(30)
STORE_ONE_REG(31)
UNWIND_HINT_RESTORE
: "=m" (regs->csr_era)
: "r" (regs->regs)
: "memory");
Expand Down
10 changes: 9 additions & 1 deletion arch/loongarch/include/asm/unwind_hints.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
UNWIND_HINT sp_reg=ORC_REG_SP type=UNWIND_HINT_TYPE_CALL
.endm

#endif /* __ASSEMBLY__ */
#else /* !__ASSEMBLY__ */

#define UNWIND_HINT_SAVE \
UNWIND_HINT(UNWIND_HINT_TYPE_SAVE, 0, 0, 0)

#define UNWIND_HINT_RESTORE \
UNWIND_HINT(UNWIND_HINT_TYPE_RESTORE, 0, 0, 0)

#endif /* !__ASSEMBLY__ */

#endif /* _ASM_LOONGARCH_UNWIND_HINTS_H */
2 changes: 1 addition & 1 deletion arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ config PPC
select ARCH_HAS_GCOV_PROFILE_ALL
select ARCH_HAS_HUGEPD if HUGETLB_PAGE
select ARCH_HAS_KCOV
select ARCH_HAS_KERNEL_FPU_SUPPORT if PPC_FPU
select ARCH_HAS_KERNEL_FPU_SUPPORT if PPC64 && PPC_FPU
select ARCH_HAS_MEMBARRIER_CALLBACKS
select ARCH_HAS_MEMBARRIER_SYNC_CORE
select ARCH_HAS_MEMREMAP_COMPAT_ALIGN if PPC_64S_HASH_MMU
Expand Down
47 changes: 37 additions & 10 deletions arch/powerpc/kernel/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1280,21 +1280,29 @@ struct iommu_table_group_ops spapr_tce_table_group_ops = {
/*
* A simple iommu_ops to allow less cruft in generic VFIO code.
*/
static int spapr_tce_platform_iommu_attach_dev(struct iommu_domain *dom,
struct device *dev)
static int
spapr_tce_platform_iommu_attach_dev(struct iommu_domain *platform_domain,
struct device *dev)
{
struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
struct iommu_group *grp = iommu_group_get(dev);
struct iommu_table_group *table_group;
int ret = -EINVAL;

if (!grp)
return -ENODEV;
/* At first attach the ownership is already set */
if (!domain) {
iommu_group_put(grp);
return 0;
}

table_group = iommu_group_get_iommudata(grp);
ret = table_group->ops->take_ownership(table_group);
/*
* The domain being set to PLATFORM from earlier
* BLOCKED. The table_group ownership has to be released.
*/
table_group->ops->release_ownership(table_group);
iommu_group_put(grp);

return ret;
return 0;
}

static const struct iommu_domain_ops spapr_tce_platform_domain_ops = {
Expand All @@ -1306,13 +1314,32 @@ static struct iommu_domain spapr_tce_platform_domain = {
.ops = &spapr_tce_platform_domain_ops,
};

static struct iommu_domain spapr_tce_blocked_domain = {
.type = IOMMU_DOMAIN_BLOCKED,
static int
spapr_tce_blocked_iommu_attach_dev(struct iommu_domain *platform_domain,
struct device *dev)
{
struct iommu_group *grp = iommu_group_get(dev);
struct iommu_table_group *table_group;
int ret = -EINVAL;

/*
* FIXME: SPAPR mixes blocked and platform behaviors, the blocked domain
* also sets the dma_api ops
*/
.ops = &spapr_tce_platform_domain_ops,
table_group = iommu_group_get_iommudata(grp);
ret = table_group->ops->take_ownership(table_group);
iommu_group_put(grp);

return ret;
}

static const struct iommu_domain_ops spapr_tce_blocked_domain_ops = {
.attach_dev = spapr_tce_blocked_iommu_attach_dev,
};

static struct iommu_domain spapr_tce_blocked_domain = {
.type = IOMMU_DOMAIN_BLOCKED,
.ops = &spapr_tce_blocked_domain_ops,
};

static bool spapr_tce_iommu_capable(struct device *dev, enum iommu_cap cap)
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/boards/mach-ecovec24/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ static struct platform_device fsi_device = {
.resource = fsi_resources,
};

static struct asoc_simple_card_info fsi_da7210_info = {
static struct simple_util_info fsi_da7210_info = {
.name = "DA7210",
.card = "FSIB-DA7210",
.codec = "da7210.0-001a",
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/boards/mach-se/7724/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ static struct platform_device fsi_device = {
.resource = fsi_resources,
};

static struct asoc_simple_card_info fsi_ak4642_info = {
static struct simple_util_info fsi_ak4642_info = {
.name = "AK4642",
.card = "FSIA-AK4642",
.codec = "ak4642-codec.0-0012",
Expand Down
Loading