Re: [PATCH 4/4] thermal/core: Remove ms based delay fields
Hi Daniel,
I love your patch! Yet something to improve:
[auto build test ERROR on linux/master]
[also build test ERROR on linus/master v5.10-rc6 next-20201201]
[cannot apply to thermal/next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url:
https://github.com/0day-ci/linux/commits/Daniel-Lezcano/thermal-core-Rename-passive_delay-and-polling_delay-with-units/20201202-201150
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
09162bc32c880a791c6c0668ce0745cf7958f576
config: nios2-randconfig-r021-20201202 (attached as .config)
compiler: nios2-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget
https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
~/bin/make.cross
chmod +x ~/bin/make.cross
#
https://github.com/0day-ci/linux/commit/6882dfdda2ded695a08357272d350db4e24fe59d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review
Daniel-Lezcano/thermal-core-Rename-passive_delay-and-polling_delay-with-units/20201202-201150
git checkout 6882dfdda2ded695a08357272d350db4e24fe59d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross
ARCH=nios2
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot
All errors (new ones prefixed by >>):
drivers/thermal/thermal_core.c: In function 'monitor_thermal_zone':
>> drivers/thermal/thermal_core.c:316:24: error: 'struct thermal_zone_device'
>> has no member named 'polling_delay_ms'; did you mean 'polling_delay_jiffies'?
316 | else if (!stop && tz->polling_delay_ms)
|^~~~
|polling_delay_jiffies
vim +316 drivers/thermal/thermal_core.c
b56bdff78e0b65f drivers/thermal/thermal_core.c Andrzej Pietrasiewicz 2020-06-29
305
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
306 static void monitor_thermal_zone(struct thermal_zone_device *tz)
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
307 {
b56bdff78e0b65f drivers/thermal/thermal_core.c Andrzej Pietrasiewicz 2020-06-29
308bool stop;
b56bdff78e0b65f drivers/thermal/thermal_core.c Andrzej Pietrasiewicz 2020-06-29
309
b56bdff78e0b65f drivers/thermal/thermal_core.c Andrzej Pietrasiewicz 2020-06-29
310stop = should_stop_polling(tz);
b56bdff78e0b65f drivers/thermal/thermal_core.c Andrzej Pietrasiewicz 2020-06-29
311
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
312mutex_lock(>lock);
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
313
b56bdff78e0b65f drivers/thermal/thermal_core.c Andrzej Pietrasiewicz 2020-06-29
314if (!stop && tz->passive)
07314bdc38fa26c drivers/thermal/thermal_core.c Daniel Lezcano2020-12-02
315thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);
ade78f158731d79 drivers/thermal/thermal_core.c Daniel Lezcano2020-12-02
@316else if (!stop && tz->polling_delay_ms)
07314bdc38fa26c drivers/thermal/thermal_core.c Daniel Lezcano2020-12-02
317thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
318else
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
319thermal_zone_device_set_polling(tz, 0);
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
320
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
321mutex_unlock(>lock);
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
322 }
0c01ebbfd3caf1d drivers/thermal/thermal_sys.c Durgadoss R 2012-09-18
323
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-...@lists.01.org
.config.gz
Description: application/gzip
Re: [PATCH 4/4] thermal/core: Remove ms based delay fields
Hi Daniel,
I love your patch! Yet something to improve:
[auto build test ERROR on linux/master]
[also build test ERROR on linus/master v5.10-rc6 next-20201201]
[cannot apply to thermal/next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url:
https://github.com/0day-ci/linux/commits/Daniel-Lezcano/thermal-core-Rename-passive_delay-and-polling_delay-with-units/20201202-201150
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
09162bc32c880a791c6c0668ce0745cf7958f576
config: riscv-randconfig-r025-20201202 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project
2671fccf0381769276ca8246ec0499adcb9b0355)
reproduce (this is a W=1 build):
wget
https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
~/bin/make.cross
chmod +x ~/bin/make.cross
# install riscv cross compiling tool for clang build
# apt-get install binutils-riscv64-linux-gnu
#
https://github.com/0day-ci/linux/commit/6882dfdda2ded695a08357272d350db4e24fe59d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review
Daniel-Lezcano/thermal-core-Rename-passive_delay-and-polling_delay-with-units/20201202-201150
git checkout 6882dfdda2ded695a08357272d350db4e24fe59d
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=riscv
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot
All errors (new ones prefixed by >>):
In file included from include/linux/hardirq.h:10:
In file included from ./arch/riscv/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:13:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/riscv/include/asm/io.h:149:
include/asm-generic/io.h:572:9: warning: performing pointer arithmetic on a
null pointer has undefined behavior [-Wnull-pointer-arithmetic]
return inl(addr);
^
arch/riscv/include/asm/io.h:57:76: note: expanded from macro 'inl'
#define inl(c) ({ u32 __v; __io_pbr(); __v =
readl_cpu((void*)(PCI_IOBASE + (c))); __io_par(__v); __v; })
~~ ^
arch/riscv/include/asm/mmio.h:89:76: note: expanded from macro 'readl_cpu'
#define readl_cpu(c)({ u32 __r = le32_to_cpu((__force
__le32)__raw_readl(c)); __r; })
^
include/uapi/linux/byteorder/little_endian.h:34:51: note: expanded from
macro '__le32_to_cpu'
#define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
^
In file included from drivers/thermal/thermal_core.c:22:
In file included from include/linux/suspend.h:5:
In file included from include/linux/swap.h:9:
In file included from include/linux/memcontrol.h:13:
In file included from include/linux/cgroup.h:26:
In file included from include/linux/kernel_stat.h:9:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from ./arch/riscv/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:13:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/riscv/include/asm/io.h:149:
include/asm-generic/io.h:580:2: warning: performing pointer arithmetic on a
null pointer has undefined behavior [-Wnull-pointer-arithmetic]
outb(value, addr);
^
arch/riscv/include/asm/io.h:59:68: note: expanded from macro 'outb'
#define outb(v,c) ({ __io_pbw(); writeb_cpu((v),(void*)(PCI_IOBASE +
(c))); __io_paw(); })
~~ ^
arch/riscv/include/asm/mmio.h:91:52: note: expanded from macro 'writeb_cpu'
#define writeb_cpu(v, c)((void)__raw_writeb((v), (c)))
^
In file included from drivers/thermal/thermal_core.c:22:
In file included from include/linux/suspend.h:5:
In file included from include/linux/swap.h:9:
In file included from include/linux/memcontrol.h:13:
In file included from include/linux/cgroup.h:26:
In file included from include/linux/kernel_stat.h:9:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from ./arch/riscv/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:13:
In file included
[PATCH 4/4] thermal/core: Remove ms based delay fields
The code does no longer use the ms unit based fields to set the
delays as they are replaced by the jiffies.
Remove them.
Signed-off-by: Daniel Lezcano
---
drivers/thermal/thermal_core.h | 2 --
drivers/thermal/thermal_sysfs.c | 2 +-
include/linux/thermal.h | 7 ---
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 2c9551ed5ef8..5baa308ee7a5 100644
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -131,7 +131,6 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz);
static inline void thermal_zone_set_passive_delay(
struct thermal_zone_device *tz, int delay_ms)
{
- tz->passive_delay_ms = delay_ms;
tz->passive_delay_jiffies = msecs_to_jiffies(delay_ms);
if (delay_ms > 1000)
tz->passive_delay_jiffies =
round_jiffies(tz->passive_delay_jiffies);
@@ -140,7 +139,6 @@ static inline void thermal_zone_set_passive_delay(
static inline void thermal_zone_set_polling_delay(
struct thermal_zone_device *tz, int delay_ms)
{
- tz->polling_delay_ms = delay_ms;
tz->polling_delay_jiffies = msecs_to_jiffies(delay_ms);
if (delay_ms > 1000)
tz->polling_delay_jiffies =
round_jiffies(tz->polling_delay_jiffies);
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 9598b288a0a1..8532b1dd0608 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -233,7 +233,7 @@ passive_store(struct device *dev, struct device_attribute
*attr,
return -EINVAL;
if (state && !tz->forced_passive) {
- if (!tz->passive_delay_ms)
+ if (!tz->passive_delay_jiffies)
thermal_zone_set_passive_delay(tz, 1000);
thermal_zone_device_rebind_exception(tz, "Processor",
sizeof("Processor"));
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 5dd9bdb6c6ad..f23a388ded15 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -116,13 +116,8 @@ struct thermal_cooling_device {
* @devdata: private pointer for device private data
* @trips: number of trip points the thermal zone supports
* @trips_disabled;bitmap for disabled trips
- * @passive_delay_ms: number of milliseconds to wait between polls when
- * performing passive cooling.
* @passive_delay_jiffies: number of jiffies to wait between polls when
* performing passive cooling.
- * @polling_delay_ms: number of milliseconds to wait between polls when
- * checking whether trip points have been crossed (0 for
- * interrupt driven systems)
* @polling_delay_jiffies: number of jiffies to wait between polls when
* checking whether trip points have been crossed (0 for
* interrupt driven systems)
@@ -164,8 +159,6 @@ struct thermal_zone_device {
void *devdata;
int trips;
unsigned long trips_disabled; /* bitmap for disabled trips */
- int passive_delay_ms;
- int polling_delay_ms;
int passive_delay_jiffies;
int polling_delay_jiffies;
int temperature;
--
2.17.1
