From e62200aeef3d2bf14395810c92a54f494ba6774c Mon Sep 17 00:00:00 2001 From: patrick Date: Thu, 11 Aug 2022 14:49:42 +0000 Subject: [PATCH] Don't yet configure smmu(4) on Qualcomm SoCs as used on the Lenovo x13s as it is still not ready for runtime use and probably needs further quirks. Discussed with deraadt@ --- sys/arch/arm64/dev/smmu_acpi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/arch/arm64/dev/smmu_acpi.c b/sys/arch/arm64/dev/smmu_acpi.c index 97b4804d806..3aff7a88cd8 100644 --- a/sys/arch/arm64/dev/smmu_acpi.c +++ b/sys/arch/arm64/dev/smmu_acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smmu_acpi.c,v 1.5 2022/08/10 17:02:37 patrick Exp $ */ +/* $OpenBSD: smmu_acpi.c,v 1.6 2022/08/11 14:49:42 patrick Exp $ */ /* * Copyright (c) 2021 Patrick Wildt * @@ -102,6 +102,12 @@ smmu_acpi_attach(struct device *parent, struct device *self, void *aux) /* Check for QCOM devices to enable quirk. */ aml_find_node(acpi_softc->sc_root, "_HID", smmu_acpi_foundqcom, sc); + /* FIXME: Don't configure on QCOM until its runtime use is fixed. */ + if (sc->sc_is_qcom) { + printf(": disabled\n"); + return; + } + if (smmu_attach(sc) != 0) return; -- 2.20.1