[PATCH 0/5] Remove qcom SoC configs

[PATCH 0/5] Remove qcom SoC configs

[Stephen Boyd]

We want to remove the ARCH_MSM* configs in mach-qcom/Kconfig
because they are proxy configs for selecting the right
clocksource driver and adjusting the text offset and there is no
difference between ARCH_MSM8X60 and ARCH_MSM8960 anymore.
Furthermore, there aren't configs for all the SoCs supported by
the mainline kernel, leading to confusion about which SoCs are
supported. This patch series removes them, leading to less confusion
with the minor downside of always forcing a text offset shift and
the selection of the qcom specific clocksource driver. The size
increase from the clocksource driver is already taken in
the qcom_defconfig, so most likely nobody will care.

Cc: Joerg Roedel <joro@8bytes.org>

Stephen Boyd (5):
  iommu: Generalize MSM_IOMMU config to ARCH_QCOM
  ARM: Makefile: Generalize qcom platform text offset
  ARM: qcom: Remove SoC specific configs
  ARM: qcom_defconfig: Drop SoC specific configs
  ARM: multi_v7_defconfig: Remove qcom SoC configs

 arch/arm/Makefile                   |  3 +--
 arch/arm/configs/multi_v7_defconfig |  3 ---
 arch/arm/configs/qcom_defconfig     |  4 ----
 arch/arm/mach-qcom/Kconfig          | 23 ++---------------------
 drivers/iommu/Kconfig               |  2 +-
 5 files changed, 4 insertions(+), 31 deletions(-)

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/5] iommu: Generalize MSM_IOMMU config to ARCH_QCOM

[Stephen Boyd]

We want to get rid of the ARCH_MSM* configs in the future, but
this still depends on them. Generalize to the ARCH_QCOM config,
which isn't going away.

Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 drivers/iommu/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 8ee54d71c7eb..a91fc7986428 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -88,7 +88,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
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 1/5] iommu: Generalize MSM_IOMMU config to ARCH_QCOM

[Joerg Roedel]

On Wed, Jan 18, 2017 at 03:27:22PM -0800, Stephen Boyd wrote:
> We want to get rid of the ARCH_MSM* configs in the future, but
> this still depends on them. Generalize to the ARCH_QCOM config,
> which isn't going away.
> 
> Cc: Joerg Roedel <joro@8bytes.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>  drivers/iommu/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Joerg Roedel <jroedel@suse.de>

[PATCH 2/5] ARM: Makefile: Generalize qcom platform text offset

[Stephen Boyd]

Some qcom platforms need a specific text offset because the first
2MB of memory is reserved for shared memory. Let's just always
shift the text segment up by 2MB when ARCH_QCOM is selected so
that we don't have to specify the specific platforms that exhibit
this problem in Kconfig.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index ab30cc634d02..8a6d344e6043 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -145,8 +145,7 @@ textofs-$(CONFIG_PM_H1940)      := 0x00108000
 ifeq ($(CONFIG_ARCH_SA1100),y)
 textofs-$(CONFIG_SA1111) := 0x00208000
 endif
-textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
-textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
+textofs-$(CONFIG_ARCH_QCOM) := 0x00208000
 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
 
 # Machine directory name.  This list is sorted alphanumerically
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH 2/5] ARM: Makefile: Generalize qcom platform text offset

[Russell King - ARM Linux]

On Wed, Jan 18, 2017 at 03:27:23PM -0800, Stephen Boyd wrote:
> Some qcom platforms need a specific text offset because the first
> 2MB of memory is reserved for shared memory. Let's just always
> shift the text segment up by 2MB when ARCH_QCOM is selected so
> that we don't have to specify the specific platforms that exhibit
> this problem in Kconfig.

I was really hoping that this sillyness would stop, but I guess
expecting it to stop is asking too much...

Is there really no other option?

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

Re: [PATCH 2/5] ARM: Makefile: Generalize qcom platform text offset

[Stephen Boyd]

On 01/18, Russell King - ARM Linux wrote:
> On Wed, Jan 18, 2017 at 03:27:23PM -0800, Stephen Boyd wrote:
> > Some qcom platforms need a specific text offset because the first
> > 2MB of memory is reserved for shared memory. Let's just always
> > shift the text segment up by 2MB when ARCH_QCOM is selected so
> > that we don't have to specify the specific platforms that exhibit
> > this problem in Kconfig.
> 
> I was really hoping that this sillyness would stop, but I guess
> expecting it to stop is asking too much...
> 
> Is there really no other option?
> 

The only other option is to make up some qcom specific config
like I_HAVE_A_QCOM_SOC_THAT_NEEDS_2MB_OFFSET that can be selected
when the configurator (not a word) knows that they are using that
SoC.

Overall, this practice has stopped inside the company over 3
years ago and has not continued as far as I know. This patch is
just taking the easy way out and forcing ARCH_QCOM to always do
the shift.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 3/5] ARM: qcom: Remove SoC specific configs

[Stephen Boyd]

We want to remove the ARCH_MSM* configs in mach-qcom/Kconfig
because they are proxy configs for selecting the right
clocksource driver and adjusting the text offset and there is no
difference between ARCH_MSM8X60 and ARCH_MSM8960 anymore.
Furthermore, there aren't configs for all the SoCs supported by
the mainline kernel, leading to confusion about which SoCs are
supported.

So just select the qcom clocksource driver all the time and rely
on users selecting HAVE_ARM_ARCH_TIMER in their defconfig for
SoCs that use the architected timer. This should simplify things.

Finally, since we're here alphabetize the select list under
ARCH_QCOM.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/mach-qcom/Kconfig | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index 46ed10a807f0..16fc13246926 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -2,29 +2,10 @@ menuconfig ARCH_QCOM
 	bool "Qualcomm Support"
 	depends on ARCH_MULTI_V7
 	select ARCH_SUPPORTS_BIG_ENDIAN
-	select ARM_GIC
 	select ARM_AMBA
+	select ARM_GIC
+	select CLKSRC_QCOM
 	select PINCTRL
 	select QCOM_SCM if SMP
 	help
 	  Support for Qualcomm's devicetree based systems.
-
-if ARCH_QCOM
-
-config ARCH_MSM8X60
-	bool "Enable support for MSM8X60"
-	select CLKSRC_QCOM
-
-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
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 4/5] ARM: qcom_defconfig: Drop SoC specific configs

[Stephen Boyd]

Now that these configs are gone let's remove them from the
defconfig.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/configs/qcom_defconfig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index 8c3a0108a231..03fc52964902 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -20,10 +20,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MSM8X60=y
-CONFIG_ARCH_MSM8960=y
-CONFIG_ARCH_MSM8974=y
-CONFIG_ARCH_MDM9615=y
 CONFIG_SMP=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_PREEMPT=y
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 5/5] ARM: multi_v7_defconfig: Remove qcom SoC configs

[Stephen Boyd]

Now that these configs are gone let's remove them from the
defconfig.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/configs/multi_v7_defconfig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index f084a0a928b8..1d05f6df8a5f 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -70,9 +70,6 @@ CONFIG_SOC_AM43XX=y
 CONFIG_SOC_DRA7XX=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_MEDIATEK=y
-CONFIG_ARCH_MSM8X60=y
-CONFIG_ARCH_MSM8960=y
-CONFIG_ARCH_MSM8974=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_PLAT_SPEAR=y
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project