From: Philip J Kelleher <[email protected]> Adding in some sysfs entries to help with debugging and testing code.
Signed-off-by: Philip J Kelleher <[email protected]> ------------------------------------------------------------------------------- diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/core.c linux-block/drivers/block/rsxx/core.c --- linux-block-vanilla/drivers/block/rsxx/core.c 2013-04-29 11:25:00.591187205 -0500 +++ linux-block/drivers/block/rsxx/core.c 2013-04-29 13:29:01.543184638 -0500 @@ -52,6 +52,183 @@ MODULE_PARM_DESC(force_legacy, "Force th static DEFINE_IDA(rsxx_disk_ida); static DEFINE_SPINLOCK(rsxx_ida_lock); +/* --------------------Sysfs Setup ---------------------*/ + +#define RSXX_ATTR(_name, _mode, _show, _store) \ +static struct rsxx_attribute rsxx_attr_##_name = \ + __ATTR(_name, _mode, _show, _store) + +struct rsxx_attribute { + struct attribute attr; + ssize_t (*show)(struct rsxx_cardinfo *, + struct rsxx_attribute *, char *); + ssize_t (*store)(struct rsxx_cardinfo *, + struct rsxx_attribute *, const char *, size_t); +}; + +static ssize_t rsxx_attr_show(struct kobject *kobj, struct attribute *attr, + char *page) +{ + struct rsxx_cardinfo *card; + struct rsxx_attribute *card_attr; + + card = container_of(kobj, struct rsxx_cardinfo, kobj); + card_attr = container_of(attr, struct rsxx_attribute, attr); + + if (!card_attr->show) + return -EIO; + + return card_attr->show(card, card_attr, page); +} + +static ssize_t rsxx_attr_pci_regs_show(struct rsxx_cardinfo *card, + struct rsxx_attribute *attr, char *buf) +{ + int i = 0; + + i += sprintf(&buf[i], "HWID 0x%08x\n", + ioread32(card->regmap + HWID)); + i += sprintf(&buf[i], "SCRATCH 0x%08x\n", + ioread32(card->regmap + SCRATCH)); + i += sprintf(&buf[i], "RESET 0x%08x\n", + ioread32(card->regmap + RESET)); + i += sprintf(&buf[i], "ISR 0x%08x\n", + ioread32(card->regmap + ISR)); + i += sprintf(&buf[i], "IER 0x%08x\n", + ioread32(card->regmap + IER)); + i += sprintf(&buf[i], "IPR 0x%08x\n", + ioread32(card->regmap + IPR)); + i += sprintf(&buf[i], "CREG_CMD 0x%08x\n", + ioread32(card->regmap + CREG_CMD)); + i += sprintf(&buf[i], "CREG_ADD 0x%08x\n", + ioread32(card->regmap + CREG_ADD)); + i += sprintf(&buf[i], "CREG_CNT 0x%08x\n", + ioread32(card->regmap + CREG_CNT)); + i += sprintf(&buf[i], "CREG_STAT 0x%08x\n", + ioread32(card->regmap + CREG_STAT)); + i += sprintf(&buf[i], "CREG_DATA0 0x%08x\n", + ioread32(card->regmap + CREG_DATA0)); + i += sprintf(&buf[i], "CREG_DATA1 0x%08x\n", + ioread32(card->regmap + CREG_DATA1)); + i += sprintf(&buf[i], "CREG_DATA2 0x%08x\n", + ioread32(card->regmap + CREG_DATA2)); + i += sprintf(&buf[i], "CREG_DATA3 0x%08x\n", + ioread32(card->regmap + CREG_DATA3)); + i += sprintf(&buf[i], "CREG_DATA4 0x%08x\n", + ioread32(card->regmap + CREG_DATA4)); + i += sprintf(&buf[i], "CREG_DATA5 0x%08x\n", + ioread32(card->regmap + CREG_DATA5)); + i += sprintf(&buf[i], "CREG_DATA6 0x%08x\n", + ioread32(card->regmap + CREG_DATA6)); + i += sprintf(&buf[i], "CREG_DATA7 0x%08x\n", + ioread32(card->regmap + CREG_DATA7)); + i += sprintf(&buf[i], "INTR_COAL 0x%08x\n", + ioread32(card->regmap + INTR_COAL)); + i += sprintf(&buf[i], "HW_ERROR 0x%08x\n", + ioread32(card->regmap + HW_ERROR)); + i += sprintf(&buf[i], "DEBUG0 0x%08x\n", + ioread32(card->regmap + PCI_DEBUG0)); + i += sprintf(&buf[i], "DEBUG1 0x%08x\n", + ioread32(card->regmap + PCI_DEBUG1)); + i += sprintf(&buf[i], "DEBUG2 0x%08x\n", + ioread32(card->regmap + PCI_DEBUG2)); + i += sprintf(&buf[i], "DEBUG3 0x%08x\n", + ioread32(card->regmap + PCI_DEBUG3)); + i += sprintf(&buf[i], "DEBUG4 0x%08x\n", + ioread32(card->regmap + PCI_DEBUG4)); + i += sprintf(&buf[i], "DEBUG5 0x%08x\n", + ioread32(card->regmap + PCI_DEBUG5)); + i += sprintf(&buf[i], "DEBUG6 0x%08x\n", + ioread32(card->regmap + PCI_DEBUG6)); + i += sprintf(&buf[i], "DEBUG7 0x%08x\n", + ioread32(card->regmap + PCI_DEBUG7)); + i += sprintf(&buf[i], "RECONFIG 0x%08x\n", + ioread32(card->regmap + PCI_RECONFIG)); + + return i; +} + +RSXX_ATTR(pci_regs, S_IRUSR, rsxx_attr_pci_regs_show, NULL); + +static ssize_t rsxx_attr_stats_show(struct rsxx_cardinfo *card, + struct rsxx_attribute *attr, char *buf) +{ + int i; + int j = 0; + + for (i = 0; i < card->n_targets; i++) { + j += sprintf(&buf[j], "Ctrl %d CRC Errors = %d\n", + i, card->ctrl[i].stats.crc_errors); + j += sprintf(&buf[j], "Ctrl %d Hard Errors = %d\n", + i, card->ctrl[i].stats.hard_errors); + j += sprintf(&buf[j], "Ctrl %d Soft Errors = %d\n", + i, card->ctrl[i].stats.soft_errors); + j += sprintf(&buf[j], "Ctrl %d Writes Issued = %d\n", + i, card->ctrl[i].stats.writes_issued); + j += sprintf(&buf[j], "Ctrl %d Writes Failed = %d\n", + i, card->ctrl[i].stats.writes_failed); + j += sprintf(&buf[j], "Ctrl %d Reads Issued = %d\n", + i, card->ctrl[i].stats.reads_issued); + j += sprintf(&buf[j], "Ctrl %d Reads Failed = %d\n", + i, card->ctrl[i].stats.reads_failed); + j += sprintf(&buf[j], "Ctrl %d Reads Retried = %d\n", + i, card->ctrl[i].stats.reads_retried); + j += sprintf(&buf[j], "Ctrl %d Discards Issued = %d\n", + i, card->ctrl[i].stats.discards_issued); + j += sprintf(&buf[j], "Ctrl %d Discards Failed = %d\n", + i, card->ctrl[i].stats.discards_failed); + j += sprintf(&buf[j], "Ctrl %d DMA SW Errors = %d\n", + i, card->ctrl[i].stats.dma_sw_err); + j += sprintf(&buf[j], "Ctrl %d DMA HW Faults = %d\n", + i, card->ctrl[i].stats.dma_hw_fault); + j += sprintf(&buf[j], "Ctrl %d DMAs Cancelled = %d\n", + i, card->ctrl[i].stats.dma_cancelled); + j += sprintf(&buf[j], "Ctrl %d SW Queue Depth = %d\n", + i, card->ctrl[i].stats.sw_q_depth); + j += sprintf(&buf[j], "Ctrl %d HW Queue Depth = %d\n", + i, atomic_read(&card->ctrl[i].stats.hw_q_depth)); + } + + return j; +} + +RSXX_ATTR(stats, S_IRUSR, rsxx_attr_stats_show, NULL); + +static ssize_t rsxx_attr_disk_name_show(struct rsxx_cardinfo *card, + struct rsxx_attribute *attr, char *buf) +{ + if (card->gendisk) + return snprintf(buf, sizeof(card->gendisk->disk_name), "%s\n", + card->gendisk->disk_name); + + return sprintf(buf, "disk not attached\n"); +} + +RSXX_ATTR(disk_name, S_IRUSR, rsxx_attr_disk_name_show, NULL); + + +static struct attribute *rsxx_attrs[] = { + &rsxx_attr_pci_regs.attr, + &rsxx_attr_stats.attr, + &rsxx_attr_disk_name.attr, + NULL, +}; + +static struct attribute_group rsxx_attribute_group = { + .name = "debug", + .attrs = rsxx_attrs, +}; + +static int rsxx_sysfs_create(struct rsxx_cardinfo *card) +{ + return sysfs_create_group(&card->kobj, &rsxx_attribute_group); +} + +static void rsxx_sysfs_remove(struct rsxx_cardinfo *card) +{ + sysfs_remove_group(&card->kobj, &rsxx_attribute_group); +} + /*----------------- Interrupt Control & Handling -------------------*/ static void rsxx_mask_interrupts(struct rsxx_cardinfo *card) @@ -523,6 +700,28 @@ static int rsxx_compatibility_check(stru return 0; } +static void rsxx_release(struct kobject *kobj) +{ + struct rsxx_cardinfo *card; + + card = container_of(kobj, struct rsxx_cardinfo, kobj); + + kobject_put(&card->kobj); + + kfree(card); +} + +static const struct sysfs_ops rsxx_sysfs_ops = { + .show = rsxx_attr_show, + .store = NULL, +}; + +static struct kobj_type rsxx_ktype = { + .release = rsxx_release, + .sysfs_ops = &rsxx_sysfs_ops, + .default_attrs = NULL, +}; + static int rsxx_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) { @@ -552,6 +751,15 @@ static int rsxx_pci_probe(struct pci_dev if (st) goto failed_ida_get; + st = kobject_init_and_add(&card->kobj, &rsxx_ktype, + &card->dev->dev.kobj, "%s", "rsxx"); + if (st) { + dev_err(CARD_TO_DEV(card), "Failed kobject_init_and_add\n"); + goto failed_kobj_setup; + } + + kobject_uevent(&card->kobj, KOBJ_ADD); + st = pci_enable_device(dev); if (st) goto failed_enable; @@ -649,6 +857,11 @@ static int rsxx_pci_probe(struct pci_dev goto failed_dma_setup; } + /************* Setup Sysfs *************/ + rsxx_sysfs_create(card); + if (st) + goto failed_sysfs_setup; + /************* Setup Card Event Handler *************/ INIT_WORK(&card->event_work, card_event_handler); @@ -688,7 +901,9 @@ static int rsxx_pci_probe(struct pci_dev return 0; failed_create_dev: + rsxx_sysfs_remove(card); rsxx_dma_destroy(card); +failed_sysfs_setup: failed_dma_setup: failed_compatiblity_check: spin_lock_irq(&card->irq_lock); @@ -704,6 +919,7 @@ failed_iomap: failed_request_regions: failed_dma_mask: pci_disable_device(dev); +failed_kobj_setup: failed_enable: spin_lock(&rsxx_ida_lock); ida_remove(&rsxx_disk_ida, card->disk_id); @@ -756,6 +972,10 @@ static void rsxx_pci_remove(struct pci_d /* Prevent work_structs from re-queuing themselves. */ card->halt = 1; + rsxx_sysfs_remove(card); + kobject_uevent(&card->kobj, KOBJ_REMOVE); + kobject_del(&card->kobj); + free_irq(dev->irq, card); if (!force_legacy) @@ -767,8 +987,6 @@ static void rsxx_pci_remove(struct pci_d pci_disable_device(dev); pci_release_regions(dev); - - kfree(card); } static int rsxx_pci_suspend(struct pci_dev *dev, pm_message_t state) diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/rsxx_priv.h linux-block/drivers/block/rsxx/rsxx_priv.h --- linux-block-vanilla/drivers/block/rsxx/rsxx_priv.h 2013-04-29 11:25:00.601187385 -0500 +++ linux-block/drivers/block/rsxx/rsxx_priv.h 2013-04-26 16:24:31.756230606 -0500 @@ -118,6 +118,7 @@ struct rsxx_dma_ctrl { struct rsxx_cardinfo { struct pci_dev *dev; + struct kobject kobj; unsigned int halt; unsigned int eeh_state; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
