Message ID | 20190428002529.14229-1-atish.patra@wdc.com |
---|---|
Headers | show |
Series | Unify CPU topology across ARM & RISC-V | expand |
On Sat, Apr 27, 2019 at 05:25:27PM -0700, Atish Patra wrote: > Both RISC-V & ARM64 are using cpu-map device tree to describe > their cpu topology. It's better to move the relevant code to > a common place instead of duplicate code. > > Signed-off-by: Atish Patra <atish.patra@wdc.com> > Tested-by: Jeffrey Hugo <jhugo@codeaurora.org> > --- > arch/arm64/include/asm/topology.h | 23 --- > arch/arm64/kernel/topology.c | 303 +----------------------------- > drivers/base/arch_topology.c | 298 ++++++++++++++++++++++++++++- > drivers/base/topology.c | 1 + > include/linux/arch_topology.h | 28 +++ > 5 files changed, 330 insertions(+), 323 deletions(-) > > -void store_cpu_topology(unsigned int cpuid); [...] > diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c > index edfcf8d982e4..2b0758c01cee 100644 > --- a/drivers/base/arch_topology.c > +++ b/drivers/base/arch_topology.c > @@ -6,8 +6,8 @@ > * Written by: Juri Lelli, ARM Ltd. > */ > > -#include <linux/acpi.h> > #include <linux/arch_topology.h> > +#include <linux/acpi.h> I assume this was to avoid compilation errors, when I rebased I got conflict and I ordered them back alphabetically as before and hit the compilation error. The actual fix would be to include linux/arch_topology.h in linux/topology.h as you are moving contents of asm/topology.h which it includes. I did the change and get it tested by kbuild. See [1] Regards, Sudeep [1] https://git.kernel.org/sudeep.holla/linux/h/cpu_topology
On 5/23/19 2:36 AM, Sudeep Holla wrote: > On Sat, Apr 27, 2019 at 05:25:27PM -0700, Atish Patra wrote: >> Both RISC-V & ARM64 are using cpu-map device tree to describe >> their cpu topology. It's better to move the relevant code to >> a common place instead of duplicate code. >> >> Signed-off-by: Atish Patra <atish.patra@wdc.com> >> Tested-by: Jeffrey Hugo <jhugo@codeaurora.org> >> --- >> arch/arm64/include/asm/topology.h | 23 --- >> arch/arm64/kernel/topology.c | 303 +----------------------------- >> drivers/base/arch_topology.c | 298 ++++++++++++++++++++++++++++- >> drivers/base/topology.c | 1 + >> include/linux/arch_topology.h | 28 +++ >> 5 files changed, 330 insertions(+), 323 deletions(-) >> >> -void store_cpu_topology(unsigned int cpuid); > [...] > > >> diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c >> index edfcf8d982e4..2b0758c01cee 100644 >> --- a/drivers/base/arch_topology.c >> +++ b/drivers/base/arch_topology.c >> @@ -6,8 +6,8 @@ >> * Written by: Juri Lelli, ARM Ltd. >> */ >> >> -#include <linux/acpi.h> >> #include <linux/arch_topology.h> >> +#include <linux/acpi.h> > > I assume this was to avoid compilation errors, when I rebased I got > conflict and I ordered them back alphabetically as before and hit the > compilation error. > > The actual fix would be to include linux/arch_topology.h in linux/topology.h > as you are moving contents of asm/topology.h which it includes. > > I did the change and get it tested by kbuild. See [1] > Thanks for pointing that out. I think we can remove arch_topology.h include in base/arch_topology.c and base/topology.c as they already include sched/topology.h or linux/topology.h. I will send out v5 soon. > Regards, > Sudeep > > [1] https://git.kernel.org/sudeep.holla/linux/h/cpu_topology >