iommu: apple-dart: Link to consumers with blanket RPM_ACTIVE

Without the RPM_ACTIVE flag, runtime PM core only seems to consider
the link insofar as it prevents the DART from suspending in case of
consumers *considered active by runtime PM*. Other devices, like those
on which runtime PM has yet to be enabled, or which lack any runtime PM
support, are not considered in preventing the DART from suspending.

DART going through suspend/resume cycle with active consumers can break
the consumers' operation by the DART being reset in its resume path,
among other things.

Add RPM_ACTIVE flag to the link to have the consumer in the link prevent
the DART from being suspended, unless the consumer itself is runtime PM
suspended. This supersedes an earlier PCIe-only workaround.

(TODO: Does this mean devices without bound drivers will keep their
DARTs up indefinitely? This depends on the timing of the iommu
probe_device/release_device calls. Investigate.)

Signed-off-by: Martin Povišer <[email protected]>

Author: povik

drivers/iommu/apple-dart.c

@@ -818,24 +818,15 @@ static struct iommu_device *apple_dart_probe_device(struct device *dev)
 {
 	struct apple_dart_master_cfg *cfg = dev_iommu_priv_get(dev);
 	struct apple_dart_stream_map *stream_map;
-	u32 dl_flags = DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE_SUPPLIER;
 	int i;
 
 	if (!cfg)
 		return ERR_PTR(-ENODEV);
 
-	/*
-	 * Runtime PM behaves strangely with PCIe devices, pm_runtime_enabled()
-	 * returns true here although the devices do not support runtime PM.
-	 * This seems to confuse the PM core and DART is runtime suspended while
-	 * the device is in use. The dart_hw_reset() in the resume path ends up
-	 * breaking PCIe devices eventually.
-	 */
-	if (dev_is_pci(dev))
-		dl_flags |= DL_FLAG_RPM_ACTIVE;
-
 	for_each_stream_map(i, cfg, stream_map)
-		device_link_add(dev, stream_map->dart->dev, dl_flags);
+		device_link_add(dev, stream_map->dart->dev,
+			DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE_SUPPLIER |
+			DL_FLAG_RPM_ACTIVE);
 
 	return &cfg->stream_maps[0].dart->iommu;
 }