* Re: [PATCH] zorro: Use str_plural() in amiga_zorro_probe()
2024-06-18 7:32 [PATCH] zorro: Use str_plural() in amiga_zorro_probe() Jiapeng Chong
2024-06-18 7:39 ` Geert Uytterhoeven
@ 2024-06-19 3:49 ` kernel test robot
2024-06-19 7:09 ` Geert Uytterhoeven
2 siblings, 0 replies; 4+ messages in thread
From: kernel test robot @ 2024-06-19 3:49 UTC (permalink / raw)
To: Jiapeng Chong, geert
Cc: oe-kbuild-all, linux-m68k, linux-kernel, Jiapeng Chong,
Abaci Robot
Hi Jiapeng,
kernel test robot noticed the following build errors:
[auto build test ERROR on geert-m68k/for-next]
[also build test ERROR on geert-m68k/for-linus gerg-m68knommu/for-next linus/master v6.10-rc4 next-20240618]
[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#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jiapeng-Chong/zorro-Use-str_plural-in-amiga_zorro_probe/20240618-181203
base: https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git for-next
patch link: https://lore.kernel.org/r/20240618073205.65303-1-jiapeng.chong%40linux.alibaba.com
patch subject: [PATCH] zorro: Use str_plural() in amiga_zorro_probe()
config: m68k-defconfig (https://download.01.org/0day-ci/archive/20240619/202406191127.BtrdVDxQ-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240619/202406191127.BtrdVDxQ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202406191127.BtrdVDxQ-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from include/asm-generic/bug.h:22,
from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/thread_info.h:13,
from include/asm-generic/preempt.h:5,
from ./arch/m68k/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:79,
from include/linux/spinlock.h:56,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:7,
from include/linux/umh.h:4,
from include/linux/kmod.h:9,
from include/linux/module.h:17,
from drivers/zorro/zorro.c:11:
drivers/zorro/zorro.c: In function 'amiga_zorro_probe':
>> drivers/zorro/zorro.c:155:37: error: implicit declaration of function 'str_plural' [-Werror=implicit-function-declaration]
155 | zorro_num_autocon, str_plural(zorro_num_autocon));
| ^~~~~~~~~~
include/linux/printk.h:436:33: note: in definition of macro 'printk_index_wrap'
436 | _p_func(_fmt, ##__VA_ARGS__); \
| ^~~~~~~~~~~
include/linux/printk.h:537:9: note: in expansion of macro 'printk'
537 | printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~
drivers/zorro/zorro.c:154:9: note: in expansion of macro 'pr_info'
154 | pr_info("Zorro: Probing AutoConfig expansion devices: %u device%s\n",
| ^~~~~~~
include/linux/kern_levels.h:5:25: warning: format '%s' expects argument of type 'char *', but argument 3 has type 'int' [-Wformat=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
include/linux/printk.h:436:25: note: in definition of macro 'printk_index_wrap'
436 | _p_func(_fmt, ##__VA_ARGS__); \
| ^~~~
include/linux/printk.h:537:9: note: in expansion of macro 'printk'
537 | printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~
include/linux/kern_levels.h:14:25: note: in expansion of macro 'KERN_SOH'
14 | #define KERN_INFO KERN_SOH "6" /* informational */
| ^~~~~~~~
include/linux/printk.h:537:16: note: in expansion of macro 'KERN_INFO'
537 | printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~~~
drivers/zorro/zorro.c:154:9: note: in expansion of macro 'pr_info'
154 | pr_info("Zorro: Probing AutoConfig expansion devices: %u device%s\n",
| ^~~~~~~
cc1: some warnings being treated as errors
vim +/str_plural +155 drivers/zorro/zorro.c
> 11 #include <linux/module.h>
12 #include <linux/types.h>
13 #include <linux/kernel.h>
14 #include <linux/init.h>
15 #include <linux/zorro.h>
16 #include <linux/bitops.h>
17 #include <linux/string.h>
18 #include <linux/platform_device.h>
19 #include <linux/dma-mapping.h>
20 #include <linux/slab.h>
21
22 #include <asm/byteorder.h>
23 #include <asm/setup.h>
24 #include <asm/amigahw.h>
25
26 #include "zorro.h"
27
28
29 /*
30 * Zorro Expansion Devices
31 */
32
33 unsigned int zorro_num_autocon;
34 struct zorro_dev_init zorro_autocon_init[ZORRO_NUM_AUTO] __initdata;
35 struct zorro_dev *zorro_autocon;
36
37
38 /*
39 * Zorro bus
40 */
41
42 struct zorro_bus {
43 struct device dev;
44 struct zorro_dev devices[];
45 };
46
47
48 /*
49 * Find Zorro Devices
50 */
51
52 struct zorro_dev *zorro_find_device(zorro_id id, struct zorro_dev *from)
53 {
54 struct zorro_dev *z;
55
56 if (!zorro_num_autocon)
57 return NULL;
58
59 for (z = from ? from+1 : &zorro_autocon[0];
60 z < zorro_autocon+zorro_num_autocon;
61 z++)
62 if (id == ZORRO_WILDCARD || id == z->id)
63 return z;
64 return NULL;
65 }
66 EXPORT_SYMBOL(zorro_find_device);
67
68
69 /*
70 * Bitmask indicating portions of available Zorro II RAM that are unused
71 * by the system. Every bit represents a 64K chunk, for a maximum of 8MB
72 * (128 chunks, physical 0x00200000-0x009fffff).
73 *
74 * If you want to use (= allocate) portions of this RAM, you should clear
75 * the corresponding bits.
76 *
77 * Possible uses:
78 * - z2ram device
79 * - SCSI DMA bounce buffers
80 *
81 * FIXME: use the normal resource management
82 */
83
84 DECLARE_BITMAP(zorro_unused_z2ram, 128);
85 EXPORT_SYMBOL(zorro_unused_z2ram);
86
87
88 static void __init mark_region(unsigned long start, unsigned long end,
89 int flag)
90 {
91 if (flag)
92 start += Z2RAM_CHUNKMASK;
93 else
94 end += Z2RAM_CHUNKMASK;
95 start &= ~Z2RAM_CHUNKMASK;
96 end &= ~Z2RAM_CHUNKMASK;
97
98 if (end <= Z2RAM_START || start >= Z2RAM_END)
99 return;
100 start = start < Z2RAM_START ? 0x00000000 : start-Z2RAM_START;
101 end = end > Z2RAM_END ? Z2RAM_SIZE : end-Z2RAM_START;
102 while (start < end) {
103 u32 chunk = start>>Z2RAM_CHUNKSHIFT;
104
105 if (flag)
106 set_bit(chunk, zorro_unused_z2ram);
107 else
108 clear_bit(chunk, zorro_unused_z2ram);
109 start += Z2RAM_CHUNKSIZE;
110 }
111 }
112
113
114 static struct resource __init *zorro_find_parent_resource(
115 struct platform_device *bridge, struct zorro_dev *z)
116 {
117 int i;
118
119 for (i = 0; i < bridge->num_resources; i++) {
120 if (resource_contains(&bridge->resource[i], &z->resource))
121 return &bridge->resource[i];
122 }
123
124 return &iomem_resource;
125 }
126
127 static int __init amiga_zorro_probe(struct platform_device *pdev)
128 {
129 struct zorro_bus *bus;
130 struct zorro_dev_init *zi;
131 struct zorro_dev *z;
132 struct resource *r;
133 unsigned int i;
134 int error;
135
136 /* Initialize the Zorro bus */
137 bus = kzalloc(struct_size(bus, devices, zorro_num_autocon),
138 GFP_KERNEL);
139 if (!bus)
140 return -ENOMEM;
141
142 zorro_autocon = bus->devices;
143 bus->dev.parent = &pdev->dev;
144 dev_set_name(&bus->dev, zorro_bus_type.name);
145 error = device_register(&bus->dev);
146 if (error) {
147 pr_err("Zorro: Error registering zorro_bus\n");
148 put_device(&bus->dev);
149 kfree(bus);
150 return error;
151 }
152 platform_set_drvdata(pdev, bus);
153
154 pr_info("Zorro: Probing AutoConfig expansion devices: %u device%s\n",
> 155 zorro_num_autocon, str_plural(zorro_num_autocon));
156
157 /* First identify all devices ... */
158 for (i = 0; i < zorro_num_autocon; i++) {
159 zi = &zorro_autocon_init[i];
160 z = &zorro_autocon[i];
161
162 z->rom = zi->rom;
163 z->id = (be16_to_cpu(z->rom.er_Manufacturer) << 16) |
164 (z->rom.er_Product << 8);
165 if (z->id == ZORRO_PROD_GVP_EPC_BASE) {
166 /* GVP quirk */
167 unsigned long magic = zi->boardaddr + 0x8000;
168
169 z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK;
170 }
171 z->slotaddr = zi->slotaddr;
172 z->slotsize = zi->slotsize;
173 sprintf(z->name, "Zorro device %08x", z->id);
174 zorro_name_device(z);
175 z->resource = DEFINE_RES_MEM_NAMED(zi->boardaddr, zi->boardsize, z->name);
176 r = zorro_find_parent_resource(pdev, z);
177 error = request_resource(r, &z->resource);
178 if (error && !(z->rom.er_Type & ERTF_MEMLIST))
179 dev_err(&bus->dev,
180 "Address space collision on device %s %pR\n",
181 z->name, &z->resource);
182 z->dev.parent = &bus->dev;
183 z->dev.bus = &zorro_bus_type;
184 z->dev.id = i;
185 switch (z->rom.er_Type & ERT_TYPEMASK) {
186 case ERT_ZORROIII:
187 z->dev.coherent_dma_mask = DMA_BIT_MASK(32);
188 break;
189
190 case ERT_ZORROII:
191 default:
192 z->dev.coherent_dma_mask = DMA_BIT_MASK(24);
193 break;
194 }
195 z->dev.dma_mask = &z->dev.coherent_dma_mask;
196 }
197
198 /* ... then register them */
199 for (i = 0; i < zorro_num_autocon; i++) {
200 z = &zorro_autocon[i];
201 error = device_register(&z->dev);
202 if (error) {
203 dev_err(&bus->dev, "Error registering device %s\n",
204 z->name);
205 put_device(&z->dev);
206 continue;
207 }
208 }
209
210 /* Mark all available Zorro II memory */
211 zorro_for_each_dev(z) {
212 if (z->rom.er_Type & ERTF_MEMLIST)
213 mark_region(zorro_resource_start(z),
214 zorro_resource_end(z)+1, 1);
215 }
216
217 /* Unmark all used Zorro II memory */
218 for (i = 0; i < m68k_num_memory; i++)
219 if (m68k_memory[i].addr < 16*1024*1024)
220 mark_region(m68k_memory[i].addr,
221 m68k_memory[i].addr+m68k_memory[i].size,
222 0);
223
224 return 0;
225 }
226
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] zorro: Use str_plural() in amiga_zorro_probe()
2024-06-18 7:32 [PATCH] zorro: Use str_plural() in amiga_zorro_probe() Jiapeng Chong
2024-06-18 7:39 ` Geert Uytterhoeven
2024-06-19 3:49 ` kernel test robot
@ 2024-06-19 7:09 ` Geert Uytterhoeven
2 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2024-06-19 7:09 UTC (permalink / raw)
To: Jiapeng Chong; +Cc: linux-m68k, linux-kernel, Abaci Robot
Hi Jiapeng,
On Tue, Jun 18, 2024 at 9:32 AM Jiapeng Chong
<jiapeng.chong@linux.alibaba.com> wrote:
> Use existing str_plural() function rather than duplicating its
> implementation.
>
> ./drivers/zorro/zorro.c:155:22-39: opportunity for str_plural(zorro_num_autocon).
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9350
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Thanks for your patch!
> --- a/drivers/zorro/zorro.c
> +++ b/drivers/zorro/zorro.c
> @@ -152,7 +152,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, bus);
>
> pr_info("Zorro: Probing AutoConfig expansion devices: %u device%s\n",
> - zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
> + zorro_num_autocon, str_plural(zorro_num_autocon));
Missing #include <linux/string_choices.h>
I will fix that up while applying.
Please try to at least compile-test your patches.
Thanks!
>
> /* First identify all devices ... */
> for (i = 0; i < zorro_num_autocon; i++) {
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread