Commit e563592c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'printk-for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux 

Pull printk updates from Petr Mladek:

 - Add %pt[RT]s modifier to vsprintf(). It overrides ISO 8601 separator
   by using ' ' (space). It produces "YYYY-mm-dd HH:MM:SS" instead of
   "YYYY-mm-ddTHH:MM:SS".

 - Correctly parse long row of numbers by sscanf() when using the field
   width. Add extensive sscanf() selftest.

 - Generalize re-entrant CPU lock that has already been used to
   serialize dump_stack() output. It is part of the ongoing printk
   rework. It will allow to remove the obsoleted printk_safe buffers and
   introduce atomic consoles.

 - Some code clean up and sparse warning fixes.

* tag 'printk-for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  printk: fix cpu lock ordering
  lib/dump_stack: move cpu lock to printk.c
  printk: Remove trailing semicolon in macros
  random32: Fix implicit truncation warning in prandom_seed_state()
  lib: test_scanf: Remove pointless use of type_min() with unsigned types
  selftests: lib: Add wrapper script for test_scanf
  lib: test_scanf: Add tests for sscanf number conversion
  lib: vsprintf: Fix handling of number field widths in vsscanf
  lib: vsprintf: scanf: Negative number must have field width > 1
  usb: host: xhci-tegra: Switch to use %ptTs
  nilfs2: Switch to use %ptTs
  kdb: Switch to use %ptTs
  lib/vsprintf: Allow to override ISO 8601 date and time separator
parents b694011a 94f2be50

Documentation/core-api/printk-formats.rst

+6 −1
Original line number Diff line number Diff line
@@ -513,9 +513,10 @@ Time and date 
::



	%pt[RT]			YYYY-mm-ddTHH:MM:SS

	%pt[RT]s		YYYY-mm-dd HH:MM:SS

	%pt[RT]d		YYYY-mm-dd

	%pt[RT]t		HH:MM:SS

	%pt[RT][dt][r]

	%pt[RT][dt][r][s]



For printing date and time as represented by::
@@ -527,6 +528,10 @@ in human readable format. 
By default year will be incremented by 1900 and month by 1.

Use %pt[RT]r (raw) to suppress this behaviour.



The %pt[RT]s (space) will override ISO 8601 separator by using ' ' (space)

instead of 'T' (Capital T) between date and time. It won't have any effect

when date or time is omitted.



Passed by reference.



struct clk

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -19629,6 +19629,7 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git

F:	Documentation/core-api/printk-formats.rst

F:	lib/test_printf.c

F:	lib/test_scanf.c

F:	lib/vsprintf.c









VT1211 HARDWARE MONITOR DRIVER

























drivers/usb/host/xhci-tegra.c



+1
−5






























Original line number
Diff line number
Diff line







@@ -917,7 +917,6 @@ static int tegra_xusb_load_firmware(struct tegra_xusb *tegra)







	struct xhci_op_regs __iomem *op;









	unsigned long timeout;









	time64_t timestamp;









	struct tm time;









	u64 address;









	u32 value;









	int err;








@@ -1014,11 +1013,8 @@ static int tegra_xusb_load_firmware(struct tegra_xusb *tegra)







	}



















	timestamp = le32_to_cpu(header->fwimg_created_time);









	time64_to_tm(timestamp, 0, &time);



















	dev_info(dev, "Firmware timestamp: %ld-%02d-%02d %02d:%02d:%02d UTC\n",









		 time.tm_year + 1900, time.tm_mon + 1, time.tm_mday,









		 time.tm_hour, time.tm_min, time.tm_sec);









	dev_info(dev, "Firmware timestamp: %ptTs UTC\n", &timestamp);



















	return 0;









}
































fs/nilfs2/sysfs.c



+3
−16






























Original line number
Diff line number
Diff line







@@ -19,19 +19,6 @@







/* /sys/fs/<nilfs>/ */









static struct kset *nilfs_kset;



















#define NILFS_SHOW_TIME(time_t_val, buf) ({ \









		struct tm res; \









		int count = 0; \









		time64_to_tm(time_t_val, 0, &res); \









		res.tm_year += 1900; \









		res.tm_mon += 1; \









		count = scnprintf(buf, PAGE_SIZE, \









				    "%ld-%.2d-%.2d %.2d:%.2d:%.2d\n", \









				    res.tm_year, res.tm_mon, res.tm_mday, \









				    res.tm_hour, res.tm_min, res.tm_sec);\









		count; \









})



















#define NILFS_DEV_INT_GROUP_OPS(name, parent_name) \









static ssize_t nilfs_##name##_attr_show(struct kobject *kobj, \









					struct attribute *attr, char *buf) \








@@ -576,7 +563,7 @@ nilfs_segctor_last_seg_write_time_show(struct nilfs_segctor_attr *attr,







	ctime = nilfs->ns_ctime;









	up_read(&nilfs->ns_segctor_sem);



















	return NILFS_SHOW_TIME(ctime, buf);









	return sysfs_emit(buf, "%ptTs\n", &ctime);









}



















static ssize_t








@@ -604,7 +591,7 @@ nilfs_segctor_last_nongc_write_time_show(struct nilfs_segctor_attr *attr,







	nongc_ctime = nilfs->ns_nongc_ctime;









	up_read(&nilfs->ns_segctor_sem);



















	return NILFS_SHOW_TIME(nongc_ctime, buf);









	return sysfs_emit(buf, "%ptTs\n", &nongc_ctime);









}



















static ssize_t








@@ -724,7 +711,7 @@ nilfs_superblock_sb_write_time_show(struct nilfs_superblock_attr *attr,







	sbwtime = nilfs->ns_sbwtime;









	up_read(&nilfs->ns_sem);



















	return NILFS_SHOW_TIME(sbwtime, buf);









	return sysfs_emit(buf, "%ptTs\n", &sbwtime);









}



















static ssize_t
































include/linux/dev_printk.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -236,7 +236,7 @@ do {									\







 * using WARN/WARN_ONCE to include file/line information and a backtrace.









 */









#define dev_WARN(dev, format, arg...) \









	WARN(1, "%s %s: " format, dev_driver_string(dev), dev_name(dev), ## arg);









	WARN(1, "%s %s: " format, dev_driver_string(dev), dev_name(dev), ## arg)



















#define dev_WARN_ONCE(dev, condition, format, arg...) \









	WARN_ONCE(condition, "%s %s: " format, \