/* * Copyright (c) 2015 Hisilicon Limited. * * Author: Bintian Wang * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ #ifndef __DT_BINDINGS_CLOCK_HI6220_H #define __DT_BINDINGS_CLOCK_HI6220_H /* clk in Hi6220 AO (always on) controller */ #define HI6220_NONE_CLOCK 0 /* fixed rate clocks */ #define HI6220_REF32K 1 #define HI6220_CLK_TCXO 2 #define HI6220_MMC1_PAD 3 #define HI6220_MMC2_PAD 4 #define HI6220_MMC0_PAD 5 #define HI6220_PLL_BBP 6 #define HI6220_PLL_GPU 7 #define HI6220_PLL1_DDR 8 #define HI6220_PLL_SYS 9 #define HI6220_PLL_SYS_MEDIA 10 #define HI6220_DDR_SRC 11 #define HI6220_PLL_MEDIA 12 #define HI6220_PLL_DDR 13 /* fixed factor clocks */ #define HI6220_300M 14 #define HI6220_150M 15 #define HI6220_PICOPHY_SRC 16 #define HI6220_MMC0_SRC_SEL 17 #define HI6220_MMC1_SRC_SEL 18 #define HI6220_MMC2_SRC_SEL 19 #define HI6220_VPU_CODEC 20 #define HI6220_MMC0_SMP 21 #define HI6220_MMC1_SMP 22 #define HI6220_MMC2_SMP 23 /* gate clocks */ #define HI6220_WDT0_PCLK 24 #define HI6220_WDT1_PCLK 25 #define HI6220_WDT2_PCLK 26 #define HI6220_TIMER0_PCLK 27 #define HI6220_TIMER1_PCLK 28 #define HI6220_TIMER2_PCLK 29 #define HI6220_TIMER3_PCLK 30 #define HI6220_TIMER4_PCLK 31 #define HI6220_TIMER5_PCLK 32 #define HI6220_TIMER6_PCLK 33 #define HI6220_TIMER7_PCLK 34 #define HI6220_TIMER8_PCLK 35 #define HI6220_UART0_PCLK 36 #define HI6220_RTC0_PCLK 37 #define HI6220_RTC1_PCLK 38 #define HI6220_AO_NR_CLKS 39 /* clk in Hi6220 systrl */ /* gate clock */ #define HI6220_MMC0_CLK 1 #define HI6220_MMC0_CIUCLK 2 #define HI6220_MMC1_CLK 3 #define HI6220_MMC1_CIUCLK 4 #define HI6220_MMC2_CLK 5 #define HI6220_MMC2_CIUCLK 6 #define HI6220_USBOTG_HCLK 7 #define HI6220_CLK_PICOPHY 8 #define HI6220_HIFI 9 #define HI6220_DACODEC_PCLK 10 #define HI6220_EDMAC_ACLK 11 #define HI6220_CS_ATB 12 #define HI6220_I2C0_CLK 13 #define HI6220_I2C1_CLK 14 #define HI6220_I2C2_CLK 15 #define HI6220_I2C3_CLK 16 #define HI6220_UART1_PCLK 17 #define HI6220_UART2_PCLK 18 #define HI6220_UART3_PCLK 19 #define HI6220_UART4_PCLK 20 #define HI6220_SPI_CLK 21 #define HI6220_TSENSOR_CLK 22 #define HI6220_MMU_CLK 23 #define HI6220_HIFI_SEL 24 #define HI6220_MMC0_SYSPLL 25 #define HI6220_MMC1_SYSPLL 26 #define HI6220_MMC2_SYSPLL 27 #define HI6220_MMC0_SEL 28 #define HI6220_MMC1_SEL 29 #define HI6220_BBPPLL_SEL 30 #define HI6220_MEDIA_PLL_SRC 31 #define HI6220_MMC2_SEL 32 #define HI6220_CS_ATB_SYSPLL 33 /* mux clocks */ #define HI6220_MMC0_SRC 34 #define HI6220_MMC0_SMP_IN 35 #define HI6220_MMC1_SRC 36 #define HI6220_MMC1_SMP_IN 37 #define HI6220_MMC2_SRC 38 #define HI6220_MMC2_SMP_IN 39 #define HI6220_HIFI_SRC 40 #define HI6220_UART1_SRC 41 #define HI6220_UART2_SRC 42 #define HI6220_UART3_SRC 43 #define HI6220_UART4_SRC 44 #define HI6220_MMC0_MUX0 45 #define HI6220_MMC1_MUX0 46 #define HI6220_MMC2_MUX0 47 #define HI6220_MMC0_MUX1 48 #define HI6220_MMC1_MUX1 49 #define HI6220_MMC2_MUX1 50 /* divider clocks */ #define HI6220_CLK_BUS 51 #define HI6220_MMC0_DIV 52 #define HI6220_MMC1_DIV 53 #define HI6220_MMC2_DIV 54 #define HI6220_HIFI_DIV 55 #define HI6220_BBPPLL0_DIV 56 #define HI6220_CS_DAPB 57 #define HI6220_CS_ATB_DIV 58 #define HI6220_SYS_NR_CLKS 59 /* clk in Hi6220 media controller */ /* gate clocks */ #define HI6220_DSI_PCLK 1 #define HI6220_G3D_PCLK 2 #define HI6220_ACLK_CODEC_VPU 3 #define HI6220_ISP_SCLK 4 #define HI6220_ADE_CORE 5 #define HI6220_MED_MMU 6 #define HI6220_CFG_CSI4PHY 7 #define HI6220_CFG_CSI2PHY 8 #define HI6220_ISP_SCLK_GATE 9 #define HI6220_ISP_SCLK_GATE1 10 #define HI6220_ADE_CORE_GATE 11 #define HI6220_CODEC_VPU_GATE 12 #define HI6220_MED_SYSPLL 13 /* mux clocks */ #define HI6220_1440_1200 14 #define HI6220_1000_1200 15 #define HI6220_1000_1440 16 /* divider clocks */ #define HI6220_CODEC_JPEG 17 #define HI6220_ISP_SCLK_SRC 18 #define HI6220_ISP_SCLK1 19 #define HI6220_ADE_CORE_SRC 20 #define HI6220_ADE_PIX_SRC 21 #define HI6220_G3D_CLK 22 #define HI6220_CODEC_VPU_SRC 23 #define HI6220_MEDIA_NR_CLKS 24 /* clk in Hi6220 power controller */ /* gate clocks */ #define HI6220_PLL_GPU_GATE 1 #define HI6220_PLL1_DDR_GATE 2 #define HI6220_PLL_DDR_GATE 3 #define HI6220_PLL_MEDIA_GATE 4 #define HI6220_PLL0_BBP_GATE 5 /* divider clocks */ #define HI6220_DDRC_SRC 6 #define HI6220_DDRC_AXI1 7 #define HI6220_POWER_NR_CLKS 8 #endif mit info' class='commit-info'> authorThomas Gleixner <tglx@linutronix.de>2017-01-31 23:58:38 +0100 committerIngo Molnar <mingo@kernel.org>2017-02-01 08:37:27 +0100 commitdd86e373e09fb16b83e8adf5c48c421a4ca76468 (patch) tree55703c2ea8584e303e342090614e0aab3509ab21 /include/net/ipconfig.h parent0b3589be9b98994ce3d5aeca52445d1f5627c4ba (diff)
perf/x86/intel/rapl: Make package handling more robust
The package management code in RAPL relies on package mapping being available before a CPU is started. This changed with: 9d85eb9119f4 ("x86/smpboot: Make logical package management more robust") because the ACPI/BIOS information turned out to be unreliable, but that left RAPL in broken state. This was not noticed because on a regular boot all CPUs are online before RAPL is initialized. A possible fix would be to reintroduce the mess which allocates a package data structure in CPU prepare and when it turns out to already exist in starting throw it away later in the CPU online callback. But that's a horrible hack and not required at all because RAPL becomes functional for perf only in the CPU online callback. That's correct because user space is not yet informed about the CPU being onlined, so nothing caan rely on RAPL being available on that particular CPU. Move the allocation to the CPU online callback and simplify the hotplug handling. At this point the package mapping is established and correct. This also adds a missing check for available package data in the event_init() function. Reported-by: Yasuaki Ishimatsu <yasu.isimatu@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: Stephane Eranian <eranian@google.com> Cc: Vince Weaver <vincent.weaver@maine.edu> Fixes: 9d85eb9119f4 ("x86/smpboot: Make logical package management more robust") Link: http://lkml.kernel.org/r/20170131230141.212593966@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/ipconfig.h')