| 35,6 → 35,7 |
|---|
| #include <smp/smp.h> |
| #include <genarch/ofw/ofw_tree.h> |
| #include <cpu.h> |
| #include <arch/cpu_family.h> |
| #include <arch/cpu.h> |
| #include <arch.h> |
| #include <config.h> |
| 62,15 → 63,54 |
|---|
| ofw_tree_node_t *node; |
| count_t cnt = 0; |
| |
| node = ofw_tree_find_child_by_device_type(cpus_parent(), "cpu"); |
| while (node) { |
| cnt++; |
| node = ofw_tree_find_peer_by_device_type(node, "cpu"); |
| if (is_us() || is_us_iii()) { |
| node = ofw_tree_find_child_by_device_type(cpus_parent(), "cpu"); |
| while (node) { |
| cnt++; |
| node = ofw_tree_find_peer_by_device_type(node, "cpu"); |
| } |
| } else if (is_us_iv()) { |
| node = ofw_tree_find_child(cpus_parent(), "cmp"); |
| while (node) { |
| cnt += 2; |
| node = ofw_tree_find_peer_by_name(node, "cmp"); |
| } |
| } |
| |
| config.cpu_count = max(1, cnt); |
| } |
| |
| /** |
| * Wakes up the CPU which is represented by the "node" OFW tree node. |
| * If "node" represents the current CPU, calling the function has |
| * no effect. |
| */ |
| static void wakeup_cpu(ofw_tree_node_t *node) |
| { |
| uint32_t mid; |
| ofw_tree_property_t *prop; |
| |
| /* 'upa-portid' for US, 'portid' for US-III, 'cpuid' for US-IV */ |
| prop = ofw_tree_getprop(node, "upa-portid"); |
| if ((!prop) || (!prop->value)) |
| prop = ofw_tree_getprop(node, "portid"); |
| if ((!prop) || (!prop->value)) |
| prop = ofw_tree_getprop(node, "cpuid"); |
| |
| if (!prop || prop->value == NULL) |
| return; |
| |
| mid = *((uint32_t *) prop->value); |
| if (CPU->arch.mid == mid) |
| return; |
| |
| waking_up_mid = mid; |
| |
| if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) |
| printf("%s: waiting for processor (mid = %" PRIu32 ") timed out\n", |
| __func__, mid); |
| } |
| |
| /** Wake application processors up. */ |
| void kmp(void *arg) |
| { |
| 77,31 → 117,19 |
|---|
| ofw_tree_node_t *node; |
| int i; |
| |
| node = ofw_tree_find_child_by_device_type(cpus_parent(), "cpu"); |
| for (i = 0; node; node = ofw_tree_find_peer_by_device_type(node, "cpu"), i++) { |
| uint32_t mid; |
| ofw_tree_property_t *prop; |
| |
| prop = ofw_tree_getprop(node, PORTID_NAME); |
| if (!prop || !prop->value) |
| continue; |
| |
| mid = *((uint32_t *) prop->value); |
| if (CPU->arch.mid == mid) { |
| /* |
| * Skip the current CPU. |
| */ |
| continue; |
| printf("\nGoing to wake CPUs up.\n"); |
| |
| if (is_us() || is_us_iii()) { |
| node = ofw_tree_find_child_by_device_type(cpus_parent(), "cpu"); |
| for (i = 0; node; node = ofw_tree_find_peer_by_device_type(node, "cpu"), i++) |
| wakeup_cpu(node); |
| } else if (is_us_iv()) { |
| node = ofw_tree_find_child(cpus_parent(), "cmp"); |
| while (node) { |
| wakeup_cpu(ofw_tree_find_child(node, "cpu@0")); |
| wakeup_cpu(ofw_tree_find_child(node, "cpu@1")); |
| node = ofw_tree_find_peer_by_name(node, "cmp"); |
| } |
| |
| /* |
| * Processor with ID == mid can proceed with its initialization. |
| */ |
| waking_up_mid = mid; |
| |
| if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) |
| printf("%s: waiting for processor (mid = %" PRIu32 ") timed out\n", |
| __func__, mid); |
| } |
| } |
| |