@@ -19,8 +19,6 @@ static const __be32 *read_prop_string(const struct device_node *np,
19
19
const __be32 * prop ;
20
20
21
21
prop = of_get_property (np , prop_name , NULL );
22
- if (cxl_verbose && prop )
23
- pr_info ("%s: %s\n" , prop_name , (char * ) prop );
24
22
return prop ;
25
23
}
26
24
@@ -32,8 +30,6 @@ static const __be32 *read_prop_dword(const struct device_node *np,
32
30
prop = of_get_property (np , prop_name , NULL );
33
31
if (prop )
34
32
* val = be32_to_cpu (prop [0 ]);
35
- if (cxl_verbose && prop )
36
- pr_info ("%s: %#x (%u)\n" , prop_name , * val , * val );
37
33
return prop ;
38
34
}
39
35
@@ -45,8 +41,6 @@ static const __be64 *read_prop64_dword(const struct device_node *np,
45
41
prop = of_get_property (np , prop_name , NULL );
46
42
if (prop )
47
43
* val = be64_to_cpu (prop [0 ]);
48
- if (cxl_verbose && prop )
49
- pr_info ("%s: %#llx (%llu)\n" , prop_name , * val , * val );
50
44
return prop ;
51
45
}
52
46
@@ -100,9 +94,6 @@ static int read_phys_addr(struct device_node *np, char *prop_name,
100
94
type , prop_name );
101
95
return - EINVAL ;
102
96
}
103
- if (cxl_verbose )
104
- pr_info ("%s: %#x %#llx (size %#llx)\n" ,
105
- prop_name , type , addr , size );
106
97
}
107
98
}
108
99
return 0 ;
@@ -139,27 +130,13 @@ int cxl_of_read_afu_handle(struct cxl_afu *afu, struct device_node *afu_np)
139
130
140
131
int cxl_of_read_afu_properties (struct cxl_afu * afu , struct device_node * np )
141
132
{
142
- int i , len , rc ;
143
- char * p ;
133
+ int i , rc ;
144
134
const __be32 * prop ;
145
135
u16 device_id , vendor_id ;
146
136
u32 val = 0 , class_code ;
147
137
148
138
/* Properties are read in the same order as listed in PAPR */
149
139
150
- if (cxl_verbose ) {
151
- pr_info ("Dump of the 'ibm,coherent-platform-function' node properties:\n" );
152
-
153
- prop = of_get_property (np , "compatible" , & len );
154
- i = 0 ;
155
- while (i < len ) {
156
- p = (char * ) prop + i ;
157
- pr_info ("compatible: %s\n" , p );
158
- i += strlen (p ) + 1 ;
159
- }
160
- read_prop_string (np , "name" );
161
- }
162
-
163
140
rc = read_phys_addr (np , "reg" , afu );
164
141
if (rc )
165
142
return rc ;
@@ -173,19 +150,10 @@ int cxl_of_read_afu_properties(struct cxl_afu *afu, struct device_node *np)
173
150
else
174
151
afu -> psa = true;
175
152
176
- if (cxl_verbose ) {
177
- read_prop_string (np , "ibm,loc-code" );
178
- read_prop_string (np , "device_type" );
179
- }
180
-
181
153
read_prop_dword (np , "ibm,#processes" , & afu -> max_procs_virtualised );
182
154
183
- if (cxl_verbose ) {
184
- read_prop_dword (np , "ibm,scratchpad-size" , & val );
185
- read_prop_dword (np , "ibm,programmable" , & val );
186
- read_prop_string (np , "ibm,phandle" );
155
+ if (cxl_verbose )
187
156
read_vpd (NULL , afu );
188
- }
189
157
190
158
read_prop_dword (np , "ibm,max-ints-per-process" , & afu -> guest -> max_ints );
191
159
afu -> irqs_max = afu -> guest -> max_ints ;
@@ -199,17 +167,9 @@ int cxl_of_read_afu_properties(struct cxl_afu *afu, struct device_node *np)
199
167
afu -> pp_irqs -- ;
200
168
}
201
169
202
- if (cxl_verbose ) {
203
- read_prop_dword (np , "ibm,max-ints" , & val );
204
- read_prop_dword (np , "ibm,vpd-size" , & val );
205
- }
206
-
207
170
read_prop64_dword (np , "ibm,error-buffer-size" , & afu -> eb_len );
208
171
afu -> eb_offset = 0 ;
209
172
210
- if (cxl_verbose )
211
- read_prop_dword (np , "ibm,config-record-type" , & val );
212
-
213
173
read_prop64_dword (np , "ibm,config-record-size" , & afu -> crs_len );
214
174
afu -> crs_offset = 0 ;
215
175
@@ -235,15 +195,6 @@ int cxl_of_read_afu_properties(struct cxl_afu *afu, struct device_node *np)
235
195
i , class_code );
236
196
}
237
197
}
238
-
239
- read_prop_dword (np , "ibm,function-number" , & val );
240
- read_prop_dword (np , "ibm,privileged-function" , & val );
241
- read_prop_dword (np , "vendor-id" , & val );
242
- read_prop_dword (np , "device-id" , & val );
243
- read_prop_dword (np , "revision-id" , & val );
244
- read_prop_dword (np , "class-code" , & val );
245
- read_prop_dword (np , "subsystem-vendor-id" , & val );
246
- read_prop_dword (np , "subsystem-id" , & val );
247
198
}
248
199
/*
249
200
* if "ibm,process-mmio" doesn't exist then per-process mmio is
@@ -256,12 +207,6 @@ int cxl_of_read_afu_properties(struct cxl_afu *afu, struct device_node *np)
256
207
else
257
208
afu -> pp_psa = false;
258
209
259
- if (cxl_verbose ) {
260
- read_prop_dword (np , "ibm,supports-aur" , & val );
261
- read_prop_dword (np , "ibm,supports-csrp" , & val );
262
- read_prop_dword (np , "ibm,supports-prr" , & val );
263
- }
264
-
265
210
prop = read_prop_dword (np , "ibm,function-error-interrupt" , & val );
266
211
if (prop )
267
212
afu -> serr_hwirq = val ;
@@ -343,49 +288,15 @@ int cxl_of_read_adapter_handle(struct cxl *adapter, struct device_node *np)
343
288
344
289
int cxl_of_read_adapter_properties (struct cxl * adapter , struct device_node * np )
345
290
{
346
- int rc , len , naddr , i ;
347
- char * p ;
291
+ int rc ;
348
292
const __be32 * prop ;
349
293
u32 val = 0 ;
350
294
351
295
/* Properties are read in the same order as listed in PAPR */
352
296
353
- naddr = of_n_addr_cells (np );
354
-
355
- if (cxl_verbose ) {
356
- pr_info ("Dump of the 'ibm,coherent-platform-facility' node properties:\n" );
357
-
358
- read_prop_dword (np , "#address-cells" , & val );
359
- read_prop_dword (np , "#size-cells" , & val );
360
-
361
- prop = of_get_property (np , "compatible" , & len );
362
- i = 0 ;
363
- while (i < len ) {
364
- p = (char * ) prop + i ;
365
- pr_info ("compatible: %s\n" , p );
366
- i += strlen (p ) + 1 ;
367
- }
368
- read_prop_string (np , "name" );
369
- read_prop_string (np , "model" );
370
-
371
- prop = of_get_property (np , "reg" , NULL );
372
- if (prop ) {
373
- pr_info ("reg: addr:%#llx size:%#x\n" ,
374
- of_read_number (prop , naddr ),
375
- be32_to_cpu (prop [naddr ]));
376
- }
377
-
378
- read_prop_string (np , "ibm,loc-code" );
379
- }
380
-
381
297
if ((rc = read_adapter_irq_config (adapter , np )))
382
298
return rc ;
383
299
384
- if (cxl_verbose ) {
385
- read_prop_string (np , "device_type" );
386
- read_prop_string (np , "ibm,phandle" );
387
- }
388
-
389
300
prop = read_prop_dword (np , "ibm,caia-version" , & val );
390
301
if (prop ) {
391
302
adapter -> caia_major = (val & 0xFF00 ) >> 8 ;
@@ -411,12 +322,6 @@ int cxl_of_read_adapter_properties(struct cxl *adapter, struct device_node *np)
411
322
if (prop )
412
323
adapter -> guest -> device = val ;
413
324
414
- if (cxl_verbose ) {
415
- read_prop_dword (np , "ibm,privileged-facility" , & val );
416
- read_prop_dword (np , "revision-id" , & val );
417
- read_prop_dword (np , "class-code" , & val );
418
- }
419
-
420
325
prop = read_prop_dword (np , "subsystem-vendor-id" , & val );
421
326
if (prop )
422
327
adapter -> guest -> subsystem_vendor = val ;
0 commit comments