| Message ID | 20161125084623.22515-9-fu.wei@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Hi , On 25 November 2016 at 22:32, kbuild test robot <lkp@intel.com> wrote: > Hi Fu, > > [auto build test ERROR on pm/linux-next] > [also build test ERROR on v4.9-rc6] > [cannot apply to tip/timers/core next-20161125] > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > > url: https://github.com/0day-ci/linux/commits/fu-wei-linaro-org/acpi-clocksource-add-GTDT-driver-and-GTDT-support-in-arm_arch_timer/20161125-171111 > base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next > config: arm64-defconfig (attached as .config) > compiler: aarch64-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705 > reproduce: > wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross > chmod +x ~/bin/make.cross > # save the attached .config to linux build tree > make.cross ARCH=arm64 > > Note: the linux-review/fu-wei-linaro-org/acpi-clocksource-add-GTDT-driver-and-GTDT-support-in-arm_arch_timer/20161125-171111 HEAD 498f1f2503da21841b0e7679ddbdb86a40451bdb builds fine. > It only hurts bisectibility. > > All errors (new ones prefixed by >>): > > drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_acpi_init': Sorry, again, a "+ int ret;" should be move from [12/15] to here, I have fix the problem in my repo, it would happen in next patchset https://git.linaro.org/people/fu.wei/linux.git/log/?h=topic-gtdt-wakeup-timer_upstream_v18_devel >>> drivers/clocksource/arm_arch_timer.c:1071:2: error: 'ret' undeclared (first use in this function) > ret = arch_timer_register(); > ^~~ > drivers/clocksource/arm_arch_timer.c:1071:2: note: each undeclared identifier is reported only once for each function it appears in > > vim +/ret +1071 drivers/clocksource/arm_arch_timer.c > > 1065 return -EINVAL; > 1066 } > 1067 > 1068 /* Always-on capability */ > 1069 arch_timer_c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON); > 1070 >> 1071 ret = arch_timer_register(); > 1072 if (ret) > 1073 return ret; > 1074 > > --- > 0-DAY kernel test infrastructure Open Source Technology Center > https://lists.01.org/pipermail/kbuild-all Intel Corporation -- Best regards, Fu Wei Software Engineer Red Hat -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Nov 25, 2016 at 9:06 AM, Fu Wei <fu.wei@linaro.org> wrote: > > a "+ int ret;" should be move from [12/15] to here, I have fix the > problem in my repo, it would happen in next patchset > > https://git.linaro.org/people/fu.wei/linux.git/log/?h=topic-gtdt-wakeup-timer_upstream_v18_devel Fu, please post v18 to the mailing list so that it can be picked up for 4.10 (if it's not too late already). -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project. -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Mark, On 8 December 2016 at 19:04, Mark Rutland <mark.rutland@arm.com> wrote: > On Thu, Dec 08, 2016 at 11:16:21AM +0800, Fu Wei wrote: >> Hi Timur, >> >> On 8 December 2016 at 01:25, Timur Tabi <timur@codeaurora.org> wrote: >> > On Fri, Nov 25, 2016 at 9:06 AM, Fu Wei <fu.wei@linaro.org> wrote: >> >> >> >> a "+ int ret;" should be move from [12/15] to here, I have fix the >> >> problem in my repo, it would happen in next patchset >> >> >> >> https://git.linaro.org/people/fu.wei/linux.git/log/?h=topic-gtdt-wakeup-timer_upstream_v18_devel >> > >> > Fu, please post v18 to the mailing list so that it can be picked up >> > for 4.10 (if it's not too late already). > > Unfortunately, it's too late for v4.10. It hasn't been sat in linux-next > at all, and we've seen kbuild test failures. > > Hopefully there's time to beat this into shape and get it into > linux-next so that it's ready to queue for v4.11, though. cross fingers for getting into v4.11 :-) > >> Great thanks for your suggestion! :-) >> yes, you are right, I would love to post v18 ASAP. >> >> But I am still waiting for more feedback from the maintainers. > > Please post a version which passes inspection by the kbuild test robot. > I haven't had a chance to look at this yet, and it'll be better to look > at a version that actually works. OK, NP, will post them in several hours Great thanks for your feedback. > > Thanks, > Mark. -- Best regards, Fu Wei Software Engineer Red Hat -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" 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/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 2c9085a..4549008 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -821,9 +821,6 @@ static bool __init arch_timer_needs_of_probing(void) static int __init arch_timer_common_init(void) { - if (acpi_disabled && arch_timer_needs_of_probing()) - return 0; - arch_timer_banner(arch_timers_present); arch_counter_register(arch_timers_present); return arch_timer_arch_init(); @@ -861,26 +858,9 @@ static enum arch_timer_ppi_nr __init arch_timer_select_ppi(void) return ARCH_TIMER_PHYS_SECURE_PPI; } -static int __init arch_timer_init(void) -{ - int ret; - - ret = arch_timer_register(); - if (ret) - return ret; - - ret = arch_timer_common_init(); - if (ret) - return ret; - - arch_timer_kvm_info.virtual_irq = arch_timer_ppi[ARCH_TIMER_VIRT_PPI]; - - return 0; -} - static int __init arch_timer_of_init(struct device_node *np) { - int i; + int i, ret; if (arch_timers_present & ARCH_TIMER_TYPE_CP15) { pr_warn("multiple nodes in dt, skipping\n"); @@ -891,6 +871,8 @@ static int __init arch_timer_of_init(struct device_node *np) for (i = ARCH_TIMER_PHYS_SECURE_PPI; i < ARCH_TIMER_MAX_TIMER_PPI; i++) arch_timer_ppi[i] = irq_of_parse_and_map(np, i); + arch_timer_kvm_info.virtual_irq = arch_timer_ppi[ARCH_TIMER_VIRT_PPI]; + if (!arch_timer_rate && of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) arch_timer_detect_rate(); @@ -921,7 +903,14 @@ static int __init arch_timer_of_init(struct device_node *np) return -EINVAL; } - return arch_timer_init(); + ret = arch_timer_register(); + if (ret) + return ret; + + if (arch_timer_needs_of_probing()) + return 0; + + return arch_timer_common_init(); } CLOCKSOURCE_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init); CLOCKSOURCE_OF_DECLARE(armv8_arch_timer, "arm,armv8-timer", arch_timer_of_init); @@ -1008,7 +997,8 @@ static int __init arch_timer_mem_init(struct device_node *np) if (ret) goto out; - return arch_timer_common_init(); + if (!arch_timer_needs_of_probing()) + ret = arch_timer_common_init(); out: iounmap(cntctlbase); of_node_put(best_frame); @@ -1064,6 +1054,8 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt, gtdt->non_secure_el2_flags); + arch_timer_kvm_info.virtual_irq = arch_timer_ppi[ARCH_TIMER_VIRT_PPI]; + /* Get the frequency from CNTFRQ */ arch_timer_detect_rate(); @@ -1076,8 +1068,11 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) /* Always-on capability */ arch_timer_c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON); - arch_timer_init(); - return 0; + ret = arch_timer_register(); + if (ret) + return ret; + + return arch_timer_common_init(); } CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init); #endif