| Message ID | 1408400614-45419-2-git-send-email-lina.iyer@linaro.org |
|---|---|
| State | New |
| Headers | show |
Lina Iyer <lina.iyer@linaro.org> writes: > Signed-off-by: Lina Iyer <lina.iyer@linaro.org> Why the move? It looks like scm-boot.c still calls into the main scm_call() stuff that still lives under arch/arm/mach-qcom, and not in arm64, so I'm not seeing the motiviation for the change (and the changelog didn't help explain either :) Kevin > arch/arm/mach-qcom/Makefile | 1 - > arch/arm/mach-qcom/platsmp.c | 2 +- > drivers/soc/qcom/Makefile | 2 +- > {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c | 4 ++-- > {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h | 0 > 5 files changed, 4 insertions(+), 5 deletions(-) > rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c (97%) > rename {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h (100%) > > diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile > index db41e8c..e324375 100644 > --- a/arch/arm/mach-qcom/Makefile > +++ b/arch/arm/mach-qcom/Makefile > @@ -1,3 +1,2 @@ > obj-y := board.o > obj-$(CONFIG_SMP) += platsmp.o > -obj-$(CONFIG_QCOM_SCM) += scm-boot.o > diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c > index d690856..a692bcb 100644 > --- a/arch/arm/mach-qcom/platsmp.c > +++ b/arch/arm/mach-qcom/platsmp.c > @@ -20,7 +20,7 @@ > > #include <asm/smp_plat.h> > > -#include "scm-boot.h" > +#include <soc/qcom/scm-boot.h> > > #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x35a0 > #define SCSS_CPU1CORE_RESET 0x2d80 > diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile > index a39446d..70d52ed 100644 > --- a/drivers/soc/qcom/Makefile > +++ b/drivers/soc/qcom/Makefile > @@ -1,3 +1,3 @@ > obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o > CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) > -obj-$(CONFIG_QCOM_SCM) += scm.o > +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o > diff --git a/arch/arm/mach-qcom/scm-boot.c b/drivers/soc/qcom/scm-boot.c > similarity index 97% > rename from arch/arm/mach-qcom/scm-boot.c > rename to drivers/soc/qcom/scm-boot.c > index 5add20e..60ff7b4 100644 > --- a/arch/arm/mach-qcom/scm-boot.c > +++ b/drivers/soc/qcom/scm-boot.c > @@ -17,9 +17,9 @@ > > #include <linux/module.h> > #include <linux/slab.h> > -#include <soc/qcom/scm.h> > > -#include "scm-boot.h" > +#include <soc/qcom/scm.h> > +#include <soc/qcom/scm-boot.h> > > /* > * Set the cold/warm boot address for one of the CPU cores. > diff --git a/arch/arm/mach-qcom/scm-boot.h b/include/soc/qcom/scm-boot.h > similarity index 100% > rename from arch/arm/mach-qcom/scm-boot.h > rename to include/soc/qcom/scm-boot.h -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Aug 27, 2014 at 10:18:24AM -0700, Kevin Hilman wrote: >Lina Iyer <lina.iyer@linaro.org> writes: > >> Signed-off-by: Lina Iyer <lina.iyer@linaro.org> > >Why the move? It looks like scm-boot.c still calls into the main >scm_call() stuff that still lives under arch/arm/mach-qcom, and not in >arm64, so I'm not seeing the motiviation for the change (and the >changelog didn't help explain either :) > >Kevin I dint intend on moving the scm-boot for 64 bit purposes, but that would be a good argument :) My motivation was to move the scm-boot.h, but figured might as well clean up the mach-qcom in the process, per guidance. > > >> arch/arm/mach-qcom/Makefile | 1 - >> arch/arm/mach-qcom/platsmp.c | 2 +- >> drivers/soc/qcom/Makefile | 2 +- >> {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c | 4 ++-- >> {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h | 0 >> 5 files changed, 4 insertions(+), 5 deletions(-) >> rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c (97%) >> rename {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h (100%) >> >> diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile >> index db41e8c..e324375 100644 >> --- a/arch/arm/mach-qcom/Makefile >> +++ b/arch/arm/mach-qcom/Makefile >> @@ -1,3 +1,2 @@ >> obj-y := board.o >> obj-$(CONFIG_SMP) += platsmp.o >> -obj-$(CONFIG_QCOM_SCM) += scm-boot.o >> diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c >> index d690856..a692bcb 100644 >> --- a/arch/arm/mach-qcom/platsmp.c >> +++ b/arch/arm/mach-qcom/platsmp.c >> @@ -20,7 +20,7 @@ >> >> #include <asm/smp_plat.h> >> >> -#include "scm-boot.h" >> +#include <soc/qcom/scm-boot.h> >> >> #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x35a0 >> #define SCSS_CPU1CORE_RESET 0x2d80 >> diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile >> index a39446d..70d52ed 100644 >> --- a/drivers/soc/qcom/Makefile >> +++ b/drivers/soc/qcom/Makefile >> @@ -1,3 +1,3 @@ >> obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o >> CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) >> -obj-$(CONFIG_QCOM_SCM) += scm.o >> +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o >> diff --git a/arch/arm/mach-qcom/scm-boot.c b/drivers/soc/qcom/scm-boot.c >> similarity index 97% >> rename from arch/arm/mach-qcom/scm-boot.c >> rename to drivers/soc/qcom/scm-boot.c >> index 5add20e..60ff7b4 100644 >> --- a/arch/arm/mach-qcom/scm-boot.c >> +++ b/drivers/soc/qcom/scm-boot.c >> @@ -17,9 +17,9 @@ >> >> #include <linux/module.h> >> #include <linux/slab.h> >> -#include <soc/qcom/scm.h> >> >> -#include "scm-boot.h" >> +#include <soc/qcom/scm.h> >> +#include <soc/qcom/scm-boot.h> >> >> /* >> * Set the cold/warm boot address for one of the CPU cores. >> diff --git a/arch/arm/mach-qcom/scm-boot.h b/include/soc/qcom/scm-boot.h >> similarity index 100% >> rename from arch/arm/mach-qcom/scm-boot.h >> rename to include/soc/qcom/scm-boot.h -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Lina Iyer <lina.iyer@linaro.org> writes: > On Wed, Aug 27, 2014 at 10:18:24AM -0700, Kevin Hilman wrote: >>Lina Iyer <lina.iyer@linaro.org> writes: >> >>> Signed-off-by: Lina Iyer <lina.iyer@linaro.org> >> >>Why the move? It looks like scm-boot.c still calls into the main >>scm_call() stuff that still lives under arch/arm/mach-qcom, and not in >>arm64, so I'm not seeing the motiviation for the change (and the >>changelog didn't help explain either :) >> >>Kevin > > I dint intend on moving the scm-boot for 64 bit purposes, but that > would be a good argument :) My motivation was to move the scm-boot.h, but > figured might as well clean up the mach-qcom in the process, per > guidance. Thanks for clarifying. I suspect that should be a separate cleanup series with its own descriptive changelog, because to me it only looks like a partial cleanup since only some of the stuff was moved out, and it's not abvious what it will be sharing that code. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Aug 27, 2014 at 01:24:44PM -0700, Kevin Hilman wrote: >Lina Iyer <lina.iyer@linaro.org> writes: > >> On Wed, Aug 27, 2014 at 10:18:24AM -0700, Kevin Hilman wrote: >>>Lina Iyer <lina.iyer@linaro.org> writes: >>> >>>> Signed-off-by: Lina Iyer <lina.iyer@linaro.org> >>> >>>Why the move? It looks like scm-boot.c still calls into the main >>>scm_call() stuff that still lives under arch/arm/mach-qcom, and not in >>>arm64, so I'm not seeing the motiviation for the change (and the >>>changelog didn't help explain either :) >>> >>>Kevin >> >> I dint intend on moving the scm-boot for 64 bit purposes, but that >> would be a good argument :) My motivation was to move the scm-boot.h, but >> figured might as well clean up the mach-qcom in the process, per >> guidance. > >Thanks for clarifying. > >I suspect that should be a separate cleanup series with its own >descriptive changelog, because to me it only looks like a partial >cleanup since only some of the stuff was moved out, and it's not abvious >what it will be sharing that code. Okay, I will split this change out of the series. > >Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile index db41e8c..e324375 100644 --- a/arch/arm/mach-qcom/Makefile +++ b/arch/arm/mach-qcom/Makefile @@ -1,3 +1,2 @@ obj-y := board.o obj-$(CONFIG_SMP) += platsmp.o -obj-$(CONFIG_QCOM_SCM) += scm-boot.o diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c index d690856..a692bcb 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -20,7 +20,7 @@ #include <asm/smp_plat.h> -#include "scm-boot.h" +#include <soc/qcom/scm-boot.h> #define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x35a0 #define SCSS_CPU1CORE_RESET 0x2d80 diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index a39446d..70d52ed 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) -obj-$(CONFIG_QCOM_SCM) += scm.o +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o diff --git a/arch/arm/mach-qcom/scm-boot.c b/drivers/soc/qcom/scm-boot.c similarity index 97% rename from arch/arm/mach-qcom/scm-boot.c rename to drivers/soc/qcom/scm-boot.c index 5add20e..60ff7b4 100644 --- a/arch/arm/mach-qcom/scm-boot.c +++ b/drivers/soc/qcom/scm-boot.c @@ -17,9 +17,9 @@ #include <linux/module.h> #include <linux/slab.h> -#include <soc/qcom/scm.h> -#include "scm-boot.h" +#include <soc/qcom/scm.h> +#include <soc/qcom/scm-boot.h> /* * Set the cold/warm boot address for one of the CPU cores.
Signed-off-by: Lina Iyer <lina.iyer@linaro.org> --- arch/arm/mach-qcom/Makefile | 1 - arch/arm/mach-qcom/platsmp.c | 2 +- drivers/soc/qcom/Makefile | 2 +- {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c | 4 ++-- {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h | 0 5 files changed, 4 insertions(+), 5 deletions(-) rename {arch/arm/mach-qcom => drivers/soc/qcom}/scm-boot.c (97%) rename {arch/arm/mach-qcom => include/soc/qcom}/scm-boot.h (100%) diff --git a/arch/arm/mach-qcom/scm-boot.h b/include/soc/qcom/scm-boot.h similarity index 100% rename from arch/arm/mach-qcom/scm-boot.h rename to include/soc/qcom/scm-boot.h