| Message ID | 20200204165547.115220-11-hare@suse.de |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | ata: kill ATA_DEBUG | expand |
On 2/4/20 5:55 PM, Hannes Reinecke wrote: > From: Hannes Reinecke <hare@suse.com> > > Implement module parameter 'pci_dump' and move the DPRINTK calls > over to dev_printk(). > > Signed-off-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > drivers/ata/sata_mv.c | 71 +++++++++++++++++++++++++++------------------------ > 1 file changed, 38 insertions(+), 33 deletions(-) > > diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c > index d7228f8e9297..9e570d455acc 100644 > --- a/drivers/ata/sata_mv.c > +++ b/drivers/ata/sata_mv.c > @@ -83,6 +83,10 @@ module_param(irq_coalescing_usecs, int, S_IRUGO); > MODULE_PARM_DESC(irq_coalescing_usecs, > "IRQ coalescing time threshold in usecs"); > > +static int pci_dump; > +module_param(pci_dump, int, S_IRUGO); > +MODULE_PARM_DESC(pci_dump, "Enable dumping of PCI registers on error"); > + > enum { > /* BAR's are enumerated in terms of pci_resource_start() terms */ > MV_PRIMARY_BAR = 0, /* offset 0x10: memory space */ > @@ -1245,47 +1249,49 @@ static int mv_stop_edma(struct ata_port *ap) > return err; > } > > -#ifdef ATA_DEBUG > -static void mv_dump_mem(void __iomem *start, unsigned bytes) > +static void mv_dump_mem(struct device *dev, void __iomem *start, unsigned bytes) > { > - int b, w; > + int b, w, o; > + unsigned char linebuf[38]; > + > for (b = 0; b < bytes; ) { > - DPRINTK("%p: ", start + b); > - for (w = 0; b < bytes && w < 4; w++) { > - printk("%08x ", readl(start + b)); > + for (w = 0, o = 0; b < bytes && w < 4; w++) { > + o += snprintf(linebuf + o, 38 - o, > + "%08x ", readl(start + b)); > b += sizeof(u32); > } > - printk("\n"); > + dev_printk(KERN_DEBUG, dev, "%p: %s\n", start + b, linebuf); > } > } > -#endif > -#if defined(ATA_DEBUG) || defined(CONFIG_PCI) > +#if defined(CONFIG_PCI) > static void mv_dump_pci_cfg(struct pci_dev *pdev, unsigned bytes) > { > -#ifdef ATA_DEBUG > - int b, w; > + int b, w, o; > u32 dw; > + unsigned char linebuf[38]; > + > for (b = 0; b < bytes; ) { > - DPRINTK("%02x: ", b); > - for (w = 0; b < bytes && w < 4; w++) { > + for (w = 0, o = 0; b < bytes && w < 4; w++) { > (void) pci_read_config_dword(pdev, b, &dw); > - printk("%08x ", dw); > + o += snprintf(linebuf + o, 38 - o, > + "%08x ", dw); > b += sizeof(u32); > } > - printk("\n"); > + dev_printk(KERN_DEBUG, &pdev->dev, "%02x: %s\n", b, linebuf); > } > -#endif > } > #endif > static void mv_dump_all_regs(void __iomem *mmio_base, int port, > struct pci_dev *pdev) > { > -#ifdef ATA_DEBUG > void __iomem *hc_base = mv_hc_base(mmio_base, > port >> MV_PORT_HC_SHIFT); > void __iomem *port_base; > int start_port, num_ports, p, start_hc, num_hcs, hc; > > + if (!pci_dump) > + return; > + dev_printk(KERN_DEBUG, &pdev->dev, "All regs @ PCI error\n"); > if (0 > port) { > start_hc = start_port = 0; > num_ports = 8; /* shld be benign for 4 port devs */ > @@ -1295,31 +1301,31 @@ static void mv_dump_all_regs(void __iomem *mmio_base, int port, > start_port = port; > num_ports = num_hcs = 1; > } > - DPRINTK("All registers for port(s) %u-%u:\n", start_port, > - num_ports > 1 ? num_ports - 1 : start_port); > + dev_printk(KERN_DEBUG, &pdev->dev, > + "All registers for port(s) %u-%u:\n", start_port, > + num_ports > 1 ? num_ports - 1 : start_port); > > if (NULL != pdev) { > - DPRINTK("PCI config space regs:\n"); > + dev_printk(KERN_DEBUG, &pdev->dev, "PCI config space regs:\n"); > mv_dump_pci_cfg(pdev, 0x68); > } > - DPRINTK("PCI regs:\n"); > - mv_dump_mem(mmio_base+0xc00, 0x3c); > - mv_dump_mem(mmio_base+0xd00, 0x34); > - mv_dump_mem(mmio_base+0xf00, 0x4); > - mv_dump_mem(mmio_base+0x1d00, 0x6c); > + dev_printk(KERN_DEBUG, &pdev->dev, "PCI regs:\n"); > + mv_dump_mem(&pdev->dev, mmio_base+0xc00, 0x3c); > + mv_dump_mem(&pdev->dev, mmio_base+0xd00, 0x34); > + mv_dump_mem(&pdev->dev, mmio_base+0xf00, 0x4); > + mv_dump_mem(&pdev->dev, mmio_base+0x1d00, 0x6c); > for (hc = start_hc; hc < start_hc + num_hcs; hc++) { > hc_base = mv_hc_base(mmio_base, hc); > - DPRINTK("HC regs (HC %i):\n", hc); > - mv_dump_mem(hc_base, 0x1c); > + dev_printk(KERN_DEBUG, &pdev->dev, "HC regs (HC %i):\n", hc); > + mv_dump_mem(&pdev->dev, hc_base, 0x1c); > } > for (p = start_port; p < start_port + num_ports; p++) { > port_base = mv_port_base(mmio_base, p); > - DPRINTK("EDMA regs (port %i):\n", p); > - mv_dump_mem(port_base, 0x54); > - DPRINTK("SATA regs (port %i):\n", p); > - mv_dump_mem(port_base+0x300, 0x60); > + dev_printk(KERN_DEBUG, &pdev->dev, "EDMA regs (port %i):\n", p); > + mv_dump_mem(&pdev->dev, port_base, 0x54); > + dev_printk(KERN_DEBUG, &pdev->dev, "SATA regs (port %i):\n", p); > + mv_dump_mem(&pdev->dev, port_base+0x300, 0x60); > } > -#endif > } > > static unsigned int mv_scr_offset(unsigned int sc_reg_in) > @@ -2958,7 +2964,6 @@ static int mv_pci_error(struct ata_host *host, void __iomem *mmio) > > dev_err(host->dev, "PCI ERROR; PCI IRQ cause=0x%08x\n", err_cause); > > - DPRINTK("All regs @ PCI error\n"); > mv_dump_all_regs(mmio, -1, to_pci_dev(host->dev)); > > writelfl(0, mmio + hpriv->irq_cause_offset); >
On 2/10/20 1:51 PM, Bartlomiej Zolnierkiewicz wrote: > > On 2/4/20 5:55 PM, Hannes Reinecke wrote: >> From: Hannes Reinecke <hare@suse.com> >> >> Implement module parameter 'pci_dump' and move the DPRINTK calls >> over to dev_printk(). >> >> Signed-off-by: Hannes Reinecke <hare@suse.de> > > Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Revoked. ;) In reply to v1 I've asked for preserving __func__ during the conversion and it hasn't been done. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > Best regards, > -- > Bartlomiej Zolnierkiewicz > Samsung R&D Institute Poland > Samsung Electronics > >> --- >> drivers/ata/sata_mv.c | 71 +++++++++++++++++++++++++++------------------------ >> 1 file changed, 38 insertions(+), 33 deletions(-) >> >> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c >> index d7228f8e9297..9e570d455acc 100644 >> --- a/drivers/ata/sata_mv.c >> +++ b/drivers/ata/sata_mv.c >> @@ -83,6 +83,10 @@ module_param(irq_coalescing_usecs, int, S_IRUGO); >> MODULE_PARM_DESC(irq_coalescing_usecs, >> "IRQ coalescing time threshold in usecs"); >> >> +static int pci_dump; >> +module_param(pci_dump, int, S_IRUGO); >> +MODULE_PARM_DESC(pci_dump, "Enable dumping of PCI registers on error"); >> + >> enum { >> /* BAR's are enumerated in terms of pci_resource_start() terms */ >> MV_PRIMARY_BAR = 0, /* offset 0x10: memory space */ >> @@ -1245,47 +1249,49 @@ static int mv_stop_edma(struct ata_port *ap) >> return err; >> } >> >> -#ifdef ATA_DEBUG >> -static void mv_dump_mem(void __iomem *start, unsigned bytes) >> +static void mv_dump_mem(struct device *dev, void __iomem *start, unsigned bytes) >> { >> - int b, w; >> + int b, w, o; >> + unsigned char linebuf[38]; >> + >> for (b = 0; b < bytes; ) { >> - DPRINTK("%p: ", start + b); >> - for (w = 0; b < bytes && w < 4; w++) { >> - printk("%08x ", readl(start + b)); >> + for (w = 0, o = 0; b < bytes && w < 4; w++) { >> + o += snprintf(linebuf + o, 38 - o, >> + "%08x ", readl(start + b)); >> b += sizeof(u32); >> } >> - printk("\n"); >> + dev_printk(KERN_DEBUG, dev, "%p: %s\n", start + b, linebuf); >> } >> } >> -#endif >> -#if defined(ATA_DEBUG) || defined(CONFIG_PCI) >> +#if defined(CONFIG_PCI) >> static void mv_dump_pci_cfg(struct pci_dev *pdev, unsigned bytes) >> { >> -#ifdef ATA_DEBUG >> - int b, w; >> + int b, w, o; >> u32 dw; >> + unsigned char linebuf[38]; >> + >> for (b = 0; b < bytes; ) { >> - DPRINTK("%02x: ", b); >> - for (w = 0; b < bytes && w < 4; w++) { >> + for (w = 0, o = 0; b < bytes && w < 4; w++) { >> (void) pci_read_config_dword(pdev, b, &dw); >> - printk("%08x ", dw); >> + o += snprintf(linebuf + o, 38 - o, >> + "%08x ", dw); >> b += sizeof(u32); >> } >> - printk("\n"); >> + dev_printk(KERN_DEBUG, &pdev->dev, "%02x: %s\n", b, linebuf); >> } >> -#endif >> } >> #endif >> static void mv_dump_all_regs(void __iomem *mmio_base, int port, >> struct pci_dev *pdev) >> { >> -#ifdef ATA_DEBUG >> void __iomem *hc_base = mv_hc_base(mmio_base, >> port >> MV_PORT_HC_SHIFT); >> void __iomem *port_base; >> int start_port, num_ports, p, start_hc, num_hcs, hc; >> >> + if (!pci_dump) >> + return; >> + dev_printk(KERN_DEBUG, &pdev->dev, "All regs @ PCI error\n"); >> if (0 > port) { >> start_hc = start_port = 0; >> num_ports = 8; /* shld be benign for 4 port devs */ >> @@ -1295,31 +1301,31 @@ static void mv_dump_all_regs(void __iomem *mmio_base, int port, >> start_port = port; >> num_ports = num_hcs = 1; >> } >> - DPRINTK("All registers for port(s) %u-%u:\n", start_port, >> - num_ports > 1 ? num_ports - 1 : start_port); >> + dev_printk(KERN_DEBUG, &pdev->dev, >> + "All registers for port(s) %u-%u:\n", start_port, >> + num_ports > 1 ? num_ports - 1 : start_port); >> >> if (NULL != pdev) { >> - DPRINTK("PCI config space regs:\n"); >> + dev_printk(KERN_DEBUG, &pdev->dev, "PCI config space regs:\n"); >> mv_dump_pci_cfg(pdev, 0x68); >> } >> - DPRINTK("PCI regs:\n"); >> - mv_dump_mem(mmio_base+0xc00, 0x3c); >> - mv_dump_mem(mmio_base+0xd00, 0x34); >> - mv_dump_mem(mmio_base+0xf00, 0x4); >> - mv_dump_mem(mmio_base+0x1d00, 0x6c); >> + dev_printk(KERN_DEBUG, &pdev->dev, "PCI regs:\n"); >> + mv_dump_mem(&pdev->dev, mmio_base+0xc00, 0x3c); >> + mv_dump_mem(&pdev->dev, mmio_base+0xd00, 0x34); >> + mv_dump_mem(&pdev->dev, mmio_base+0xf00, 0x4); >> + mv_dump_mem(&pdev->dev, mmio_base+0x1d00, 0x6c); >> for (hc = start_hc; hc < start_hc + num_hcs; hc++) { >> hc_base = mv_hc_base(mmio_base, hc); >> - DPRINTK("HC regs (HC %i):\n", hc); >> - mv_dump_mem(hc_base, 0x1c); >> + dev_printk(KERN_DEBUG, &pdev->dev, "HC regs (HC %i):\n", hc); >> + mv_dump_mem(&pdev->dev, hc_base, 0x1c); >> } >> for (p = start_port; p < start_port + num_ports; p++) { >> port_base = mv_port_base(mmio_base, p); >> - DPRINTK("EDMA regs (port %i):\n", p); >> - mv_dump_mem(port_base, 0x54); >> - DPRINTK("SATA regs (port %i):\n", p); >> - mv_dump_mem(port_base+0x300, 0x60); >> + dev_printk(KERN_DEBUG, &pdev->dev, "EDMA regs (port %i):\n", p); >> + mv_dump_mem(&pdev->dev, port_base, 0x54); >> + dev_printk(KERN_DEBUG, &pdev->dev, "SATA regs (port %i):\n", p); >> + mv_dump_mem(&pdev->dev, port_base+0x300, 0x60); >> } >> -#endif >> } >> >> static unsigned int mv_scr_offset(unsigned int sc_reg_in) >> @@ -2958,7 +2964,6 @@ static int mv_pci_error(struct ata_host *host, void __iomem *mmio) >> >> dev_err(host->dev, "PCI ERROR; PCI IRQ cause=0x%08x\n", err_cause); >> >> - DPRINTK("All regs @ PCI error\n"); >> mv_dump_all_regs(mmio, -1, to_pci_dev(host->dev)); >> >> writelfl(0, mmio + hpriv->irq_cause_offset); >>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index d7228f8e9297..9e570d455acc 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -83,6 +83,10 @@ module_param(irq_coalescing_usecs, int, S_IRUGO); MODULE_PARM_DESC(irq_coalescing_usecs, "IRQ coalescing time threshold in usecs"); +static int pci_dump; +module_param(pci_dump, int, S_IRUGO); +MODULE_PARM_DESC(pci_dump, "Enable dumping of PCI registers on error"); + enum { /* BAR's are enumerated in terms of pci_resource_start() terms */ MV_PRIMARY_BAR = 0, /* offset 0x10: memory space */ @@ -1245,47 +1249,49 @@ static int mv_stop_edma(struct ata_port *ap) return err; } -#ifdef ATA_DEBUG -static void mv_dump_mem(void __iomem *start, unsigned bytes) +static void mv_dump_mem(struct device *dev, void __iomem *start, unsigned bytes) { - int b, w; + int b, w, o; + unsigned char linebuf[38]; + for (b = 0; b < bytes; ) { - DPRINTK("%p: ", start + b); - for (w = 0; b < bytes && w < 4; w++) { - printk("%08x ", readl(start + b)); + for (w = 0, o = 0; b < bytes && w < 4; w++) { + o += snprintf(linebuf + o, 38 - o, + "%08x ", readl(start + b)); b += sizeof(u32); } - printk("\n"); + dev_printk(KERN_DEBUG, dev, "%p: %s\n", start + b, linebuf); } } -#endif -#if defined(ATA_DEBUG) || defined(CONFIG_PCI) +#if defined(CONFIG_PCI) static void mv_dump_pci_cfg(struct pci_dev *pdev, unsigned bytes) { -#ifdef ATA_DEBUG - int b, w; + int b, w, o; u32 dw; + unsigned char linebuf[38]; + for (b = 0; b < bytes; ) { - DPRINTK("%02x: ", b); - for (w = 0; b < bytes && w < 4; w++) { + for (w = 0, o = 0; b < bytes && w < 4; w++) { (void) pci_read_config_dword(pdev, b, &dw); - printk("%08x ", dw); + o += snprintf(linebuf + o, 38 - o, + "%08x ", dw); b += sizeof(u32); } - printk("\n"); + dev_printk(KERN_DEBUG, &pdev->dev, "%02x: %s\n", b, linebuf); } -#endif } #endif static void mv_dump_all_regs(void __iomem *mmio_base, int port, struct pci_dev *pdev) { -#ifdef ATA_DEBUG void __iomem *hc_base = mv_hc_base(mmio_base, port >> MV_PORT_HC_SHIFT); void __iomem *port_base; int start_port, num_ports, p, start_hc, num_hcs, hc; + if (!pci_dump) + return; + dev_printk(KERN_DEBUG, &pdev->dev, "All regs @ PCI error\n"); if (0 > port) { start_hc = start_port = 0; num_ports = 8; /* shld be benign for 4 port devs */ @@ -1295,31 +1301,31 @@ static void mv_dump_all_regs(void __iomem *mmio_base, int port, start_port = port; num_ports = num_hcs = 1; } - DPRINTK("All registers for port(s) %u-%u:\n", start_port, - num_ports > 1 ? num_ports - 1 : start_port); + dev_printk(KERN_DEBUG, &pdev->dev, + "All registers for port(s) %u-%u:\n", start_port, + num_ports > 1 ? num_ports - 1 : start_port); if (NULL != pdev) { - DPRINTK("PCI config space regs:\n"); + dev_printk(KERN_DEBUG, &pdev->dev, "PCI config space regs:\n"); mv_dump_pci_cfg(pdev, 0x68); } - DPRINTK("PCI regs:\n"); - mv_dump_mem(mmio_base+0xc00, 0x3c); - mv_dump_mem(mmio_base+0xd00, 0x34); - mv_dump_mem(mmio_base+0xf00, 0x4); - mv_dump_mem(mmio_base+0x1d00, 0x6c); + dev_printk(KERN_DEBUG, &pdev->dev, "PCI regs:\n"); + mv_dump_mem(&pdev->dev, mmio_base+0xc00, 0x3c); + mv_dump_mem(&pdev->dev, mmio_base+0xd00, 0x34); + mv_dump_mem(&pdev->dev, mmio_base+0xf00, 0x4); + mv_dump_mem(&pdev->dev, mmio_base+0x1d00, 0x6c); for (hc = start_hc; hc < start_hc + num_hcs; hc++) { hc_base = mv_hc_base(mmio_base, hc); - DPRINTK("HC regs (HC %i):\n", hc); - mv_dump_mem(hc_base, 0x1c); + dev_printk(KERN_DEBUG, &pdev->dev, "HC regs (HC %i):\n", hc); + mv_dump_mem(&pdev->dev, hc_base, 0x1c); } for (p = start_port; p < start_port + num_ports; p++) { port_base = mv_port_base(mmio_base, p); - DPRINTK("EDMA regs (port %i):\n", p); - mv_dump_mem(port_base, 0x54); - DPRINTK("SATA regs (port %i):\n", p); - mv_dump_mem(port_base+0x300, 0x60); + dev_printk(KERN_DEBUG, &pdev->dev, "EDMA regs (port %i):\n", p); + mv_dump_mem(&pdev->dev, port_base, 0x54); + dev_printk(KERN_DEBUG, &pdev->dev, "SATA regs (port %i):\n", p); + mv_dump_mem(&pdev->dev, port_base+0x300, 0x60); } -#endif } static unsigned int mv_scr_offset(unsigned int sc_reg_in) @@ -2958,7 +2964,6 @@ static int mv_pci_error(struct ata_host *host, void __iomem *mmio) dev_err(host->dev, "PCI ERROR; PCI IRQ cause=0x%08x\n", err_cause); - DPRINTK("All regs @ PCI error\n"); mv_dump_all_regs(mmio, -1, to_pci_dev(host->dev)); writelfl(0, mmio + hpriv->irq_cause_offset);