From patchwork Thu Dec 7 12:54:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 751258 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Zeoq22n+" Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 380A810C4 for ; Thu, 7 Dec 2023 04:55:04 -0800 (PST) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2c9ea37ac87so9423271fa.3 for ; Thu, 07 Dec 2023 04:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701953702; x=1702558502; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dRRcxjW3hYUF4pvL7cDymuG16d1D2vZw+YzDn6n0y/M=; b=Zeoq22n+b3z4auVgMXGzve+VqM8ikqeT/CtZtWXmiBzXHjVknfMYtTDJ0Cxo9N2TZ7 t7WwqrV7LDx2r/DUVsNu+p0U8OUI2yuF0uJpn6t1zzZTJPMiartQJ4LWqbf5kJ2L5FMQ O1VNbhbf/s9cTS8zIFk1Eb40LuMMSZVXUuvBsR6ehfuaO7/LUkC5TT2s7/HS6G4Kehdu lwpk4aHvpG4JR+cWEJUmerCtLd2ZrmIusFjeanTMWU2J+PnjP209IG5EETHO64yu7VF7 jARHmM28J75JS6h794bTSwnl4x2xzCIaUivFttKf2NNXP9e2tLYYNzpK5x3BTZ7EX2lo PCcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701953702; x=1702558502; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dRRcxjW3hYUF4pvL7cDymuG16d1D2vZw+YzDn6n0y/M=; b=QMD8Tv3qqpxZXdzZdEbfXqmRaad4toMv4SFOYkE9SJYLRcYOYtzakHccvHTtT4hX4C 8+8cnLOggBO/9cErA9r1sAVGIwJGQ4wajcZQrHNFqcI+EIaYvPPHv6k6lATL/I0yByCt ciwXZYldfe5IcBAH4/r338G+0RC/91NBrQdstucZiVXN7ykVrPOvXfDC43rsiQxamKs0 EYyEVvQ0f5Rin/CgCIXLvqMV0upSDdzAlU0yE5VKYXQrvEUW745u1KlQdArYkZUC2M4S 2TKeYZaYgWfVmFvCRcn4OxmOFikbbG6ECzEcOYUzaBm+nugvbHPqd+U+isJzVHo+G1Ij RrGw== X-Gm-Message-State: AOJu0Yw1WbndRKt40jMJVr2zUJuUspDLzsWf2XqM39D8PwZnTuEn94Xz SHUQ126R6JAgGDW+AMo8FWDgmg== X-Google-Smtp-Source: AGHT+IFZ7sHhE81Ocy92+1ArPxojSOEYpfmENzAM2vPFw3RZ+Xcz+EuXmeZtcNaYJEK+StIVY5K/Rg== X-Received: by 2002:a05:6512:29b:b0:50b:f8d8:b176 with SMTP id j27-20020a056512029b00b0050bf8d8b176mr1354154lfp.124.1701953702303; Thu, 07 Dec 2023 04:55:02 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id cf30-20020a056512281e00b0050bfc6dbb8asm163659lfb.302.2023.12.07.04.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:55:02 -0800 (PST) From: Dmitry Baryshkov To: Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Rob Clark Cc: Vinod Koul , Sai Prakash Ranjan , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 1/3] iommu/msm-iommu: don't limit the driver too much Date: Thu, 7 Dec 2023 15:54:58 +0300 Message-Id: <20231207125500.3322229-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> References: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In preparation of dropping most of ARCH_QCOM subtypes, stop limiting the driver just to those machines. Allow it to be built for any 32-bit Qualcomm platform (ARCH_QCOM). Signed-off-by: Dmitry Baryshkov Acked-by: Joerg Roedel --- drivers/iommu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 7673bb82945b..fd67f586f010 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -178,7 +178,7 @@ config FSL_PAMU config MSM_IOMMU bool "MSM IOMMU Support" depends on ARM - depends on ARCH_MSM8X60 || ARCH_MSM8960 || COMPILE_TEST + depends on ARCH_QCOM || COMPILE_TEST select IOMMU_API select IOMMU_IO_PGTABLE_ARMV7S help From patchwork Thu Dec 7 12:54:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 751257 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="vS9g3SHV" Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFD3410C7 for ; Thu, 7 Dec 2023 04:55:04 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-50bdec453c8so755098e87.3 for ; Thu, 07 Dec 2023 04:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701953703; x=1702558503; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MXRZlAau+k7NGTbzeyPNFZOgIyK71YnKo+kgg/iWUAM=; b=vS9g3SHVs2A55tdg6+yaKVy7xh5AfQWZEs22yuWPJDg5JVyNd32o59c05V5tB9vjfU f3nQESSEMituK8GpAeHnbqUw2yeE9RjOGzAEFWWpEHyNzNirCOP5k3x5vfxhm678+lU5 c5f3M45sI+QUURgfrNxwyrsRp+raQcA4Z+/fKM2IIsA1W2Sy8PJcPxRdO92DLcJzipxQ ir5U45IM7YAz/z+TobRseU9vwkkNgg1cY7N799idHJWlDYqejHvE6Bmkf0UiX5iPn+c0 PXcCkytjbNvrzJm4alsuy0MUIQgBJHpfIstB9TfM2LyQb0BDqnnTgA2ya4T93XHeygNg Y7kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701953703; x=1702558503; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MXRZlAau+k7NGTbzeyPNFZOgIyK71YnKo+kgg/iWUAM=; b=tT/x/ecdmSK1i4Ir74iD1XWuXv/cCgN2QMJeuJlQQd+eVJyRMOv32Rc++Ke4Q89GTd 56W7WCQ9uH0HlkwdlQn3NVeFp167/bc4KN9DEeWReCQB5uDOoWSb042u9HE4T4jlAWQC xcFSSbCaQF4oiOIYsINXta60gY2uae9EuDr41WiGxvuLWjC1kClG959qGhL3FkHHkIjY /TO9wMmQjJTEt97Xm4EMMLZczXvDp/bOWPYMy7zmtopiIGTK4CIpXRsFVpHJkMfrKGQK uOoHRTSTPr/savM3bEpDlKTFNzyz0Xzt1Ofhr+yrzA1PS/hoysD2PvRmqDCkIkXx7ht6 0KEw== X-Gm-Message-State: AOJu0YxEsjLUC1G2a8XVoo5saHxF9C49LPGX9ks5qrfiDiF6HlH4WxDV Rgb4u6Cl43A8wEgxOzVqKehRWQ== X-Google-Smtp-Source: AGHT+IH8ass7HzS6uZLXeKJmVhmIziNGBwk8jv4tdxJanOaneYQPNZLBKTC6kWejFA4F6qBuDA1Nrg== X-Received: by 2002:a19:9102:0:b0:50b:ee85:ef5e with SMTP id t2-20020a199102000000b0050bee85ef5emr1247967lfd.119.1701953703035; Thu, 07 Dec 2023 04:55:03 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id cf30-20020a056512281e00b0050bfc6dbb8asm163659lfb.302.2023.12.07.04.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:55:02 -0800 (PST) From: Dmitry Baryshkov To: Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Rob Clark Cc: Vinod Koul , Sai Prakash Ranjan , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 2/3] ARM: qcom: drop most of 32-bit ARCH_QCOM subtypes Date: Thu, 7 Dec 2023 15:54:59 +0300 Message-Id: <20231207125500.3322229-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> References: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Historically we had several subtypes of 32-bit Qualcomm platforms. Nowadays they became just useless symbols in Kconfig. Drop them and pull corresponding clocksource entries towards top-level ARCH_QCOM entry. Note, I've left ARCH_IPQ40XX, ARCH_MSM8x60 and ARCH_MSM8960 in place, since they have special TEXT_OFFSET handling, which can be sorted out separately. Signed-off-by: Dmitry Baryshkov --- arch/arm/mach-qcom/Kconfig | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 12a812e61c16..27d5ca0043be 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -4,46 +4,24 @@ menuconfig ARCH_QCOM depends on ARCH_MULTI_V7 select ARM_GIC select ARM_AMBA + select CLKSRC_QCOM + select HAVE_ARM_ARCH_TIMER select PINCTRL select QCOM_SCM if SMP help Support for Qualcomm's devicetree based systems. + This includes support for a few devices with ARM64 SoC, that have + ARM32 signed firmware that does not allow booting ARM64 kernels. if ARCH_QCOM config ARCH_IPQ40XX bool "Enable support for IPQ40XX" - select CLKSRC_QCOM - select HAVE_ARM_ARCH_TIMER config ARCH_MSM8X60 bool "Enable support for MSM8X60" - select CLKSRC_QCOM - -config ARCH_MSM8909 - bool "Enable support for MSM8909" - select HAVE_ARM_ARCH_TIMER - -config ARCH_MSM8916 - bool "Enable support for MSM8916" - select HAVE_ARM_ARCH_TIMER - help - Enable support for the Qualcomm Snapdragon 410 (MSM8916/APQ8016). - - Note that ARM64 is the main supported architecture for MSM8916. - The ARM32 option is intended for a few devices with signed firmware - that does not allow booting ARM64 kernels. config ARCH_MSM8960 bool "Enable support for MSM8960" - select CLKSRC_QCOM - -config ARCH_MSM8974 - bool "Enable support for MSM8974" - select HAVE_ARM_ARCH_TIMER - -config ARCH_MDM9615 - bool "Enable support for MDM9615" - select CLKSRC_QCOM endif