forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29
kernel/arch/mips/include/asm/mach-ip27/topology.h
....@@ -2,37 +2,27 @@
22 #ifndef _ASM_MACH_TOPOLOGY_H
33 #define _ASM_MACH_TOPOLOGY_H 1
44
5
-#include <asm/sn/hub.h>
65 #include <asm/sn/types.h>
76 #include <asm/mmzone.h>
87
98 struct cpuinfo_ip27 {
10
-// cpuid_t p_cpuid; /* PROM assigned cpuid */
11
- cnodeid_t p_nodeid; /* my node ID in compact-id-space */
129 nasid_t p_nasid; /* my node ID in numa-as-id-space */
10
+ unsigned short p_speed; /* cpu speed in MHz */
1311 unsigned char p_slice; /* Physical position on node board */
14
-#if 0
15
- unsigned long loops_per_sec;
16
- unsigned long ipi_count;
17
- unsigned long irq_attempt[NR_IRQS];
18
- unsigned long smp_local_irq_count;
19
- unsigned long prof_multiplier;
20
- unsigned long prof_counter;
21
-#endif
2212 };
2313
2414 extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];
2515
26
-#define cpu_to_node(cpu) (sn_cpu_info[(cpu)].p_nodeid)
16
+#define cpu_to_node(cpu) (cputonasid(cpu))
2717 #define cpumask_of_node(node) ((node) == -1 ? \
2818 cpu_all_mask : \
2919 &hub_data(node)->h_cpus)
3020 struct pci_bus;
3121 extern int pcibus_to_node(struct pci_bus *);
3222
33
-#define cpumask_of_pcibus(bus) (cpu_online_mask)
23
+#define cpumask_of_pcibus(bus) (cpumask_of_node(pcibus_to_node(bus)))
3424
35
-extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES];
25
+extern unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES];
3626
3727 #define node_distance(from, to) (__node_distances[(from)][(to)])
3828