From patchwork Tue Oct 12 03:26:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 515629 Delivered-To: patches@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp5058818ime; Mon, 11 Oct 2021 20:26:39 -0700 (PDT) X-Received: by 2002:a17:902:e144:b0:13f:4b7:68c0 with SMTP id d4-20020a170902e14400b0013f04b768c0mr27609144pla.77.1634009199663; Mon, 11 Oct 2021 20:26:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634009199; cv=none; d=google.com; s=arc-20160816; b=mZwxTggH+C5vJ9zrqN9aSb9zDXuIY7XsxaoftddJWKVuky06WokDzR3XhzAf1PBWHA uJLJR5JW+tdu95PAOpdnRFOp+BsAlhMmkKlbhTQHc9dEZSKwF2xoCoY2w4d5rzmzop6L /9j8AbuGrDQll3isgU+pcLC8BracscMe0MuOQFZi5I5CvPVmDuTPZhLJI2k4t1zcimQz HKCUc8SKpYm+GsM3W0T4V8V65DoLwshlbiH6yP5TvVMAHNIQ1UwXIsg16RO+PzRQJdcR auVOj4+NMYZfyVUSp1Z6Bx0ggEofIUwALdGp6sQGTj03mYr3KnNNY092MO8QJSCToOib jiOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=dHHwrsGoY09KjGS2vtOrPmLf2afjNsa5iG32r2zDjY4=; b=rrLp44rZ9NigH8WgX/KGIWTaE3s7J5wPPJ+ftY7JEqDEINZEthxJLBrYWc8uH4FzRo fXDXOmBnWOtGgb5HM58ra5rZEWo8z1ZFIWmri/VFtkC+aJsvxLOUWUYPrramhZAbgBj/ 3F9olmLBn60Y2oK19iQ05bHJQfT7MbHZ0Zxht4qzR9B6KNlgn9R0efEZ36s+bkuHx2vh Bw2EEq7heB2RWYAUXB+AeThgxKEJhlFftPGmOmySP69FNXLO4tc5Efwmwzv65pQkAfiK qWVIZ5u1eEMPzjbEEyq8RMD4xrSoz5OS9b/1dbnO53ftSpSnyRgp9mW4Ts7at/Mk5lxo QJug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvbtsrsH; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id o123sor2280172pfb.56.2021.10.11.20.26.39 for (Google Transport Security); Mon, 11 Oct 2021 20:26:39 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvbtsrsH; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=Jtfz0ei/jYldBetnU4ptcrkKm/qNqx9iw5NDNpzxOdT+QFEK0cl0s2T0KMFJjncyDU 6/vsebpAkSJM9oUSvyDFLDLziwBNhxjV8fqv3S5ZgYdioUvLJqguPpaHKHY43aLQQ8ho +38cCz0KFNB7vX8LR5Amh71g95yoIjlXxsGBY4qCioztjG2u+Zdk7n3nwfRpWRtVZlVB rpPaLEHKMx1bAFA74I0uUD/wEgJO2CXP+8bSQfbCQ9Nmz8p5JnbjytT20GS21WWTl496 +KQvXbnz+RA+4P1gEbhRsvm+7iklkrEiHOVM4B/s2NJuAYMdmtxN7Q8K5CFPoBiGqPbE 1EcA== X-Gm-Message-State: AOAM532bYHpJULpL1OWCi4MAP9ujUTJoJSqV46YKPv81IrlEVUlvikXF uYK9PuOjpnkcLDszxjwxTgIrzQD4 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) Return-Path: 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 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(+) -- 2.25.1 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