From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 122BBC433EF for ; Tue, 12 Oct 2021 03:28:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C88AC60EE9 for ; Tue, 12 Oct 2021 03:28:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C88AC60EE9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=HIiHcD9ghFXdGyrVK06iTc0pwZ1jMp8KbojHfvpzefw=; b=LvpWGt8PKPgRQK CZeGgvMye69Ioy9xftEZ6GChZddnXhvOqfgD5c5q54O7DygM2xycLtm2V22s0vOlxLN362Ot+66x3 BLwHiPFifgc3Tnin16HORpXc7kDgGoBn3wr5y1TAI4kKRpCMvfPzjbD6Oqz3VFYyDsI0q1BsUXDaV E854iQmPdGIn6VlfkjQm6ZE/aG7OPTqJizvAi9f/DuB9XKDTOQpdDG9zU40TlvCVlX22TrgpZUJdQ Gp8EpD2MAVkX93Nw31PiBFZhUmAslr6s4gcwBxP1oQ3bddSoQaorCjylr1+eaBS8MywJMoSNsqLWE 791T1uRRqKUZLrGz7fMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ma8R9-00BKje-U9; Tue, 12 Oct 2021 03:26:44 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ma8R6-00BKik-2B for linux-arm-kernel@lists.infradead.org; Tue, 12 Oct 2021 03:26:41 +0000 Received: by mail-pg1-x52a.google.com with SMTP id r2so12569721pgl.10 for ; Mon, 11 Oct 2021 20:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dHHwrsGoY09KjGS2vtOrPmLf2afjNsa5iG32r2zDjY4=; b=QvbtsrsHAUIWklgtzUpkQ2LOQO3HnlOIYDGNk6ZShxTSz5fMzrMmaU8KAAtVKMJuf+ /UZzvHspUYE3eHPRRdlhVHUeQe4qg1Ad8Y2lZIXa2AG7GT5JNSsc/MDwhxxAdKtt9ny1 lBfCXqSQazloAumpfww2OaJSIcmuSdLm83icTdJryiXsjFx38rCHHKIsug8FarSKXIHR kp6+BsOBO4HwX7KB8MK8kHgl0L5vx4DZaLref6IuToSqrbuCGYIbZWyRp3HHZaGfcpr/ uHMAuZYrqYWWihAIg1LTfprrAJiXXRQtice0l2QqGOWZgbagjW/T/F9BFh1X/hy5mDd/ bp0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dHHwrsGoY09KjGS2vtOrPmLf2afjNsa5iG32r2zDjY4=; b=lkPAm8X5bZ90zDMFeoH9NEx4A2c0DHEJ20kQFpkFR/A3LYtH7Z9zCKCsnVwDDlPyIt ByTJ441DcU7wCY1SQd5dLkBp2/8pkV57yItIWNSxjofVVV0KOw4HPNlLLVT/NB4QKlWB IjQs14r5m73vyyqWT2u3BnTY4gK4IEdI2/bzbVW0HFYkPj1WFhXCURPN1YgQQm/inRyG AZvt14rriTVrUSWE+qqT3ME52HDROyOdZLD08y7zqV9mZqAeFBRs/GAKAP6ohxaSnOmJ tibfRdazjjs3XllPkdxXm6BLaOSO6ITNXCKH+nVm1KpMwi9piju+1dtaKwovlfHEoTjg kkVw== X-Gm-Message-State: AOAM533cXNkLEdZjpOlcxHSx8vHmjCKPDUZpp+Dgufy15EH51zn+dTOY lgU/PLyWjMSPmaqNHPOiQDP3TQ== X-Google-Smtp-Source: ABdhPJzyHHdi3XrbSyUElVJVoExTAE6S8BIyM8etv1e80ONk1GLiz7rx5KGsLdo4S9RUaDmgJBMdyg== X-Received: by 2002:a05:6a00:a10:b0:412:448c:89c7 with SMTP id p16-20020a056a000a1000b00412448c89c7mr29286065pfh.83.1634009199232; Mon, 11 Oct 2021 20:26:39 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id u3sm9241071pfl.155.2021.10.11.20.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Oct 2021 20:26:38 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Arnd Bergmann , Bjorn Andersson , Amit Pundir , Caleb Connolly , Kalle Valo , linux-arm-kernel , linux-arm-msm Subject: [RFC][PATCH] iommu: Kconfig: Fix missing config option for CONFIG_ARM_SMMU_QCOM Date: Tue, 12 Oct 2021 03:26:33 +0000 Message-Id: <20211012032633.4169364-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211011_202640_136263_2012EF1B X-CRM114-Status: GOOD ( 13.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In commit 424953cf3c665 ("qcom_scm: hide Kconfig symbol"), some logic was added to make the code depend on CONFIG_ARM_SMMU_QCOM, however no such option exist. This caused regressions on db845c (and I suspect other qcom platforms), but can be easily fixed up by adding a new option to re-enable the newly conditionalized code. I set it to default to ARCH_QCOM, so folks don't have to discover this new option to keep things booting, but if folks would rather, I'm ok to drop that line. Cc: Arnd Bergmann Cc: Bjorn Andersson Cc: Amit Pundir Cc: Caleb Connolly Cc: Kalle Valo Cc: linux-arm-kernel Cc: linux-arm-msm Fixes: 424953cf3c665 ("qcom_scm: hide Kconfig symbol") Signed-off-by: John Stultz --- drivers/iommu/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index c5c71b7ab7e83..e674796b1174d 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -380,6 +380,16 @@ config ARM_SMMU_V3_SVA Say Y here if your system supports SVA extensions such as PCIe PASID and PRI. +config ARM_SMMU_QCOM + bool "QCOM Specific ARM SMMU implementation support" + depends on ARM_SMMU + default ARCH_QCOM + help + Support for the QCOM implementation of the ARM System MMU architecture. + + Say Y here if your SoC includes an QCOM IOMMU device implementing + the ARM SMMU architecture. + config S390_IOMMU def_bool y if S390 && PCI depends on S390 && PCI -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel