Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
cc6e8e08
Commit
cc6e8e08
authored
Oct 11, 2007
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MIPS] Remove IP27 specific structures from struct cpuinfo_mips
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
641e97f3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
22 deletions
+25
-22
arch/mips/sgi-ip27/ip27-init.c
arch/mips/sgi-ip27/ip27-init.c
+3
-0
arch/mips/sgi-ip27/ip27-smp.c
arch/mips/sgi-ip27/ip27-smp.c
+1
-1
include/asm-mips/cpu-info.h
include/asm-mips/cpu-info.h
+0
-18
include/asm-mips/mach-ip27/topology.h
include/asm-mips/mach-ip27/topology.h
+19
-1
include/asm-mips/sn/arch.h
include/asm-mips/sn/arch.h
+2
-2
No files found.
arch/mips/sgi-ip27/ip27-init.c
View file @
cc6e8e08
...
@@ -47,6 +47,9 @@ cnodeid_t cpuid_to_compact_node[MAXCPUS];
...
@@ -47,6 +47,9 @@ cnodeid_t cpuid_to_compact_node[MAXCPUS];
EXPORT_SYMBOL
(
nasid_to_compact_node
);
EXPORT_SYMBOL
(
nasid_to_compact_node
);
struct
cpuinfo_ip27
sn_cpu_info
[
NR_CPUS
];
EXPORT_SYMBOL_GPL
(
sn_cpu_info
);
extern
void
pcibr_setup
(
cnodeid_t
);
extern
void
pcibr_setup
(
cnodeid_t
);
extern
void
xtalk_probe_node
(
cnodeid_t
nid
);
extern
void
xtalk_probe_node
(
cnodeid_t
nid
);
...
...
arch/mips/sgi-ip27/ip27-smp.c
View file @
cc6e8e08
...
@@ -33,7 +33,7 @@ static void alloc_cpupda(cpuid_t cpu, int cpunum)
...
@@ -33,7 +33,7 @@ static void alloc_cpupda(cpuid_t cpu, int cpunum)
nasid_t
nasid
=
COMPACT_TO_NASID_NODEID
(
node
);
nasid_t
nasid
=
COMPACT_TO_NASID_NODEID
(
node
);
cputonasid
(
cpunum
)
=
nasid
;
cputonasid
(
cpunum
)
=
nasid
;
cpu_data
[
cpunum
].
p_nodeid
=
node
;
sn_cpu_info
[
cpunum
].
p_nodeid
=
node
;
cputoslice
(
cpunum
)
=
get_cpu_slice
(
cpu
);
cputoslice
(
cpunum
)
=
get_cpu_slice
(
cpu
);
}
}
...
...
include/asm-mips/cpu-info.h
View file @
cc6e8e08
...
@@ -14,10 +14,6 @@
...
@@ -14,10 +14,6 @@
#include <asm/cache.h>
#include <asm/cache.h>
#ifdef CONFIG_SGI_IP27
#include <asm/sn/types.h>
#endif
/*
/*
* Descriptor for a cache
* Descriptor for a cache
*/
*/
...
@@ -43,20 +39,6 @@ struct cache_desc {
...
@@ -43,20 +39,6 @@ struct cache_desc {
struct
cpuinfo_mips
{
struct
cpuinfo_mips
{
unsigned
long
udelay_val
;
unsigned
long
udelay_val
;
unsigned
long
asid_cache
;
unsigned
long
asid_cache
;
#if defined(CONFIG_SGI_IP27)
// cpuid_t p_cpuid; /* PROM assigned cpuid */
cnodeid_t
p_nodeid
;
/* my node ID in compact-id-space */
nasid_t
p_nasid
;
/* my node ID in numa-as-id-space */
unsigned
char
p_slice
;
/* Physical position on node board */
#endif
#if 0
unsigned long loops_per_sec;
unsigned long ipi_count;
unsigned long irq_attempt[NR_IRQS];
unsigned long smp_local_irq_count;
unsigned long prof_multiplier;
unsigned long prof_counter;
#endif
/*
/*
* Capability and feature descriptor structure for MIPS CPU
* Capability and feature descriptor structure for MIPS CPU
...
...
include/asm-mips/mach-ip27/topology.h
View file @
cc6e8e08
...
@@ -2,9 +2,27 @@
...
@@ -2,9 +2,27 @@
#define _ASM_MACH_TOPOLOGY_H 1
#define _ASM_MACH_TOPOLOGY_H 1
#include <asm/sn/hub.h>
#include <asm/sn/hub.h>
#include <asm/sn/types.h>
#include <asm/mmzone.h>
#include <asm/mmzone.h>
#define cpu_to_node(cpu) (cpu_data[(cpu)].p_nodeid)
struct
cpuinfo_ip27
{
// cpuid_t p_cpuid; /* PROM assigned cpuid */
cnodeid_t
p_nodeid
;
/* my node ID in compact-id-space */
nasid_t
p_nasid
;
/* my node ID in numa-as-id-space */
unsigned
char
p_slice
;
/* Physical position on node board */
#if 0
unsigned long loops_per_sec;
unsigned long ipi_count;
unsigned long irq_attempt[NR_IRQS];
unsigned long smp_local_irq_count;
unsigned long prof_multiplier;
unsigned long prof_counter;
#endif
};
extern
struct
cpuinfo_ip27
sn_cpu_info
[
NR_CPUS
];
#define cpu_to_node(cpu) (sn_cpu_info[(cpu)].p_nodeid)
#define parent_node(node) (node)
#define parent_node(node) (node)
#define node_to_cpumask(node) (hub_data(node)->h_cpus)
#define node_to_cpumask(node) (hub_data(node)->h_cpus)
#define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node)))
#define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node)))
...
...
include/asm-mips/sn/arch.h
View file @
cc6e8e08
...
@@ -19,8 +19,8 @@
...
@@ -19,8 +19,8 @@
typedef
u64
hubreg_t
;
typedef
u64
hubreg_t
;
#define cputonasid(cpu)
(cpu_data
[(cpu)].p_nasid)
#define cputonasid(cpu)
(sn_cpu_info
[(cpu)].p_nasid)
#define cputoslice(cpu)
(cpu_data
[(cpu)].p_slice)
#define cputoslice(cpu)
(sn_cpu_info
[(cpu)].p_slice)
#define makespnum(_nasid, _slice) \
#define makespnum(_nasid, _slice) \
(((_nasid) << CPUS_PER_NODE_SHFT) | (_slice))
(((_nasid) << CPUS_PER_NODE_SHFT) | (_slice))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment