Skip to content

Commit 4969a3a

Browse files
bostrovsbostrovs
committed
xen/pci: Get rid of verbose_request and use dev_dbg() instead
Information printed under verbose_request is clearly used for debugging only. Remove it and use dev_dbg() instead. Signed-off-by: Boris Ostrovsky <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Juergen Gross <[email protected]> Signed-off-by: Boris Ostrovsky <[email protected]>
1 parent 64b3eaf commit 4969a3a

File tree

5 files changed

+31
-67
lines changed

5 files changed

+31
-67
lines changed

‎drivers/pci/xen-pcifront.c

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ static inline void pcifront_init_sd(struct pcifront_sd *sd,
7777
static DEFINE_SPINLOCK(pcifront_dev_lock);
7878
static struct pcifront_device *pcifront_dev;
7979

80-
static int verbose_request;
81-
module_param(verbose_request, int, 0644);
82-
8380
static int errno_to_pcibios_err(int errno)
8481
{
8582
switch (errno) {
@@ -190,18 +187,16 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,
190187
struct pcifront_sd *sd = bus->sysdata;
191188
struct pcifront_device *pdev = pcifront_get_pdev(sd);
192189

193-
if (verbose_request)
194-
dev_info(&pdev->xdev->dev,
195-
"read dev=%04x:%02x:%02x.%d - offset %x size %d\n",
196-
pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
197-
PCI_FUNC(devfn), where, size);
190+
dev_dbg(&pdev->xdev->dev,
191+
"read dev=%04x:%02x:%02x.%d - offset %x size %d\n",
192+
pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
193+
PCI_FUNC(devfn), where, size);
198194

199195
err = do_pci_op(pdev, &op);
200196

201197
if (likely(!err)) {
202-
if (verbose_request)
203-
dev_info(&pdev->xdev->dev, "read got back value %x\n",
204-
op.value);
198+
dev_dbg(&pdev->xdev->dev, "read got back value %x\n",
199+
op.value);
205200

206201
*val = op.value;
207202
} else if (err == -ENODEV) {
@@ -229,12 +224,10 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn,
229224
struct pcifront_sd *sd = bus->sysdata;
230225
struct pcifront_device *pdev = pcifront_get_pdev(sd);
231226

232-
if (verbose_request)
233-
dev_info(&pdev->xdev->dev,
234-
"write dev=%04x:%02x:%02x.%d - "
235-
"offset %x size %d val %x\n",
236-
pci_domain_nr(bus), bus->number,
237-
PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
227+
dev_dbg(&pdev->xdev->dev,
228+
"write dev=%04x:%02x:%02x.%d - offset %x size %d val %x\n",
229+
pci_domain_nr(bus), bus->number,
230+
PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
238231

239232
return errno_to_pcibios_err(do_pci_op(pdev, &op));
240233
}

‎drivers/xen/xen-pciback/conf_space.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
156156
* (as if device didn't respond) */
157157
u32 value = 0, tmp_val;
158158

159-
if (unlikely(verbose_request))
160-
dev_printk(KERN_DEBUG, &dev->dev, "read %d bytes at 0x%x\n",
161-
size, offset);
159+
dev_dbg(&dev->dev, "read %d bytes at 0x%x\n", size, offset);
162160

163161
if (!valid_request(offset, size)) {
164162
err = XEN_PCI_ERR_invalid_offset;
@@ -197,9 +195,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
197195
}
198196

199197
out:
200-
if (unlikely(verbose_request))
201-
dev_printk(KERN_DEBUG, &dev->dev,
202-
"read %d bytes at 0x%x = %x\n", size, offset, value);
198+
dev_dbg(&dev->dev, "read %d bytes at 0x%x = %x\n", size, offset, value);
203199

204200
*ret_val = value;
205201
return xen_pcibios_err_to_errno(err);
@@ -214,10 +210,8 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)
214210
u32 tmp_val;
215211
int field_start, field_end;
216212

217-
if (unlikely(verbose_request))
218-
dev_printk(KERN_DEBUG, &dev->dev,
219-
"write request %d bytes at 0x%x = %x\n", size,
220-
offset, value);
213+
dev_dbg(&dev->dev, "write request %d bytes at 0x%x = %x\n",
214+
size, offset, value);
221215

222216
if (!valid_request(offset, size))
223217
return XEN_PCI_ERR_invalid_offset;

‎drivers/xen/xen-pciback/conf_space_header.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,36 +68,30 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data)
6868

6969
dev_data = pci_get_drvdata(dev);
7070
if (!pci_is_enabled(dev) && is_enable_cmd(value)) {
71-
if (unlikely(verbose_request))
72-
dev_printk(KERN_DEBUG, &dev->dev, "enable\n");
71+
dev_dbg(&dev->dev, "enable\n");
7372
err = pci_enable_device(dev);
7473
if (err)
7574
return err;
7675
if (dev_data)
7776
dev_data->enable_intx = 1;
7877
} else if (pci_is_enabled(dev) && !is_enable_cmd(value)) {
79-
if (unlikely(verbose_request))
80-
dev_printk(KERN_DEBUG, &dev->dev, "disable\n");
78+
dev_dbg(&dev->dev, "disable\n");
8179
pci_disable_device(dev);
8280
if (dev_data)
8381
dev_data->enable_intx = 0;
8482
}
8583

8684
if (!dev->is_busmaster && is_master_cmd(value)) {
87-
if (unlikely(verbose_request))
88-
dev_printk(KERN_DEBUG, &dev->dev, "set bus master\n");
85+
dev_dbg(&dev->dev, "set bus master\n");
8986
pci_set_master(dev);
9087
} else if (dev->is_busmaster && !is_master_cmd(value)) {
91-
if (unlikely(verbose_request))
92-
dev_printk(KERN_DEBUG, &dev->dev, "clear bus master\n");
88+
dev_dbg(&dev->dev, "clear bus master\n");
9389
pci_clear_master(dev);
9490
}
9591

9692
if (!(cmd->val & PCI_COMMAND_INVALIDATE) &&
9793
(value & PCI_COMMAND_INVALIDATE)) {
98-
if (unlikely(verbose_request))
99-
dev_printk(KERN_DEBUG, &dev->dev,
100-
"enable memory-write-invalidate\n");
94+
dev_dbg(&dev->dev, "enable memory-write-invalidate\n");
10195
err = pci_set_mwi(dev);
10296
if (err) {
10397
dev_warn(&dev->dev, "cannot enable memory-write-invalidate (%d)\n",
@@ -106,9 +100,7 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data)
106100
}
107101
} else if ((cmd->val & PCI_COMMAND_INVALIDATE) &&
108102
!(value & PCI_COMMAND_INVALIDATE)) {
109-
if (unlikely(verbose_request))
110-
dev_printk(KERN_DEBUG, &dev->dev,
111-
"disable memory-write-invalidate\n");
103+
dev_dbg(&dev->dev, "disable memory-write-invalidate\n");
112104
pci_clear_mwi(dev);
113105
}
114106

‎drivers/xen/xen-pciback/pciback.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,6 @@ void xen_pcibk_do_op(struct work_struct *data);
186186
int xen_pcibk_xenbus_register(void);
187187
void xen_pcibk_xenbus_unregister(void);
188188

189-
extern int verbose_request;
190-
191189
void xen_pcibk_test_and_schedule_op(struct xen_pcibk_device *pdev);
192190
#endif
193191

‎drivers/xen/xen-pciback/pciback_ops.c

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
#include <linux/sched.h>
1616
#include "pciback.h"
1717

18-
int verbose_request;
19-
module_param(verbose_request, int, 0644);
20-
2118
static irqreturn_t xen_pcibk_guest_interrupt(int irq, void *dev_id);
2219

2320
/* Ensure a device is has the fake IRQ handler "turned on/off" and is
@@ -148,9 +145,6 @@ int xen_pcibk_enable_msi(struct xen_pcibk_device *pdev,
148145
struct xen_pcibk_dev_data *dev_data;
149146
int status;
150147

151-
if (unlikely(verbose_request))
152-
dev_printk(KERN_DEBUG, &dev->dev, "enable MSI\n");
153-
154148
if (dev->msi_enabled)
155149
status = -EALREADY;
156150
else if (dev->msix_enabled)
@@ -169,8 +163,8 @@ int xen_pcibk_enable_msi(struct xen_pcibk_device *pdev,
169163
* the local domain's IRQ number. */
170164

171165
op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
172-
if (unlikely(verbose_request))
173-
dev_printk(KERN_DEBUG, &dev->dev, "MSI: %d\n", op->value);
166+
167+
dev_dbg(&dev->dev, "MSI: %d\n", op->value);
174168

175169
dev_data = pci_get_drvdata(dev);
176170
if (dev_data)
@@ -183,9 +177,6 @@ static
183177
int xen_pcibk_disable_msi(struct xen_pcibk_device *pdev,
184178
struct pci_dev *dev, struct xen_pci_op *op)
185179
{
186-
if (unlikely(verbose_request))
187-
dev_printk(KERN_DEBUG, &dev->dev, "disable MSI\n");
188-
189180
if (dev->msi_enabled) {
190181
struct xen_pcibk_dev_data *dev_data;
191182

@@ -196,8 +187,9 @@ int xen_pcibk_disable_msi(struct xen_pcibk_device *pdev,
196187
dev_data->ack_intr = 1;
197188
}
198189
op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
199-
if (unlikely(verbose_request))
200-
dev_printk(KERN_DEBUG, &dev->dev, "MSI: %d\n", op->value);
190+
191+
dev_dbg(&dev->dev, "MSI: %d\n", op->value);
192+
201193
return 0;
202194
}
203195

@@ -210,8 +202,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
210202
struct msix_entry *entries;
211203
u16 cmd;
212204

213-
if (unlikely(verbose_request))
214-
dev_printk(KERN_DEBUG, &dev->dev, "enable MSI-X\n");
205+
dev_dbg(&dev->dev, "enable MSI-X\n");
215206

216207
if (op->value > SH_INFO_MAX_VEC)
217208
return -EINVAL;
@@ -244,10 +235,8 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
244235
if (entries[i].vector) {
245236
op->msix_entries[i].vector =
246237
xen_pirq_from_irq(entries[i].vector);
247-
if (unlikely(verbose_request))
248-
dev_printk(KERN_DEBUG, &dev->dev,
249-
"MSI-X[%d]: %d\n", i,
250-
op->msix_entries[i].vector);
238+
dev_dbg(&dev->dev, "MSI-X[%d]: %d\n", i,
239+
op->msix_entries[i].vector);
251240
}
252241
}
253242
} else
@@ -267,9 +256,6 @@ static
267256
int xen_pcibk_disable_msix(struct xen_pcibk_device *pdev,
268257
struct pci_dev *dev, struct xen_pci_op *op)
269258
{
270-
if (unlikely(verbose_request))
271-
dev_printk(KERN_DEBUG, &dev->dev, "disable MSI-X\n");
272-
273259
if (dev->msix_enabled) {
274260
struct xen_pcibk_dev_data *dev_data;
275261

@@ -284,8 +270,9 @@ int xen_pcibk_disable_msix(struct xen_pcibk_device *pdev,
284270
* an undefined IRQ value of zero.
285271
*/
286272
op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
287-
if (unlikely(verbose_request))
288-
dev_printk(KERN_DEBUG, &dev->dev, "MSI-X: %d\n", op->value);
273+
274+
dev_dbg(&dev->dev, "MSI-X: %d\n", op->value);
275+
289276
return 0;
290277
}
291278
#endif

0 commit comments

Comments
 (0)