diff options
Diffstat (limited to 'drivers')
219 files changed, 3410 insertions, 1938 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 2618a6169a1..1266ead6ace 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -36,7 +36,7 @@ obj-$(CONFIG_FB_INTEL) += video/intelfb/ | |||
36 | 36 | ||
37 | obj-y += serial/ | 37 | obj-y += serial/ |
38 | obj-$(CONFIG_PARPORT) += parport/ | 38 | obj-$(CONFIG_PARPORT) += parport/ |
39 | obj-y += base/ block/ misc/ mfd/ media/ | 39 | obj-y += base/ block/ misc/ mfd/ |
40 | obj-$(CONFIG_NUBUS) += nubus/ | 40 | obj-$(CONFIG_NUBUS) += nubus/ |
41 | obj-y += macintosh/ | 41 | obj-y += macintosh/ |
42 | obj-$(CONFIG_IDE) += ide/ | 42 | obj-$(CONFIG_IDE) += ide/ |
@@ -71,7 +71,7 @@ obj-$(CONFIG_GAMEPORT) += input/gameport/ | |||
71 | obj-$(CONFIG_INPUT) += input/ | 71 | obj-$(CONFIG_INPUT) += input/ |
72 | obj-$(CONFIG_I2O) += message/ | 72 | obj-$(CONFIG_I2O) += message/ |
73 | obj-$(CONFIG_RTC_LIB) += rtc/ | 73 | obj-$(CONFIG_RTC_LIB) += rtc/ |
74 | obj-y += i2c/ | 74 | obj-y += i2c/ media/ |
75 | obj-$(CONFIG_W1) += w1/ | 75 | obj-$(CONFIG_W1) += w1/ |
76 | obj-$(CONFIG_POWER_SUPPLY) += power/ | 76 | obj-$(CONFIG_POWER_SUPPLY) += power/ |
77 | obj-$(CONFIG_HWMON) += hwmon/ | 77 | obj-$(CONFIG_HWMON) += hwmon/ |
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c index b6667ff059e..88b5a2c4814 100644 --- a/drivers/acpi/acpica/rscalc.c +++ b/drivers/acpi/acpica/rscalc.c | |||
@@ -543,6 +543,13 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object, | |||
543 | 543 | ||
544 | package_element = *top_object_list; | 544 | package_element = *top_object_list; |
545 | 545 | ||
546 | /* We must have a valid Package object */ | ||
547 | |||
548 | if (!package_element || | ||
549 | (package_element->common.type != ACPI_TYPE_PACKAGE)) { | ||
550 | return_ACPI_STATUS (AE_AML_OPERAND_TYPE); | ||
551 | } | ||
552 | |||
546 | /* | 553 | /* |
547 | * The sub_object_list will now point to an array of the | 554 | * The sub_object_list will now point to an array of the |
548 | * four IRQ elements: Address, Pin, Source and source_index | 555 | * four IRQ elements: Address, Pin, Source and source_index |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 942d14ac879..d51a17c0f59 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -72,6 +72,7 @@ | |||
72 | * ICH2 spec c #20 - IDE PRD must not cross a 64K boundary | 72 | * ICH2 spec c #20 - IDE PRD must not cross a 64K boundary |
73 | * and must be dword aligned | 73 | * and must be dword aligned |
74 | * ICH2 spec c #24 - UDMA mode 4,5 t85/86 should be 6ns not 3.3 | 74 | * ICH2 spec c #24 - UDMA mode 4,5 t85/86 should be 6ns not 3.3 |
75 | * ICH7 errata #16 - MWDMA1 timings are incorrect | ||
75 | * | 76 | * |
76 | * Should have been BIOS fixed: | 77 | * Should have been BIOS fixed: |
77 | * 450NX: errata #19 - DMA hangs on old 450NX | 78 | * 450NX: errata #19 - DMA hangs on old 450NX |
@@ -94,7 +95,7 @@ | |||
94 | #include <linux/dmi.h> | 95 | #include <linux/dmi.h> |
95 | 96 | ||
96 | #define DRV_NAME "ata_piix" | 97 | #define DRV_NAME "ata_piix" |
97 | #define DRV_VERSION "2.12" | 98 | #define DRV_VERSION "2.13" |
98 | 99 | ||
99 | enum { | 100 | enum { |
100 | PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ | 101 | PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ |
@@ -136,6 +137,7 @@ enum piix_controller_ids { | |||
136 | ich_pata_33, /* ICH up to UDMA 33 only */ | 137 | ich_pata_33, /* ICH up to UDMA 33 only */ |
137 | ich_pata_66, /* ICH up to 66 Mhz */ | 138 | ich_pata_66, /* ICH up to 66 Mhz */ |
138 | ich_pata_100, /* ICH up to UDMA 100 */ | 139 | ich_pata_100, /* ICH up to UDMA 100 */ |
140 | ich_pata_100_nomwdma1, /* ICH up to UDMA 100 but with no MWDMA1*/ | ||
139 | ich5_sata, | 141 | ich5_sata, |
140 | ich6_sata, | 142 | ich6_sata, |
141 | ich6m_sata, | 143 | ich6m_sata, |
@@ -216,8 +218,8 @@ static const struct pci_device_id piix_pci_tbl[] = { | |||
216 | /* ICH6 (and 6) (i915) UDMA 100 */ | 218 | /* ICH6 (and 6) (i915) UDMA 100 */ |
217 | { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 219 | { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
218 | /* ICH7/7-R (i945, i975) UDMA 100*/ | 220 | /* ICH7/7-R (i945, i975) UDMA 100*/ |
219 | { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 221 | { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 }, |
220 | { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 222 | { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 }, |
221 | /* ICH8 Mobile PATA Controller */ | 223 | /* ICH8 Mobile PATA Controller */ |
222 | { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 224 | { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
223 | 225 | ||
@@ -487,6 +489,15 @@ static struct ata_port_info piix_port_info[] = { | |||
487 | .port_ops = &ich_pata_ops, | 489 | .port_ops = &ich_pata_ops, |
488 | }, | 490 | }, |
489 | 491 | ||
492 | [ich_pata_100_nomwdma1] = | ||
493 | { | ||
494 | .flags = PIIX_PATA_FLAGS | PIIX_FLAG_CHECKINTR, | ||
495 | .pio_mask = ATA_PIO4, | ||
496 | .mwdma_mask = ATA_MWDMA2_ONLY, | ||
497 | .udma_mask = ATA_UDMA5, | ||
498 | .port_ops = &ich_pata_ops, | ||
499 | }, | ||
500 | |||
490 | [ich5_sata] = | 501 | [ich5_sata] = |
491 | { | 502 | { |
492 | .flags = PIIX_SATA_FLAGS, | 503 | .flags = PIIX_SATA_FLAGS, |
@@ -594,6 +605,7 @@ static const struct ich_laptop ich_laptop[] = { | |||
594 | { 0x24CA, 0x1025, 0x003d }, /* ICH4 on ACER TM290 */ | 605 | { 0x24CA, 0x1025, 0x003d }, /* ICH4 on ACER TM290 */ |
595 | { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */ | 606 | { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */ |
596 | { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ | 607 | { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ |
608 | { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ | ||
597 | /* end marker */ | 609 | /* end marker */ |
598 | { 0, } | 610 | { 0, } |
599 | }; | 611 | }; |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 17c5d48a75d..c9242301cfa 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -4091,7 +4091,9 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class, | |||
4091 | 4091 | ||
4092 | /* fail early if !ATA && !ATAPI to avoid issuing [P]IDENTIFY to PMP */ | 4092 | /* fail early if !ATA && !ATAPI to avoid issuing [P]IDENTIFY to PMP */ |
4093 | if (ata_class_enabled(new_class) && | 4093 | if (ata_class_enabled(new_class) && |
4094 | new_class != ATA_DEV_ATA && new_class != ATA_DEV_ATAPI) { | 4094 | new_class != ATA_DEV_ATA && |
4095 | new_class != ATA_DEV_ATAPI && | ||
4096 | new_class != ATA_DEV_SEMB) { | ||
4095 | ata_dev_printk(dev, KERN_INFO, "class mismatch %u != %u\n", | 4097 | ata_dev_printk(dev, KERN_INFO, "class mismatch %u != %u\n", |
4096 | dev->class, new_class); | 4098 | dev->class, new_class); |
4097 | rc = -ENODEV; | 4099 | rc = -ENODEV; |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 01831312c36..94919ad03df 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -2783,6 +2783,12 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
2783 | } else if (dev->class == ATA_DEV_UNKNOWN && | 2783 | } else if (dev->class == ATA_DEV_UNKNOWN && |
2784 | ehc->tries[dev->devno] && | 2784 | ehc->tries[dev->devno] && |
2785 | ata_class_enabled(ehc->classes[dev->devno])) { | 2785 | ata_class_enabled(ehc->classes[dev->devno])) { |
2786 | /* Temporarily set dev->class, it will be | ||
2787 | * permanently set once all configurations are | ||
2788 | * complete. This is necessary because new | ||
2789 | * device configuration is done in two | ||
2790 | * separate loops. | ||
2791 | */ | ||
2786 | dev->class = ehc->classes[dev->devno]; | 2792 | dev->class = ehc->classes[dev->devno]; |
2787 | 2793 | ||
2788 | if (dev->class == ATA_DEV_PMP) | 2794 | if (dev->class == ATA_DEV_PMP) |
@@ -2790,6 +2796,11 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
2790 | else | 2796 | else |
2791 | rc = ata_dev_read_id(dev, &dev->class, | 2797 | rc = ata_dev_read_id(dev, &dev->class, |
2792 | readid_flags, dev->id); | 2798 | readid_flags, dev->id); |
2799 | |||
2800 | /* read_id might have changed class, store and reset */ | ||
2801 | ehc->classes[dev->devno] = dev->class; | ||
2802 | dev->class = ATA_DEV_UNKNOWN; | ||
2803 | |||
2793 | switch (rc) { | 2804 | switch (rc) { |
2794 | case 0: | 2805 | case 0: |
2795 | /* clear error info accumulated during probe */ | 2806 | /* clear error info accumulated during probe */ |
@@ -2799,13 +2810,11 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
2799 | case -ENOENT: | 2810 | case -ENOENT: |
2800 | /* IDENTIFY was issued to non-existent | 2811 | /* IDENTIFY was issued to non-existent |
2801 | * device. No need to reset. Just | 2812 | * device. No need to reset. Just |
2802 | * thaw and kill the device. | 2813 | * thaw and ignore the device. |
2803 | */ | 2814 | */ |
2804 | ata_eh_thaw_port(ap); | 2815 | ata_eh_thaw_port(ap); |
2805 | dev->class = ATA_DEV_UNKNOWN; | ||
2806 | break; | 2816 | break; |
2807 | default: | 2817 | default: |
2808 | dev->class = ATA_DEV_UNKNOWN; | ||
2809 | goto err; | 2818 | goto err; |
2810 | } | 2819 | } |
2811 | } | 2820 | } |
@@ -2826,11 +2835,15 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, | |||
2826 | dev->class == ATA_DEV_PMP) | 2835 | dev->class == ATA_DEV_PMP) |
2827 | continue; | 2836 | continue; |
2828 | 2837 | ||
2838 | dev->class = ehc->classes[dev->devno]; | ||
2839 | |||
2829 | ehc->i.flags |= ATA_EHI_PRINTINFO; | 2840 | ehc->i.flags |= ATA_EHI_PRINTINFO; |
2830 | rc = ata_dev_configure(dev); | 2841 | rc = ata_dev_configure(dev); |
2831 | ehc->i.flags &= ~ATA_EHI_PRINTINFO; | 2842 | ehc->i.flags &= ~ATA_EHI_PRINTINFO; |
2832 | if (rc) | 2843 | if (rc) { |
2844 | dev->class = ATA_DEV_UNKNOWN; | ||
2833 | goto err; | 2845 | goto err; |
2846 | } | ||
2834 | 2847 | ||
2835 | spin_lock_irqsave(ap->lock, flags); | 2848 | spin_lock_irqsave(ap->lock, flags); |
2836 | ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG; | 2849 | ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG; |
@@ -3494,6 +3507,8 @@ static void ata_eh_handle_port_suspend(struct ata_port *ap) | |||
3494 | */ | 3507 | */ |
3495 | static void ata_eh_handle_port_resume(struct ata_port *ap) | 3508 | static void ata_eh_handle_port_resume(struct ata_port *ap) |
3496 | { | 3509 | { |
3510 | struct ata_link *link; | ||
3511 | struct ata_device *dev; | ||
3497 | unsigned long flags; | 3512 | unsigned long flags; |
3498 | int rc = 0; | 3513 | int rc = 0; |
3499 | 3514 | ||
@@ -3508,6 +3523,17 @@ static void ata_eh_handle_port_resume(struct ata_port *ap) | |||
3508 | 3523 | ||
3509 | WARN_ON(!(ap->pflags & ATA_PFLAG_SUSPENDED)); | 3524 | WARN_ON(!(ap->pflags & ATA_PFLAG_SUSPENDED)); |
3510 | 3525 | ||
3526 | /* | ||
3527 | * Error timestamps are in jiffies which doesn't run while | ||
3528 | * suspended and PHY events during resume isn't too uncommon. | ||
3529 | * When the two are combined, it can lead to unnecessary speed | ||
3530 | * downs if the machine is suspended and resumed repeatedly. | ||
3531 | * Clear error history. | ||
3532 | */ | ||
3533 | ata_for_each_link(link, ap, HOST_FIRST) | ||
3534 | ata_for_each_dev(dev, link, ALL) | ||
3535 | ata_ering_clear(&dev->ering); | ||
3536 | |||
3511 | ata_acpi_set_state(ap, PMSG_ON); | 3537 | ata_acpi_set_state(ap, PMSG_ON); |
3512 | 3538 | ||
3513 | if (ap->ops->port_resume) | 3539 | if (ap->ops->port_resume) |
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 2733b0c90b7..68d9132d8f6 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -313,7 +313,7 @@ ata_scsi_em_message_show(struct device *dev, struct device_attribute *attr, | |||
313 | return ap->ops->em_show(ap, buf); | 313 | return ap->ops->em_show(ap, buf); |
314 | return -EINVAL; | 314 | return -EINVAL; |
315 | } | 315 | } |
316 | DEVICE_ATTR(em_message, S_IRUGO | S_IWUGO, | 316 | DEVICE_ATTR(em_message, S_IRUGO | S_IWUSR, |
317 | ata_scsi_em_message_show, ata_scsi_em_message_store); | 317 | ata_scsi_em_message_show, ata_scsi_em_message_store); |
318 | EXPORT_SYMBOL_GPL(dev_attr_em_message); | 318 | EXPORT_SYMBOL_GPL(dev_attr_em_message); |
319 | 319 | ||
@@ -366,7 +366,7 @@ ata_scsi_activity_store(struct device *dev, struct device_attribute *attr, | |||
366 | } | 366 | } |
367 | return -EINVAL; | 367 | return -EINVAL; |
368 | } | 368 | } |
369 | DEVICE_ATTR(sw_activity, S_IWUGO | S_IRUGO, ata_scsi_activity_show, | 369 | DEVICE_ATTR(sw_activity, S_IWUSR | S_IRUGO, ata_scsi_activity_show, |
370 | ata_scsi_activity_store); | 370 | ata_scsi_activity_store); |
371 | EXPORT_SYMBOL_GPL(dev_attr_sw_activity); | 371 | EXPORT_SYMBOL_GPL(dev_attr_sw_activity); |
372 | 372 | ||
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c index 5fedb3d4032..2f3c9bed63d 100644 --- a/drivers/ata/pata_pdc202xx_old.c +++ b/drivers/ata/pata_pdc202xx_old.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * pata_pdc202xx_old.c - Promise PDC202xx PATA for new ATA layer | 2 | * pata_pdc202xx_old.c - Promise PDC202xx PATA for new ATA layer |
3 | * (C) 2005 Red Hat Inc | 3 | * (C) 2005 Red Hat Inc |
4 | * Alan Cox <alan@lxorguk.ukuu.org.uk> | 4 | * Alan Cox <alan@lxorguk.ukuu.org.uk> |
5 | * (C) 2007 Bartlomiej Zolnierkiewicz | 5 | * (C) 2007,2009 Bartlomiej Zolnierkiewicz |
6 | * | 6 | * |
7 | * Based in part on linux/drivers/ide/pci/pdc202xx_old.c | 7 | * Based in part on linux/drivers/ide/pci/pdc202xx_old.c |
8 | * | 8 | * |
@@ -158,7 +158,7 @@ static void pdc2026x_bmdma_start(struct ata_queued_cmd *qc) | |||
158 | u32 len; | 158 | u32 len; |
159 | 159 | ||
160 | /* Check we keep host level locking here */ | 160 | /* Check we keep host level locking here */ |
161 | if (adev->dma_mode >= XFER_UDMA_2) | 161 | if (adev->dma_mode > XFER_UDMA_2) |
162 | iowrite8(ioread8(clock) | sel66, clock); | 162 | iowrite8(ioread8(clock) | sel66, clock); |
163 | else | 163 | else |
164 | iowrite8(ioread8(clock) & ~sel66, clock); | 164 | iowrite8(ioread8(clock) & ~sel66, clock); |
@@ -212,7 +212,7 @@ static void pdc2026x_bmdma_stop(struct ata_queued_cmd *qc) | |||
212 | iowrite8(ioread8(clock) & ~sel66, clock); | 212 | iowrite8(ioread8(clock) & ~sel66, clock); |
213 | } | 213 | } |
214 | /* Flip back to 33Mhz for PIO */ | 214 | /* Flip back to 33Mhz for PIO */ |
215 | if (adev->dma_mode >= XFER_UDMA_2) | 215 | if (adev->dma_mode > XFER_UDMA_2) |
216 | iowrite8(ioread8(clock) & ~sel66, clock); | 216 | iowrite8(ioread8(clock) & ~sel66, clock); |
217 | ata_bmdma_stop(qc); | 217 | ata_bmdma_stop(qc); |
218 | pdc202xx_set_piomode(ap, adev); | 218 | pdc202xx_set_piomode(ap, adev); |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 870dcfd8235..23714aefb82 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -293,6 +293,10 @@ enum { | |||
293 | FISCFG_WAIT_DEV_ERR = (1 << 8), /* wait for host on DevErr */ | 293 | FISCFG_WAIT_DEV_ERR = (1 << 8), /* wait for host on DevErr */ |
294 | FISCFG_SINGLE_SYNC = (1 << 16), /* SYNC on DMA activation */ | 294 | FISCFG_SINGLE_SYNC = (1 << 16), /* SYNC on DMA activation */ |
295 | 295 | ||
296 | PHY_MODE9_GEN2 = 0x398, | ||
297 | PHY_MODE9_GEN1 = 0x39c, | ||
298 | PHYCFG_OFS = 0x3a0, /* only in 65n devices */ | ||
299 | |||
296 | MV5_PHY_MODE = 0x74, | 300 | MV5_PHY_MODE = 0x74, |
297 | MV5_LTMODE = 0x30, | 301 | MV5_LTMODE = 0x30, |
298 | MV5_PHY_CTL = 0x0C, | 302 | MV5_PHY_CTL = 0x0C, |
@@ -609,6 +613,8 @@ static int mv_soc_reset_hc(struct mv_host_priv *hpriv, | |||
609 | static void mv_soc_reset_flash(struct mv_host_priv *hpriv, | 613 | static void mv_soc_reset_flash(struct mv_host_priv *hpriv, |
610 | void __iomem *mmio); | 614 | void __iomem *mmio); |
611 | static void mv_soc_reset_bus(struct ata_host *host, void __iomem *mmio); | 615 | static void mv_soc_reset_bus(struct ata_host *host, void __iomem *mmio); |
616 | static void mv_soc_65n_phy_errata(struct mv_host_priv *hpriv, | ||
617 | void __iomem *mmio, unsigned int port); | ||
612 | static void mv_reset_pci_bus(struct ata_host *host, void __iomem *mmio); | 618 | static void mv_reset_pci_bus(struct ata_host *host, void __iomem *mmio); |
613 | static void mv_reset_channel(struct mv_host_priv *hpriv, void __iomem *mmio, | 619 | static void mv_reset_channel(struct mv_host_priv *hpriv, void __iomem *mmio, |
614 | unsigned int port_no); | 620 | unsigned int port_no); |
@@ -807,6 +813,14 @@ static const struct mv_hw_ops mv_soc_ops = { | |||
807 | .reset_bus = mv_soc_reset_bus, | 813 | .reset_bus = mv_soc_reset_bus, |
808 | }; | 814 | }; |
809 | 815 | ||
816 | static const struct mv_hw_ops mv_soc_65n_ops = { | ||
817 | .phy_errata = mv_soc_65n_phy_errata, | ||
818 | .enable_leds = mv_soc_enable_leds, | ||
819 | .reset_hc = mv_soc_reset_hc, | ||
820 | .reset_flash = mv_soc_reset_flash, | ||
821 | .reset_bus = mv_soc_reset_bus, | ||
822 | }; | ||
823 | |||
810 | /* | 824 | /* |
811 | * Functions | 825 | * Functions |
812 | */ | 826 | */ |
@@ -3397,6 +3411,53 @@ static void mv_soc_reset_bus(struct ata_host *host, void __iomem *mmio) | |||
3397 | return; | 3411 | return; |
3398 | } | 3412 | } |
3399 | 3413 | ||
3414 | static void mv_soc_65n_phy_errata(struct mv_host_priv *hpriv, | ||
3415 | void __iomem *mmio, unsigned int port) | ||
3416 | { | ||
3417 | void __iomem *port_mmio = mv_port_base(mmio, port); | ||
3418 | u32 reg; | ||
3419 | |||
3420 | reg = readl(port_mmio + PHY_MODE3); | ||
3421 | reg &= ~(0x3 << 27); /* SELMUPF (bits 28:27) to 1 */ | ||
3422 | reg |= (0x1 << 27); | ||
3423 | reg &= ~(0x3 << 29); /* SELMUPI (bits 30:29) to 1 */ | ||
3424 | reg |= (0x1 << 29); | ||
3425 | writel(reg, port_mmio + PHY_MODE3); | ||
3426 | |||
3427 | reg = readl(port_mmio + PHY_MODE4); | ||
3428 | reg &= ~0x1; /* SATU_OD8 (bit 0) to 0, reserved bit 16 must be set */ | ||
3429 | reg |= (0x1 << 16); | ||
3430 | writel(reg, port_mmio + PHY_MODE4); | ||
3431 | |||
3432 | reg = readl(port_mmio + PHY_MODE9_GEN2); | ||
3433 | reg &= ~0xf; /* TXAMP[3:0] (bits 3:0) to 8 */ | ||
3434 | reg |= 0x8; | ||
3435 | reg &= ~(0x1 << 14); /* TXAMP[4] (bit 14) to 0 */ | ||
3436 | writel(reg, port_mmio + PHY_MODE9_GEN2); | ||
3437 | |||
3438 | reg = readl(port_mmio + PHY_MODE9_GEN1); | ||
3439 | reg &= ~0xf; /* TXAMP[3:0] (bits 3:0) to 8 */ | ||
3440 | reg |= 0x8; | ||
3441 | reg &= ~(0x1 << 14); /* TXAMP[4] (bit 14) to 0 */ | ||
3442 | writel(reg, port_mmio + PHY_MODE9_GEN1); | ||
3443 | } | ||
3444 | |||
3445 | /** | ||
3446 | * soc_is_65 - check if the soc is 65 nano device | ||
3447 | * | ||
3448 | * Detect the type of the SoC, this is done by reading the PHYCFG_OFS | ||
3449 | * register, this register should contain non-zero value and it exists only | ||
3450 | * in the 65 nano devices, when reading it from older devices we get 0. | ||
3451 | */ | ||
3452 | static bool soc_is_65n(struct mv_host_priv *hpriv) | ||
3453 | { | ||
3454 | void __iomem *port0_mmio = mv_port_base(hpriv->base, 0); | ||
3455 | |||
3456 | if (readl(port0_mmio + PHYCFG_OFS)) | ||
3457 | return true; | ||
3458 | return false; | ||
3459 | } | ||
3460 | |||
3400 | static void mv_setup_ifcfg(void __iomem *port_mmio, int want_gen2i) | 3461 | static void mv_setup_ifcfg(void __iomem *port_mmio, int want_gen2i) |
3401 | { | 3462 | { |
3402 | u32 ifcfg = readl(port_mmio + SATA_IFCFG); | 3463 | u32 ifcfg = readl(port_mmio + SATA_IFCFG); |
@@ -3737,7 +3798,10 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx) | |||
3737 | } | 3798 | } |
3738 | break; | 3799 | break; |
3739 | case chip_soc: | 3800 | case chip_soc: |
3740 | hpriv->ops = &mv_soc_ops; | 3801 | if (soc_is_65n(hpriv)) |
3802 | hpriv->ops = &mv_soc_65n_ops; | ||
3803 | else | ||
3804 | hpriv->ops = &mv_soc_ops; | ||
3741 | hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE | | 3805 | hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE | |
3742 | MV_HP_ERRATA_60X1C0; | 3806 | MV_HP_ERRATA_60X1C0; |
3743 | break; | 3807 | break; |
@@ -3800,7 +3864,8 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx) | |||
3800 | n_hc = mv_get_hc_count(host->ports[0]->flags); | 3864 | n_hc = mv_get_hc_count(host->ports[0]->flags); |
3801 | 3865 | ||
3802 | for (port = 0; port < host->n_ports; port++) | 3866 | for (port = 0; port < host->n_ports; port++) |
3803 | hpriv->ops->read_preamp(hpriv, port, mmio); | 3867 | if (hpriv->ops->read_preamp) |
3868 | hpriv->ops->read_preamp(hpriv, port, mmio); | ||
3804 | 3869 | ||
3805 | rc = hpriv->ops->reset_hc(hpriv, mmio, n_hc); | 3870 | rc = hpriv->ops->reset_hc(hpriv, mmio, n_hc); |
3806 | if (rc) | 3871 | if (rc) |
diff --git a/drivers/base/iommu.c b/drivers/base/iommu.c index 9f0e672f4be..8ad4ffea692 100644 --- a/drivers/base/iommu.c +++ b/drivers/base/iommu.c | |||
@@ -18,6 +18,8 @@ | |||
18 | 18 | ||
19 | #include <linux/bug.h> | 19 | #include <linux/bug.h> |
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <linux/module.h> | ||
22 | #include <linux/slab.h> | ||
21 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
22 | #include <linux/iommu.h> | 24 | #include <linux/iommu.h> |
23 | 25 | ||
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index b5b6c973a2e..8b4708e0624 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
@@ -217,7 +217,6 @@ int platform_device_add_data(struct platform_device *pdev, const void *data, | |||
217 | if (d) { | 217 | if (d) { |
218 | memcpy(d, data, size); | 218 | memcpy(d, data, size); |
219 | pdev->dev.platform_data = d; | 219 | pdev->dev.platform_data = d; |
220 | pdev->platform_data = d; | ||
221 | } | 220 | } |
222 | return d ? 0 : -ENOMEM; | 221 | return d ? 0 : -ENOMEM; |
223 | } | 222 | } |
@@ -247,21 +246,6 @@ int platform_device_add(struct platform_device *pdev) | |||
247 | else | 246 | else |
248 | dev_set_name(&pdev->dev, pdev->name); | 247 | dev_set_name(&pdev->dev, pdev->name); |
249 | 248 | ||
250 | /* We will remove platform_data field from struct device | ||
251 | * if all platform devices pass its platform specific data | ||
252 | * from platform_device. The conversion is going to be a | ||
253 | * long time, so we allow the two cases coexist to make | ||
254 | * this kind of fix more easily*/ | ||
255 | if (pdev->platform_data && pdev->dev.platform_data) { | ||
256 | printk(KERN_ERR | ||
257 | "%s: use which platform_data?\n", | ||
258 | dev_name(&pdev->dev)); | ||
259 | } else if (pdev->platform_data) { | ||
260 | pdev->dev.platform_data = pdev->platform_data; | ||
261 | } else if (pdev->dev.platform_data) { | ||
262 | pdev->platform_data = pdev->dev.platform_data; | ||
263 | } | ||
264 | |||
265 | for (i = 0; i < pdev->num_resources; i++) { | 249 | for (i = 0; i < pdev->num_resources; i++) { |
266 | struct resource *p, *r = &pdev->resource[i]; | 250 | struct resource *p, *r = &pdev->resource[i]; |
267 | 251 | ||
@@ -1028,7 +1012,7 @@ static __initdata LIST_HEAD(early_platform_device_list); | |||
1028 | 1012 | ||
1029 | /** | 1013 | /** |
1030 | * early_platform_driver_register | 1014 | * early_platform_driver_register |
1031 | * @edrv: early_platform driver structure | 1015 | * @epdrv: early_platform driver structure |
1032 | * @buf: string passed from early_param() | 1016 | * @buf: string passed from early_param() |
1033 | */ | 1017 | */ |
1034 | int __init early_platform_driver_register(struct early_platform_driver *epdrv, | 1018 | int __init early_platform_driver_register(struct early_platform_driver *epdrv, |
@@ -1112,7 +1096,7 @@ void __init early_platform_driver_register_all(char *class_str) | |||
1112 | 1096 | ||
1113 | /** | 1097 | /** |
1114 | * early_platform_match | 1098 | * early_platform_match |
1115 | * @edrv: early platform driver structure | 1099 | * @epdrv: early platform driver structure |
1116 | * @id: id to match against | 1100 | * @id: id to match against |
1117 | */ | 1101 | */ |
1118 | static __init struct platform_device * | 1102 | static __init struct platform_device * |
@@ -1130,7 +1114,7 @@ early_platform_match(struct early_platform_driver *epdrv, int id) | |||
1130 | 1114 | ||
1131 | /** | 1115 | /** |
1132 | * early_platform_left | 1116 | * early_platform_left |
1133 | * @edrv: early platform driver structure | 1117 | * @epdrv: early platform driver structure |
1134 | * @id: return true if id or above exists | 1118 | * @id: return true if id or above exists |
1135 | */ | 1119 | */ |
1136 | static __init int early_platform_left(struct early_platform_driver *epdrv, | 1120 | static __init int early_platform_left(struct early_platform_driver *epdrv, |
diff --git a/drivers/char/random.c b/drivers/char/random.c index f824ef8a927..b2ced39d76b 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -1665,15 +1665,20 @@ EXPORT_SYMBOL(secure_dccp_sequence_number); | |||
1665 | * value is not cryptographically secure but for several uses the cost of | 1665 | * value is not cryptographically secure but for several uses the cost of |
1666 | * depleting entropy is too high | 1666 | * depleting entropy is too high |
1667 | */ | 1667 | */ |
1668 | DEFINE_PER_CPU(__u32 [4], get_random_int_hash); | ||
1668 | unsigned int get_random_int(void) | 1669 | unsigned int get_random_int(void) |
1669 | { | 1670 | { |
1670 | /* | 1671 | struct keydata *keyptr; |
1671 | * Use IP's RNG. It suits our purpose perfectly: it re-keys itself | 1672 | __u32 *hash = get_cpu_var(get_random_int_hash); |
1672 | * every second, from the entropy pool (and thus creates a limited | 1673 | int ret; |
1673 | * drain on it), and uses halfMD4Transform within the second. We | 1674 | |
1674 | * also mix it with jiffies and the PID: | 1675 | keyptr = get_keyptr(); |
1675 | */ | 1676 | hash[0] += current->pid + jiffies + get_cycles() + (int)(long)&ret; |
1676 | return secure_ip_id((__force __be32)(current->pid + jiffies)); | 1677 | |
1678 | ret = half_md4_transform(hash, keyptr->secret); | ||
1679 | put_cpu_var(get_random_int_hash); | ||
1680 | |||
1681 | return ret; | ||
1677 | } | 1682 | } |
1678 | 1683 | ||
1679 | /* | 1684 | /* |
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index a2dee0eb6da..e6ce632a393 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c | |||
@@ -400,6 +400,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, | |||
400 | case KIOCSOUND: | 400 | case KIOCSOUND: |
401 | if (!perm) | 401 | if (!perm) |
402 | goto eperm; | 402 | goto eperm; |
403 | /* FIXME: This is an old broken API but we need to keep it | ||
404 | supported and somehow separate the historic advertised | ||
405 | tick rate from any real one */ | ||
403 | if (arg) | 406 | if (arg) |
404 | arg = CLOCK_TICK_RATE / arg; | 407 | arg = CLOCK_TICK_RATE / arg; |
405 | kd_mksound(arg, 0); | 408 | kd_mksound(arg, 0); |
@@ -417,6 +420,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, | |||
417 | */ | 420 | */ |
418 | ticks = HZ * ((arg >> 16) & 0xffff) / 1000; | 421 | ticks = HZ * ((arg >> 16) & 0xffff) / 1000; |
419 | count = ticks ? (arg & 0xffff) : 0; | 422 | count = ticks ? (arg & 0xffff) : 0; |
423 | /* FIXME: This is an old broken API but we need to keep it | ||
424 | supported and somehow separate the historic advertised | ||
425 | tick rate from any real one */ | ||
420 | if (count) | 426 | if (count) |
421 | count = CLOCK_TICK_RATE / count; | 427 | count = CLOCK_TICK_RATE / count; |
422 | kd_mksound(count, ticks); | 428 | kd_mksound(count, ticks); |
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 92438e9dacc..5a87384ea4f 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
@@ -804,11 +804,14 @@ dma_async_memcpy_buf_to_buf(struct dma_chan *chan, void *dest, | |||
804 | dma_addr_t dma_dest, dma_src; | 804 | dma_addr_t dma_dest, dma_src; |
805 | dma_cookie_t cookie; | 805 | dma_cookie_t cookie; |
806 | int cpu; | 806 | int cpu; |
807 | unsigned long flags; | ||
807 | 808 | ||
808 | dma_src = dma_map_single(dev->dev, src, len, DMA_TO_DEVICE); | 809 | dma_src = dma_map_single(dev->dev, src, len, DMA_TO_DEVICE); |
809 | dma_dest = dma_map_single(dev->dev, dest, len, DMA_FROM_DEVICE); | 810 | dma_dest = dma_map_single(dev->dev, dest, len, DMA_FROM_DEVICE); |
810 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, | 811 | flags = DMA_CTRL_ACK | |
811 | DMA_CTRL_ACK); | 812 | DMA_COMPL_SRC_UNMAP_SINGLE | |
813 | DMA_COMPL_DEST_UNMAP_SINGLE; | ||
814 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags); | ||
812 | 815 | ||
813 | if (!tx) { | 816 | if (!tx) { |
814 | dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE); | 817 | dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE); |
@@ -850,11 +853,12 @@ dma_async_memcpy_buf_to_pg(struct dma_chan *chan, struct page *page, | |||
850 | dma_addr_t dma_dest, dma_src; | 853 | dma_addr_t dma_dest, dma_src; |
851 | dma_cookie_t cookie; | 854 | dma_cookie_t cookie; |
852 | int cpu; | 855 | int cpu; |
856 | unsigned long flags; | ||
853 | 857 | ||
854 | dma_src = dma_map_single(dev->dev, kdata, len, DMA_TO_DEVICE); | 858 | dma_src = dma_map_single(dev->dev, kdata, len, DMA_TO_DEVICE); |
855 | dma_dest = dma_map_page(dev->dev, page, offset, len, DMA_FROM_DEVICE); | 859 | dma_dest = dma_map_page(dev->dev, page, offset, len, DMA_FROM_DEVICE); |
856 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, | 860 | flags = DMA_CTRL_ACK | DMA_COMPL_SRC_UNMAP_SINGLE; |
857 | DMA_CTRL_ACK); | 861 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags); |
858 | 862 | ||
859 | if (!tx) { | 863 | if (!tx) { |
860 | dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE); | 864 | dma_unmap_single(dev->dev, dma_src, len, DMA_TO_DEVICE); |
@@ -898,12 +902,13 @@ dma_async_memcpy_pg_to_pg(struct dma_chan *chan, struct page *dest_pg, | |||
898 | dma_addr_t dma_dest, dma_src; | 902 | dma_addr_t dma_dest, dma_src; |
899 | dma_cookie_t cookie; | 903 | dma_cookie_t cookie; |
900 | int cpu; | 904 | int cpu; |
905 | unsigned long flags; | ||
901 | 906 | ||
902 | dma_src = dma_map_page(dev->dev, src_pg, src_off, len, DMA_TO_DEVICE); | 907 | dma_src = dma_map_page(dev->dev, src_pg, src_off, len, DMA_TO_DEVICE); |
903 | dma_dest = dma_map_page(dev->dev, dest_pg, dest_off, len, | 908 | dma_dest = dma_map_page(dev->dev, dest_pg, dest_off, len, |
904 | DMA_FROM_DEVICE); | 909 | DMA_FROM_DEVICE); |
905 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, | 910 | flags = DMA_CTRL_ACK; |
906 | DMA_CTRL_ACK); | 911 | tx = dev->device_prep_dma_memcpy(chan, dma_dest, dma_src, len, flags); |
907 | 912 | ||
908 | if (!tx) { | 913 | if (!tx) { |
909 | dma_unmap_page(dev->dev, dma_src, len, DMA_TO_DEVICE); | 914 | dma_unmap_page(dev->dev, dma_src, len, DMA_TO_DEVICE); |
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index a27c0fb1bc1..fb7da5141e9 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
@@ -531,9 +531,7 @@ static int __init dmatest_init(void) | |||
531 | chan = dma_request_channel(mask, filter, NULL); | 531 | chan = dma_request_channel(mask, filter, NULL); |
532 | if (chan) { | 532 | if (chan) { |
533 | err = dmatest_add_channel(chan); | 533 | err = dmatest_add_channel(chan); |
534 | if (err == 0) | 534 | if (err) { |
535 | continue; | ||
536 | else { | ||
537 | dma_release_channel(chan); | 535 | dma_release_channel(chan); |
538 | break; /* add_channel failed, punt */ | 536 | break; /* add_channel failed, punt */ |
539 | } | 537 | } |
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c index e4fc33c1c32..1955ee8d6d2 100644 --- a/drivers/dma/ioat_dma.c +++ b/drivers/dma/ioat_dma.c | |||
@@ -1063,22 +1063,31 @@ static void ioat_dma_cleanup_tasklet(unsigned long data) | |||
1063 | static void | 1063 | static void |
1064 | ioat_dma_unmap(struct ioat_dma_chan *ioat_chan, struct ioat_desc_sw *desc) | 1064 | ioat_dma_unmap(struct ioat_dma_chan *ioat_chan, struct ioat_desc_sw *desc) |
1065 | { | 1065 | { |
1066 | /* | 1066 | if (!(desc->async_tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) { |
1067 | * yes we are unmapping both _page and _single | 1067 | if (desc->async_tx.flags & DMA_COMPL_DEST_UNMAP_SINGLE) |
1068 | * alloc'd regions with unmap_page. Is this | 1068 | pci_unmap_single(ioat_chan->device->pdev, |
1069 | * *really* that bad? | 1069 | pci_unmap_addr(desc, dst), |
1070 | */ | 1070 | pci_unmap_len(desc, len), |
1071 | if (!(desc->async_tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) | 1071 | PCI_DMA_FROMDEVICE); |
1072 | pci_unmap_page(ioat_chan->device->pdev, | 1072 | else |
1073 | pci_unmap_addr(desc, dst), | 1073 | pci_unmap_page(ioat_chan->device->pdev, |
1074 | pci_unmap_len(desc, len), | 1074 | pci_unmap_addr(desc, dst), |
1075 | PCI_DMA_FROMDEVICE); | 1075 | pci_unmap_len(desc, len), |
1076 | 1076 | PCI_DMA_FROMDEVICE); | |
1077 | if (!(desc->async_tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) | 1077 | } |
1078 | pci_unmap_page(ioat_chan->device->pdev, | 1078 | |
1079 | pci_unmap_addr(desc, src), | 1079 | if (!(desc->async_tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) { |
1080 | pci_unmap_len(desc, len), | 1080 | if (desc->async_tx.flags & DMA_COMPL_SRC_UNMAP_SINGLE) |
1081 | PCI_DMA_TODEVICE); | 1081 | pci_unmap_single(ioat_chan->device->pdev, |
1082 | pci_unmap_addr(desc, src), | ||
1083 | pci_unmap_len(desc, len), | ||
1084 | PCI_DMA_TODEVICE); | ||
1085 | else | ||
1086 | pci_unmap_page(ioat_chan->device->pdev, | ||
1087 | pci_unmap_addr(desc, src), | ||
1088 | pci_unmap_len(desc, len), | ||
1089 | PCI_DMA_TODEVICE); | ||
1090 | } | ||
1082 | } | 1091 | } |
1083 | 1092 | ||
1084 | /** | 1093 | /** |
@@ -1363,6 +1372,7 @@ static int ioat_dma_self_test(struct ioatdma_device *device) | |||
1363 | int err = 0; | 1372 | int err = 0; |
1364 | struct completion cmp; | 1373 | struct completion cmp; |
1365 | unsigned long tmo; | 1374 | unsigned long tmo; |
1375 | unsigned long flags; | ||
1366 | 1376 | ||
1367 | src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL); | 1377 | src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL); |
1368 | if (!src) | 1378 | if (!src) |
@@ -1392,8 +1402,9 @@ static int ioat_dma_self_test(struct ioatdma_device *device) | |||
1392 | DMA_TO_DEVICE); | 1402 | DMA_TO_DEVICE); |
1393 | dma_dest = dma_map_single(dma_chan->device->dev, dest, IOAT_TEST_SIZE, | 1403 | dma_dest = dma_map_single(dma_chan->device->dev, dest, IOAT_TEST_SIZE, |
1394 | DMA_FROM_DEVICE); | 1404 | DMA_FROM_DEVICE); |
1405 | flags = DMA_COMPL_SRC_UNMAP_SINGLE | DMA_COMPL_DEST_UNMAP_SINGLE; | ||
1395 | tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src, | 1406 | tx = device->common.device_prep_dma_memcpy(dma_chan, dma_dest, dma_src, |
1396 | IOAT_TEST_SIZE, 0); | 1407 | IOAT_TEST_SIZE, flags); |
1397 | if (!tx) { | 1408 | if (!tx) { |
1398 | dev_err(&device->pdev->dev, | 1409 | dev_err(&device->pdev->dev, |
1399 | "Self-test prep failed, disabling\n"); | 1410 | "Self-test prep failed, disabling\n"); |
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index e202a6ce557..9a5bc1a7389 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c | |||
@@ -1272,7 +1272,8 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id) | |||
1272 | /* Other interrupts do not interfere with this channel */ | 1272 | /* Other interrupts do not interfere with this channel */ |
1273 | spin_lock(&ichan->lock); | 1273 | spin_lock(&ichan->lock); |
1274 | if (unlikely(chan_id != IDMAC_SDC_0 && chan_id != IDMAC_SDC_1 && | 1274 | if (unlikely(chan_id != IDMAC_SDC_0 && chan_id != IDMAC_SDC_1 && |
1275 | ((curbuf >> chan_id) & 1) == ichan->active_buffer)) { | 1275 | ((curbuf >> chan_id) & 1) == ichan->active_buffer && |
1276 | !list_is_last(ichan->queue.next, &ichan->queue))) { | ||
1276 | int i = 100; | 1277 | int i = 100; |
1277 | 1278 | ||
1278 | /* This doesn't help. See comment in ipu_disable_channel() */ | 1279 | /* This doesn't help. See comment in ipu_disable_channel() */ |
@@ -1547,7 +1548,7 @@ static irqreturn_t ic_sof_irq(int irq, void *dev_id) | |||
1547 | struct idmac_channel *ichan = dev_id; | 1548 | struct idmac_channel *ichan = dev_id; |
1548 | printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n", | 1549 | printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n", |
1549 | irq, ichan->dma_chan.chan_id); | 1550 | irq, ichan->dma_chan.chan_id); |
1550 | disable_irq(irq); | 1551 | disable_irq_nosync(irq); |
1551 | return IRQ_HANDLED; | 1552 | return IRQ_HANDLED; |
1552 | } | 1553 | } |
1553 | 1554 | ||
@@ -1556,7 +1557,7 @@ static irqreturn_t ic_eof_irq(int irq, void *dev_id) | |||
1556 | struct idmac_channel *ichan = dev_id; | 1557 | struct idmac_channel *ichan = dev_id; |
1557 | printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n", | 1558 | printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n", |
1558 | irq, ichan->dma_chan.chan_id); | 1559 | irq, ichan->dma_chan.chan_id); |
1559 | disable_irq(irq); | 1560 | disable_irq_nosync(irq); |
1560 | return IRQ_HANDLED; | 1561 | return IRQ_HANDLED; |
1561 | } | 1562 | } |
1562 | 1563 | ||
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 7b7ddc2d51c..420a96e7f2d 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
@@ -754,11 +754,11 @@ static int __init ibft_check_nic_for(struct ibft_nic *nic, int entry) | |||
754 | rc = 1; | 754 | rc = 1; |
755 | break; | 755 | break; |
756 | case ibft_eth_ip_addr: | 756 | case ibft_eth_ip_addr: |
757 | if (!memcmp(nic->dhcp, nulls, sizeof(nic->dhcp))) | 757 | if (memcmp(nic->ip_addr, nulls, sizeof(nic->ip_addr))) |
758 | rc = 1; | 758 | rc = 1; |
759 | break; | 759 | break; |
760 | case ibft_eth_subnet_mask: | 760 | case ibft_eth_subnet_mask: |
761 | if (!memcmp(nic->dhcp, nulls, sizeof(nic->dhcp))) | 761 | if (nic->subnet_mask_prefix) |
762 | rc = 1; | 762 | rc = 1; |
763 | break; | 763 | break; |
764 | case ibft_eth_origin: | 764 | case ibft_eth_origin: |
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 3a22eb9be37..17b24c580c0 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
@@ -71,6 +71,7 @@ config DRM_I915 | |||
71 | select FB_CFB_COPYAREA | 71 | select FB_CFB_COPYAREA |
72 | select FB_CFB_IMAGEBLIT | 72 | select FB_CFB_IMAGEBLIT |
73 | select FB | 73 | select FB |
74 | select FRAMEBUFFER_CONSOLE if !EMBEDDED | ||
74 | tristate "i915 driver" | 75 | tristate "i915 driver" |
75 | help | 76 | help |
76 | Choose this option if you have a system that has Intel 830M, 845G, | 77 | Choose this option if you have a system that has Intel 830M, 845G, |
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index a04639dc633..45890447fee 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
@@ -561,7 +561,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, | |||
561 | int saved_x, saved_y; | 561 | int saved_x, saved_y; |
562 | struct drm_encoder *encoder; | 562 | struct drm_encoder *encoder; |
563 | bool ret = true; | 563 | bool ret = true; |
564 | bool depth_changed, bpp_changed; | ||
565 | 564 | ||
566 | adjusted_mode = drm_mode_duplicate(dev, mode); | 565 | adjusted_mode = drm_mode_duplicate(dev, mode); |
567 | 566 | ||
@@ -570,15 +569,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, | |||
570 | if (!crtc->enabled) | 569 | if (!crtc->enabled) |
571 | return true; | 570 | return true; |
572 | 571 | ||
573 | if (old_fb && crtc->fb) { | ||
574 | depth_changed = (old_fb->depth != crtc->fb->depth); | ||
575 | bpp_changed = (old_fb->bits_per_pixel != | ||
576 | crtc->fb->bits_per_pixel); | ||
577 | } else { | ||
578 | depth_changed = true; | ||
579 | bpp_changed = true; | ||
580 | } | ||
581 | |||
582 | saved_mode = crtc->mode; | 572 | saved_mode = crtc->mode; |
583 | saved_x = crtc->x; | 573 | saved_x = crtc->x; |
584 | saved_y = crtc->y; | 574 | saved_y = crtc->y; |
@@ -590,15 +580,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, | |||
590 | crtc->x = x; | 580 | crtc->x = x; |
591 | crtc->y = y; | 581 | crtc->y = y; |
592 | 582 | ||
593 | if (drm_mode_equal(&saved_mode, &crtc->mode)) { | ||
594 | if (saved_x != crtc->x || saved_y != crtc->y || | ||
595 | depth_changed || bpp_changed) { | ||
596 | ret = !crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y, | ||
597 | old_fb); | ||
598 | goto done; | ||
599 | } | ||
600 | } | ||
601 | |||
602 | /* Pass our mode to the connectors and the CRTC to give them a chance to | 583 | /* Pass our mode to the connectors and the CRTC to give them a chance to |
603 | * adjust it according to limitations or connector properties, and also | 584 | * adjust it according to limitations or connector properties, and also |
604 | * a chance to reject the mode entirely. | 585 | * a chance to reject the mode entirely. |
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index c4ada8b6295..f01def16a66 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
@@ -456,7 +456,8 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
456 | retcode = -EINVAL; | 456 | retcode = -EINVAL; |
457 | } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || | 457 | } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) || |
458 | ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || | 458 | ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) || |
459 | ((ioctl->flags & DRM_MASTER) && !file_priv->is_master)) { | 459 | ((ioctl->flags & DRM_MASTER) && !file_priv->is_master) || |
460 | (!(ioctl->flags & DRM_CONTROL_ALLOW) && (file_priv->minor->type == DRM_MINOR_CONTROL))) { | ||
460 | retcode = -EACCES; | 461 | retcode = -EACCES; |
461 | } else { | 462 | } else { |
462 | if (cmd & (IOC_IN | IOC_OUT)) { | 463 | if (cmd & (IOC_IN | IOC_OUT)) { |
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index ef878615c49..b9631e3a1ea 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c | |||
@@ -402,14 +402,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, | |||
402 | if (dev->driver->load) { | 402 | if (dev->driver->load) { |
403 | ret = dev->driver->load(dev, ent->driver_data); | 403 | ret = dev->driver->load(dev, ent->driver_data); |
404 | if (ret) | 404 | if (ret) |
405 | goto err_g3; | 405 | goto err_g4; |
406 | } | 406 | } |
407 | 407 | ||
408 | /* setup the grouping for the legacy output */ | 408 | /* setup the grouping for the legacy output */ |
409 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | 409 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
410 | ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); | 410 | ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); |
411 | if (ret) | 411 | if (ret) |
412 | goto err_g3; | 412 | goto err_g4; |
413 | } | 413 | } |
414 | 414 | ||
415 | list_add_tail(&dev->driver_item, &driver->device_list); | 415 | list_add_tail(&dev->driver_item, &driver->device_list); |
@@ -420,8 +420,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, | |||
420 | 420 | ||
421 | return 0; | 421 | return 0; |
422 | 422 | ||
423 | err_g3: | 423 | err_g4: |
424 | drm_put_minor(&dev->primary); | 424 | drm_put_minor(&dev->primary); |
425 | err_g3: | ||
426 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | ||
427 | drm_put_minor(&dev->control); | ||
425 | err_g2: | 428 | err_g2: |
426 | pci_disable_device(pdev); | 429 | pci_disable_device(pdev); |
427 | err_g1: | 430 | err_g1: |
@@ -502,11 +505,11 @@ void drm_put_dev(struct drm_device *dev) | |||
502 | dev->agp = NULL; | 505 | dev->agp = NULL; |
503 | } | 506 | } |
504 | 507 | ||
505 | drm_ht_remove(&dev->map_hash); | ||
506 | drm_ctxbitmap_cleanup(dev); | ||
507 | |||
508 | list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) | 508 | list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) |
509 | drm_rmmap(dev, r_list->map); | 509 | drm_rmmap(dev, r_list->map); |
510 | drm_ht_remove(&dev->map_hash); | ||
511 | |||
512 | drm_ctxbitmap_cleanup(dev); | ||
510 | 513 | ||
511 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | 514 | if (drm_core_check_feature(dev, DRIVER_MODESET)) |
512 | drm_put_minor(&dev->control); | 515 | drm_put_minor(&dev->control); |
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 022876ae34f..8f9372921f8 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
@@ -489,9 +489,7 @@ int drm_sysfs_device_add(struct drm_minor *minor) | |||
489 | 489 | ||
490 | return 0; | 490 | return 0; |
491 | 491 | ||
492 | device_unregister(&minor->kdev); | ||
493 | err_out: | 492 | err_out: |
494 | |||
495 | return err; | 493 | return err; |
496 | } | 494 | } |
497 | 495 | ||
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index 32de4cedc36..077c0455a6b 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c | |||
@@ -511,9 +511,9 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init) | |||
511 | 511 | ||
512 | #if __OS_HAS_AGP | 512 | #if __OS_HAS_AGP |
513 | if (!dev_priv->is_pci) { | 513 | if (!dev_priv->is_pci) { |
514 | drm_core_ioremap(dev_priv->cce_ring, dev); | 514 | drm_core_ioremap_wc(dev_priv->cce_ring, dev); |
515 | drm_core_ioremap(dev_priv->ring_rptr, dev); | 515 | drm_core_ioremap_wc(dev_priv->ring_rptr, dev); |
516 | drm_core_ioremap(dev->agp_buffer_map, dev); | 516 | drm_core_ioremap_wc(dev->agp_buffer_map, dev); |
517 | if (!dev_priv->cce_ring->handle || | 517 | if (!dev_priv->cce_ring->handle || |
518 | !dev_priv->ring_rptr->handle || | 518 | !dev_priv->ring_rptr->handle || |
519 | !dev->agp_buffer_map->handle) { | 519 | !dev->agp_buffer_map->handle) { |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index ed4d27e6ee6..8071d965f14 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
@@ -99,9 +99,10 @@ | |||
99 | * 1.27- Add support for IGP GART | 99 | * 1.27- Add support for IGP GART |
100 | * 1.28- Add support for VBL on CRTC2 | 100 | * 1.28- Add support for VBL on CRTC2 |
101 | * 1.29- R500 3D cmd buffer support | 101 | * 1.29- R500 3D cmd buffer support |
102 | * 1.30- Add support for occlusion queries | ||
102 | */ | 103 | */ |
103 | #define DRIVER_MAJOR 1 | 104 | #define DRIVER_MAJOR 1 |
104 | #define DRIVER_MINOR 29 | 105 | #define DRIVER_MINOR 30 |
105 | #define DRIVER_PATCHLEVEL 0 | 106 | #define DRIVER_PATCHLEVEL 0 |
106 | 107 | ||
107 | /* | 108 | /* |
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 7359d9d88e4..acbce5745b0 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
@@ -151,7 +151,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, | |||
151 | if (fnmode) { | 151 | if (fnmode) { |
152 | int do_translate; | 152 | int do_translate; |
153 | 153 | ||
154 | trans = apple_find_translation((hid->product < 0x220 || | 154 | trans = apple_find_translation((hid->product < 0x21d || |
155 | hid->product >= 0x300) ? | 155 | hid->product >= 0x300) ? |
156 | powerbook_fn_keys : apple_fn_keys, | 156 | powerbook_fn_keys : apple_fn_keys, |
157 | usage->code); | 157 | usage->code); |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 5746a5903bc..8551693d645 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1293,6 +1293,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1293 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) }, | 1293 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) }, |
1294 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, | 1294 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, |
1295 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, | 1295 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, |
1296 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) }, | ||
1296 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) }, | 1297 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) }, |
1297 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) }, | 1298 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) }, |
1298 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, | 1299 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, |
@@ -1824,6 +1825,9 @@ int hid_check_keys_pressed(struct hid_device *hid) | |||
1824 | struct hid_input *hidinput; | 1825 | struct hid_input *hidinput; |
1825 | int i; | 1826 | int i; |
1826 | 1827 | ||
1828 | if (!(hid->claimed & HID_CLAIMED_INPUT)) | ||
1829 | return 0; | ||
1830 | |||
1827 | list_for_each_entry(hidinput, &hid->inputs, list) { | 1831 | list_for_each_entry(hidinput, &hid->inputs, list) { |
1828 | for (i = 0; i < BITS_TO_LONGS(KEY_MAX); i++) | 1832 | for (i = 0; i < BITS_TO_LONGS(KEY_MAX); i++) |
1829 | if (hidinput->input->key[i]) | 1833 | if (hidinput->input->key[i]) |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index bdeda4c7cc1..4d5ee2bbc62 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -113,6 +113,11 @@ | |||
113 | #define USB_VENDOR_ID_BERKSHIRE 0x0c98 | 113 | #define USB_VENDOR_ID_BERKSHIRE 0x0c98 |
114 | #define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140 | 114 | #define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140 |
115 | 115 | ||
116 | #define USB_VENDOR_ID_CH 0x068e | ||
117 | #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2 | ||
118 | #define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4 | ||
119 | #define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE 0x00ff | ||
120 | |||
116 | #define USB_VENDOR_ID_CHERRY 0x046a | 121 | #define USB_VENDOR_ID_CHERRY 0x046a |
117 | #define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023 | 122 | #define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023 |
118 | 123 | ||
@@ -292,6 +297,7 @@ | |||
292 | #define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO 0xc286 | 297 | #define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO 0xc286 |
293 | #define USB_DEVICE_ID_LOGITECH_WHEEL 0xc294 | 298 | #define USB_DEVICE_ID_LOGITECH_WHEEL 0xc294 |
294 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295 | 299 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295 |
300 | #define USB_DEVICE_ID_LOGITECH_G25_WHEEL 0xc299 | ||
295 | #define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a | 301 | #define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a |
296 | #define USB_DEVICE_ID_S510_RECEIVER 0xc50c | 302 | #define USB_DEVICE_ID_S510_RECEIVER 0xc50c |
297 | #define USB_DEVICE_ID_S510_RECEIVER_2 0xc517 | 303 | #define USB_DEVICE_ID_S510_RECEIVER_2 0xc517 |
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index 7b80cb69498..7afbaa0efd1 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c | |||
@@ -297,6 +297,8 @@ static const struct hid_device_id lg_devices[] = { | |||
297 | .driver_data = LG_FF }, | 297 | .driver_data = LG_FF }, |
298 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), | 298 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), |
299 | .driver_data = LG_FF }, | 299 | .driver_data = LG_FF }, |
300 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), | ||
301 | .driver_data = LG_FF }, | ||
300 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2), | 302 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2), |
301 | .driver_data = LG_FF2 }, | 303 | .driver_data = LG_FF2 }, |
302 | { } | 304 | { } |
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index e263d473117..00ccf4b1985 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
@@ -285,8 +285,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, | |||
285 | 285 | ||
286 | if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) { | 286 | if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) { |
287 | int len; | 287 | int len; |
288 | if (!hid->name) | 288 | if (!hid->name) { |
289 | return 0; | 289 | ret = 0; |
290 | break; | ||
291 | } | ||
290 | len = strlen(hid->name) + 1; | 292 | len = strlen(hid->name) + 1; |
291 | if (len > _IOC_SIZE(cmd)) | 293 | if (len > _IOC_SIZE(cmd)) |
292 | len = _IOC_SIZE(cmd); | 294 | len = _IOC_SIZE(cmd); |
@@ -297,8 +299,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, | |||
297 | 299 | ||
298 | if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) { | 300 | if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) { |
299 | int len; | 301 | int len; |
300 | if (!hid->phys) | 302 | if (!hid->phys) { |
301 | return 0; | 303 | ret = 0; |
304 | break; | ||
305 | } | ||
302 | len = strlen(hid->phys) + 1; | 306 | len = strlen(hid->phys) + 1; |
303 | if (len > _IOC_SIZE(cmd)) | 307 | if (len > _IOC_SIZE(cmd)) |
304 | len = _IOC_SIZE(cmd); | 308 | len = _IOC_SIZE(cmd); |
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 4306cb1b8ce..ac8049b5f1e 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c | |||
@@ -662,8 +662,8 @@ void usbhid_close(struct hid_device *hid) | |||
662 | spin_lock_irq(&usbhid->lock); | 662 | spin_lock_irq(&usbhid->lock); |
663 | if (!--hid->open) { | 663 | if (!--hid->open) { |
664 | spin_unlock_irq(&usbhid->lock); | 664 | spin_unlock_irq(&usbhid->lock); |
665 | hid_cancel_delayed_stuff(usbhid); | ||
665 | usb_kill_urb(usbhid->urbin); | 666 | usb_kill_urb(usbhid->urbin); |
666 | flush_scheduled_work(); | ||
667 | usbhid->intf->needs_remote_wakeup = 0; | 667 | usbhid->intf->needs_remote_wakeup = 0; |
668 | } else { | 668 | } else { |
669 | spin_unlock_irq(&usbhid->lock); | 669 | spin_unlock_irq(&usbhid->lock); |
@@ -898,7 +898,7 @@ static int usbhid_parse(struct hid_device *hid) | |||
898 | goto err; | 898 | goto err; |
899 | } | 899 | } |
900 | 900 | ||
901 | hid->quirks = quirks; | 901 | hid->quirks |= quirks; |
902 | 902 | ||
903 | return 0; | 903 | return 0; |
904 | err: | 904 | err: |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 4391717d251..d8f7423f363 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -50,6 +50,9 @@ static const struct hid_blacklist { | |||
50 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET }, | 50 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET }, |
51 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, | 51 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, |
52 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, | 52 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, |
53 | { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET }, | ||
54 | { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET }, | ||
55 | { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET }, | ||
53 | { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, | 56 | { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, |
54 | { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, | 57 | { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, |
55 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, | 58 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, |
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index 0897edef257..bff0103610c 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c | |||
@@ -348,6 +348,7 @@ static int validate_hwmon_pack(struct atk_data *data, union acpi_object *obj) | |||
348 | return 0; | 348 | return 0; |
349 | } | 349 | } |
350 | 350 | ||
351 | #ifdef DEBUG | ||
351 | static char const *atk_sensor_type(union acpi_object *flags) | 352 | static char const *atk_sensor_type(union acpi_object *flags) |
352 | { | 353 | { |
353 | u64 type = flags->integer.value & ATK_TYPE_MASK; | 354 | u64 type = flags->integer.value & ATK_TYPE_MASK; |
@@ -370,6 +371,7 @@ static char const *atk_sensor_type(union acpi_object *flags) | |||
370 | 371 | ||
371 | return what; | 372 | return what; |
372 | } | 373 | } |
374 | #endif | ||
373 | 375 | ||
374 | static void atk_print_sensor(struct atk_data *data, union acpi_object *obj) | 376 | static void atk_print_sensor(struct atk_data *data, union acpi_object *obj) |
375 | { | 377 | { |
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index dbfb30c588d..0bdab959b73 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
@@ -1462,7 +1462,8 @@ static struct w83781d_data *w83781d_update_device(struct device *dev) | |||
1462 | data->pwm[i] = | 1462 | data->pwm[i] = |
1463 | w83781d_read_value(data, | 1463 | w83781d_read_value(data, |
1464 | W83781D_REG_PWM[i]); | 1464 | W83781D_REG_PWM[i]); |
1465 | if ((data->type != w83782d || !client->driver) | 1465 | /* Only W83782D on SMBus has PWM3 and PWM4 */ |
1466 | if ((data->type != w83782d || !client) | ||
1466 | && i == 1) | 1467 | && i == 1) |
1467 | break; | 1468 | break; |
1468 | } | 1469 | } |
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index d420cc5f563..e25e13980af 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c | |||
@@ -104,7 +104,7 @@ static int sclhi(struct i2c_algo_bit_data *adap) | |||
104 | * chips may hold it low ("clock stretching") while they | 104 | * chips may hold it low ("clock stretching") while they |
105 | * are processing data internally. | 105 | * are processing data internally. |
106 | */ | 106 | */ |
107 | if (time_after_eq(jiffies, start + adap->timeout)) | 107 | if (time_after(jiffies, start + adap->timeout)) |
108 | return -ETIMEDOUT; | 108 | return -ETIMEDOUT; |
109 | cond_resched(); | 109 | cond_resched(); |
110 | } | 110 | } |
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index 6318f7ddc1d..78d42aae008 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c | |||
@@ -287,10 +287,21 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, | |||
287 | 287 | ||
288 | case 0x30: /* Data byte in I2CDAT has been transmitted; NOT ACK has been received */ | 288 | case 0x30: /* Data byte in I2CDAT has been transmitted; NOT ACK has been received */ |
289 | DEB2("NOT ACK received after data byte\n"); | 289 | DEB2("NOT ACK received after data byte\n"); |
290 | pca_stop(adap); | ||
290 | goto out; | 291 | goto out; |
291 | 292 | ||
292 | case 0x38: /* Arbitration lost during SLA+W, SLA+R or data bytes */ | 293 | case 0x38: /* Arbitration lost during SLA+W, SLA+R or data bytes */ |
293 | DEB2("Arbitration lost\n"); | 294 | DEB2("Arbitration lost\n"); |
295 | /* | ||
296 | * The PCA9564 data sheet (2006-09-01) says "A | ||
297 | * START condition will be transmitted when the | ||
298 | * bus becomes free (STOP or SCL and SDA high)" | ||
299 | * when the STA bit is set (p. 11). | ||
300 | * | ||
301 | * In case this won't work, try pca_reset() | ||
302 | * instead. | ||
303 | */ | ||
304 | pca_start(adap); | ||
294 | goto out; | 305 | goto out; |
295 | 306 | ||
296 | case 0x58: /* Data byte has been received; NOT ACK has been returned */ | 307 | case 0x58: /* Data byte has been received; NOT ACK has been returned */ |
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index a48c8aee021..f1c6ca7e285 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -467,7 +467,7 @@ config I2C_PXA_SLAVE | |||
467 | 467 | ||
468 | config I2C_S3C2410 | 468 | config I2C_S3C2410 |
469 | tristate "S3C2410 I2C Driver" | 469 | tristate "S3C2410 I2C Driver" |
470 | depends on ARCH_S3C2410 | 470 | depends on ARCH_S3C2410 || ARCH_S3C64XX |
471 | help | 471 | help |
472 | Say Y here to include support for I2C controller in the | 472 | Say Y here to include support for I2C controller in the |
473 | Samsung S3C2410 based System-on-Chip devices. | 473 | Samsung S3C2410 based System-on-Chip devices. |
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c index 981e080b32a..d108450df06 100644 --- a/drivers/i2c/busses/i2c-ali1535.c +++ b/drivers/i2c/busses/i2c-ali1535.c | |||
@@ -284,7 +284,7 @@ static int ali1535_transaction(struct i2c_adapter *adap) | |||
284 | && (timeout++ < MAX_TIMEOUT)); | 284 | && (timeout++ < MAX_TIMEOUT)); |
285 | 285 | ||
286 | /* If the SMBus is still busy, we give up */ | 286 | /* If the SMBus is still busy, we give up */ |
287 | if (timeout >= MAX_TIMEOUT) { | 287 | if (timeout > MAX_TIMEOUT) { |
288 | result = -ETIMEDOUT; | 288 | result = -ETIMEDOUT; |
289 | dev_err(&adap->dev, "SMBus Timeout!\n"); | 289 | dev_err(&adap->dev, "SMBus Timeout!\n"); |
290 | } | 290 | } |
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index 39066dee46e..d627fceb790 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c | |||
@@ -306,7 +306,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap) | |||
306 | && (timeout++ < MAX_TIMEOUT)); | 306 | && (timeout++ < MAX_TIMEOUT)); |
307 | 307 | ||
308 | /* If the SMBus is still busy, we give up */ | 308 | /* If the SMBus is still busy, we give up */ |
309 | if (timeout >= MAX_TIMEOUT) { | 309 | if (timeout > MAX_TIMEOUT) { |
310 | result = -ETIMEDOUT; | 310 | result = -ETIMEDOUT; |
311 | dev_err(&adap->dev, "SMBus Timeout!\n"); | 311 | dev_err(&adap->dev, "SMBus Timeout!\n"); |
312 | } | 312 | } |
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 220f4a1eee1..f7d6fe9c49b 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c | |||
@@ -126,7 +126,7 @@ static int amd756_transaction(struct i2c_adapter *adap) | |||
126 | } while ((temp & (GS_HST_STS | GS_SMB_STS)) && | 126 | } while ((temp & (GS_HST_STS | GS_SMB_STS)) && |
127 | (timeout++ < MAX_TIMEOUT)); | 127 | (timeout++ < MAX_TIMEOUT)); |
128 | /* If the SMBus is still busy, we give up */ | 128 | /* If the SMBus is still busy, we give up */ |
129 | if (timeout >= MAX_TIMEOUT) { | 129 | if (timeout > MAX_TIMEOUT) { |
130 | dev_dbg(&adap->dev, "Busy wait timeout (%04x)\n", temp); | 130 | dev_dbg(&adap->dev, "Busy wait timeout (%04x)\n", temp); |
131 | goto abort; | 131 | goto abort; |
132 | } | 132 | } |
@@ -143,7 +143,7 @@ static int amd756_transaction(struct i2c_adapter *adap) | |||
143 | } while ((temp & GS_HST_STS) && (timeout++ < MAX_TIMEOUT)); | 143 | } while ((temp & GS_HST_STS) && (timeout++ < MAX_TIMEOUT)); |
144 | 144 | ||
145 | /* If the SMBus is still busy, we give up */ | 145 | /* If the SMBus is still busy, we give up */ |
146 | if (timeout >= MAX_TIMEOUT) { | 146 | if (timeout > MAX_TIMEOUT) { |
147 | dev_dbg(&adap->dev, "Completion timeout!\n"); | 147 | dev_dbg(&adap->dev, "Completion timeout!\n"); |
148 | goto abort; | 148 | goto abort; |
149 | } | 149 | } |
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 3fcf78e906d..b5db8b88361 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c | |||
@@ -531,16 +531,16 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) | |||
531 | rbdf = cpm->rbase; | 531 | rbdf = cpm->rbase; |
532 | 532 | ||
533 | for (i = 0; i < CPM_MAXBD; i++) { | 533 | for (i = 0; i < CPM_MAXBD; i++) { |
534 | cpm->rxbuf[i] = dma_alloc_coherent( | 534 | cpm->rxbuf[i] = dma_alloc_coherent(&cpm->ofdev->dev, |
535 | NULL, CPM_MAX_READ + 1, &cpm->rxdma[i], GFP_KERNEL); | 535 | CPM_MAX_READ + 1, |
536 | &cpm->rxdma[i], GFP_KERNEL); | ||
536 | if (!cpm->rxbuf[i]) { | 537 | if (!cpm->rxbuf[i]) { |
537 | ret = -ENOMEM; | 538 | ret = -ENOMEM; |
538 | goto out_muram; | 539 | goto out_muram; |
539 | } | 540 | } |
540 | out_be32(&rbdf[i].cbd_bufaddr, ((cpm->rxdma[i] + 1) & ~1)); | 541 | out_be32(&rbdf[i].cbd_bufaddr, ((cpm->rxdma[i] + 1) & ~1)); |
541 | 542 | ||
542 | cpm->txbuf[i] = (unsigned char *)dma_alloc_coherent( | 543 | cpm->txbuf[i] = (unsigned char *)dma_alloc_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, &cpm->txdma[i], GFP_KERNEL); |
543 | NULL, CPM_MAX_READ + 1, &cpm->txdma[i], GFP_KERNEL); | ||
544 | if (!cpm->txbuf[i]) { | 544 | if (!cpm->txbuf[i]) { |
545 | ret = -ENOMEM; | 545 | ret = -ENOMEM; |
546 | goto out_muram; | 546 | goto out_muram; |
@@ -585,10 +585,10 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) | |||
585 | out_muram: | 585 | out_muram: |
586 | for (i = 0; i < CPM_MAXBD; i++) { | 586 | for (i = 0; i < CPM_MAXBD; i++) { |
587 | if (cpm->rxbuf[i]) | 587 | if (cpm->rxbuf[i]) |
588 | dma_free_coherent(NULL, CPM_MAX_READ + 1, | 588 | dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, |
589 | cpm->rxbuf[i], cpm->rxdma[i]); | 589 | cpm->rxbuf[i], cpm->rxdma[i]); |
590 | if (cpm->txbuf[i]) | 590 | if (cpm->txbuf[i]) |
591 | dma_free_coherent(NULL, CPM_MAX_READ + 1, | 591 | dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, |
592 | cpm->txbuf[i], cpm->txdma[i]); | 592 | cpm->txbuf[i], cpm->txdma[i]); |
593 | } | 593 | } |
594 | cpm_muram_free(cpm->dp_addr); | 594 | cpm_muram_free(cpm->dp_addr); |
@@ -619,9 +619,9 @@ static void cpm_i2c_shutdown(struct cpm_i2c *cpm) | |||
619 | 619 | ||
620 | /* Free all memory */ | 620 | /* Free all memory */ |
621 | for (i = 0; i < CPM_MAXBD; i++) { | 621 | for (i = 0; i < CPM_MAXBD; i++) { |
622 | dma_free_coherent(NULL, CPM_MAX_READ + 1, | 622 | dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, |
623 | cpm->rxbuf[i], cpm->rxdma[i]); | 623 | cpm->rxbuf[i], cpm->rxdma[i]); |
624 | dma_free_coherent(NULL, CPM_MAX_READ + 1, | 624 | dma_free_coherent(&cpm->ofdev->dev, CPM_MAX_READ + 1, |
625 | cpm->txbuf[i], cpm->txdma[i]); | 625 | cpm->txbuf[i], cpm->txdma[i]); |
626 | } | 626 | } |
627 | 627 | ||
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 10411848fd7..9d2c5adf5d4 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c | |||
@@ -237,7 +237,7 @@ static int i801_transaction(int xact) | |||
237 | status = inb_p(SMBHSTSTS); | 237 | status = inb_p(SMBHSTSTS); |
238 | } while ((status & SMBHSTSTS_HOST_BUSY) && (timeout++ < MAX_TIMEOUT)); | 238 | } while ((status & SMBHSTSTS_HOST_BUSY) && (timeout++ < MAX_TIMEOUT)); |
239 | 239 | ||
240 | result = i801_check_post(status, timeout >= MAX_TIMEOUT); | 240 | result = i801_check_post(status, timeout > MAX_TIMEOUT); |
241 | if (result < 0) | 241 | if (result < 0) |
242 | return result; | 242 | return result; |
243 | 243 | ||
@@ -257,9 +257,9 @@ static void i801_wait_hwpec(void) | |||
257 | } while ((!(status & SMBHSTSTS_INTR)) | 257 | } while ((!(status & SMBHSTSTS_INTR)) |
258 | && (timeout++ < MAX_TIMEOUT)); | 258 | && (timeout++ < MAX_TIMEOUT)); |
259 | 259 | ||
260 | if (timeout >= MAX_TIMEOUT) { | 260 | if (timeout > MAX_TIMEOUT) |
261 | dev_dbg(&I801_dev->dev, "PEC Timeout!\n"); | 261 | dev_dbg(&I801_dev->dev, "PEC Timeout!\n"); |
262 | } | 262 | |
263 | outb_p(status, SMBHSTSTS); | 263 | outb_p(status, SMBHSTSTS); |
264 | } | 264 | } |
265 | 265 | ||
@@ -344,7 +344,7 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data, | |||
344 | while ((!(status & SMBHSTSTS_BYTE_DONE)) | 344 | while ((!(status & SMBHSTSTS_BYTE_DONE)) |
345 | && (timeout++ < MAX_TIMEOUT)); | 345 | && (timeout++ < MAX_TIMEOUT)); |
346 | 346 | ||
347 | result = i801_check_post(status, timeout >= MAX_TIMEOUT); | 347 | result = i801_check_post(status, timeout > MAX_TIMEOUT); |
348 | if (result < 0) | 348 | if (result < 0) |
349 | return result; | 349 | return result; |
350 | 350 | ||
diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c index b9c01aa9003..9f6b8e0f863 100644 --- a/drivers/i2c/busses/i2c-isch.c +++ b/drivers/i2c/busses/i2c-isch.c | |||
@@ -112,7 +112,7 @@ static int sch_transaction(void) | |||
112 | } while ((temp & 0x08) && (timeout++ < MAX_TIMEOUT)); | 112 | } while ((temp & 0x08) && (timeout++ < MAX_TIMEOUT)); |
113 | 113 | ||
114 | /* If the SMBus is still busy, we give up */ | 114 | /* If the SMBus is still busy, we give up */ |
115 | if (timeout >= MAX_TIMEOUT) { | 115 | if (timeout > MAX_TIMEOUT) { |
116 | dev_err(&sch_adapter.dev, "SMBus Timeout!\n"); | 116 | dev_err(&sch_adapter.dev, "SMBus Timeout!\n"); |
117 | result = -ETIMEDOUT; | 117 | result = -ETIMEDOUT; |
118 | } | 118 | } |
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 4af5c09f0e8..dd778d7ae04 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
@@ -164,7 +164,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) | |||
164 | return 0; | 164 | return 0; |
165 | } | 165 | } |
166 | 166 | ||
167 | #ifdef CONFIG_PPC_52xx | 167 | #ifdef CONFIG_PPC_MPC52xx |
168 | static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = { | 168 | static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = { |
169 | {20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23}, | 169 | {20, 0x20}, {22, 0x21}, {24, 0x22}, {26, 0x23}, |
170 | {28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02}, | 170 | {28, 0x24}, {30, 0x01}, {32, 0x25}, {34, 0x02}, |
@@ -188,7 +188,7 @@ static const struct mpc_i2c_divider mpc_i2c_dividers_52xx[] = { | |||
188 | 188 | ||
189 | int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler) | 189 | int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler) |
190 | { | 190 | { |
191 | const struct mpc52xx_i2c_divider *div = NULL; | 191 | const struct mpc_i2c_divider *div = NULL; |
192 | unsigned int pvr = mfspr(SPRN_PVR); | 192 | unsigned int pvr = mfspr(SPRN_PVR); |
193 | u32 divider; | 193 | u32 divider; |
194 | int i; | 194 | int i; |
@@ -203,7 +203,7 @@ int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler) | |||
203 | * We want to choose an FDR/DFSR that generates an I2C bus speed that | 203 | * We want to choose an FDR/DFSR that generates an I2C bus speed that |
204 | * is equal to or lower than the requested speed. | 204 | * is equal to or lower than the requested speed. |
205 | */ | 205 | */ |
206 | for (i = 0; i < ARRAY_SIZE(mpc52xx_i2c_dividers); i++) { | 206 | for (i = 0; i < ARRAY_SIZE(mpc_i2c_dividers_52xx); i++) { |
207 | div = &mpc_i2c_dividers_52xx[i]; | 207 | div = &mpc_i2c_dividers_52xx[i]; |
208 | /* Old MPC5200 rev A CPUs do not support the high bits */ | 208 | /* Old MPC5200 rev A CPUs do not support the high bits */ |
209 | if (div->fdr & 0xc0 && pvr == 0x80822011) | 209 | if (div->fdr & 0xc0 && pvr == 0x80822011) |
@@ -219,20 +219,23 @@ static void mpc_i2c_setclock_52xx(struct device_node *node, | |||
219 | struct mpc_i2c *i2c, | 219 | struct mpc_i2c *i2c, |
220 | u32 clock, u32 prescaler) | 220 | u32 clock, u32 prescaler) |
221 | { | 221 | { |
222 | int fdr = mpc52xx_i2c_get_fdr(node, clock, prescaler); | 222 | int ret, fdr; |
223 | |||
224 | ret = mpc_i2c_get_fdr_52xx(node, clock, prescaler); | ||
225 | fdr = (ret >= 0) ? ret : 0x3f; /* backward compatibility */ | ||
223 | 226 | ||
224 | if (fdr < 0) | ||
225 | fdr = 0x3f; /* backward compatibility */ | ||
226 | writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR); | 227 | writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR); |
227 | dev_info(i2c->dev, "clock %d Hz (fdr=%d)\n", clock, fdr); | 228 | |
229 | if (ret >= 0) | ||
230 | dev_info(i2c->dev, "clock %d Hz (fdr=%d)\n", clock, fdr); | ||
228 | } | 231 | } |
229 | #else /* !CONFIG_PPC_52xx */ | 232 | #else /* !CONFIG_PPC_MPC52xx */ |
230 | static void mpc_i2c_setclock_52xx(struct device_node *node, | 233 | static void mpc_i2c_setclock_52xx(struct device_node *node, |
231 | struct mpc_i2c *i2c, | 234 | struct mpc_i2c *i2c, |
232 | u32 clock, u32 prescaler) | 235 | u32 clock, u32 prescaler) |
233 | { | 236 | { |
234 | } | 237 | } |
235 | #endif /* CONFIG_PPC_52xx*/ | 238 | #endif /* CONFIG_PPC_MPC52xx*/ |
236 | 239 | ||
237 | #ifdef CONFIG_FSL_SOC | 240 | #ifdef CONFIG_FSL_SOC |
238 | static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] = { | 241 | static const struct mpc_i2c_divider mpc_i2c_dividers_8xxx[] = { |
@@ -321,14 +324,17 @@ static void mpc_i2c_setclock_8xxx(struct device_node *node, | |||
321 | struct mpc_i2c *i2c, | 324 | struct mpc_i2c *i2c, |
322 | u32 clock, u32 prescaler) | 325 | u32 clock, u32 prescaler) |
323 | { | 326 | { |
324 | int fdr = mpc_i2c_get_fdr_8xxx(node, clock, prescaler); | 327 | int ret, fdr; |
328 | |||
329 | ret = mpc_i2c_get_fdr_8xxx(node, clock, prescaler); | ||
330 | fdr = (ret >= 0) ? ret : 0x1031; /* backward compatibility */ | ||
325 | 331 | ||
326 | if (fdr < 0) | ||
327 | fdr = 0x1031; /* backward compatibility */ | ||
328 | writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR); | 332 | writeb(fdr & 0xff, i2c->base + MPC_I2C_FDR); |
329 | writeb((fdr >> 8) & 0xff, i2c->base + MPC_I2C_DFSRR); | 333 | writeb((fdr >> 8) & 0xff, i2c->base + MPC_I2C_DFSRR); |
330 | dev_info(i2c->dev, "clock %d Hz (dfsrr=%d fdr=%d)\n", | 334 | |
331 | clock, fdr >> 8, fdr & 0xff); | 335 | if (ret >= 0) |
336 | dev_info(i2c->dev, "clock %d Hz (dfsrr=%d fdr=%d)\n", | ||
337 | clock, fdr >> 8, fdr & 0xff); | ||
332 | } | 338 | } |
333 | 339 | ||
334 | #else /* !CONFIG_FSL_SOC */ | 340 | #else /* !CONFIG_FSL_SOC */ |
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c index 2ff4683703a..ec11d1c4e77 100644 --- a/drivers/i2c/busses/i2c-nforce2.c +++ b/drivers/i2c/busses/i2c-nforce2.c | |||
@@ -173,7 +173,7 @@ static int nforce2_check_status(struct i2c_adapter *adap) | |||
173 | temp = inb_p(NVIDIA_SMB_STS); | 173 | temp = inb_p(NVIDIA_SMB_STS); |
174 | } while ((!temp) && (timeout++ < MAX_TIMEOUT)); | 174 | } while ((!temp) && (timeout++ < MAX_TIMEOUT)); |
175 | 175 | ||
176 | if (timeout >= MAX_TIMEOUT) { | 176 | if (timeout > MAX_TIMEOUT) { |
177 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); | 177 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); |
178 | if (smbus->can_abort) | 178 | if (smbus->can_abort) |
179 | nforce2_abort(adap); | 179 | nforce2_abort(adap); |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index c1405c8f6ba..acc7143d965 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -265,10 +265,10 @@ static int i2c_pxa_wait_bus_not_busy(struct pxa_i2c *i2c) | |||
265 | show_state(i2c); | 265 | show_state(i2c); |
266 | } | 266 | } |
267 | 267 | ||
268 | if (timeout <= 0) | 268 | if (timeout < 0) |
269 | show_state(i2c); | 269 | show_state(i2c); |
270 | 270 | ||
271 | return timeout <= 0 ? I2C_RETRY : 0; | 271 | return timeout < 0 ? I2C_RETRY : 0; |
272 | } | 272 | } |
273 | 273 | ||
274 | static int i2c_pxa_wait_master(struct pxa_i2c *i2c) | 274 | static int i2c_pxa_wait_master(struct pxa_i2c *i2c) |
@@ -612,7 +612,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c) | |||
612 | show_state(i2c); | 612 | show_state(i2c); |
613 | } | 613 | } |
614 | 614 | ||
615 | if (timeout <= 0) { | 615 | if (timeout < 0) { |
616 | show_state(i2c); | 616 | show_state(i2c); |
617 | dev_err(&i2c->adap.dev, | 617 | dev_err(&i2c->adap.dev, |
618 | "i2c_pxa: timeout waiting for bus free\n"); | 618 | "i2c_pxa: timeout waiting for bus free\n"); |
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index f320ab27da4..139f0c7f12a 100644 --- a/drivers/i2c/busses/i2c-sis5595.c +++ b/drivers/i2c/busses/i2c-sis5595.c | |||
@@ -256,7 +256,7 @@ static int sis5595_transaction(struct i2c_adapter *adap) | |||
256 | } while (!(temp & 0x40) && (timeout++ < MAX_TIMEOUT)); | 256 | } while (!(temp & 0x40) && (timeout++ < MAX_TIMEOUT)); |
257 | 257 | ||
258 | /* If the SMBus is still busy, we give up */ | 258 | /* If the SMBus is still busy, we give up */ |
259 | if (timeout >= MAX_TIMEOUT) { | 259 | if (timeout > MAX_TIMEOUT) { |
260 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); | 260 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); |
261 | result = -ETIMEDOUT; | 261 | result = -ETIMEDOUT; |
262 | } | 262 | } |
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index 50c3610e602..70ca41e90e5 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c | |||
@@ -173,7 +173,7 @@ static int sis630_transaction_wait(struct i2c_adapter *adap, int size) | |||
173 | } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); | 173 | } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); |
174 | 174 | ||
175 | /* If the SMBus is still busy, we give up */ | 175 | /* If the SMBus is still busy, we give up */ |
176 | if (timeout >= MAX_TIMEOUT) { | 176 | if (timeout > MAX_TIMEOUT) { |
177 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); | 177 | dev_dbg(&adap->dev, "SMBus Timeout!\n"); |
178 | result = -ETIMEDOUT; | 178 | result = -ETIMEDOUT; |
179 | } | 179 | } |
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c index 7e1594b4057..8295885b2fd 100644 --- a/drivers/i2c/busses/i2c-sis96x.c +++ b/drivers/i2c/busses/i2c-sis96x.c | |||
@@ -132,7 +132,7 @@ static int sis96x_transaction(int size) | |||
132 | } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); | 132 | } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); |
133 | 133 | ||
134 | /* If the SMBus is still busy, we give up */ | 134 | /* If the SMBus is still busy, we give up */ |
135 | if (timeout >= MAX_TIMEOUT) { | 135 | if (timeout > MAX_TIMEOUT) { |
136 | dev_dbg(&sis96x_adapter.dev, "SMBus Timeout! (0x%02x)\n", temp); | 136 | dev_dbg(&sis96x_adapter.dev, "SMBus Timeout! (0x%02x)\n", temp); |
137 | result = -ETIMEDOUT; | 137 | result = -ETIMEDOUT; |
138 | } | 138 | } |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 3d4e0996976..925eb9e245d 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -312,7 +312,6 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
312 | ide_hwif_t *hwif = drive->hwif; | 312 | ide_hwif_t *hwif = drive->hwif; |
313 | struct request *rq = hwif->rq; | 313 | struct request *rq = hwif->rq; |
314 | int err, sense_key, do_end_request = 0; | 314 | int err, sense_key, do_end_request = 0; |
315 | u8 quiet = rq->cmd_flags & REQ_QUIET; | ||
316 | 315 | ||
317 | /* get the IDE error register */ | 316 | /* get the IDE error register */ |
318 | err = ide_read_error(drive); | 317 | err = ide_read_error(drive); |
@@ -347,7 +346,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
347 | } else { | 346 | } else { |
348 | cdrom_saw_media_change(drive); | 347 | cdrom_saw_media_change(drive); |
349 | 348 | ||
350 | if (blk_fs_request(rq) && !quiet) | 349 | if (blk_fs_request(rq) && !blk_rq_quiet(rq)) |
351 | printk(KERN_ERR PFX "%s: tray open\n", | 350 | printk(KERN_ERR PFX "%s: tray open\n", |
352 | drive->name); | 351 | drive->name); |
353 | } | 352 | } |
@@ -382,7 +381,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
382 | * No point in retrying after an illegal request or data | 381 | * No point in retrying after an illegal request or data |
383 | * protect error. | 382 | * protect error. |
384 | */ | 383 | */ |
385 | if (!quiet) | 384 | if (!blk_rq_quiet(rq)) |
386 | ide_dump_status(drive, "command error", stat); | 385 | ide_dump_status(drive, "command error", stat); |
387 | do_end_request = 1; | 386 | do_end_request = 1; |
388 | break; | 387 | break; |
@@ -391,14 +390,14 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat) | |||
391 | * No point in re-trying a zillion times on a bad sector. | 390 | * No point in re-trying a zillion times on a bad sector. |
392 | * If we got here the error is not correctable. | 391 | * If we got here the error is not correctable. |
393 | */ | 392 | */ |
394 | if (!quiet) | 393 | if (!blk_rq_quiet(rq)) |
395 | ide_dump_status(drive, "media error " | 394 | ide_dump_status(drive, "media error " |
396 | "(bad sector)", stat); | 395 | "(bad sector)", stat); |
397 | do_end_request = 1; | 396 | do_end_request = 1; |
398 | break; | 397 | break; |
399 | case BLANK_CHECK: | 398 | case BLANK_CHECK: |
400 | /* disk appears blank? */ | 399 | /* disk appears blank? */ |
401 | if (!quiet) | 400 | if (!blk_rq_quiet(rq)) |
402 | ide_dump_status(drive, "media error (blank)", | 401 | ide_dump_status(drive, "media error (blank)", |
403 | stat); | 402 | stat); |
404 | do_end_request = 1; | 403 | do_end_request = 1; |
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index 8dc2bb78160..b3684060465 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
@@ -347,7 +347,7 @@ static int ipathfs_fill_super(struct super_block *sb, void *data, | |||
347 | spin_unlock_irqrestore(&ipath_devs_lock, flags); | 347 | spin_unlock_irqrestore(&ipath_devs_lock, flags); |
348 | ret = create_device_files(sb, dd); | 348 | ret = create_device_files(sb, dd); |
349 | if (ret) { | 349 | if (ret) { |
350 | deactivate_super(sb); | 350 | deactivate_locked_super(sb); |
351 | goto bail; | 351 | goto bail; |
352 | } | 352 | } |
353 | spin_lock_irqsave(&ipath_devs_lock, flags); | 353 | spin_lock_irqsave(&ipath_devs_lock, flags); |
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 13d7674b293..75223f50de5 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
@@ -599,6 +599,7 @@ static struct scsi_host_template iscsi_iser_sht = { | |||
599 | .eh_abort_handler = iscsi_eh_abort, | 599 | .eh_abort_handler = iscsi_eh_abort, |
600 | .eh_device_reset_handler= iscsi_eh_device_reset, | 600 | .eh_device_reset_handler= iscsi_eh_device_reset, |
601 | .eh_target_reset_handler= iscsi_eh_target_reset, | 601 | .eh_target_reset_handler= iscsi_eh_target_reset, |
602 | .target_alloc = iscsi_target_alloc, | ||
602 | .use_clustering = DISABLE_CLUSTERING, | 603 | .use_clustering = DISABLE_CLUSTERING, |
603 | .proc_name = "iscsi_iser", | 604 | .proc_name = "iscsi_iser", |
604 | .this_id = -1, | 605 | .this_id = -1, |
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index bc4e40f3ede..2d1415e1683 100644 --- a/drivers/input/ff-memless.c +++ b/drivers/input/ff-memless.c | |||
@@ -226,7 +226,7 @@ static int get_compatible_type(struct ff_device *ff, int effect_type) | |||
226 | */ | 226 | */ |
227 | static void ml_combine_effects(struct ff_effect *effect, | 227 | static void ml_combine_effects(struct ff_effect *effect, |
228 | struct ml_effect_state *state, | 228 | struct ml_effect_state *state, |
229 | int gain) | 229 | unsigned int gain) |
230 | { | 230 | { |
231 | struct ff_effect *new = state->effect; | 231 | struct ff_effect *new = state->effect; |
232 | unsigned int strong, weak, i; | 232 | unsigned int strong, weak, i; |
diff --git a/drivers/input/input.c b/drivers/input/input.c index 935a1835de2..e54e002665b 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
@@ -29,6 +29,23 @@ MODULE_LICENSE("GPL"); | |||
29 | 29 | ||
30 | #define INPUT_DEVICES 256 | 30 | #define INPUT_DEVICES 256 |
31 | 31 | ||
32 | /* | ||
33 | * EV_ABS events which should not be cached are listed here. | ||
34 | */ | ||
35 | static unsigned int input_abs_bypass_init_data[] __initdata = { | ||
36 | ABS_MT_TOUCH_MAJOR, | ||
37 | ABS_MT_TOUCH_MINOR, | ||
38 | ABS_MT_WIDTH_MAJOR, | ||
39 | ABS_MT_WIDTH_MINOR, | ||
40 | ABS_MT_ORIENTATION, | ||
41 | ABS_MT_POSITION_X, | ||
42 | ABS_MT_POSITION_Y, | ||
43 | ABS_MT_TOOL_TYPE, | ||
44 | ABS_MT_BLOB_ID, | ||
45 | 0 | ||
46 | }; | ||
47 | static unsigned long input_abs_bypass[BITS_TO_LONGS(ABS_CNT)]; | ||
48 | |||
32 | static LIST_HEAD(input_dev_list); | 49 | static LIST_HEAD(input_dev_list); |
33 | static LIST_HEAD(input_handler_list); | 50 | static LIST_HEAD(input_handler_list); |
34 | 51 | ||
@@ -161,6 +178,10 @@ static void input_handle_event(struct input_dev *dev, | |||
161 | disposition = INPUT_PASS_TO_HANDLERS; | 178 | disposition = INPUT_PASS_TO_HANDLERS; |
162 | } | 179 | } |
163 | break; | 180 | break; |
181 | case SYN_MT_REPORT: | ||
182 | dev->sync = 0; | ||
183 | disposition = INPUT_PASS_TO_HANDLERS; | ||
184 | break; | ||
164 | } | 185 | } |
165 | break; | 186 | break; |
166 | 187 | ||
@@ -192,6 +213,11 @@ static void input_handle_event(struct input_dev *dev, | |||
192 | case EV_ABS: | 213 | case EV_ABS: |
193 | if (is_event_supported(code, dev->absbit, ABS_MAX)) { | 214 | if (is_event_supported(code, dev->absbit, ABS_MAX)) { |
194 | 215 | ||
216 | if (test_bit(code, input_abs_bypass)) { | ||
217 | disposition = INPUT_PASS_TO_HANDLERS; | ||
218 | break; | ||
219 | } | ||
220 | |||
195 | value = input_defuzz_abs_event(value, | 221 | value = input_defuzz_abs_event(value, |
196 | dev->abs[code], dev->absfuzz[code]); | 222 | dev->abs[code], dev->absfuzz[code]); |
197 | 223 | ||
@@ -1634,10 +1660,20 @@ static const struct file_operations input_fops = { | |||
1634 | .open = input_open_file, | 1660 | .open = input_open_file, |
1635 | }; | 1661 | }; |
1636 | 1662 | ||
1663 | static void __init input_init_abs_bypass(void) | ||
1664 | { | ||
1665 | const unsigned int *p; | ||
1666 | |||
1667 | for (p = input_abs_bypass_init_data; *p; p++) | ||
1668 | input_abs_bypass[BIT_WORD(*p)] |= BIT_MASK(*p); | ||
1669 | } | ||
1670 | |||
1637 | static int __init input_init(void) | 1671 | static int __init input_init(void) |
1638 | { | 1672 | { |
1639 | int err; | 1673 | int err; |
1640 | 1674 | ||
1675 | input_init_abs_bypass(); | ||
1676 | |||
1641 | err = class_register(&input_class); | 1677 | err = class_register(&input_class); |
1642 | if (err) { | 1678 | if (err) { |
1643 | printk(KERN_ERR "input: unable to register input_dev class\n"); | 1679 | printk(KERN_ERR "input: unable to register input_dev class\n"); |
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 4224f011284..012a5e75399 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
@@ -843,7 +843,13 @@ static const struct input_device_id joydev_blacklist[] = { | |||
843 | INPUT_DEVICE_ID_MATCH_KEYBIT, | 843 | INPUT_DEVICE_ID_MATCH_KEYBIT, |
844 | .evbit = { BIT_MASK(EV_KEY) }, | 844 | .evbit = { BIT_MASK(EV_KEY) }, |
845 | .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, | 845 | .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, |
846 | }, /* Avoid itouchpads, touchscreens and tablets */ | 846 | }, /* Avoid itouchpads and touchscreens */ |
847 | { | ||
848 | .flags = INPUT_DEVICE_ID_MATCH_EVBIT | | ||
849 | INPUT_DEVICE_ID_MATCH_KEYBIT, | ||
850 | .evbit = { BIT_MASK(EV_KEY) }, | ||
851 | .keybit = { [BIT_WORD(BTN_DIGI)] = BIT_MASK(BTN_DIGI) }, | ||
852 | }, /* Avoid tablets, digitisers and similar devices */ | ||
847 | { } /* Terminating entry */ | 853 | { } /* Terminating entry */ |
848 | }; | 854 | }; |
849 | 855 | ||
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 444dec07e5d..df3f8aa6811 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
@@ -895,6 +895,13 @@ static unsigned int atkbd_amilo_pa1510_forced_release_keys[] = { | |||
895 | }; | 895 | }; |
896 | 896 | ||
897 | /* | 897 | /* |
898 | * Amilo Xi 3650 key release for light touch bar not working | ||
899 | */ | ||
900 | static unsigned int atkbd_amilo_xi3650_forced_release_keys[] = { | ||
901 | 0x67, 0xed, 0x90, 0xa2, 0x99, 0xa4, 0xae, 0xb0, -1U | ||
902 | }; | ||
903 | |||
904 | /* | ||
898 | * atkbd_set_keycode_table() initializes keyboard's keycode table | 905 | * atkbd_set_keycode_table() initializes keyboard's keycode table |
899 | * according to the selected scancode set | 906 | * according to the selected scancode set |
900 | */ | 907 | */ |
@@ -1560,6 +1567,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = { | |||
1560 | .callback = atkbd_setup_forced_release, | 1567 | .callback = atkbd_setup_forced_release, |
1561 | .driver_data = atkbd_amilo_pa1510_forced_release_keys, | 1568 | .driver_data = atkbd_amilo_pa1510_forced_release_keys, |
1562 | }, | 1569 | }, |
1570 | { | ||
1571 | .ident = "Fujitsu Amilo Xi 3650", | ||
1572 | .matches = { | ||
1573 | DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), | ||
1574 | DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 3650"), | ||
1575 | }, | ||
1576 | .callback = atkbd_setup_forced_release, | ||
1577 | .driver_data = atkbd_amilo_xi3650_forced_release_keys, | ||
1578 | }, | ||
1563 | { } | 1579 | { } |
1564 | }; | 1580 | }; |
1565 | 1581 | ||
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 058fa8b02c2..87ec7b18ac6 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -100,8 +100,20 @@ static irqreturn_t omap_kp_interrupt(int irq, void *dev_id) | |||
100 | /* disable keyboard interrupt and schedule for handling */ | 100 | /* disable keyboard interrupt and schedule for handling */ |
101 | if (cpu_is_omap24xx()) { | 101 | if (cpu_is_omap24xx()) { |
102 | int i; | 102 | int i; |
103 | for (i = 0; i < omap_kp->rows; i++) | 103 | |
104 | disable_irq(gpio_to_irq(row_gpios[i])); | 104 | for (i = 0; i < omap_kp->rows; i++) { |
105 | int gpio_irq = gpio_to_irq(row_gpios[i]); | ||
106 | /* | ||
107 | * The interrupt which we're currently handling should | ||
108 | * be disabled _nosync() to avoid deadlocks waiting | ||
109 | * for this handler to complete. All others should | ||
110 | * be disabled the regular way for SMP safety. | ||
111 | */ | ||
112 | if (gpio_irq == irq) | ||
113 | disable_irq_nosync(gpio_irq); | ||
114 | else | ||
115 | disable_irq(gpio_irq); | ||
116 | } | ||
105 | } else | 117 | } else |
106 | /* disable keyboard interrupt and schedule for handling */ | 118 | /* disable keyboard interrupt and schedule for handling */ |
107 | omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); | 119 | omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); |
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index cbedf957cc5..daecc75c72e 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #define ALPS_FW_BK_2 0x40 | 37 | #define ALPS_FW_BK_2 0x40 |
38 | 38 | ||
39 | static const struct alps_model_info alps_model_data[] = { | 39 | static const struct alps_model_info alps_model_data[] = { |
40 | { { 0x32, 0x02, 0x14 }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* Toshiba Salellite Pro M10 */ | ||
40 | { { 0x33, 0x02, 0x0a }, 0x88, 0xf8, ALPS_OLDPROTO }, /* UMAX-530T */ | 41 | { { 0x33, 0x02, 0x0a }, 0x88, 0xf8, ALPS_OLDPROTO }, /* UMAX-530T */ |
41 | { { 0x53, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, | 42 | { { 0x53, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, |
42 | { { 0x53, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, | 43 | { { 0x53, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, |
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c index 454b96112f0..e0140fdc02a 100644 --- a/drivers/input/mouse/appletouch.c +++ b/drivers/input/mouse/appletouch.c | |||
@@ -255,15 +255,22 @@ MODULE_PARM_DESC(debug, "Activate debugging output"); | |||
255 | */ | 255 | */ |
256 | static int atp_geyser_init(struct usb_device *udev) | 256 | static int atp_geyser_init(struct usb_device *udev) |
257 | { | 257 | { |
258 | char data[8]; | 258 | char *data; |
259 | int size; | 259 | int size; |
260 | int i; | 260 | int i; |
261 | int ret; | ||
262 | |||
263 | data = kmalloc(8, GFP_KERNEL); | ||
264 | if (!data) { | ||
265 | err("Out of memory"); | ||
266 | return -ENOMEM; | ||
267 | } | ||
261 | 268 | ||
262 | size = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), | 269 | size = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), |
263 | ATP_GEYSER_MODE_READ_REQUEST_ID, | 270 | ATP_GEYSER_MODE_READ_REQUEST_ID, |
264 | USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE, | 271 | USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE, |
265 | ATP_GEYSER_MODE_REQUEST_VALUE, | 272 | ATP_GEYSER_MODE_REQUEST_VALUE, |
266 | ATP_GEYSER_MODE_REQUEST_INDEX, &data, 8, 5000); | 273 | ATP_GEYSER_MODE_REQUEST_INDEX, data, 8, 5000); |
267 | 274 | ||
268 | if (size != 8) { | 275 | if (size != 8) { |
269 | dprintk("atp_geyser_init: read error\n"); | 276 | dprintk("atp_geyser_init: read error\n"); |
@@ -271,7 +278,8 @@ static int atp_geyser_init(struct usb_device *udev) | |||
271 | dprintk("appletouch[%d]: %d\n", i, data[i]); | 278 | dprintk("appletouch[%d]: %d\n", i, data[i]); |
272 | 279 | ||
273 | err("Failed to read mode from device."); | 280 | err("Failed to read mode from device."); |
274 | return -EIO; | 281 | ret = -EIO; |
282 | goto out_free; | ||
275 | } | 283 | } |
276 | 284 | ||
277 | /* Apply the mode switch */ | 285 | /* Apply the mode switch */ |
@@ -281,7 +289,7 @@ static int atp_geyser_init(struct usb_device *udev) | |||
281 | ATP_GEYSER_MODE_WRITE_REQUEST_ID, | 289 | ATP_GEYSER_MODE_WRITE_REQUEST_ID, |
282 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, | 290 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, |
283 | ATP_GEYSER_MODE_REQUEST_VALUE, | 291 | ATP_GEYSER_MODE_REQUEST_VALUE, |
284 | ATP_GEYSER_MODE_REQUEST_INDEX, &data, 8, 5000); | 292 | ATP_GEYSER_MODE_REQUEST_INDEX, data, 8, 5000); |
285 | 293 | ||
286 | if (size != 8) { | 294 | if (size != 8) { |
287 | dprintk("atp_geyser_init: write error\n"); | 295 | dprintk("atp_geyser_init: write error\n"); |
@@ -289,9 +297,13 @@ static int atp_geyser_init(struct usb_device *udev) | |||
289 | dprintk("appletouch[%d]: %d\n", i, data[i]); | 297 | dprintk("appletouch[%d]: %d\n", i, data[i]); |
290 | 298 | ||
291 | err("Failed to request geyser raw mode"); | 299 | err("Failed to request geyser raw mode"); |
292 | return -EIO; | 300 | ret = -EIO; |
301 | goto out_free; | ||
293 | } | 302 | } |
294 | return 0; | 303 | ret = 0; |
304 | out_free: | ||
305 | kfree(data); | ||
306 | return ret; | ||
295 | } | 307 | } |
296 | 308 | ||
297 | /* | 309 | /* |
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 2998a6ac9ae..2d8fc0bf692 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c | |||
@@ -51,6 +51,10 @@ | |||
51 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230 | 51 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230 |
52 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231 | 52 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231 |
53 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232 | 53 | #define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232 |
54 | /* Macbook5,1 (unibody), aka wellspring3 */ | ||
55 | #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236 | ||
56 | #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237 | ||
57 | #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238 | ||
54 | 58 | ||
55 | #define BCM5974_DEVICE(prod) { \ | 59 | #define BCM5974_DEVICE(prod) { \ |
56 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ | 60 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ |
@@ -72,6 +76,10 @@ static const struct usb_device_id bcm5974_table[] = { | |||
72 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI), | 76 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI), |
73 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ISO), | 77 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_ISO), |
74 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_JIS), | 78 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING2_JIS), |
79 | /* Macbook5,1 */ | ||
80 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI), | ||
81 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ISO), | ||
82 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_JIS), | ||
75 | /* Terminating entry */ | 83 | /* Terminating entry */ |
76 | {} | 84 | {} |
77 | }; | 85 | }; |
@@ -96,14 +104,23 @@ struct bt_data { | |||
96 | u8 rel_y; /* relative y coordinate */ | 104 | u8 rel_y; /* relative y coordinate */ |
97 | }; | 105 | }; |
98 | 106 | ||
99 | /* trackpad header structure */ | 107 | /* trackpad header types */ |
100 | struct tp_header { | 108 | enum tp_type { |
101 | u8 unknown1[16]; /* constants, timers, etc */ | 109 | TYPE1, /* plain trackpad */ |
102 | u8 fingers; /* number of fingers on trackpad */ | 110 | TYPE2 /* button integrated in trackpad */ |
103 | u8 unknown2[9]; /* constants, timers, etc */ | ||
104 | }; | 111 | }; |
105 | 112 | ||
106 | /* trackpad finger structure */ | 113 | /* trackpad finger data offsets, le16-aligned */ |
114 | #define FINGER_TYPE1 (13 * sizeof(__le16)) | ||
115 | #define FINGER_TYPE2 (15 * sizeof(__le16)) | ||
116 | |||
117 | /* trackpad button data offsets */ | ||
118 | #define BUTTON_TYPE2 15 | ||
119 | |||
120 | /* list of device capability bits */ | ||
121 | #define HAS_INTEGRATED_BUTTON 1 | ||
122 | |||
123 | /* trackpad finger structure, le16-aligned */ | ||
107 | struct tp_finger { | 124 | struct tp_finger { |
108 | __le16 origin; /* zero when switching track finger */ | 125 | __le16 origin; /* zero when switching track finger */ |
109 | __le16 abs_x; /* absolute x coodinate */ | 126 | __le16 abs_x; /* absolute x coodinate */ |
@@ -117,13 +134,11 @@ struct tp_finger { | |||
117 | __le16 force_minor; /* trackpad force, minor axis? */ | 134 | __le16 force_minor; /* trackpad force, minor axis? */ |
118 | __le16 unused[3]; /* zeros */ | 135 | __le16 unused[3]; /* zeros */ |
119 | __le16 multi; /* one finger: varies, more fingers: constant */ | 136 | __le16 multi; /* one finger: varies, more fingers: constant */ |
120 | }; | 137 | } __attribute__((packed,aligned(2))); |
121 | 138 | ||
122 | /* trackpad data structure, empirically at least ten fingers */ | 139 | /* trackpad finger data size, empirically at least ten fingers */ |
123 | struct tp_data { | 140 | #define SIZEOF_FINGER sizeof(struct tp_finger) |
124 | struct tp_header header; | 141 | #define SIZEOF_ALL_FINGERS (16 * SIZEOF_FINGER) |
125 | struct tp_finger finger[16]; | ||
126 | }; | ||
127 | 142 | ||
128 | /* device-specific parameters */ | 143 | /* device-specific parameters */ |
129 | struct bcm5974_param { | 144 | struct bcm5974_param { |
@@ -136,9 +151,12 @@ struct bcm5974_param { | |||
136 | /* device-specific configuration */ | 151 | /* device-specific configuration */ |
137 | struct bcm5974_config { | 152 | struct bcm5974_config { |
138 | int ansi, iso, jis; /* the product id of this device */ | 153 | int ansi, iso, jis; /* the product id of this device */ |
154 | int caps; /* device capability bitmask */ | ||
139 | int bt_ep; /* the endpoint of the button interface */ | 155 | int bt_ep; /* the endpoint of the button interface */ |
140 | int bt_datalen; /* data length of the button interface */ | 156 | int bt_datalen; /* data length of the button interface */ |
141 | int tp_ep; /* the endpoint of the trackpad interface */ | 157 | int tp_ep; /* the endpoint of the trackpad interface */ |
158 | enum tp_type tp_type; /* type of trackpad interface */ | ||
159 | int tp_offset; /* offset to trackpad finger data */ | ||
142 | int tp_datalen; /* data length of the trackpad interface */ | 160 | int tp_datalen; /* data length of the trackpad interface */ |
143 | struct bcm5974_param p; /* finger pressure limits */ | 161 | struct bcm5974_param p; /* finger pressure limits */ |
144 | struct bcm5974_param w; /* finger width limits */ | 162 | struct bcm5974_param w; /* finger width limits */ |
@@ -158,7 +176,7 @@ struct bcm5974 { | |||
158 | struct urb *bt_urb; /* button usb request block */ | 176 | struct urb *bt_urb; /* button usb request block */ |
159 | struct bt_data *bt_data; /* button transferred data */ | 177 | struct bt_data *bt_data; /* button transferred data */ |
160 | struct urb *tp_urb; /* trackpad usb request block */ | 178 | struct urb *tp_urb; /* trackpad usb request block */ |
161 | struct tp_data *tp_data; /* trackpad transferred data */ | 179 | u8 *tp_data; /* trackpad transferred data */ |
162 | int fingers; /* number of fingers on trackpad */ | 180 | int fingers; /* number of fingers on trackpad */ |
163 | }; | 181 | }; |
164 | 182 | ||
@@ -183,8 +201,9 @@ static const struct bcm5974_config bcm5974_config_table[] = { | |||
183 | USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, | 201 | USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, |
184 | USB_DEVICE_ID_APPLE_WELLSPRING_ISO, | 202 | USB_DEVICE_ID_APPLE_WELLSPRING_ISO, |
185 | USB_DEVICE_ID_APPLE_WELLSPRING_JIS, | 203 | USB_DEVICE_ID_APPLE_WELLSPRING_JIS, |
204 | 0, | ||
186 | 0x84, sizeof(struct bt_data), | 205 | 0x84, sizeof(struct bt_data), |
187 | 0x81, sizeof(struct tp_data), | 206 | 0x81, TYPE1, FINGER_TYPE1, FINGER_TYPE1 + SIZEOF_ALL_FINGERS, |
188 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 }, | 207 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 }, |
189 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, | 208 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, |
190 | { DIM_X, DIM_X / SN_COORD, -4824, 5342 }, | 209 | { DIM_X, DIM_X / SN_COORD, -4824, 5342 }, |
@@ -194,13 +213,26 @@ static const struct bcm5974_config bcm5974_config_table[] = { | |||
194 | USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, | 213 | USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, |
195 | USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, | 214 | USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, |
196 | USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, | 215 | USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, |
216 | 0, | ||
197 | 0x84, sizeof(struct bt_data), | 217 | 0x84, sizeof(struct bt_data), |
198 | 0x81, sizeof(struct tp_data), | 218 | 0x81, TYPE1, FINGER_TYPE1, FINGER_TYPE1 + SIZEOF_ALL_FINGERS, |
199 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 }, | 219 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 256 }, |
200 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, | 220 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, |
201 | { DIM_X, DIM_X / SN_COORD, -4824, 4824 }, | 221 | { DIM_X, DIM_X / SN_COORD, -4824, 4824 }, |
202 | { DIM_Y, DIM_Y / SN_COORD, -172, 4290 } | 222 | { DIM_Y, DIM_Y / SN_COORD, -172, 4290 } |
203 | }, | 223 | }, |
224 | { | ||
225 | USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI, | ||
226 | USB_DEVICE_ID_APPLE_WELLSPRING3_ISO, | ||
227 | USB_DEVICE_ID_APPLE_WELLSPRING3_JIS, | ||
228 | HAS_INTEGRATED_BUTTON, | ||
229 | 0x84, sizeof(struct bt_data), | ||
230 | 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS, | ||
231 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 }, | ||
232 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, | ||
233 | { DIM_X, DIM_X / SN_COORD, -4460, 5166 }, | ||
234 | { DIM_Y, DIM_Y / SN_COORD, -75, 6700 } | ||
235 | }, | ||
204 | {} | 236 | {} |
205 | }; | 237 | }; |
206 | 238 | ||
@@ -257,6 +289,7 @@ static void setup_events_to_report(struct input_dev *input_dev, | |||
257 | __set_bit(BTN_TOOL_FINGER, input_dev->keybit); | 289 | __set_bit(BTN_TOOL_FINGER, input_dev->keybit); |
258 | __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); | 290 | __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); |
259 | __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); | 291 | __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); |
292 | __set_bit(BTN_TOOL_QUADTAP, input_dev->keybit); | ||
260 | __set_bit(BTN_LEFT, input_dev->keybit); | 293 | __set_bit(BTN_LEFT, input_dev->keybit); |
261 | } | 294 | } |
262 | 295 | ||
@@ -266,6 +299,11 @@ static int report_bt_state(struct bcm5974 *dev, int size) | |||
266 | if (size != sizeof(struct bt_data)) | 299 | if (size != sizeof(struct bt_data)) |
267 | return -EIO; | 300 | return -EIO; |
268 | 301 | ||
302 | dprintk(7, | ||
303 | "bcm5974: button data: %x %x %x %x\n", | ||
304 | dev->bt_data->unknown1, dev->bt_data->button, | ||
305 | dev->bt_data->rel_x, dev->bt_data->rel_y); | ||
306 | |||
269 | input_report_key(dev->input, BTN_LEFT, dev->bt_data->button); | 307 | input_report_key(dev->input, BTN_LEFT, dev->bt_data->button); |
270 | input_sync(dev->input); | 308 | input_sync(dev->input); |
271 | 309 | ||
@@ -276,29 +314,37 @@ static int report_bt_state(struct bcm5974 *dev, int size) | |||
276 | static int report_tp_state(struct bcm5974 *dev, int size) | 314 | static int report_tp_state(struct bcm5974 *dev, int size) |
277 | { | 315 | { |
278 | const struct bcm5974_config *c = &dev->cfg; | 316 | const struct bcm5974_config *c = &dev->cfg; |
279 | const struct tp_finger *f = dev->tp_data->finger; | 317 | const struct tp_finger *f; |
280 | struct input_dev *input = dev->input; | 318 | struct input_dev *input = dev->input; |
281 | const int fingers = (size - 26) / 28; | 319 | int raw_p, raw_w, raw_x, raw_y, raw_n; |
282 | int raw_p, raw_w, raw_x, raw_y; | 320 | int ptest = 0, origin = 0, ibt = 0, nmin = 0, nmax = 0; |
283 | int ptest = 0, origin = 0, nmin = 0, nmax = 0; | ||
284 | int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0; | 321 | int abs_p = 0, abs_w = 0, abs_x = 0, abs_y = 0; |
285 | 322 | ||
286 | if (size < 26 || (size - 26) % 28 != 0) | 323 | if (size < c->tp_offset || (size - c->tp_offset) % SIZEOF_FINGER != 0) |
287 | return -EIO; | 324 | return -EIO; |
288 | 325 | ||
326 | /* finger data, le16-aligned */ | ||
327 | f = (const struct tp_finger *)(dev->tp_data + c->tp_offset); | ||
328 | raw_n = (size - c->tp_offset) / SIZEOF_FINGER; | ||
329 | |||
289 | /* always track the first finger; when detached, start over */ | 330 | /* always track the first finger; when detached, start over */ |
290 | if (fingers) { | 331 | if (raw_n) { |
291 | raw_p = raw2int(f->force_major); | 332 | raw_p = raw2int(f->force_major); |
292 | raw_w = raw2int(f->size_major); | 333 | raw_w = raw2int(f->size_major); |
293 | raw_x = raw2int(f->abs_x); | 334 | raw_x = raw2int(f->abs_x); |
294 | raw_y = raw2int(f->abs_y); | 335 | raw_y = raw2int(f->abs_y); |
295 | 336 | ||
296 | dprintk(9, | 337 | dprintk(9, |
297 | "bcm5974: raw: p: %+05d w: %+05d x: %+05d y: %+05d\n", | 338 | "bcm5974: " |
298 | raw_p, raw_w, raw_x, raw_y); | 339 | "raw: p: %+05d w: %+05d x: %+05d y: %+05d n: %d\n", |
340 | raw_p, raw_w, raw_x, raw_y, raw_n); | ||
299 | 341 | ||
300 | ptest = int2bound(&c->p, raw_p); | 342 | ptest = int2bound(&c->p, raw_p); |
301 | origin = raw2int(f->origin); | 343 | origin = raw2int(f->origin); |
344 | |||
345 | /* set the integrated button if applicable */ | ||
346 | if (c->tp_type == TYPE2) | ||
347 | ibt = raw2int(dev->tp_data[BUTTON_TYPE2]); | ||
302 | } | 348 | } |
303 | 349 | ||
304 | /* while tracking finger still valid, count all fingers */ | 350 | /* while tracking finger still valid, count all fingers */ |
@@ -307,12 +353,13 @@ static int report_tp_state(struct bcm5974 *dev, int size) | |||
307 | abs_w = int2bound(&c->w, raw_w); | 353 | abs_w = int2bound(&c->w, raw_w); |
308 | abs_x = int2bound(&c->x, raw_x - c->x.devmin); | 354 | abs_x = int2bound(&c->x, raw_x - c->x.devmin); |
309 | abs_y = int2bound(&c->y, c->y.devmax - raw_y); | 355 | abs_y = int2bound(&c->y, c->y.devmax - raw_y); |
310 | for (; f != dev->tp_data->finger + fingers; f++) { | 356 | while (raw_n--) { |
311 | ptest = int2bound(&c->p, raw2int(f->force_major)); | 357 | ptest = int2bound(&c->p, raw2int(f->force_major)); |
312 | if (ptest > PRESSURE_LOW) | 358 | if (ptest > PRESSURE_LOW) |
313 | nmax++; | 359 | nmax++; |
314 | if (ptest > PRESSURE_HIGH) | 360 | if (ptest > PRESSURE_HIGH) |
315 | nmin++; | 361 | nmin++; |
362 | f++; | ||
316 | } | 363 | } |
317 | } | 364 | } |
318 | 365 | ||
@@ -324,7 +371,8 @@ static int report_tp_state(struct bcm5974 *dev, int size) | |||
324 | input_report_key(input, BTN_TOUCH, dev->fingers > 0); | 371 | input_report_key(input, BTN_TOUCH, dev->fingers > 0); |
325 | input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1); | 372 | input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1); |
326 | input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2); | 373 | input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2); |
327 | input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers > 2); | 374 | input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers == 3); |
375 | input_report_key(input, BTN_TOOL_QUADTAP, dev->fingers > 3); | ||
328 | 376 | ||
329 | input_report_abs(input, ABS_PRESSURE, abs_p); | 377 | input_report_abs(input, ABS_PRESSURE, abs_p); |
330 | input_report_abs(input, ABS_TOOL_WIDTH, abs_w); | 378 | input_report_abs(input, ABS_TOOL_WIDTH, abs_w); |
@@ -335,11 +383,15 @@ static int report_tp_state(struct bcm5974 *dev, int size) | |||
335 | 383 | ||
336 | dprintk(8, | 384 | dprintk(8, |
337 | "bcm5974: abs: p: %+05d w: %+05d x: %+05d y: %+05d " | 385 | "bcm5974: abs: p: %+05d w: %+05d x: %+05d y: %+05d " |
338 | "nmin: %d nmax: %d n: %d\n", | 386 | "nmin: %d nmax: %d n: %d ibt: %d\n", abs_p, abs_w, |
339 | abs_p, abs_w, abs_x, abs_y, nmin, nmax, dev->fingers); | 387 | abs_x, abs_y, nmin, nmax, dev->fingers, ibt); |
340 | 388 | ||
341 | } | 389 | } |
342 | 390 | ||
391 | /* type 2 reports button events via ibt only */ | ||
392 | if (c->tp_type == TYPE2) | ||
393 | input_report_key(input, BTN_LEFT, ibt); | ||
394 | |||
343 | input_sync(input); | 395 | input_sync(input); |
344 | 396 | ||
345 | return 0; | 397 | return 0; |
@@ -649,6 +701,8 @@ static int bcm5974_probe(struct usb_interface *iface, | |||
649 | input_dev->name = "bcm5974"; | 701 | input_dev->name = "bcm5974"; |
650 | input_dev->phys = dev->phys; | 702 | input_dev->phys = dev->phys; |
651 | usb_to_input_id(dev->udev, &input_dev->id); | 703 | usb_to_input_id(dev->udev, &input_dev->id); |
704 | /* report driver capabilities via the version field */ | ||
705 | input_dev->id.version = cfg->caps; | ||
652 | input_dev->dev.parent = &iface->dev; | 706 | input_dev->dev.parent = &iface->dev; |
653 | 707 | ||
654 | input_set_drvdata(input_dev, dev); | 708 | input_set_drvdata(input_dev, dev); |
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 6ab0eb1ada1..4bc78892ba9 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Elantech Touchpad driver (v5) | 2 | * Elantech Touchpad driver (v6) |
3 | * | 3 | * |
4 | * Copyright (C) 2007-2008 Arjan Opmeer <arjan@opmeer.net> | 4 | * Copyright (C) 2007-2009 Arjan Opmeer <arjan@opmeer.net> |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms of the GNU General Public License version 2 as published | 7 | * under the terms of the GNU General Public License version 2 as published |
@@ -178,6 +178,7 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse) | |||
178 | struct elantech_data *etd = psmouse->private; | 178 | struct elantech_data *etd = psmouse->private; |
179 | unsigned char *packet = psmouse->packet; | 179 | unsigned char *packet = psmouse->packet; |
180 | int fingers; | 180 | int fingers; |
181 | static int old_fingers; | ||
181 | 182 | ||
182 | if (etd->fw_version_maj == 0x01) { | 183 | if (etd->fw_version_maj == 0x01) { |
183 | /* byte 0: D U p1 p2 1 p3 R L | 184 | /* byte 0: D U p1 p2 1 p3 R L |
@@ -190,6 +191,14 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse) | |||
190 | fingers = (packet[0] & 0xc0) >> 6; | 191 | fingers = (packet[0] & 0xc0) >> 6; |
191 | } | 192 | } |
192 | 193 | ||
194 | if (etd->jumpy_cursor) { | ||
195 | /* Discard packets that are likely to have bogus coordinates */ | ||
196 | if (fingers > old_fingers) { | ||
197 | elantech_debug("elantech.c: discarding packet\n"); | ||
198 | goto discard_packet_v1; | ||
199 | } | ||
200 | } | ||
201 | |||
193 | input_report_key(dev, BTN_TOUCH, fingers != 0); | 202 | input_report_key(dev, BTN_TOUCH, fingers != 0); |
194 | 203 | ||
195 | /* byte 2: x7 x6 x5 x4 x3 x2 x1 x0 | 204 | /* byte 2: x7 x6 x5 x4 x3 x2 x1 x0 |
@@ -216,6 +225,9 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse) | |||
216 | } | 225 | } |
217 | 226 | ||
218 | input_sync(dev); | 227 | input_sync(dev); |
228 | |||
229 | discard_packet_v1: | ||
230 | old_fingers = fingers; | ||
219 | } | 231 | } |
220 | 232 | ||
221 | /* | 233 | /* |
@@ -363,9 +375,14 @@ static int elantech_set_absolute_mode(struct psmouse *psmouse) | |||
363 | rc = -1; | 375 | rc = -1; |
364 | break; | 376 | break; |
365 | } | 377 | } |
378 | } | ||
379 | |||
380 | if (rc == 0) { | ||
366 | /* | 381 | /* |
367 | * Read back reg 0x10. The touchpad is probably initalising | 382 | * Read back reg 0x10. For hardware version 1 we must make |
368 | * and not ready until we read back the value we just wrote. | 383 | * sure the absolute mode bit is set. For hardware version 2 |
384 | * the touchpad is probably initalising and not ready until | ||
385 | * we read back the value we just wrote. | ||
369 | */ | 386 | */ |
370 | do { | 387 | do { |
371 | rc = elantech_read_reg(psmouse, 0x10, &val); | 388 | rc = elantech_read_reg(psmouse, 0x10, &val); |
@@ -373,12 +390,18 @@ static int elantech_set_absolute_mode(struct psmouse *psmouse) | |||
373 | break; | 390 | break; |
374 | tries--; | 391 | tries--; |
375 | elantech_debug("elantech.c: retrying read (%d).\n", | 392 | elantech_debug("elantech.c: retrying read (%d).\n", |
376 | tries); | 393 | tries); |
377 | msleep(ETP_READ_BACK_DELAY); | 394 | msleep(ETP_READ_BACK_DELAY); |
378 | } while (tries > 0); | 395 | } while (tries > 0); |
379 | if (rc) | 396 | |
397 | if (rc) { | ||
380 | pr_err("elantech.c: failed to read back register 0x10.\n"); | 398 | pr_err("elantech.c: failed to read back register 0x10.\n"); |
381 | break; | 399 | } else if (etd->hw_version == 1 && |
400 | !(val & ETP_R10_ABSOLUTE_MODE)) { | ||
401 | pr_err("elantech.c: touchpad refuses " | ||
402 | "to switch to absolute mode.\n"); | ||
403 | rc = -1; | ||
404 | } | ||
382 | } | 405 | } |
383 | 406 | ||
384 | if (rc) | 407 | if (rc) |
@@ -662,6 +685,17 @@ int elantech_init(struct psmouse *psmouse) | |||
662 | param[0], param[1], param[2]); | 685 | param[0], param[1], param[2]); |
663 | etd->capabilities = param[0]; | 686 | etd->capabilities = param[0]; |
664 | 687 | ||
688 | /* | ||
689 | * This firmware seems to suffer from misreporting coordinates when | ||
690 | * a touch action starts causing the mouse cursor or scrolled page | ||
691 | * to jump. Enable a workaround. | ||
692 | */ | ||
693 | if (etd->fw_version_maj == 0x02 && etd->fw_version_min == 0x22) { | ||
694 | pr_info("elantech.c: firmware version 2.34 detected, " | ||
695 | "enabling jumpy cursor workaround\n"); | ||
696 | etd->jumpy_cursor = 1; | ||
697 | } | ||
698 | |||
665 | if (elantech_set_absolute_mode(psmouse)) { | 699 | if (elantech_set_absolute_mode(psmouse)) { |
666 | pr_err("elantech.c: failed to put touchpad into absolute mode.\n"); | 700 | pr_err("elantech.c: failed to put touchpad into absolute mode.\n"); |
667 | goto init_fail; | 701 | goto init_fail; |
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h index bee282b540b..ed848cc8081 100644 --- a/drivers/input/mouse/elantech.h +++ b/drivers/input/mouse/elantech.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Elantech Touchpad driver (v5) | 2 | * Elantech Touchpad driver (v6) |
3 | * | 3 | * |
4 | * Copyright (C) 2007-2008 Arjan Opmeer <arjan@opmeer.net> | 4 | * Copyright (C) 2007-2009 Arjan Opmeer <arjan@opmeer.net> |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms of the GNU General Public License version 2 as published | 7 | * under the terms of the GNU General Public License version 2 as published |
@@ -104,6 +104,7 @@ struct elantech_data { | |||
104 | unsigned char fw_version_min; | 104 | unsigned char fw_version_min; |
105 | unsigned char hw_version; | 105 | unsigned char hw_version; |
106 | unsigned char paritycheck; | 106 | unsigned char paritycheck; |
107 | unsigned char jumpy_cursor; | ||
107 | unsigned char parity[256]; | 108 | unsigned char parity[256]; |
108 | }; | 109 | }; |
109 | 110 | ||
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c index df81b0aaa9f..15ac3205ac0 100644 --- a/drivers/input/mouse/lifebook.c +++ b/drivers/input/mouse/lifebook.c | |||
@@ -61,6 +61,12 @@ static const struct dmi_system_id lifebook_dmi_table[] = { | |||
61 | }, | 61 | }, |
62 | }, | 62 | }, |
63 | { | 63 | { |
64 | .ident = "Lifebook B-2130", | ||
65 | .matches = { | ||
66 | DMI_MATCH(DMI_BOARD_NAME, "ZEPHYR"), | ||
67 | }, | ||
68 | }, | ||
69 | { | ||
64 | .ident = "Lifebook B213x/B2150", | 70 | .ident = "Lifebook B213x/B2150", |
65 | .matches = { | 71 | .matches = { |
66 | DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B2131/B2133/B2150"), | 72 | DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B2131/B2133/B2150"), |
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c index 57953c0eb82..f412c69478a 100644 --- a/drivers/input/serio/sa1111ps2.c +++ b/drivers/input/serio/sa1111ps2.c | |||
@@ -77,7 +77,7 @@ static irqreturn_t ps2_txint(int irq, void *dev_id) | |||
77 | spin_lock(&ps2if->lock); | 77 | spin_lock(&ps2if->lock); |
78 | status = sa1111_readl(ps2if->base + SA1111_PS2STAT); | 78 | status = sa1111_readl(ps2if->base + SA1111_PS2STAT); |
79 | if (ps2if->head == ps2if->tail) { | 79 | if (ps2if->head == ps2if->tail) { |
80 | disable_irq(irq); | 80 | disable_irq_nosync(irq); |
81 | /* done */ | 81 | /* done */ |
82 | } else if (status & PS2STAT_TXE) { | 82 | } else if (status & PS2STAT_TXE) { |
83 | sa1111_writel(ps2if->buf[ps2if->tail], ps2if->base + SA1111_PS2DATA); | 83 | sa1111_writel(ps2if->buf[ps2if->tail], ps2if->base + SA1111_PS2DATA); |
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h index 677680e9f54..9710bfd49cf 100644 --- a/drivers/input/tablet/wacom.h +++ b/drivers/input/tablet/wacom.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * Copyright (c) 2000 Daniel Egger <egger@suse.de> | 11 | * Copyright (c) 2000 Daniel Egger <egger@suse.de> |
12 | * Copyright (c) 2001 Frederic Lepied <flepied@mandrakesoft.com> | 12 | * Copyright (c) 2001 Frederic Lepied <flepied@mandrakesoft.com> |
13 | * Copyright (c) 2004 Panagiotis Issaris <panagiotis.issaris@mech.kuleuven.ac.be> | 13 | * Copyright (c) 2004 Panagiotis Issaris <panagiotis.issaris@mech.kuleuven.ac.be> |
14 | * Copyright (c) 2002-2008 Ping Cheng <pingc@wacom.com> | 14 | * Copyright (c) 2002-2009 Ping Cheng <pingc@wacom.com> |
15 | * | 15 | * |
16 | * ChangeLog: | 16 | * ChangeLog: |
17 | * v0.1 (vp) - Initial release | 17 | * v0.1 (vp) - Initial release |
@@ -67,6 +67,7 @@ | |||
67 | * v1.47 (pc) - Added support for Bamboo | 67 | * v1.47 (pc) - Added support for Bamboo |
68 | * v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX | 68 | * v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX |
69 | * v1.49 (pc) - Added support for USB Tablet PC (0x90, 0x93, and 0x9A) | 69 | * v1.49 (pc) - Added support for USB Tablet PC (0x90, 0x93, and 0x9A) |
70 | * v1.50 (pc) - Fixed a TabletPC touch bug in 2.6.28 | ||
70 | */ | 71 | */ |
71 | 72 | ||
72 | /* | 73 | /* |
@@ -87,7 +88,7 @@ | |||
87 | /* | 88 | /* |
88 | * Version Information | 89 | * Version Information |
89 | */ | 90 | */ |
90 | #define DRIVER_VERSION "v1.49" | 91 | #define DRIVER_VERSION "v1.50" |
91 | #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>" | 92 | #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>" |
92 | #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" | 93 | #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" |
93 | #define DRIVER_LICENSE "GPL" | 94 | #define DRIVER_LICENSE "GPL" |
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 484496daa0f..b8624f27abf 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -289,6 +289,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi | |||
289 | 5000); /* 5 secs */ | 289 | 5000); /* 5 secs */ |
290 | } while (result < 0 && limit++ < 5); | 290 | } while (result < 0 && limit++ < 5); |
291 | 291 | ||
292 | /* No need to parse the Descriptor. It isn't an error though */ | ||
292 | if (result < 0) | 293 | if (result < 0) |
293 | goto out; | 294 | goto out; |
294 | 295 | ||
@@ -368,9 +369,8 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi | |||
368 | } | 369 | } |
369 | } | 370 | } |
370 | 371 | ||
371 | result = 0; | ||
372 | |||
373 | out: | 372 | out: |
373 | result = 0; | ||
374 | kfree(report); | 374 | kfree(report); |
375 | return result; | 375 | return result; |
376 | } | 376 | } |
@@ -425,6 +425,15 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
425 | 425 | ||
426 | endpoint = &intf->cur_altsetting->endpoint[0].desc; | 426 | endpoint = &intf->cur_altsetting->endpoint[0].desc; |
427 | 427 | ||
428 | /* Initialize touch_x_max and touch_y_max in case it is not defined */ | ||
429 | if (wacom_wac->features->type == TABLETPC) { | ||
430 | features->touch_x_max = 1023; | ||
431 | features->touch_y_max = 1023; | ||
432 | } else { | ||
433 | features->touch_x_max = 0; | ||
434 | features->touch_y_max = 0; | ||
435 | } | ||
436 | |||
428 | /* TabletPC need to retrieve the physical and logical maximum from report descriptor */ | 437 | /* TabletPC need to retrieve the physical and logical maximum from report descriptor */ |
429 | if (wacom_wac->features->type == TABLETPC) { | 438 | if (wacom_wac->features->type == TABLETPC) { |
430 | if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) { | 439 | if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) { |
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index 4ab07024689..948e167557f 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
@@ -200,8 +200,9 @@ static int tsc2007_read_values(struct tsc2007 *tsc) | |||
200 | static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle) | 200 | static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle) |
201 | { | 201 | { |
202 | struct tsc2007 *ts = container_of(handle, struct tsc2007, timer); | 202 | struct tsc2007 *ts = container_of(handle, struct tsc2007, timer); |
203 | unsigned long flags; | ||
203 | 204 | ||
204 | spin_lock_irq(&ts->lock); | 205 | spin_lock_irqsave(&ts->lock, flags); |
205 | 206 | ||
206 | if (unlikely(!ts->get_pendown_state() && ts->pendown)) { | 207 | if (unlikely(!ts->get_pendown_state() && ts->pendown)) { |
207 | struct input_dev *input = ts->input; | 208 | struct input_dev *input = ts->input; |
@@ -222,7 +223,7 @@ static enum hrtimer_restart tsc2007_timer(struct hrtimer *handle) | |||
222 | tsc2007_send_event(ts); | 223 | tsc2007_send_event(ts); |
223 | } | 224 | } |
224 | 225 | ||
225 | spin_unlock_irq(&ts->lock); | 226 | spin_unlock_irqrestore(&ts->lock, flags); |
226 | 227 | ||
227 | return HRTIMER_NORESTART; | 228 | return HRTIMER_NORESTART; |
228 | } | 229 | } |
@@ -235,7 +236,7 @@ static irqreturn_t tsc2007_irq(int irq, void *handle) | |||
235 | spin_lock_irqsave(&ts->lock, flags); | 236 | spin_lock_irqsave(&ts->lock, flags); |
236 | 237 | ||
237 | if (likely(ts->get_pendown_state())) { | 238 | if (likely(ts->get_pendown_state())) { |
238 | disable_irq(ts->irq); | 239 | disable_irq_nosync(ts->irq); |
239 | hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), | 240 | hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), |
240 | HRTIMER_MODE_REL); | 241 | HRTIMER_MODE_REL); |
241 | } | 242 | } |
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index e868264fe79..f100c7f4c1d 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
@@ -256,7 +256,7 @@ static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid) | |||
256 | struct ucb1400_ts *ucb = devid; | 256 | struct ucb1400_ts *ucb = devid; |
257 | 257 | ||
258 | if (irqnr == ucb->irq) { | 258 | if (irqnr == ucb->irq) { |
259 | disable_irq(ucb->irq); | 259 | disable_irq_nosync(ucb->irq); |
260 | ucb->irq_pending = 1; | 260 | ucb->irq_pending = 1; |
261 | wake_up(&ucb->ts_wait); | 261 | wake_up(&ucb->ts_wait); |
262 | return IRQ_HANDLED; | 262 | return IRQ_HANDLED; |
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c index b129409925a..bff72d81f26 100644 --- a/drivers/isdn/capi/capifs.c +++ b/drivers/isdn/capi/capifs.c | |||
@@ -75,15 +75,17 @@ static int capifs_remount(struct super_block *s, int *flags, char *data) | |||
75 | } | 75 | } |
76 | } | 76 | } |
77 | 77 | ||
78 | kfree(s->s_options); | 78 | mutex_lock(&s->s_root->d_inode->i_mutex); |
79 | s->s_options = new_opt; | ||
80 | 79 | ||
80 | replace_mount_options(s, new_opt); | ||
81 | config.setuid = setuid; | 81 | config.setuid = setuid; |
82 | config.setgid = setgid; | 82 | config.setgid = setgid; |
83 | config.uid = uid; | 83 | config.uid = uid; |
84 | config.gid = gid; | 84 | config.gid = gid; |
85 | config.mode = mode; | 85 | config.mode = mode; |
86 | 86 | ||
87 | mutex_unlock(&s->s_root->d_inode->i_mutex); | ||
88 | |||
87 | return 0; | 89 | return 0; |
88 | } | 90 | } |
89 | 91 | ||
@@ -154,13 +156,16 @@ void capifs_new_ncci(unsigned int number, dev_t device) | |||
154 | if (!inode) | 156 | if (!inode) |
155 | return; | 157 | return; |
156 | inode->i_ino = number+2; | 158 | inode->i_ino = number+2; |
159 | |||
160 | dentry = get_node(number); | ||
161 | |||
162 | /* config contents is protected by root's i_mutex */ | ||
157 | inode->i_uid = config.setuid ? config.uid : current_fsuid(); | 163 | inode->i_uid = config.setuid ? config.uid : current_fsuid(); |
158 | inode->i_gid = config.setgid ? config.gid : current_fsgid(); | 164 | inode->i_gid = config.setgid ? config.gid : current_fsgid(); |
159 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; | 165 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; |
160 | init_special_inode(inode, S_IFCHR|config.mode, device); | 166 | init_special_inode(inode, S_IFCHR|config.mode, device); |
161 | //inode->i_op = &capifs_file_inode_operations; | 167 | //inode->i_op = &capifs_file_inode_operations; |
162 | 168 | ||
163 | dentry = get_node(number); | ||
164 | if (!IS_ERR(dentry) && !dentry->d_inode) | 169 | if (!IS_ERR(dentry) && !dentry->d_inode) |
165 | d_instantiate(dentry, inode); | 170 | d_instantiate(dentry, inode); |
166 | mutex_unlock(&capifs_root->d_inode->i_mutex); | 171 | mutex_unlock(&capifs_root->d_inode->i_mutex); |
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index 5360c4fd473..f33170368cd 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c | |||
@@ -270,6 +270,15 @@ static void recv_handler(struct work_struct *work) | |||
270 | mutex_unlock(&ap->recv_mtx); | 270 | mutex_unlock(&ap->recv_mtx); |
271 | } | 271 | } |
272 | 272 | ||
273 | /** | ||
274 | * capi_ctr_handle_message() - handle incoming CAPI message | ||
275 | * @card: controller descriptor structure. | ||
276 | * @appl: application ID. | ||
277 | * @skb: message. | ||
278 | * | ||
279 | * Called by hardware driver to pass a CAPI message to the application. | ||
280 | */ | ||
281 | |||
273 | void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct sk_buff *skb) | 282 | void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct sk_buff *skb) |
274 | { | 283 | { |
275 | struct capi20_appl *ap; | 284 | struct capi20_appl *ap; |
@@ -348,6 +357,13 @@ error: | |||
348 | 357 | ||
349 | EXPORT_SYMBOL(capi_ctr_handle_message); | 358 | EXPORT_SYMBOL(capi_ctr_handle_message); |
350 | 359 | ||
360 | /** | ||
361 | * capi_ctr_ready() - signal CAPI controller ready | ||
362 | * @card: controller descriptor structure. | ||
363 | * | ||
364 | * Called by hardware driver to signal that the controller is up and running. | ||
365 | */ | ||
366 | |||
351 | void capi_ctr_ready(struct capi_ctr * card) | 367 | void capi_ctr_ready(struct capi_ctr * card) |
352 | { | 368 | { |
353 | card->cardstate = CARD_RUNNING; | 369 | card->cardstate = CARD_RUNNING; |
@@ -360,6 +376,14 @@ void capi_ctr_ready(struct capi_ctr * card) | |||
360 | 376 | ||
361 | EXPORT_SYMBOL(capi_ctr_ready); | 377 | EXPORT_SYMBOL(capi_ctr_ready); |
362 | 378 | ||
379 | /** | ||
380 | * capi_ctr_reseted() - signal CAPI controller reset | ||
381 | * @card: controller descriptor structure. | ||
382 | * | ||
383 | * Called by hardware driver to signal that the controller is down and | ||
384 | * unavailable for use. | ||
385 | */ | ||
386 | |||
363 | void capi_ctr_reseted(struct capi_ctr * card) | 387 | void capi_ctr_reseted(struct capi_ctr * card) |
364 | { | 388 | { |
365 | u16 appl; | 389 | u16 appl; |
@@ -391,6 +415,13 @@ void capi_ctr_reseted(struct capi_ctr * card) | |||
391 | 415 | ||
392 | EXPORT_SYMBOL(capi_ctr_reseted); | 416 | EXPORT_SYMBOL(capi_ctr_reseted); |
393 | 417 | ||
418 | /** | ||
419 | * capi_ctr_suspend_output() - suspend controller | ||
420 | * @card: controller descriptor structure. | ||
421 | * | ||
422 | * Called by hardware driver to stop data flow. | ||
423 | */ | ||
424 | |||
394 | void capi_ctr_suspend_output(struct capi_ctr *card) | 425 | void capi_ctr_suspend_output(struct capi_ctr *card) |
395 | { | 426 | { |
396 | if (!card->blocked) { | 427 | if (!card->blocked) { |
@@ -401,6 +432,13 @@ void capi_ctr_suspend_output(struct capi_ctr *card) | |||
401 | 432 | ||
402 | EXPORT_SYMBOL(capi_ctr_suspend_output); | 433 | EXPORT_SYMBOL(capi_ctr_suspend_output); |
403 | 434 | ||
435 | /** | ||
436 | * capi_ctr_resume_output() - resume controller | ||
437 | * @card: controller descriptor structure. | ||
438 | * | ||
439 | * Called by hardware driver to resume data flow. | ||
440 | */ | ||
441 | |||
404 | void capi_ctr_resume_output(struct capi_ctr *card) | 442 | void capi_ctr_resume_output(struct capi_ctr *card) |
405 | { | 443 | { |
406 | if (card->blocked) { | 444 | if (card->blocked) { |
@@ -413,6 +451,14 @@ EXPORT_SYMBOL(capi_ctr_resume_output); | |||
413 | 451 | ||
414 | /* ------------------------------------------------------------- */ | 452 | /* ------------------------------------------------------------- */ |
415 | 453 | ||
454 | /** | ||
455 | * attach_capi_ctr() - register CAPI controller | ||
456 | * @card: controller descriptor structure. | ||
457 | * | ||
458 | * Called by hardware driver to register a controller with the CAPI subsystem. | ||
459 | * Return value: 0 on success, error code < 0 on error | ||
460 | */ | ||
461 | |||
416 | int | 462 | int |
417 | attach_capi_ctr(struct capi_ctr *card) | 463 | attach_capi_ctr(struct capi_ctr *card) |
418 | { | 464 | { |
@@ -459,6 +505,15 @@ attach_capi_ctr(struct capi_ctr *card) | |||
459 | 505 | ||
460 | EXPORT_SYMBOL(attach_capi_ctr); | 506 | EXPORT_SYMBOL(attach_capi_ctr); |
461 | 507 | ||
508 | /** | ||
509 | * detach_capi_ctr() - unregister CAPI controller | ||
510 | * @card: controller descriptor structure. | ||
511 | * | ||
512 | * Called by hardware driver to remove the registration of a controller | ||
513 | * with the CAPI subsystem. | ||
514 | * Return value: 0 on success, error code < 0 on error | ||
515 | */ | ||
516 | |||
462 | int detach_capi_ctr(struct capi_ctr *card) | 517 | int detach_capi_ctr(struct capi_ctr *card) |
463 | { | 518 | { |
464 | if (card->cardstate != CARD_DETECTED) | 519 | if (card->cardstate != CARD_DETECTED) |
@@ -479,6 +534,13 @@ int detach_capi_ctr(struct capi_ctr *card) | |||
479 | 534 | ||
480 | EXPORT_SYMBOL(detach_capi_ctr); | 535 | EXPORT_SYMBOL(detach_capi_ctr); |
481 | 536 | ||
537 | /** | ||
538 | * register_capi_driver() - register CAPI driver | ||
539 | * @driver: driver descriptor structure. | ||
540 | * | ||
541 | * Called by hardware driver to register itself with the CAPI subsystem. | ||
542 | */ | ||
543 | |||
482 | void register_capi_driver(struct capi_driver *driver) | 544 | void register_capi_driver(struct capi_driver *driver) |
483 | { | 545 | { |
484 | unsigned long flags; | 546 | unsigned long flags; |
@@ -490,6 +552,13 @@ void register_capi_driver(struct capi_driver *driver) | |||
490 | 552 | ||
491 | EXPORT_SYMBOL(register_capi_driver); | 553 | EXPORT_SYMBOL(register_capi_driver); |
492 | 554 | ||
555 | /** | ||
556 | * unregister_capi_driver() - unregister CAPI driver | ||
557 | * @driver: driver descriptor structure. | ||
558 | * | ||
559 | * Called by hardware driver to unregister itself from the CAPI subsystem. | ||
560 | */ | ||
561 | |||
493 | void unregister_capi_driver(struct capi_driver *driver) | 562 | void unregister_capi_driver(struct capi_driver *driver) |
494 | { | 563 | { |
495 | unsigned long flags; | 564 | unsigned long flags; |
@@ -505,6 +574,13 @@ EXPORT_SYMBOL(unregister_capi_driver); | |||
505 | /* -------- CAPI2.0 Interface ---------------------------------- */ | 574 | /* -------- CAPI2.0 Interface ---------------------------------- */ |
506 | /* ------------------------------------------------------------- */ | 575 | /* ------------------------------------------------------------- */ |
507 | 576 | ||
577 | /** | ||
578 | * capi20_isinstalled() - CAPI 2.0 operation CAPI_INSTALLED | ||
579 | * | ||
580 | * Return value: CAPI result code (CAPI_NOERROR if at least one ISDN controller | ||
581 | * is ready for use, CAPI_REGNOTINSTALLED otherwise) | ||
582 | */ | ||
583 | |||
508 | u16 capi20_isinstalled(void) | 584 | u16 capi20_isinstalled(void) |
509 | { | 585 | { |
510 | int i; | 586 | int i; |
@@ -517,6 +593,18 @@ u16 capi20_isinstalled(void) | |||
517 | 593 | ||
518 | EXPORT_SYMBOL(capi20_isinstalled); | 594 | EXPORT_SYMBOL(capi20_isinstalled); |
519 | 595 | ||
596 | /** | ||
597 | * capi20_register() - CAPI 2.0 operation CAPI_REGISTER | ||
598 | * @ap: CAPI application descriptor structure. | ||
599 | * | ||
600 | * Register an application's presence with CAPI. | ||
601 | * A unique application ID is assigned and stored in @ap->applid. | ||
602 | * After this function returns successfully, the message receive | ||
603 | * callback function @ap->recv_message() may be called at any time | ||
604 | * until capi20_release() has been called for the same @ap. | ||
605 | * Return value: CAPI result code | ||
606 | */ | ||
607 | |||
520 | u16 capi20_register(struct capi20_appl *ap) | 608 | u16 capi20_register(struct capi20_appl *ap) |
521 | { | 609 | { |
522 | int i; | 610 | int i; |
@@ -571,6 +659,16 @@ u16 capi20_register(struct capi20_appl *ap) | |||
571 | 659 | ||
572 | EXPORT_SYMBOL(capi20_register); | 660 | EXPORT_SYMBOL(capi20_register); |
573 | 661 | ||
662 | /** | ||
663 | * capi20_release() - CAPI 2.0 operation CAPI_RELEASE | ||
664 | * @ap: CAPI application descriptor structure. | ||
665 | * | ||
666 | * Terminate an application's registration with CAPI. | ||
667 | * After this function returns successfully, the message receive | ||
668 | * callback function @ap->recv_message() will no longer be called. | ||
669 | * Return value: CAPI result code | ||
670 | */ | ||
671 | |||
574 | u16 capi20_release(struct capi20_appl *ap) | 672 | u16 capi20_release(struct capi20_appl *ap) |
575 | { | 673 | { |
576 | int i; | 674 | int i; |
@@ -603,6 +701,15 @@ u16 capi20_release(struct capi20_appl *ap) | |||
603 | 701 | ||
604 | EXPORT_SYMBOL(capi20_release); | 702 | EXPORT_SYMBOL(capi20_release); |
605 | 703 | ||
704 | /** | ||
705 | * capi20_put_message() - CAPI 2.0 operation CAPI_PUT_MESSAGE | ||
706 | * @ap: CAPI application descriptor structure. | ||
707 | * @skb: CAPI message. | ||
708 | * | ||
709 | * Transfer a single message to CAPI. | ||
710 | * Return value: CAPI result code | ||
711 | */ | ||
712 | |||
606 | u16 capi20_put_message(struct capi20_appl *ap, struct sk_buff *skb) | 713 | u16 capi20_put_message(struct capi20_appl *ap, struct sk_buff *skb) |
607 | { | 714 | { |
608 | struct capi_ctr *card; | 715 | struct capi_ctr *card; |
@@ -668,6 +775,16 @@ u16 capi20_put_message(struct capi20_appl *ap, struct sk_buff *skb) | |||
668 | 775 | ||
669 | EXPORT_SYMBOL(capi20_put_message); | 776 | EXPORT_SYMBOL(capi20_put_message); |
670 | 777 | ||
778 | /** | ||
779 | * capi20_get_manufacturer() - CAPI 2.0 operation CAPI_GET_MANUFACTURER | ||
780 | * @contr: controller number. | ||
781 | * @buf: result buffer (64 bytes). | ||
782 | * | ||
783 | * Retrieve information about the manufacturer of the specified ISDN controller | ||
784 | * or (for @contr == 0) the driver itself. | ||
785 | * Return value: CAPI result code | ||
786 | */ | ||
787 | |||
671 | u16 capi20_get_manufacturer(u32 contr, u8 *buf) | 788 | u16 capi20_get_manufacturer(u32 contr, u8 *buf) |
672 | { | 789 | { |
673 | struct capi_ctr *card; | 790 | struct capi_ctr *card; |
@@ -685,6 +802,16 @@ u16 capi20_get_manufacturer(u32 contr, u8 *buf) | |||
685 | 802 | ||
686 | EXPORT_SYMBOL(capi20_get_manufacturer); | 803 | EXPORT_SYMBOL(capi20_get_manufacturer); |
687 | 804 | ||
805 | /** | ||
806 | * capi20_get_version() - CAPI 2.0 operation CAPI_GET_VERSION | ||
807 | * @contr: controller number. | ||
808 | * @verp: result structure. | ||
809 | * | ||
810 | * Retrieve version information for the specified ISDN controller | ||
811 | * or (for @contr == 0) the driver itself. | ||
812 | * Return value: CAPI result code | ||
813 | */ | ||
814 | |||
688 | u16 capi20_get_version(u32 contr, struct capi_version *verp) | 815 | u16 capi20_get_version(u32 contr, struct capi_version *verp) |
689 | { | 816 | { |
690 | struct capi_ctr *card; | 817 | struct capi_ctr *card; |
@@ -703,6 +830,16 @@ u16 capi20_get_version(u32 contr, struct capi_version *verp) | |||
703 | 830 | ||
704 | EXPORT_SYMBOL(capi20_get_version); | 831 | EXPORT_SYMBOL(capi20_get_version); |
705 | 832 | ||
833 | /** | ||
834 | * capi20_get_serial() - CAPI 2.0 operation CAPI_GET_SERIAL_NUMBER | ||
835 | * @contr: controller number. | ||
836 | * @serial: result buffer (8 bytes). | ||
837 | * | ||
838 | * Retrieve the serial number of the specified ISDN controller | ||
839 | * or (for @contr == 0) the driver itself. | ||
840 | * Return value: CAPI result code | ||
841 | */ | ||
842 | |||
706 | u16 capi20_get_serial(u32 contr, u8 *serial) | 843 | u16 capi20_get_serial(u32 contr, u8 *serial) |
707 | { | 844 | { |
708 | struct capi_ctr *card; | 845 | struct capi_ctr *card; |
@@ -721,6 +858,16 @@ u16 capi20_get_serial(u32 contr, u8 *serial) | |||
721 | 858 | ||
722 | EXPORT_SYMBOL(capi20_get_serial); | 859 | EXPORT_SYMBOL(capi20_get_serial); |
723 | 860 | ||
861 | /** | ||
862 | * capi20_get_profile() - CAPI 2.0 operation CAPI_GET_PROFILE | ||
863 | * @contr: controller number. | ||
864 | * @profp: result structure. | ||
865 | * | ||
866 | * Retrieve capability information for the specified ISDN controller | ||
867 | * or (for @contr == 0) the number of installed controllers. | ||
868 | * Return value: CAPI result code | ||
869 | */ | ||
870 | |||
724 | u16 capi20_get_profile(u32 contr, struct capi_profile *profp) | 871 | u16 capi20_get_profile(u32 contr, struct capi_profile *profp) |
725 | { | 872 | { |
726 | struct capi_ctr *card; | 873 | struct capi_ctr *card; |
@@ -903,6 +1050,15 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data) | |||
903 | } | 1050 | } |
904 | #endif | 1051 | #endif |
905 | 1052 | ||
1053 | /** | ||
1054 | * capi20_manufacturer() - CAPI 2.0 operation CAPI_MANUFACTURER | ||
1055 | * @cmd: command. | ||
1056 | * @data: parameter. | ||
1057 | * | ||
1058 | * Perform manufacturer specific command. | ||
1059 | * Return value: CAPI result code | ||
1060 | */ | ||
1061 | |||
906 | int capi20_manufacturer(unsigned int cmd, void __user *data) | 1062 | int capi20_manufacturer(unsigned int cmd, void __user *data) |
907 | { | 1063 | { |
908 | struct capi_ctr *card; | 1064 | struct capi_ctr *card; |
@@ -981,6 +1137,21 @@ int capi20_manufacturer(unsigned int cmd, void __user *data) | |||
981 | EXPORT_SYMBOL(capi20_manufacturer); | 1137 | EXPORT_SYMBOL(capi20_manufacturer); |
982 | 1138 | ||
983 | /* temporary hack */ | 1139 | /* temporary hack */ |
1140 | |||
1141 | /** | ||
1142 | * capi20_set_callback() - set CAPI application notification callback function | ||
1143 | * @ap: CAPI application descriptor structure. | ||
1144 | * @callback: callback function (NULL to remove). | ||
1145 | * | ||
1146 | * If not NULL, the callback function will be called to notify the | ||
1147 | * application of the addition or removal of a controller. | ||
1148 | * The first argument (cmd) will tell whether the controller was added | ||
1149 | * (KCI_CONTRUP) or removed (KCI_CONTRDOWN). | ||
1150 | * The second argument (contr) will be the controller number. | ||
1151 | * For cmd==KCI_CONTRUP the third argument (data) will be a pointer to the | ||
1152 | * new controller's capability profile structure. | ||
1153 | */ | ||
1154 | |||
984 | void capi20_set_callback(struct capi20_appl *ap, | 1155 | void capi20_set_callback(struct capi20_appl *ap, |
985 | void (*callback) (unsigned int cmd, __u32 contr, void *data)) | 1156 | void (*callback) (unsigned int cmd, __u32 contr, void *data)) |
986 | { | 1157 | { |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 1fb91edc7de..47c68bc75a1 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -986,6 +986,9 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) | |||
986 | oldindex = index; | 986 | oldindex = index; |
987 | oldpage = page; | 987 | oldpage = page; |
988 | 988 | ||
989 | bitmap->filemap[bitmap->file_pages++] = page; | ||
990 | bitmap->last_page_size = count; | ||
991 | |||
989 | if (outofdate) { | 992 | if (outofdate) { |
990 | /* | 993 | /* |
991 | * if bitmap is out of date, dirty the | 994 | * if bitmap is out of date, dirty the |
@@ -998,15 +1001,9 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) | |||
998 | write_page(bitmap, page, 1); | 1001 | write_page(bitmap, page, 1); |
999 | 1002 | ||
1000 | ret = -EIO; | 1003 | ret = -EIO; |
1001 | if (bitmap->flags & BITMAP_WRITE_ERROR) { | 1004 | if (bitmap->flags & BITMAP_WRITE_ERROR) |
1002 | /* release, page not in filemap yet */ | ||
1003 | put_page(page); | ||
1004 | goto err; | 1005 | goto err; |
1005 | } | ||
1006 | } | 1006 | } |
1007 | |||
1008 | bitmap->filemap[bitmap->file_pages++] = page; | ||
1009 | bitmap->last_page_size = count; | ||
1010 | } | 1007 | } |
1011 | paddr = kmap_atomic(page, KM_USER0); | 1008 | paddr = kmap_atomic(page, KM_USER0); |
1012 | if (bitmap->flags & BITMAP_HOSTENDIAN) | 1009 | if (bitmap->flags & BITMAP_HOSTENDIAN) |
@@ -1016,9 +1013,11 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start) | |||
1016 | kunmap_atomic(paddr, KM_USER0); | 1013 | kunmap_atomic(paddr, KM_USER0); |
1017 | if (b) { | 1014 | if (b) { |
1018 | /* if the disk bit is set, set the memory bit */ | 1015 | /* if the disk bit is set, set the memory bit */ |
1019 | bitmap_set_memory_bits(bitmap, i << CHUNK_BLOCK_SHIFT(bitmap), | 1016 | int needed = ((sector_t)(i+1) << (CHUNK_BLOCK_SHIFT(bitmap)) |
1020 | ((i+1) << (CHUNK_BLOCK_SHIFT(bitmap)) >= start) | 1017 | >= start); |
1021 | ); | 1018 | bitmap_set_memory_bits(bitmap, |
1019 | (sector_t)i << CHUNK_BLOCK_SHIFT(bitmap), | ||
1020 | needed); | ||
1022 | bit_cnt++; | 1021 | bit_cnt++; |
1023 | set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN); | 1022 | set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN); |
1024 | } | 1023 | } |
@@ -1154,8 +1153,9 @@ void bitmap_daemon_work(struct bitmap *bitmap) | |||
1154 | spin_lock_irqsave(&bitmap->lock, flags); | 1153 | spin_lock_irqsave(&bitmap->lock, flags); |
1155 | clear_page_attr(bitmap, page, BITMAP_PAGE_CLEAN); | 1154 | clear_page_attr(bitmap, page, BITMAP_PAGE_CLEAN); |
1156 | } | 1155 | } |
1157 | bmc = bitmap_get_counter(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap), | 1156 | bmc = bitmap_get_counter(bitmap, |
1158 | &blocks, 0); | 1157 | (sector_t)j << CHUNK_BLOCK_SHIFT(bitmap), |
1158 | &blocks, 0); | ||
1159 | if (bmc) { | 1159 | if (bmc) { |
1160 | /* | 1160 | /* |
1161 | if (j < 100) printk("bitmap: j=%lu, *bmc = 0x%x\n", j, *bmc); | 1161 | if (j < 100) printk("bitmap: j=%lu, *bmc = 0x%x\n", j, *bmc); |
@@ -1169,7 +1169,8 @@ void bitmap_daemon_work(struct bitmap *bitmap) | |||
1169 | } else if (*bmc == 1) { | 1169 | } else if (*bmc == 1) { |
1170 | /* we can clear the bit */ | 1170 | /* we can clear the bit */ |
1171 | *bmc = 0; | 1171 | *bmc = 0; |
1172 | bitmap_count_page(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap), | 1172 | bitmap_count_page(bitmap, |
1173 | (sector_t)j << CHUNK_BLOCK_SHIFT(bitmap), | ||
1173 | -1); | 1174 | -1); |
1174 | 1175 | ||
1175 | /* clear the bit */ | 1176 | /* clear the bit */ |
@@ -1514,7 +1515,7 @@ void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e) | |||
1514 | unsigned long chunk; | 1515 | unsigned long chunk; |
1515 | 1516 | ||
1516 | for (chunk = s; chunk <= e; chunk++) { | 1517 | for (chunk = s; chunk <= e; chunk++) { |
1517 | sector_t sec = chunk << CHUNK_BLOCK_SHIFT(bitmap); | 1518 | sector_t sec = (sector_t)chunk << CHUNK_BLOCK_SHIFT(bitmap); |
1518 | bitmap_set_memory_bits(bitmap, sec, 1); | 1519 | bitmap_set_memory_bits(bitmap, sec, 1); |
1519 | bitmap_file_set_bit(bitmap, sec); | 1520 | bitmap_file_set_bit(bitmap, sec); |
1520 | } | 1521 | } |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 612343fdde9..fccc8343a25 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -3066,11 +3066,8 @@ array_state_store(mddev_t *mddev, const char *buf, size_t len) | |||
3066 | } else | 3066 | } else |
3067 | err = -EBUSY; | 3067 | err = -EBUSY; |
3068 | spin_unlock_irq(&mddev->write_lock); | 3068 | spin_unlock_irq(&mddev->write_lock); |
3069 | } else { | 3069 | } else |
3070 | mddev->ro = 0; | 3070 | err = -EINVAL; |
3071 | mddev->recovery_cp = MaxSector; | ||
3072 | err = do_md_run(mddev); | ||
3073 | } | ||
3074 | break; | 3071 | break; |
3075 | case active: | 3072 | case active: |
3076 | if (mddev->pers) { | 3073 | if (mddev->pers) { |
@@ -4297,6 +4294,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
4297 | { | 4294 | { |
4298 | int err = 0; | 4295 | int err = 0; |
4299 | struct gendisk *disk = mddev->gendisk; | 4296 | struct gendisk *disk = mddev->gendisk; |
4297 | mdk_rdev_t *rdev; | ||
4300 | 4298 | ||
4301 | if (atomic_read(&mddev->openers) > is_open) { | 4299 | if (atomic_read(&mddev->openers) > is_open) { |
4302 | printk("md: %s still in use.\n",mdname(mddev)); | 4300 | printk("md: %s still in use.\n",mdname(mddev)); |
@@ -4339,6 +4337,13 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
4339 | /* tell userspace to handle 'inactive' */ | 4337 | /* tell userspace to handle 'inactive' */ |
4340 | sysfs_notify_dirent(mddev->sysfs_state); | 4338 | sysfs_notify_dirent(mddev->sysfs_state); |
4341 | 4339 | ||
4340 | list_for_each_entry(rdev, &mddev->disks, same_set) | ||
4341 | if (rdev->raid_disk >= 0) { | ||
4342 | char nm[20]; | ||
4343 | sprintf(nm, "rd%d", rdev->raid_disk); | ||
4344 | sysfs_remove_link(&mddev->kobj, nm); | ||
4345 | } | ||
4346 | |||
4342 | set_capacity(disk, 0); | 4347 | set_capacity(disk, 0); |
4343 | mddev->changed = 1; | 4348 | mddev->changed = 1; |
4344 | 4349 | ||
@@ -4359,7 +4364,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
4359 | * Free resources if final stop | 4364 | * Free resources if final stop |
4360 | */ | 4365 | */ |
4361 | if (mode == 0) { | 4366 | if (mode == 0) { |
4362 | mdk_rdev_t *rdev; | ||
4363 | 4367 | ||
4364 | printk(KERN_INFO "md: %s stopped.\n", mdname(mddev)); | 4368 | printk(KERN_INFO "md: %s stopped.\n", mdname(mddev)); |
4365 | 4369 | ||
@@ -4371,13 +4375,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
4371 | } | 4375 | } |
4372 | mddev->bitmap_offset = 0; | 4376 | mddev->bitmap_offset = 0; |
4373 | 4377 | ||
4374 | list_for_each_entry(rdev, &mddev->disks, same_set) | ||
4375 | if (rdev->raid_disk >= 0) { | ||
4376 | char nm[20]; | ||
4377 | sprintf(nm, "rd%d", rdev->raid_disk); | ||
4378 | sysfs_remove_link(&mddev->kobj, nm); | ||
4379 | } | ||
4380 | |||
4381 | /* make sure all md_delayed_delete calls have finished */ | 4378 | /* make sure all md_delayed_delete calls have finished */ |
4382 | flush_scheduled_work(); | 4379 | flush_scheduled_work(); |
4383 | 4380 | ||
@@ -5705,37 +5702,38 @@ static void status_unused(struct seq_file *seq) | |||
5705 | 5702 | ||
5706 | static void status_resync(struct seq_file *seq, mddev_t * mddev) | 5703 | static void status_resync(struct seq_file *seq, mddev_t * mddev) |
5707 | { | 5704 | { |
5708 | sector_t max_blocks, resync, res; | 5705 | sector_t max_sectors, resync, res; |
5709 | unsigned long dt, db, rt; | 5706 | unsigned long dt, db; |
5707 | sector_t rt; | ||
5710 | int scale; | 5708 | int scale; |
5711 | unsigned int per_milli; | 5709 | unsigned int per_milli; |
5712 | 5710 | ||
5713 | resync = (mddev->curr_resync - atomic_read(&mddev->recovery_active))/2; | 5711 | resync = mddev->curr_resync - atomic_read(&mddev->recovery_active); |
5714 | 5712 | ||
5715 | if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) | 5713 | if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) |
5716 | max_blocks = mddev->resync_max_sectors >> 1; | 5714 | max_sectors = mddev->resync_max_sectors; |
5717 | else | 5715 | else |
5718 | max_blocks = mddev->dev_sectors / 2; | 5716 | max_sectors = mddev->dev_sectors; |
5719 | 5717 | ||
5720 | /* | 5718 | /* |
5721 | * Should not happen. | 5719 | * Should not happen. |
5722 | */ | 5720 | */ |
5723 | if (!max_blocks) { | 5721 | if (!max_sectors) { |
5724 | MD_BUG(); | 5722 | MD_BUG(); |
5725 | return; | 5723 | return; |
5726 | } | 5724 | } |
5727 | /* Pick 'scale' such that (resync>>scale)*1000 will fit | 5725 | /* Pick 'scale' such that (resync>>scale)*1000 will fit |
5728 | * in a sector_t, and (max_blocks>>scale) will fit in a | 5726 | * in a sector_t, and (max_sectors>>scale) will fit in a |
5729 | * u32, as those are the requirements for sector_div. | 5727 | * u32, as those are the requirements for sector_div. |
5730 | * Thus 'scale' must be at least 10 | 5728 | * Thus 'scale' must be at least 10 |
5731 | */ | 5729 | */ |
5732 | scale = 10; | 5730 | scale = 10; |
5733 | if (sizeof(sector_t) > sizeof(unsigned long)) { | 5731 | if (sizeof(sector_t) > sizeof(unsigned long)) { |
5734 | while ( max_blocks/2 > (1ULL<<(scale+32))) | 5732 | while ( max_sectors/2 > (1ULL<<(scale+32))) |
5735 | scale++; | 5733 | scale++; |
5736 | } | 5734 | } |
5737 | res = (resync>>scale)*1000; | 5735 | res = (resync>>scale)*1000; |
5738 | sector_div(res, (u32)((max_blocks>>scale)+1)); | 5736 | sector_div(res, (u32)((max_sectors>>scale)+1)); |
5739 | 5737 | ||
5740 | per_milli = res; | 5738 | per_milli = res; |
5741 | { | 5739 | { |
@@ -5756,25 +5754,35 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev) | |||
5756 | (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ? | 5754 | (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ? |
5757 | "resync" : "recovery"))), | 5755 | "resync" : "recovery"))), |
5758 | per_milli/10, per_milli % 10, | 5756 | per_milli/10, per_milli % 10, |
5759 | (unsigned long long) resync, | 5757 | (unsigned long long) resync/2, |
5760 | (unsigned long long) max_blocks); | 5758 | (unsigned long long) max_sectors/2); |
5761 | 5759 | ||
5762 | /* | 5760 | /* |
5763 | * We do not want to overflow, so the order of operands and | ||
5764 | * the * 100 / 100 trick are important. We do a +1 to be | ||
5765 | * safe against division by zero. We only estimate anyway. | ||
5766 | * | ||
5767 | * dt: time from mark until now | 5761 | * dt: time from mark until now |
5768 | * db: blocks written from mark until now | 5762 | * db: blocks written from mark until now |
5769 | * rt: remaining time | 5763 | * rt: remaining time |
5764 | * | ||
5765 | * rt is a sector_t, so could be 32bit or 64bit. | ||
5766 | * So we divide before multiply in case it is 32bit and close | ||
5767 | * to the limit. | ||
5768 | * We scale the divisor (db) by 32 to avoid loosing precision | ||
5769 | * near the end of resync when the number of remaining sectors | ||
5770 | * is close to 'db'. | ||
5771 | * We then divide rt by 32 after multiplying by db to compensate. | ||
5772 | * The '+1' avoids division by zero if db is very small. | ||
5770 | */ | 5773 | */ |
5771 | dt = ((jiffies - mddev->resync_mark) / HZ); | 5774 | dt = ((jiffies - mddev->resync_mark) / HZ); |
5772 | if (!dt) dt++; | 5775 | if (!dt) dt++; |
5773 | db = (mddev->curr_mark_cnt - atomic_read(&mddev->recovery_active)) | 5776 | db = (mddev->curr_mark_cnt - atomic_read(&mddev->recovery_active)) |
5774 | - mddev->resync_mark_cnt; | 5777 | - mddev->resync_mark_cnt; |
5775 | rt = (dt * ((unsigned long)(max_blocks-resync) / (db/2/100+1)))/100; | ||
5776 | 5778 | ||
5777 | seq_printf(seq, " finish=%lu.%lumin", rt / 60, (rt % 60)/6); | 5779 | rt = max_sectors - resync; /* number of remaining sectors */ |
5780 | sector_div(rt, db/32+1); | ||
5781 | rt *= dt; | ||
5782 | rt >>= 5; | ||
5783 | |||
5784 | seq_printf(seq, " finish=%lu.%lumin", (unsigned long)rt / 60, | ||
5785 | ((unsigned long)rt % 60)/6); | ||
5778 | 5786 | ||
5779 | seq_printf(seq, " speed=%ldK/sec", db/2/dt); | 5787 | seq_printf(seq, " speed=%ldK/sec", db/2/dt); |
5780 | } | 5788 | } |
@@ -5965,7 +5973,7 @@ static int md_seq_show(struct seq_file *seq, void *v) | |||
5965 | return 0; | 5973 | return 0; |
5966 | } | 5974 | } |
5967 | 5975 | ||
5968 | static struct seq_operations md_seq_ops = { | 5976 | static const struct seq_operations md_seq_ops = { |
5969 | .start = md_seq_start, | 5977 | .start = md_seq_start, |
5970 | .next = md_seq_next, | 5978 | .next = md_seq_next, |
5971 | .stop = md_seq_stop, | 5979 | .stop = md_seq_stop, |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 81a54f17417..499620afb44 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
@@ -1809,17 +1809,17 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i | |||
1809 | r10_bio->sector = sect; | 1809 | r10_bio->sector = sect; |
1810 | 1810 | ||
1811 | raid10_find_phys(conf, r10_bio); | 1811 | raid10_find_phys(conf, r10_bio); |
1812 | /* Need to check if this section will still be | 1812 | |
1813 | /* Need to check if the array will still be | ||
1813 | * degraded | 1814 | * degraded |
1814 | */ | 1815 | */ |
1815 | for (j=0; j<conf->copies;j++) { | 1816 | for (j=0; j<conf->raid_disks; j++) |
1816 | int d = r10_bio->devs[j].devnum; | 1817 | if (conf->mirrors[j].rdev == NULL || |
1817 | if (conf->mirrors[d].rdev == NULL || | 1818 | test_bit(Faulty, &conf->mirrors[j].rdev->flags)) { |
1818 | test_bit(Faulty, &conf->mirrors[d].rdev->flags)) { | ||
1819 | still_degraded = 1; | 1819 | still_degraded = 1; |
1820 | break; | 1820 | break; |
1821 | } | 1821 | } |
1822 | } | 1822 | |
1823 | must_sync = bitmap_start_sync(mddev->bitmap, sect, | 1823 | must_sync = bitmap_start_sync(mddev->bitmap, sect, |
1824 | &sync_blocks, still_degraded); | 1824 | &sync_blocks, still_degraded); |
1825 | 1825 | ||
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c index 1dba8f0832a..5cf6c45b91f 100644 --- a/drivers/media/radio/radio-sf16fmi.c +++ b/drivers/media/radio/radio-sf16fmi.c | |||
@@ -153,7 +153,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
153 | mult = (fmi->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; | 153 | mult = (fmi->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; |
154 | v->rangelow = RSF16_MINFREQ / mult; | 154 | v->rangelow = RSF16_MINFREQ / mult; |
155 | v->rangehigh = RSF16_MAXFREQ / mult; | 155 | v->rangehigh = RSF16_MAXFREQ / mult; |
156 | v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO; | 156 | v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; |
157 | v->capability = fmi->flags & V4L2_TUNER_CAP_LOW; | 157 | v->capability = fmi->flags & V4L2_TUNER_CAP_LOW; |
158 | v->audmode = V4L2_TUNER_MODE_STEREO; | 158 | v->audmode = V4L2_TUNER_MODE_STEREO; |
159 | v->signal = fmi_getsigstr(fmi); | 159 | v->signal = fmi_getsigstr(fmi); |
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c index c09ca8600ea..935ff9bcdfc 100644 --- a/drivers/media/radio/radio-sf16fmr2.c +++ b/drivers/media/radio/radio-sf16fmr2.c | |||
@@ -233,7 +233,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
233 | mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; | 233 | mult = (fmr2->flags & V4L2_TUNER_CAP_LOW) ? 1 : 1000; |
234 | v->rangelow = RSF16_MINFREQ / mult; | 234 | v->rangelow = RSF16_MINFREQ / mult; |
235 | v->rangehigh = RSF16_MAXFREQ / mult; | 235 | v->rangehigh = RSF16_MAXFREQ / mult; |
236 | v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_MODE_STEREO; | 236 | v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO; |
237 | v->capability = fmr2->flags&V4L2_TUNER_CAP_LOW; | 237 | v->capability = fmr2->flags&V4L2_TUNER_CAP_LOW; |
238 | v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO: | 238 | v->audmode = fmr2->stereo ? V4L2_TUNER_MODE_STEREO: |
239 | V4L2_TUNER_MODE_MONO; | 239 | V4L2_TUNER_MODE_MONO; |
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c index 4cee0b92eee..a1e4c0d769a 100644 --- a/drivers/media/video/au0828/au0828-core.c +++ b/drivers/media/video/au0828/au0828-core.c | |||
@@ -192,8 +192,6 @@ static int au0828_usb_probe(struct usb_interface *interface, | |||
192 | dev->usbdev = usbdev; | 192 | dev->usbdev = usbdev; |
193 | dev->boardnr = id->driver_info; | 193 | dev->boardnr = id->driver_info; |
194 | 194 | ||
195 | usb_set_intfdata(interface, dev); | ||
196 | |||
197 | /* Create the v4l2_device */ | 195 | /* Create the v4l2_device */ |
198 | retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); | 196 | retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); |
199 | if (retval) { | 197 | if (retval) { |
@@ -222,6 +220,10 @@ static int au0828_usb_probe(struct usb_interface *interface, | |||
222 | /* Digital TV */ | 220 | /* Digital TV */ |
223 | au0828_dvb_register(dev); | 221 | au0828_dvb_register(dev); |
224 | 222 | ||
223 | /* Store the pointer to the au0828_dev so it can be accessed in | ||
224 | au0828_usb_disconnect */ | ||
225 | usb_set_intfdata(interface, dev); | ||
226 | |||
225 | printk(KERN_INFO "Registered device AU0828 [%s]\n", | 227 | printk(KERN_INFO "Registered device AU0828 [%s]\n", |
226 | dev->board.name == NULL ? "Unset" : dev->board.name); | 228 | dev->board.name == NULL ? "Unset" : dev->board.name); |
227 | 229 | ||
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 5f582726985..c4d181dde1c 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -774,6 +774,7 @@ static int cafe_cam_init(struct cafe_camera *cam) | |||
774 | ret = __cafe_cam_reset(cam); | 774 | ret = __cafe_cam_reset(cam); |
775 | if (ret) | 775 | if (ret) |
776 | goto out; | 776 | goto out; |
777 | chip.ident = V4L2_IDENT_NONE; | ||
777 | chip.match.type = V4L2_CHIP_MATCH_I2C_ADDR; | 778 | chip.match.type = V4L2_CHIP_MATCH_I2C_ADDR; |
778 | chip.match.addr = cam->sensor_addr; | 779 | chip.match.addr = cam->sensor_addr; |
779 | ret = sensor_call(cam, core, g_chip_ident, &chip); | 780 | ret = sensor_call(cam, core, g_chip_ident, &chip); |
diff --git a/drivers/media/video/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c index 1519e91c677..7a8ad5963de 100644 --- a/drivers/media/video/cx18/cx18-audio.c +++ b/drivers/media/video/cx18/cx18-audio.c | |||
@@ -44,7 +44,7 @@ int cx18_audio_set_io(struct cx18 *cx) | |||
44 | 44 | ||
45 | /* handle muxer chips */ | 45 | /* handle muxer chips */ |
46 | v4l2_subdev_call(cx->sd_extmux, audio, s_routing, | 46 | v4l2_subdev_call(cx->sd_extmux, audio, s_routing, |
47 | in->audio_input, 0, 0); | 47 | (u32) in->muxer_input, 0, 0); |
48 | 48 | ||
49 | err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl, | 49 | err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl, |
50 | audio, s_routing, in->audio_input, 0, 0); | 50 | audio, s_routing, in->audio_input, 0, 0); |
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c index b9b7064a2be..8591e4fc359 100644 --- a/drivers/media/video/cx18/cx18-i2c.c +++ b/drivers/media/video/cx18/cx18-i2c.c | |||
@@ -211,7 +211,7 @@ static struct i2c_algo_bit_data cx18_i2c_algo_template = { | |||
211 | /* init + register i2c algo-bit adapter */ | 211 | /* init + register i2c algo-bit adapter */ |
212 | int init_cx18_i2c(struct cx18 *cx) | 212 | int init_cx18_i2c(struct cx18 *cx) |
213 | { | 213 | { |
214 | int i; | 214 | int i, err; |
215 | CX18_DEBUG_I2C("i2c init\n"); | 215 | CX18_DEBUG_I2C("i2c init\n"); |
216 | 216 | ||
217 | for (i = 0; i < 2; i++) { | 217 | for (i = 0; i < 2; i++) { |
@@ -268,8 +268,18 @@ int init_cx18_i2c(struct cx18 *cx) | |||
268 | cx18_call_hw(cx, CX18_HW_GPIO_RESET_CTRL, | 268 | cx18_call_hw(cx, CX18_HW_GPIO_RESET_CTRL, |
269 | core, reset, (u32) CX18_GPIO_RESET_I2C); | 269 | core, reset, (u32) CX18_GPIO_RESET_I2C); |
270 | 270 | ||
271 | return i2c_bit_add_bus(&cx->i2c_adap[0]) || | 271 | err = i2c_bit_add_bus(&cx->i2c_adap[0]); |
272 | i2c_bit_add_bus(&cx->i2c_adap[1]); | 272 | if (err) |
273 | goto err; | ||
274 | err = i2c_bit_add_bus(&cx->i2c_adap[1]); | ||
275 | if (err) | ||
276 | goto err_del_bus_0; | ||
277 | return 0; | ||
278 | |||
279 | err_del_bus_0: | ||
280 | i2c_del_adapter(&cx->i2c_adap[0]); | ||
281 | err: | ||
282 | return err; | ||
273 | } | 283 | } |
274 | 284 | ||
275 | void exit_cx18_i2c(struct cx18 *cx) | 285 | void exit_cx18_i2c(struct cx18 *cx) |
diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig index 91156546a07..477d4ab5e9a 100644 --- a/drivers/media/video/cx231xx/Kconfig +++ b/drivers/media/video/cx231xx/Kconfig | |||
@@ -1,12 +1,11 @@ | |||
1 | config VIDEO_CX231XX | 1 | config VIDEO_CX231XX |
2 | tristate "Conexant cx231xx USB video capture support" | 2 | tristate "Conexant cx231xx USB video capture support" |
3 | depends on VIDEO_DEV && I2C && INPUT | 3 | depends on VIDEO_DEV && I2C && INPUT |
4 | select VIDEO_TUNER | 4 | select VIDEO_TUNER |
5 | select VIDEO_TVEEPROM | 5 | select VIDEO_TVEEPROM |
6 | select VIDEO_IR | 6 | select VIDEO_IR |
7 | select VIDEOBUF_VMALLOC | 7 | select VIDEOBUF_VMALLOC |
8 | select VIDEO_CX25840 | 8 | select VIDEO_CX25840 |
9 | select VIDEO_CX231XX_ALSA | ||
10 | 9 | ||
11 | ---help--- | 10 | ---help--- |
12 | This is a video4linux driver for Conexant 231xx USB based TV cards. | 11 | This is a video4linux driver for Conexant 231xx USB based TV cards. |
@@ -15,21 +14,22 @@ config VIDEO_CX231XX | |||
15 | module will be called cx231xx | 14 | module will be called cx231xx |
16 | 15 | ||
17 | config VIDEO_CX231XX_ALSA | 16 | config VIDEO_CX231XX_ALSA |
18 | tristate "Conexant Cx231xx ALSA audio module" | 17 | tristate "Conexant Cx231xx ALSA audio module" |
19 | depends on VIDEO_CX231XX && SND | 18 | depends on VIDEO_CX231XX && SND |
20 | select SND_PCM | 19 | select SND_PCM |
21 | 20 | ||
22 | ---help--- | 21 | ---help--- |
23 | This is an ALSA driver for Cx231xx USB based TV cards. | 22 | This is an ALSA driver for Cx231xx USB based TV cards. |
24 | 23 | ||
25 | To compile this driver as a module, choose M here: the | 24 | To compile this driver as a module, choose M here: the |
26 | module will be called cx231xx-alsa | 25 | module will be called cx231xx-alsa |
27 | 26 | ||
28 | config VIDEO_CX231XX_DVB | 27 | config VIDEO_CX231XX_DVB |
29 | tristate "DVB/ATSC Support for Cx231xx based TV cards" | 28 | tristate "DVB/ATSC Support for Cx231xx based TV cards" |
30 | depends on VIDEO_CX231XX && DVB_CORE | 29 | depends on VIDEO_CX231XX && DVB_CORE |
31 | select VIDEOBUF_DVB | 30 | select VIDEOBUF_DVB |
32 | select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE | 31 | select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE |
33 | ---help--- | 32 | |
34 | This adds support for DVB cards based on the | 33 | ---help--- |
35 | Conexant cx231xx chips. | 34 | This adds support for DVB cards based on the |
35 | Conexant cx231xx chips. | ||
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c index a3c0565be1a..6d6293f7d42 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c | |||
@@ -441,9 +441,9 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg) | |||
441 | case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP: | 441 | case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP: |
442 | /* Two identical tuners on two different i2c buses, | 442 | /* Two identical tuners on two different i2c buses, |
443 | * we need to reset the correct gpio. */ | 443 | * we need to reset the correct gpio. */ |
444 | if (port->nr == 0) | 444 | if (port->nr == 1) |
445 | bitmask = 0x01; | 445 | bitmask = 0x01; |
446 | else if (port->nr == 1) | 446 | else if (port->nr == 2) |
447 | bitmask = 0x04; | 447 | bitmask = 0x04; |
448 | break; | 448 | break; |
449 | } | 449 | } |
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index f48454ab390..1dc070da865 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -314,6 +314,7 @@ static struct zl10353_config dvico_fusionhdtv_xc3028 = { | |||
314 | .demod_address = 0x0f, | 314 | .demod_address = 0x0f, |
315 | .if2 = 45600, | 315 | .if2 = 45600, |
316 | .no_tuner = 1, | 316 | .no_tuner = 1, |
317 | .disable_i2c_gate_ctrl = 1, | ||
317 | }; | 318 | }; |
318 | 319 | ||
319 | static struct stv0900_config netup_stv0900_config = { | 320 | static struct stv0900_config netup_stv0900_config = { |
@@ -471,7 +472,7 @@ static int dvb_register(struct cx23885_tsport *port) | |||
471 | static struct xc2028_ctrl ctl = { | 472 | static struct xc2028_ctrl ctl = { |
472 | .fname = XC2028_DEFAULT_FIRMWARE, | 473 | .fname = XC2028_DEFAULT_FIRMWARE, |
473 | .max_len = 64, | 474 | .max_len = 64, |
474 | .scode_table = XC3028_FE_OREN538, | 475 | .demod = XC3028_FE_OREN538, |
475 | }; | 476 | }; |
476 | 477 | ||
477 | fe = dvb_attach(xc2028_attach, | 478 | fe = dvb_attach(xc2028_attach, |
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index b0195e8ee4d..db2ac9a99ac 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -305,14 +305,17 @@ int ivtv_waitq(wait_queue_head_t *waitq) | |||
305 | /* Generic utility functions */ | 305 | /* Generic utility functions */ |
306 | int ivtv_msleep_timeout(unsigned int msecs, int intr) | 306 | int ivtv_msleep_timeout(unsigned int msecs, int intr) |
307 | { | 307 | { |
308 | int ret; | ||
309 | int timeout = msecs_to_jiffies(msecs); | 308 | int timeout = msecs_to_jiffies(msecs); |
310 | 309 | ||
311 | do { | 310 | do { |
312 | set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); | 311 | set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); |
313 | timeout = schedule_timeout(timeout); | 312 | timeout = schedule_timeout(timeout); |
314 | if (intr && (ret = signal_pending(current))) | 313 | if (intr) { |
315 | return ret; | 314 | int ret = signal_pending(current); |
315 | |||
316 | if (ret) | ||
317 | return ret; | ||
318 | } | ||
316 | } while (timeout); | 319 | } while (timeout); |
317 | return 0; | 320 | return 0; |
318 | } | 321 | } |
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c index ceb05bdcaf6..85ac707228e 100644 --- a/drivers/media/video/ivtv/ivtv-gpio.c +++ b/drivers/media/video/ivtv/ivtv-gpio.c | |||
@@ -190,8 +190,8 @@ static int subdev_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) | |||
190 | 190 | ||
191 | mask = itv->card->gpio_audio_detect.mask; | 191 | mask = itv->card->gpio_audio_detect.mask; |
192 | if (mask == 0 || (read_reg(IVTV_REG_GPIO_IN) & mask)) | 192 | if (mask == 0 || (read_reg(IVTV_REG_GPIO_IN) & mask)) |
193 | vt->rxsubchans = V4L2_TUNER_MODE_STEREO | | 193 | vt->rxsubchans = V4L2_TUNER_SUB_STEREO | |
194 | V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2; | 194 | V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2; |
195 | else | 195 | else |
196 | vt->rxsubchans = V4L2_TUNER_SUB_MONO; | 196 | vt->rxsubchans = V4L2_TUNER_SUB_MONO; |
197 | return 0; | 197 | return 0; |
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 4a2d464f055..c342a9fe983 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
@@ -180,7 +180,7 @@ int ivtv_set_speed(struct ivtv *itv, int speed) | |||
180 | 180 | ||
181 | /* Wait for any DMA to finish */ | 181 | /* Wait for any DMA to finish */ |
182 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); | 182 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); |
183 | while (itv->i_flags & IVTV_F_I_DMA) { | 183 | while (test_bit(IVTV_F_I_DMA, &itv->i_flags)) { |
184 | got_sig = signal_pending(current); | 184 | got_sig = signal_pending(current); |
185 | if (got_sig) | 185 | if (got_sig) |
186 | break; | 186 | break; |
@@ -1710,7 +1710,8 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) | |||
1710 | we are waiting unlock first and later lock again. */ | 1710 | we are waiting unlock first and later lock again. */ |
1711 | mutex_unlock(&itv->serialize_lock); | 1711 | mutex_unlock(&itv->serialize_lock); |
1712 | prepare_to_wait(&itv->event_waitq, &wait, TASK_INTERRUPTIBLE); | 1712 | prepare_to_wait(&itv->event_waitq, &wait, TASK_INTERRUPTIBLE); |
1713 | if ((itv->i_flags & (IVTV_F_I_EV_DEC_STOPPED|IVTV_F_I_EV_VSYNC)) == 0) | 1713 | if (!test_bit(IVTV_F_I_EV_DEC_STOPPED, &itv->i_flags) && |
1714 | !test_bit(IVTV_F_I_EV_VSYNC, &itv->i_flags)) | ||
1714 | schedule(); | 1715 | schedule(); |
1715 | finish_wait(&itv->event_waitq, &wait); | 1716 | finish_wait(&itv->event_waitq, &wait); |
1716 | mutex_lock(&itv->serialize_lock); | 1717 | mutex_lock(&itv->serialize_lock); |
diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c index 01c14d2b381..cd9db0bf33b 100644 --- a/drivers/media/video/ivtv/ivtv-irq.c +++ b/drivers/media/video/ivtv/ivtv-irq.c | |||
@@ -196,7 +196,7 @@ static int stream_enc_dma_append(struct ivtv_stream *s, u32 data[CX2341X_MBOX_MA | |||
196 | bytes_needed, s->name); | 196 | bytes_needed, s->name); |
197 | return -1; | 197 | return -1; |
198 | } | 198 | } |
199 | if (rc && !s->buffers_stolen && (s->s_flags & IVTV_F_S_APPL_IO)) { | 199 | if (rc && !s->buffers_stolen && test_bit(IVTV_F_S_APPL_IO, &s->s_flags)) { |
200 | IVTV_WARN("All %s stream buffers are full. Dropping data.\n", s->name); | 200 | IVTV_WARN("All %s stream buffers are full. Dropping data.\n", s->name); |
201 | IVTV_WARN("Cause: the application is not reading fast enough.\n"); | 201 | IVTV_WARN("Cause: the application is not reading fast enough.\n"); |
202 | } | 202 | } |
diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c index 7912ed6b72e..c0875378acc 100644 --- a/drivers/media/video/ivtv/ivtv-yuv.c +++ b/drivers/media/video/ivtv/ivtv-yuv.c | |||
@@ -1063,7 +1063,8 @@ static int ivtv_yuv_udma_frame(struct ivtv *itv, struct ivtv_dma_frame *args) | |||
1063 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); | 1063 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); |
1064 | /* if no UDMA is pending and no UDMA is in progress, then the DMA | 1064 | /* if no UDMA is pending and no UDMA is in progress, then the DMA |
1065 | is finished */ | 1065 | is finished */ |
1066 | while (itv->i_flags & (IVTV_F_I_UDMA_PENDING | IVTV_F_I_UDMA)) { | 1066 | while (test_bit(IVTV_F_I_UDMA_PENDING, &itv->i_flags) || |
1067 | test_bit(IVTV_F_I_UDMA, &itv->i_flags)) { | ||
1067 | /* don't interrupt if the DMA is in progress but break off | 1068 | /* don't interrupt if the DMA is in progress but break off |
1068 | a still pending DMA. */ | 1069 | a still pending DMA. */ |
1069 | got_sig = signal_pending(current); | 1070 | got_sig = signal_pending(current); |
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 66e6eb51307..fa6bb85cb4b 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c | |||
@@ -298,7 +298,8 @@ static int ivtvfb_prep_dec_dma_to_device(struct ivtv *itv, | |||
298 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); | 298 | prepare_to_wait(&itv->dma_waitq, &wait, TASK_INTERRUPTIBLE); |
299 | /* if no UDMA is pending and no UDMA is in progress, then the DMA | 299 | /* if no UDMA is pending and no UDMA is in progress, then the DMA |
300 | is finished */ | 300 | is finished */ |
301 | while (itv->i_flags & (IVTV_F_I_UDMA_PENDING | IVTV_F_I_UDMA)) { | 301 | while (test_bit(IVTV_F_I_UDMA_PENDING, &itv->i_flags) || |
302 | test_bit(IVTV_F_I_UDMA, &itv->i_flags)) { | ||
302 | /* don't interrupt if the DMA is in progress but break off | 303 | /* don't interrupt if the DMA is in progress but break off |
303 | a still pending DMA. */ | 304 | a still pending DMA. */ |
304 | got_sig = signal_pending(current); | 305 | got_sig = signal_pending(current); |
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index c462b811e99..2d0781118eb 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c | |||
@@ -1063,10 +1063,6 @@ static struct soc_camera_host_ops mx3_soc_camera_host_ops = { | |||
1063 | .owner = THIS_MODULE, | 1063 | .owner = THIS_MODULE, |
1064 | .add = mx3_camera_add_device, | 1064 | .add = mx3_camera_add_device, |
1065 | .remove = mx3_camera_remove_device, | 1065 | .remove = mx3_camera_remove_device, |
1066 | #ifdef CONFIG_PM | ||
1067 | .suspend = mx3_camera_suspend, | ||
1068 | .resume = mx3_camera_resume, | ||
1069 | #endif | ||
1070 | .set_crop = mx3_camera_set_crop, | 1066 | .set_crop = mx3_camera_set_crop, |
1071 | .set_fmt = mx3_camera_set_fmt, | 1067 | .set_fmt = mx3_camera_set_fmt, |
1072 | .try_fmt = mx3_camera_try_fmt, | 1068 | .try_fmt = mx3_camera_try_fmt, |
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index 5202cadb2aa..30f4698be90 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c | |||
@@ -1237,6 +1237,7 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn, | |||
1237 | buffer[1] = (u32) chn_rev; | 1237 | buffer[1] = (u32) chn_rev; |
1238 | buffer[2] = CMD_SET_MODE; | 1238 | buffer[2] = CMD_SET_MODE; |
1239 | memcpy(&buffer[3], &dev->mode[chn], sizeof(struct s2255_mode)); | 1239 | memcpy(&buffer[3], &dev->mode[chn], sizeof(struct s2255_mode)); |
1240 | dev->setmode_ready[chn] = 0; | ||
1240 | res = s2255_write_config(dev->udev, (unsigned char *)buffer, 512); | 1241 | res = s2255_write_config(dev->udev, (unsigned char *)buffer, 512); |
1241 | if (debug) | 1242 | if (debug) |
1242 | dump_verify_mode(dev, mode); | 1243 | dump_verify_mode(dev, mode); |
@@ -1245,7 +1246,6 @@ static int s2255_set_mode(struct s2255_dev *dev, unsigned long chn, | |||
1245 | 1246 | ||
1246 | /* wait at least 3 frames before continuing */ | 1247 | /* wait at least 3 frames before continuing */ |
1247 | if (mode->restart) { | 1248 | if (mode->restart) { |
1248 | dev->setmode_ready[chn] = 0; | ||
1249 | wait_event_timeout(dev->wait_setmode[chn], | 1249 | wait_event_timeout(dev->wait_setmode[chn], |
1250 | (dev->setmode_ready[chn] != 0), | 1250 | (dev->setmode_ready[chn] != 0), |
1251 | msecs_to_jiffies(S2255_SETMODE_TIMEOUT)); | 1251 | msecs_to_jiffies(S2255_SETMODE_TIMEOUT)); |
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index da47b2f0528..155804b061e 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
@@ -1092,9 +1092,8 @@ static int saa5246a_probe(struct i2c_client *client, | |||
1092 | /* Register it */ | 1092 | /* Register it */ |
1093 | err = video_register_device(t->vdev, VFL_TYPE_VTX, -1); | 1093 | err = video_register_device(t->vdev, VFL_TYPE_VTX, -1); |
1094 | if (err < 0) { | 1094 | if (err < 0) { |
1095 | kfree(t); | ||
1096 | video_device_release(t->vdev); | 1095 | video_device_release(t->vdev); |
1097 | t->vdev = NULL; | 1096 | kfree(t); |
1098 | return err; | 1097 | return err; |
1099 | } | 1098 | } |
1100 | return 0; | 1099 | return 0; |
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 48b27fe4808..271d6e931b7 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
@@ -598,6 +598,7 @@ static int saa5249_probe(struct i2c_client *client, | |||
598 | /* Now create a video4linux device */ | 598 | /* Now create a video4linux device */ |
599 | t->vdev = video_device_alloc(); | 599 | t->vdev = video_device_alloc(); |
600 | if (t->vdev == NULL) { | 600 | if (t->vdev == NULL) { |
601 | kfree(t); | ||
601 | kfree(client); | 602 | kfree(client); |
602 | return -ENOMEM; | 603 | return -ENOMEM; |
603 | } | 604 | } |
@@ -617,9 +618,8 @@ static int saa5249_probe(struct i2c_client *client, | |||
617 | /* Register it */ | 618 | /* Register it */ |
618 | err = video_register_device(t->vdev, VFL_TYPE_VTX, -1); | 619 | err = video_register_device(t->vdev, VFL_TYPE_VTX, -1); |
619 | if (err < 0) { | 620 | if (err < 0) { |
620 | kfree(t); | ||
621 | video_device_release(t->vdev); | 621 | video_device_release(t->vdev); |
622 | t->vdev = NULL; | 622 | kfree(t); |
623 | return err; | 623 | return err; |
624 | } | 624 | } |
625 | return 0; | 625 | return 0; |
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index 399412d7f02..507dc85646b 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
@@ -1726,14 +1726,17 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message) | |||
1726 | static int __uvc_resume(struct usb_interface *intf, int reset) | 1726 | static int __uvc_resume(struct usb_interface *intf, int reset) |
1727 | { | 1727 | { |
1728 | struct uvc_device *dev = usb_get_intfdata(intf); | 1728 | struct uvc_device *dev = usb_get_intfdata(intf); |
1729 | int ret; | ||
1730 | 1729 | ||
1731 | uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n", | 1730 | uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n", |
1732 | intf->cur_altsetting->desc.bInterfaceNumber); | 1731 | intf->cur_altsetting->desc.bInterfaceNumber); |
1733 | 1732 | ||
1734 | if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) { | 1733 | if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) { |
1735 | if (reset && (ret = uvc_ctrl_resume_device(dev)) < 0) | 1734 | if (reset) { |
1736 | return ret; | 1735 | int ret = uvc_ctrl_resume_device(dev); |
1736 | |||
1737 | if (ret < 0) | ||
1738 | return ret; | ||
1739 | } | ||
1737 | 1740 | ||
1738 | return uvc_status_resume(dev); | 1741 | return uvc_status_resume(dev); |
1739 | } | 1742 | } |
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index a95e17329c5..6ce974d7362 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c | |||
@@ -742,7 +742,7 @@ static int uvc_alloc_urb_buffers(struct uvc_video_device *video, | |||
742 | 742 | ||
743 | /* Buffers are already allocated, bail out. */ | 743 | /* Buffers are already allocated, bail out. */ |
744 | if (video->urb_size) | 744 | if (video->urb_size) |
745 | return 0; | 745 | return video->urb_size / psize; |
746 | 746 | ||
747 | /* Compute the number of packets. Bulk endpoints might transfer UVC | 747 | /* Compute the number of packets. Bulk endpoints might transfer UVC |
748 | * payloads accross multiple URBs. | 748 | * payloads accross multiple URBs. |
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 88f10d6cbc9..be64a502ea2 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
@@ -42,6 +42,12 @@ | |||
42 | printk(KERN_DEBUG "%s: " fmt, vfd->name, ## arg);\ | 42 | printk(KERN_DEBUG "%s: " fmt, vfd->name, ## arg);\ |
43 | } while (0) | 43 | } while (0) |
44 | 44 | ||
45 | /* Zero out the end of the struct pointed to by p. Everthing after, but | ||
46 | * not including, the specified field is cleared. */ | ||
47 | #define CLEAR_AFTER_FIELD(p, field) \ | ||
48 | memset((u8 *)(p) + offsetof(typeof(*(p)), field) + sizeof((p)->field), \ | ||
49 | 0, sizeof(*(p)) - offsetof(typeof(*(p)), field) - sizeof((p)->field)) | ||
50 | |||
45 | struct std_descr { | 51 | struct std_descr { |
46 | v4l2_std_id std; | 52 | v4l2_std_id std; |
47 | const char *descr; | 53 | const char *descr; |
@@ -544,39 +550,39 @@ static int check_fmt(const struct v4l2_ioctl_ops *ops, enum v4l2_buf_type type) | |||
544 | 550 | ||
545 | switch (type) { | 551 | switch (type) { |
546 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 552 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
547 | if (ops->vidioc_try_fmt_vid_cap) | 553 | if (ops->vidioc_g_fmt_vid_cap) |
548 | return 0; | 554 | return 0; |
549 | break; | 555 | break; |
550 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 556 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
551 | if (ops->vidioc_try_fmt_vid_overlay) | 557 | if (ops->vidioc_g_fmt_vid_overlay) |
552 | return 0; | 558 | return 0; |
553 | break; | 559 | break; |
554 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 560 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
555 | if (ops->vidioc_try_fmt_vid_out) | 561 | if (ops->vidioc_g_fmt_vid_out) |
556 | return 0; | 562 | return 0; |
557 | break; | 563 | break; |
558 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 564 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
559 | if (ops->vidioc_try_fmt_vid_out_overlay) | 565 | if (ops->vidioc_g_fmt_vid_out_overlay) |
560 | return 0; | 566 | return 0; |
561 | break; | 567 | break; |
562 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 568 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
563 | if (ops->vidioc_try_fmt_vbi_cap) | 569 | if (ops->vidioc_g_fmt_vbi_cap) |
564 | return 0; | 570 | return 0; |
565 | break; | 571 | break; |
566 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 572 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
567 | if (ops->vidioc_try_fmt_vbi_out) | 573 | if (ops->vidioc_g_fmt_vbi_out) |
568 | return 0; | 574 | return 0; |
569 | break; | 575 | break; |
570 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | 576 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: |
571 | if (ops->vidioc_try_fmt_sliced_vbi_cap) | 577 | if (ops->vidioc_g_fmt_sliced_vbi_cap) |
572 | return 0; | 578 | return 0; |
573 | break; | 579 | break; |
574 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 580 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: |
575 | if (ops->vidioc_try_fmt_sliced_vbi_out) | 581 | if (ops->vidioc_g_fmt_sliced_vbi_out) |
576 | return 0; | 582 | return 0; |
577 | break; | 583 | break; |
578 | case V4L2_BUF_TYPE_PRIVATE: | 584 | case V4L2_BUF_TYPE_PRIVATE: |
579 | if (ops->vidioc_try_fmt_type_private) | 585 | if (ops->vidioc_g_fmt_type_private) |
580 | return 0; | 586 | return 0; |
581 | break; | 587 | break; |
582 | } | 588 | } |
@@ -782,44 +788,53 @@ static long __video_do_ioctl(struct file *file, | |||
782 | 788 | ||
783 | switch (f->type) { | 789 | switch (f->type) { |
784 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 790 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
791 | CLEAR_AFTER_FIELD(f, fmt.pix); | ||
785 | v4l_print_pix_fmt(vfd, &f->fmt.pix); | 792 | v4l_print_pix_fmt(vfd, &f->fmt.pix); |
786 | if (ops->vidioc_s_fmt_vid_cap) | 793 | if (ops->vidioc_s_fmt_vid_cap) |
787 | ret = ops->vidioc_s_fmt_vid_cap(file, fh, f); | 794 | ret = ops->vidioc_s_fmt_vid_cap(file, fh, f); |
788 | break; | 795 | break; |
789 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 796 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
797 | CLEAR_AFTER_FIELD(f, fmt.win); | ||
790 | if (ops->vidioc_s_fmt_vid_overlay) | 798 | if (ops->vidioc_s_fmt_vid_overlay) |
791 | ret = ops->vidioc_s_fmt_vid_overlay(file, | 799 | ret = ops->vidioc_s_fmt_vid_overlay(file, |
792 | fh, f); | 800 | fh, f); |
793 | break; | 801 | break; |
794 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 802 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
803 | CLEAR_AFTER_FIELD(f, fmt.pix); | ||
795 | v4l_print_pix_fmt(vfd, &f->fmt.pix); | 804 | v4l_print_pix_fmt(vfd, &f->fmt.pix); |
796 | if (ops->vidioc_s_fmt_vid_out) | 805 | if (ops->vidioc_s_fmt_vid_out) |
797 | ret = ops->vidioc_s_fmt_vid_out(file, fh, f); | 806 | ret = ops->vidioc_s_fmt_vid_out(file, fh, f); |
798 | break; | 807 | break; |
799 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 808 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
809 | CLEAR_AFTER_FIELD(f, fmt.win); | ||
800 | if (ops->vidioc_s_fmt_vid_out_overlay) | 810 | if (ops->vidioc_s_fmt_vid_out_overlay) |
801 | ret = ops->vidioc_s_fmt_vid_out_overlay(file, | 811 | ret = ops->vidioc_s_fmt_vid_out_overlay(file, |
802 | fh, f); | 812 | fh, f); |
803 | break; | 813 | break; |
804 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 814 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
815 | CLEAR_AFTER_FIELD(f, fmt.vbi); | ||
805 | if (ops->vidioc_s_fmt_vbi_cap) | 816 | if (ops->vidioc_s_fmt_vbi_cap) |
806 | ret = ops->vidioc_s_fmt_vbi_cap(file, fh, f); | 817 | ret = ops->vidioc_s_fmt_vbi_cap(file, fh, f); |
807 | break; | 818 | break; |
808 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 819 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
820 | CLEAR_AFTER_FIELD(f, fmt.vbi); | ||
809 | if (ops->vidioc_s_fmt_vbi_out) | 821 | if (ops->vidioc_s_fmt_vbi_out) |
810 | ret = ops->vidioc_s_fmt_vbi_out(file, fh, f); | 822 | ret = ops->vidioc_s_fmt_vbi_out(file, fh, f); |
811 | break; | 823 | break; |
812 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | 824 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: |
825 | CLEAR_AFTER_FIELD(f, fmt.sliced); | ||
813 | if (ops->vidioc_s_fmt_sliced_vbi_cap) | 826 | if (ops->vidioc_s_fmt_sliced_vbi_cap) |
814 | ret = ops->vidioc_s_fmt_sliced_vbi_cap(file, | 827 | ret = ops->vidioc_s_fmt_sliced_vbi_cap(file, |
815 | fh, f); | 828 | fh, f); |
816 | break; | 829 | break; |
817 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 830 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: |
831 | CLEAR_AFTER_FIELD(f, fmt.sliced); | ||
818 | if (ops->vidioc_s_fmt_sliced_vbi_out) | 832 | if (ops->vidioc_s_fmt_sliced_vbi_out) |
819 | ret = ops->vidioc_s_fmt_sliced_vbi_out(file, | 833 | ret = ops->vidioc_s_fmt_sliced_vbi_out(file, |
820 | fh, f); | 834 | fh, f); |
821 | break; | 835 | break; |
822 | case V4L2_BUF_TYPE_PRIVATE: | 836 | case V4L2_BUF_TYPE_PRIVATE: |
837 | /* CLEAR_AFTER_FIELD(f, fmt.raw_data); <- does nothing */ | ||
823 | if (ops->vidioc_s_fmt_type_private) | 838 | if (ops->vidioc_s_fmt_type_private) |
824 | ret = ops->vidioc_s_fmt_type_private(file, | 839 | ret = ops->vidioc_s_fmt_type_private(file, |
825 | fh, f); | 840 | fh, f); |
@@ -836,46 +851,55 @@ static long __video_do_ioctl(struct file *file, | |||
836 | v4l2_type_names)); | 851 | v4l2_type_names)); |
837 | switch (f->type) { | 852 | switch (f->type) { |
838 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: | 853 | case V4L2_BUF_TYPE_VIDEO_CAPTURE: |
854 | CLEAR_AFTER_FIELD(f, fmt.pix); | ||
839 | if (ops->vidioc_try_fmt_vid_cap) | 855 | if (ops->vidioc_try_fmt_vid_cap) |
840 | ret = ops->vidioc_try_fmt_vid_cap(file, fh, f); | 856 | ret = ops->vidioc_try_fmt_vid_cap(file, fh, f); |
841 | if (!ret) | 857 | if (!ret) |
842 | v4l_print_pix_fmt(vfd, &f->fmt.pix); | 858 | v4l_print_pix_fmt(vfd, &f->fmt.pix); |
843 | break; | 859 | break; |
844 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 860 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
861 | CLEAR_AFTER_FIELD(f, fmt.win); | ||
845 | if (ops->vidioc_try_fmt_vid_overlay) | 862 | if (ops->vidioc_try_fmt_vid_overlay) |
846 | ret = ops->vidioc_try_fmt_vid_overlay(file, | 863 | ret = ops->vidioc_try_fmt_vid_overlay(file, |
847 | fh, f); | 864 | fh, f); |
848 | break; | 865 | break; |
849 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: | 866 | case V4L2_BUF_TYPE_VIDEO_OUTPUT: |
867 | CLEAR_AFTER_FIELD(f, fmt.pix); | ||
850 | if (ops->vidioc_try_fmt_vid_out) | 868 | if (ops->vidioc_try_fmt_vid_out) |
851 | ret = ops->vidioc_try_fmt_vid_out(file, fh, f); | 869 | ret = ops->vidioc_try_fmt_vid_out(file, fh, f); |
852 | if (!ret) | 870 | if (!ret) |
853 | v4l_print_pix_fmt(vfd, &f->fmt.pix); | 871 | v4l_print_pix_fmt(vfd, &f->fmt.pix); |
854 | break; | 872 | break; |
855 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 873 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
874 | CLEAR_AFTER_FIELD(f, fmt.win); | ||
856 | if (ops->vidioc_try_fmt_vid_out_overlay) | 875 | if (ops->vidioc_try_fmt_vid_out_overlay) |
857 | ret = ops->vidioc_try_fmt_vid_out_overlay(file, | 876 | ret = ops->vidioc_try_fmt_vid_out_overlay(file, |
858 | fh, f); | 877 | fh, f); |
859 | break; | 878 | break; |
860 | case V4L2_BUF_TYPE_VBI_CAPTURE: | 879 | case V4L2_BUF_TYPE_VBI_CAPTURE: |
880 | CLEAR_AFTER_FIELD(f, fmt.vbi); | ||
861 | if (ops->vidioc_try_fmt_vbi_cap) | 881 | if (ops->vidioc_try_fmt_vbi_cap) |
862 | ret = ops->vidioc_try_fmt_vbi_cap(file, fh, f); | 882 | ret = ops->vidioc_try_fmt_vbi_cap(file, fh, f); |
863 | break; | 883 | break; |
864 | case V4L2_BUF_TYPE_VBI_OUTPUT: | 884 | case V4L2_BUF_TYPE_VBI_OUTPUT: |
885 | CLEAR_AFTER_FIELD(f, fmt.vbi); | ||
865 | if (ops->vidioc_try_fmt_vbi_out) | 886 | if (ops->vidioc_try_fmt_vbi_out) |
866 | ret = ops->vidioc_try_fmt_vbi_out(file, fh, f); | 887 | ret = ops->vidioc_try_fmt_vbi_out(file, fh, f); |
867 | break; | 888 | break; |
868 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: | 889 | case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE: |
890 | CLEAR_AFTER_FIELD(f, fmt.sliced); | ||
869 | if (ops->vidioc_try_fmt_sliced_vbi_cap) | 891 | if (ops->vidioc_try_fmt_sliced_vbi_cap) |
870 | ret = ops->vidioc_try_fmt_sliced_vbi_cap(file, | 892 | ret = ops->vidioc_try_fmt_sliced_vbi_cap(file, |
871 | fh, f); | 893 | fh, f); |
872 | break; | 894 | break; |
873 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: | 895 | case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT: |
896 | CLEAR_AFTER_FIELD(f, fmt.sliced); | ||
874 | if (ops->vidioc_try_fmt_sliced_vbi_out) | 897 | if (ops->vidioc_try_fmt_sliced_vbi_out) |
875 | ret = ops->vidioc_try_fmt_sliced_vbi_out(file, | 898 | ret = ops->vidioc_try_fmt_sliced_vbi_out(file, |
876 | fh, f); | 899 | fh, f); |
877 | break; | 900 | break; |
878 | case V4L2_BUF_TYPE_PRIVATE: | 901 | case V4L2_BUF_TYPE_PRIVATE: |
902 | /* CLEAR_AFTER_FIELD(f, fmt.raw_data); <- does nothing */ | ||
879 | if (ops->vidioc_try_fmt_type_private) | 903 | if (ops->vidioc_try_fmt_type_private) |
880 | ret = ops->vidioc_try_fmt_type_private(file, | 904 | ret = ops->vidioc_try_fmt_type_private(file, |
881 | fh, f); | 905 | fh, f); |
@@ -898,6 +922,9 @@ static long __video_do_ioctl(struct file *file, | |||
898 | if (ret) | 922 | if (ret) |
899 | break; | 923 | break; |
900 | 924 | ||
925 | if (p->type < V4L2_BUF_TYPE_PRIVATE) | ||
926 | CLEAR_AFTER_FIELD(p, memory); | ||
927 | |||
901 | ret = ops->vidioc_reqbufs(file, fh, p); | 928 | ret = ops->vidioc_reqbufs(file, fh, p); |
902 | dbgarg(cmd, "count=%d, type=%s, memory=%s\n", | 929 | dbgarg(cmd, "count=%d, type=%s, memory=%s\n", |
903 | p->count, | 930 | p->count, |
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index 092333b1c34..643cccaa1aa 100644 --- a/drivers/media/video/zoran/zoran_driver.c +++ b/drivers/media/video/zoran/zoran_driver.c | |||
@@ -1863,22 +1863,20 @@ static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capability | |||
1863 | 1863 | ||
1864 | static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag) | 1864 | static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag) |
1865 | { | 1865 | { |
1866 | int num = -1, i; | 1866 | unsigned int num, i; |
1867 | 1867 | ||
1868 | for (i = 0; i < NUM_FORMATS; i++) { | 1868 | for (num = i = 0; i < NUM_FORMATS; i++) { |
1869 | if (zoran_formats[i].flags & flag) | 1869 | if (zoran_formats[i].flags & flag && num++ == fmt->index) { |
1870 | num++; | 1870 | strncpy(fmt->description, zoran_formats[i].name, |
1871 | if (num == fmt->index) | 1871 | sizeof(fmt->description) - 1); |
1872 | break; | 1872 | /* fmt struct pre-zeroed, so adding '\0' not neeed */ |
1873 | fmt->pixelformat = zoran_formats[i].fourcc; | ||
1874 | if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED) | ||
1875 | fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; | ||
1876 | return 0; | ||
1877 | } | ||
1873 | } | 1878 | } |
1874 | if (fmt->index < 0 /* late, but not too late */ || i == NUM_FORMATS) | 1879 | return -EINVAL; |
1875 | return -EINVAL; | ||
1876 | |||
1877 | strncpy(fmt->description, zoran_formats[i].name, sizeof(fmt->description)-1); | ||
1878 | fmt->pixelformat = zoran_formats[i].fourcc; | ||
1879 | if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED) | ||
1880 | fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; | ||
1881 | return 0; | ||
1882 | } | 1880 | } |
1883 | 1881 | ||
1884 | static int zoran_enum_fmt_vid_cap(struct file *file, void *__fh, | 1882 | static int zoran_enum_fmt_vid_cap(struct file *file, void *__fh, |
diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c index 2e2a5923d4c..a71e245801e 100644 --- a/drivers/misc/isl29003.c +++ b/drivers/misc/isl29003.c | |||
@@ -64,6 +64,7 @@ struct isl29003_data { | |||
64 | struct i2c_client *client; | 64 | struct i2c_client *client; |
65 | struct mutex lock; | 65 | struct mutex lock; |
66 | u8 reg_cache[ISL29003_NUM_CACHABLE_REGS]; | 66 | u8 reg_cache[ISL29003_NUM_CACHABLE_REGS]; |
67 | u8 power_state_before_suspend; | ||
67 | }; | 68 | }; |
68 | 69 | ||
69 | static int gain_range[] = { | 70 | static int gain_range[] = { |
@@ -411,6 +412,9 @@ static int __devexit isl29003_remove(struct i2c_client *client) | |||
411 | #ifdef CONFIG_PM | 412 | #ifdef CONFIG_PM |
412 | static int isl29003_suspend(struct i2c_client *client, pm_message_t mesg) | 413 | static int isl29003_suspend(struct i2c_client *client, pm_message_t mesg) |
413 | { | 414 | { |
415 | struct isl29003_data *data = i2c_get_clientdata(client); | ||
416 | |||
417 | data->power_state_before_suspend = isl29003_get_power_state(client); | ||
414 | return isl29003_set_power_state(client, 0); | 418 | return isl29003_set_power_state(client, 0); |
415 | } | 419 | } |
416 | 420 | ||
@@ -421,10 +425,11 @@ static int isl29003_resume(struct i2c_client *client) | |||
421 | 425 | ||
422 | /* restore registers from cache */ | 426 | /* restore registers from cache */ |
423 | for (i = 0; i < ARRAY_SIZE(data->reg_cache); i++) | 427 | for (i = 0; i < ARRAY_SIZE(data->reg_cache); i++) |
424 | if (!i2c_smbus_write_byte_data(client, i, data->reg_cache[i])) | 428 | if (i2c_smbus_write_byte_data(client, i, data->reg_cache[i])) |
425 | return -EIO; | 429 | return -EIO; |
426 | 430 | ||
427 | return 0; | 431 | return isl29003_set_power_state(client, |
432 | data->power_state_before_suspend); | ||
428 | } | 433 | } |
429 | 434 | ||
430 | #else | 435 | #else |
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index fe8041e619e..b25e9b6516a 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
@@ -254,6 +254,14 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) | |||
254 | brq.data.blocks = req->nr_sectors; | 254 | brq.data.blocks = req->nr_sectors; |
255 | 255 | ||
256 | /* | 256 | /* |
257 | * The block layer doesn't support all sector count | ||
258 | * restrictions, so we need to be prepared for too big | ||
259 | * requests. | ||
260 | */ | ||
261 | if (brq.data.blocks > card->host->max_blk_count) | ||
262 | brq.data.blocks = card->host->max_blk_count; | ||
263 | |||
264 | /* | ||
257 | * After a read error, we redo the request one sector at a time | 265 | * After a read error, we redo the request one sector at a time |
258 | * in order to accurately determine which sectors can be read | 266 | * in order to accurately determine which sectors can be read |
259 | * successfully. | 267 | * successfully. |
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index fa073ab3fa3..26491173275 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c | |||
@@ -706,7 +706,7 @@ static void mmc_power_up(struct mmc_host *host) | |||
706 | * This delay should be sufficient to allow the power supply | 706 | * This delay should be sufficient to allow the power supply |
707 | * to reach the minimum voltage. | 707 | * to reach the minimum voltage. |
708 | */ | 708 | */ |
709 | mmc_delay(2); | 709 | mmc_delay(10); |
710 | 710 | ||
711 | host->ios.clock = host->f_min; | 711 | host->ios.clock = host->f_min; |
712 | host->ios.power_mode = MMC_POWER_ON; | 712 | host->ios.power_mode = MMC_POWER_ON; |
@@ -716,7 +716,7 @@ static void mmc_power_up(struct mmc_host *host) | |||
716 | * This delay must be at least 74 clock sizes, or 1 ms, or the | 716 | * This delay must be at least 74 clock sizes, or 1 ms, or the |
717 | * time required to reach a stable voltage. | 717 | * time required to reach a stable voltage. |
718 | */ | 718 | */ |
719 | mmc_delay(2); | 719 | mmc_delay(10); |
720 | } | 720 | } |
721 | 721 | ||
722 | static void mmc_power_off(struct mmc_host *host) | 722 | static void mmc_power_off(struct mmc_host *host) |
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index a663429b3d5..36875dcfa49 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
@@ -514,6 +514,7 @@ static int __devinit mmci_probe(struct amba_device *dev, void *id) | |||
514 | } | 514 | } |
515 | 515 | ||
516 | host = mmc_priv(mmc); | 516 | host = mmc_priv(mmc); |
517 | host->mmc = mmc; | ||
517 | /* Bits 12 thru 19 is the designer */ | 518 | /* Bits 12 thru 19 is the designer */ |
518 | host->hw_designer = (dev->periphid >> 12) & 0xff; | 519 | host->hw_designer = (dev->periphid >> 12) & 0xff; |
519 | /* Bits 20 thru 23 is the revison */ | 520 | /* Bits 20 thru 23 is the revison */ |
@@ -545,7 +546,6 @@ static int __devinit mmci_probe(struct amba_device *dev, void *id) | |||
545 | host->mclk = clk_get_rate(host->clk); | 546 | host->mclk = clk_get_rate(host->clk); |
546 | DBG(host, "eventual mclk rate: %u Hz\n", host->mclk); | 547 | DBG(host, "eventual mclk rate: %u Hz\n", host->mclk); |
547 | } | 548 | } |
548 | host->mmc = mmc; | ||
549 | host->base = ioremap(dev->res.start, SZ_4K); | 549 | host->base = ioremap(dev->res.start, SZ_4K); |
550 | if (!host->base) { | 550 | if (!host->base) { |
551 | ret = -ENOMEM; | 551 | ret = -ENOMEM; |
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index b5c375d94ab..c643d0fe118 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c | |||
@@ -825,24 +825,23 @@ static int __exit mvsd_remove(struct platform_device *pdev) | |||
825 | } | 825 | } |
826 | 826 | ||
827 | #ifdef CONFIG_PM | 827 | #ifdef CONFIG_PM |
828 | static int mvsd_suspend(struct platform_device *dev, pm_message_t state, | 828 | static int mvsd_suspend(struct platform_device *dev, pm_message_t state) |
829 | u32 level) | ||
830 | { | 829 | { |
831 | struct mmc_host *mmc = platform_get_drvdata(dev); | 830 | struct mmc_host *mmc = platform_get_drvdata(dev); |
832 | int ret = 0; | 831 | int ret = 0; |
833 | 832 | ||
834 | if (mmc && level == SUSPEND_DISABLE) | 833 | if (mmc) |
835 | ret = mmc_suspend_host(mmc, state); | 834 | ret = mmc_suspend_host(mmc, state); |
836 | 835 | ||
837 | return ret; | 836 | return ret; |
838 | } | 837 | } |
839 | 838 | ||
840 | static int mvsd_resume(struct platform_device *dev, u32 level) | 839 | static int mvsd_resume(struct platform_device *dev) |
841 | { | 840 | { |
842 | struct mmc_host *mmc = platform_dev_get_drvdata(dev); | 841 | struct mmc_host *mmc = platform_get_drvdata(dev); |
843 | int ret = 0; | 842 | int ret = 0; |
844 | 843 | ||
845 | if (mmc && level == RESUME_ENABLE) | 844 | if (mmc) |
846 | ret = mmc_resume_host(mmc); | 845 | ret = mmc_resume_host(mmc); |
847 | 846 | ||
848 | return ret; | 847 | return ret; |
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 5570849188c..bfa25c01c87 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -157,8 +157,6 @@ struct mmc_omap_host { | |||
157 | struct timer_list dma_timer; | 157 | struct timer_list dma_timer; |
158 | unsigned dma_len; | 158 | unsigned dma_len; |
159 | 159 | ||
160 | short power_pin; | ||
161 | |||
162 | struct mmc_omap_slot *slots[OMAP_MMC_MAX_SLOTS]; | 160 | struct mmc_omap_slot *slots[OMAP_MMC_MAX_SLOTS]; |
163 | struct mmc_omap_slot *current_slot; | 161 | struct mmc_omap_slot *current_slot; |
164 | spinlock_t slot_lock; | 162 | spinlock_t slot_lock; |
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index cd37962ec44..65be27995d5 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c | |||
@@ -522,8 +522,8 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( | |||
522 | 522 | ||
523 | host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pci_slot)); | 523 | host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pci_slot)); |
524 | if (IS_ERR(host)) { | 524 | if (IS_ERR(host)) { |
525 | ret = PTR_ERR(host); | 525 | dev_err(&pdev->dev, "cannot allocate host\n"); |
526 | goto unmap; | 526 | return ERR_PTR(PTR_ERR(host)); |
527 | } | 527 | } |
528 | 528 | ||
529 | slot = sdhci_priv(host); | 529 | slot = sdhci_priv(host); |
@@ -541,7 +541,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( | |||
541 | ret = pci_request_region(pdev, bar, mmc_hostname(host->mmc)); | 541 | ret = pci_request_region(pdev, bar, mmc_hostname(host->mmc)); |
542 | if (ret) { | 542 | if (ret) { |
543 | dev_err(&pdev->dev, "cannot request region\n"); | 543 | dev_err(&pdev->dev, "cannot request region\n"); |
544 | return ERR_PTR(ret); | 544 | goto free; |
545 | } | 545 | } |
546 | 546 | ||
547 | addr = pci_resource_start(pdev, bar); | 547 | addr = pci_resource_start(pdev, bar); |
@@ -572,6 +572,8 @@ unmap: | |||
572 | 572 | ||
573 | release: | 573 | release: |
574 | pci_release_region(pdev, bar); | 574 | pci_release_region(pdev, bar); |
575 | |||
576 | free: | ||
575 | sdhci_free_host(host); | 577 | sdhci_free_host(host); |
576 | 578 | ||
577 | return ERR_PTR(ret); | 579 | return ERR_PTR(ret); |
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index f20a834f430..65c6f996bbd 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h | |||
@@ -125,7 +125,7 @@ | |||
125 | #define SDHCI_INT_DATA_MASK (SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | \ | 125 | #define SDHCI_INT_DATA_MASK (SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | \ |
126 | SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \ | 126 | SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \ |
127 | SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \ | 127 | SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \ |
128 | SDHCI_INT_DATA_END_BIT) | 128 | SDHCI_INT_DATA_END_BIT | SDHCI_ADMA_ERROR) |
129 | #define SDHCI_INT_ALL_MASK ((unsigned int)-1) | 129 | #define SDHCI_INT_ALL_MASK ((unsigned int)-1) |
130 | 130 | ||
131 | #define SDHCI_ACMD12_ERR 0x3C | 131 | #define SDHCI_ACMD12_ERR 0x3C |
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 8185b1f3e5e..cc6369ea67d 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #define SR_SRWD 0x80 /* SR write protect */ | 54 | #define SR_SRWD 0x80 /* SR write protect */ |
55 | 55 | ||
56 | /* Define max times to check status register before we give up. */ | 56 | /* Define max times to check status register before we give up. */ |
57 | #define MAX_READY_WAIT_COUNT 100000 | 57 | #define MAX_READY_WAIT_JIFFIES (10 * HZ) /* eg. M25P128 specs 6s max sector erase */ |
58 | #define CMD_SIZE 4 | 58 | #define CMD_SIZE 4 |
59 | 59 | ||
60 | #ifdef CONFIG_M25PXX_USE_FAST_READ | 60 | #ifdef CONFIG_M25PXX_USE_FAST_READ |
@@ -139,20 +139,20 @@ static inline int write_enable(struct m25p *flash) | |||
139 | */ | 139 | */ |
140 | static int wait_till_ready(struct m25p *flash) | 140 | static int wait_till_ready(struct m25p *flash) |
141 | { | 141 | { |
142 | int count; | 142 | unsigned long deadline; |
143 | int sr; | 143 | int sr; |
144 | 144 | ||
145 | /* one chip guarantees max 5 msec wait here after page writes, | 145 | deadline = jiffies + MAX_READY_WAIT_JIFFIES; |
146 | * but potentially three seconds (!) after page erase. | 146 | |
147 | */ | 147 | do { |
148 | for (count = 0; count < MAX_READY_WAIT_COUNT; count++) { | ||
149 | if ((sr = read_sr(flash)) < 0) | 148 | if ((sr = read_sr(flash)) < 0) |
150 | break; | 149 | break; |
151 | else if (!(sr & SR_WIP)) | 150 | else if (!(sr & SR_WIP)) |
152 | return 0; | 151 | return 0; |
153 | 152 | ||
154 | /* REVISIT sometimes sleeping would be best */ | 153 | cond_resched(); |
155 | } | 154 | |
155 | } while (!time_after_eq(jiffies, deadline)); | ||
156 | 156 | ||
157 | return 1; | 157 | return 1; |
158 | } | 158 | } |
@@ -246,10 +246,12 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr) | |||
246 | mutex_lock(&flash->lock); | 246 | mutex_lock(&flash->lock); |
247 | 247 | ||
248 | /* whole-chip erase? */ | 248 | /* whole-chip erase? */ |
249 | if (len == flash->mtd.size && erase_chip(flash)) { | 249 | if (len == flash->mtd.size) { |
250 | instr->state = MTD_ERASE_FAILED; | 250 | if (erase_chip(flash)) { |
251 | mutex_unlock(&flash->lock); | 251 | instr->state = MTD_ERASE_FAILED; |
252 | return -EIO; | 252 | mutex_unlock(&flash->lock); |
253 | return -EIO; | ||
254 | } | ||
253 | 255 | ||
254 | /* REVISIT in some cases we could speed up erasing large regions | 256 | /* REVISIT in some cases we could speed up erasing large regions |
255 | * by using OPCODE_SE instead of OPCODE_BE_4K. We may have set up | 257 | * by using OPCODE_SE instead of OPCODE_BE_4K. We may have set up |
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index fdd6ae85939..bccb4b1ffc4 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c | |||
@@ -48,11 +48,11 @@ static LIST_HEAD(mtd_notifiers); | |||
48 | */ | 48 | */ |
49 | static void mtd_release(struct device *dev) | 49 | static void mtd_release(struct device *dev) |
50 | { | 50 | { |
51 | struct mtd_info *mtd = dev_to_mtd(dev); | 51 | dev_t index = MTD_DEVT(dev_to_mtd(dev)->index); |
52 | 52 | ||
53 | /* remove /dev/mtdXro node if needed */ | 53 | /* remove /dev/mtdXro node if needed */ |
54 | if (MTD_DEVT(mtd->index)) | 54 | if (index) |
55 | device_destroy(mtd_class, MTD_DEVT(mtd->index) + 1); | 55 | device_destroy(mtd_class, index + 1); |
56 | } | 56 | } |
57 | 57 | ||
58 | static ssize_t mtd_type_show(struct device *dev, | 58 | static ssize_t mtd_type_show(struct device *dev, |
@@ -132,6 +132,17 @@ static ssize_t mtd_writesize_show(struct device *dev, | |||
132 | } | 132 | } |
133 | static DEVICE_ATTR(writesize, S_IRUGO, mtd_writesize_show, NULL); | 133 | static DEVICE_ATTR(writesize, S_IRUGO, mtd_writesize_show, NULL); |
134 | 134 | ||
135 | static ssize_t mtd_subpagesize_show(struct device *dev, | ||
136 | struct device_attribute *attr, char *buf) | ||
137 | { | ||
138 | struct mtd_info *mtd = dev_to_mtd(dev); | ||
139 | unsigned int subpagesize = mtd->writesize >> mtd->subpage_sft; | ||
140 | |||
141 | return snprintf(buf, PAGE_SIZE, "%u\n", subpagesize); | ||
142 | |||
143 | } | ||
144 | static DEVICE_ATTR(subpagesize, S_IRUGO, mtd_subpagesize_show, NULL); | ||
145 | |||
135 | static ssize_t mtd_oobsize_show(struct device *dev, | 146 | static ssize_t mtd_oobsize_show(struct device *dev, |
136 | struct device_attribute *attr, char *buf) | 147 | struct device_attribute *attr, char *buf) |
137 | { | 148 | { |
@@ -169,6 +180,7 @@ static struct attribute *mtd_attrs[] = { | |||
169 | &dev_attr_size.attr, | 180 | &dev_attr_size.attr, |
170 | &dev_attr_erasesize.attr, | 181 | &dev_attr_erasesize.attr, |
171 | &dev_attr_writesize.attr, | 182 | &dev_attr_writesize.attr, |
183 | &dev_attr_subpagesize.attr, | ||
172 | &dev_attr_oobsize.attr, | 184 | &dev_attr_oobsize.attr, |
173 | &dev_attr_numeraseregions.attr, | 185 | &dev_attr_numeraseregions.attr, |
174 | &dev_attr_name.attr, | 186 | &dev_attr_name.attr, |
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index 92285d0089c..af8b42e0a55 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c | |||
@@ -74,8 +74,7 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags, | |||
74 | 74 | ||
75 | ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); | 75 | ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0); |
76 | if (ret < 0) { | 76 | if (ret < 0) { |
77 | up_write(&sb->s_umount); | 77 | deactivate_locked_super(sb); |
78 | deactivate_super(sb); | ||
79 | return ret; | 78 | return ret; |
80 | } | 79 | } |
81 | 80 | ||
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 448487e22fa..a740053d3af 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
@@ -338,12 +338,12 @@ static int ixp4xx_mdio_register(void) | |||
338 | if (cpu_is_ixp43x()) { | 338 | if (cpu_is_ixp43x()) { |
339 | /* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */ | 339 | /* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */ |
340 | if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEC_ETH)) | 340 | if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEC_ETH)) |
341 | return -ENOSYS; | 341 | return -ENODEV; |
342 | mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT; | 342 | mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT; |
343 | } else { | 343 | } else { |
344 | /* All MII PHY accesses use NPE-B Ethernet registers */ | 344 | /* All MII PHY accesses use NPE-B Ethernet registers */ |
345 | if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0)) | 345 | if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0)) |
346 | return -ENOSYS; | 346 | return -ENODEV; |
347 | mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT; | 347 | mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT; |
348 | } | 348 | } |
349 | 349 | ||
@@ -1174,7 +1174,7 @@ static int __devinit eth_init_one(struct platform_device *pdev) | |||
1174 | regs_phys = IXP4XX_EthC_BASE_PHYS; | 1174 | regs_phys = IXP4XX_EthC_BASE_PHYS; |
1175 | break; | 1175 | break; |
1176 | default: | 1176 | default: |
1177 | err = -ENOSYS; | 1177 | err = -ENODEV; |
1178 | goto err_free; | 1178 | goto err_free; |
1179 | } | 1179 | } |
1180 | 1180 | ||
@@ -1189,15 +1189,10 @@ static int __devinit eth_init_one(struct platform_device *pdev) | |||
1189 | goto err_free; | 1189 | goto err_free; |
1190 | } | 1190 | } |
1191 | 1191 | ||
1192 | if (register_netdev(dev)) { | ||
1193 | err = -EIO; | ||
1194 | goto err_npe_rel; | ||
1195 | } | ||
1196 | |||
1197 | port->mem_res = request_mem_region(regs_phys, REGS_SIZE, dev->name); | 1192 | port->mem_res = request_mem_region(regs_phys, REGS_SIZE, dev->name); |
1198 | if (!port->mem_res) { | 1193 | if (!port->mem_res) { |
1199 | err = -EBUSY; | 1194 | err = -EBUSY; |
1200 | goto err_unreg; | 1195 | goto err_npe_rel; |
1201 | } | 1196 | } |
1202 | 1197 | ||
1203 | port->plat = plat; | 1198 | port->plat = plat; |
@@ -1215,20 +1210,25 @@ static int __devinit eth_init_one(struct platform_device *pdev) | |||
1215 | snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy); | 1210 | snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy); |
1216 | port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0, | 1211 | port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0, |
1217 | PHY_INTERFACE_MODE_MII); | 1212 | PHY_INTERFACE_MODE_MII); |
1218 | if (IS_ERR(port->phydev)) { | 1213 | if ((err = IS_ERR(port->phydev))) |
1219 | printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); | 1214 | goto err_free_mem; |
1220 | return PTR_ERR(port->phydev); | ||
1221 | } | ||
1222 | 1215 | ||
1223 | port->phydev->irq = PHY_POLL; | 1216 | port->phydev->irq = PHY_POLL; |
1224 | 1217 | ||
1218 | if ((err = register_netdev(dev))) | ||
1219 | goto err_phy_dis; | ||
1220 | |||
1225 | printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy, | 1221 | printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy, |
1226 | npe_name(port->npe)); | 1222 | npe_name(port->npe)); |
1227 | 1223 | ||
1228 | return 0; | 1224 | return 0; |
1229 | 1225 | ||
1230 | err_unreg: | 1226 | err_phy_dis: |
1231 | unregister_netdev(dev); | 1227 | phy_disconnect(port->phydev); |
1228 | err_free_mem: | ||
1229 | npe_port_tab[NPE_ID(port->id)] = NULL; | ||
1230 | platform_set_drvdata(pdev, NULL); | ||
1231 | release_resource(port->mem_res); | ||
1232 | err_npe_rel: | 1232 | err_npe_rel: |
1233 | npe_release(port->npe); | 1233 | npe_release(port->npe); |
1234 | err_free: | 1234 | err_free: |
@@ -1242,6 +1242,7 @@ static int __devexit eth_remove_one(struct platform_device *pdev) | |||
1242 | struct port *port = netdev_priv(dev); | 1242 | struct port *port = netdev_priv(dev); |
1243 | 1243 | ||
1244 | unregister_netdev(dev); | 1244 | unregister_netdev(dev); |
1245 | phy_disconnect(port->phydev); | ||
1245 | npe_port_tab[NPE_ID(port->id)] = NULL; | 1246 | npe_port_tab[NPE_ID(port->id)] = NULL; |
1246 | platform_set_drvdata(pdev, NULL); | 1247 | platform_set_drvdata(pdev, NULL); |
1247 | npe_release(port->npe); | 1248 | npe_release(port->npe); |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index d47839184a0..b0cb29d4cc0 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -54,8 +54,8 @@ | |||
54 | 54 | ||
55 | #define DRV_MODULE_NAME "bnx2" | 55 | #define DRV_MODULE_NAME "bnx2" |
56 | #define PFX DRV_MODULE_NAME ": " | 56 | #define PFX DRV_MODULE_NAME ": " |
57 | #define DRV_MODULE_VERSION "2.0.0" | 57 | #define DRV_MODULE_VERSION "2.0.1" |
58 | #define DRV_MODULE_RELDATE "April 2, 2009" | 58 | #define DRV_MODULE_RELDATE "May 6, 2009" |
59 | #define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-4.6.16.fw" | 59 | #define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-4.6.16.fw" |
60 | #define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-4.6.16.fw" | 60 | #define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-4.6.16.fw" |
61 | #define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-4.6.17.fw" | 61 | #define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-4.6.17.fw" |
@@ -2600,6 +2600,7 @@ bnx2_get_hw_tx_cons(struct bnx2_napi *bnapi) | |||
2600 | /* Tell compiler that status block fields can change. */ | 2600 | /* Tell compiler that status block fields can change. */ |
2601 | barrier(); | 2601 | barrier(); |
2602 | cons = *bnapi->hw_tx_cons_ptr; | 2602 | cons = *bnapi->hw_tx_cons_ptr; |
2603 | barrier(); | ||
2603 | if (unlikely((cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT)) | 2604 | if (unlikely((cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT)) |
2604 | cons++; | 2605 | cons++; |
2605 | return cons; | 2606 | return cons; |
@@ -2879,6 +2880,7 @@ bnx2_get_hw_rx_cons(struct bnx2_napi *bnapi) | |||
2879 | /* Tell compiler that status block fields can change. */ | 2880 | /* Tell compiler that status block fields can change. */ |
2880 | barrier(); | 2881 | barrier(); |
2881 | cons = *bnapi->hw_rx_cons_ptr; | 2882 | cons = *bnapi->hw_rx_cons_ptr; |
2883 | barrier(); | ||
2882 | if (unlikely((cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT)) | 2884 | if (unlikely((cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT)) |
2883 | cons++; | 2885 | cons++; |
2884 | return cons; | 2886 | return cons; |
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 553a8991977..46d312bedfb 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
@@ -1706,10 +1706,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave | |||
1706 | * Called with RTNL | 1706 | * Called with RTNL |
1707 | */ | 1707 | */ |
1708 | int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) | 1708 | int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) |
1709 | __releases(&bond->curr_slave_lock) | ||
1710 | __releases(&bond->lock) | ||
1711 | __acquires(&bond->lock) | 1709 | __acquires(&bond->lock) |
1712 | __acquires(&bond->curr_slave_lock) | 1710 | __releases(&bond->lock) |
1713 | { | 1711 | { |
1714 | struct bonding *bond = netdev_priv(bond_dev); | 1712 | struct bonding *bond = netdev_priv(bond_dev); |
1715 | struct sockaddr *sa = addr; | 1713 | struct sockaddr *sa = addr; |
@@ -1745,9 +1743,6 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) | |||
1745 | } | 1743 | } |
1746 | } | 1744 | } |
1747 | 1745 | ||
1748 | write_unlock_bh(&bond->curr_slave_lock); | ||
1749 | read_unlock(&bond->lock); | ||
1750 | |||
1751 | if (swap_slave) { | 1746 | if (swap_slave) { |
1752 | alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave); | 1747 | alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave); |
1753 | alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave); | 1748 | alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave); |
@@ -1755,16 +1750,15 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) | |||
1755 | alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr, | 1750 | alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr, |
1756 | bond->alb_info.rlb_enabled); | 1751 | bond->alb_info.rlb_enabled); |
1757 | 1752 | ||
1753 | read_lock(&bond->lock); | ||
1758 | alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr); | 1754 | alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr); |
1759 | if (bond->alb_info.rlb_enabled) { | 1755 | if (bond->alb_info.rlb_enabled) { |
1760 | /* inform clients mac address has changed */ | 1756 | /* inform clients mac address has changed */ |
1761 | rlb_req_update_slave_clients(bond, bond->curr_active_slave); | 1757 | rlb_req_update_slave_clients(bond, bond->curr_active_slave); |
1762 | } | 1758 | } |
1759 | read_unlock(&bond->lock); | ||
1763 | } | 1760 | } |
1764 | 1761 | ||
1765 | read_lock(&bond->lock); | ||
1766 | write_lock_bh(&bond->curr_slave_lock); | ||
1767 | |||
1768 | return 0; | 1762 | return 0; |
1769 | } | 1763 | } |
1770 | 1764 | ||
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 63369b6b14d..74824028f85 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -2213,33 +2213,24 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in | |||
2213 | { | 2213 | { |
2214 | struct bonding *bond = netdev_priv(bond_dev); | 2214 | struct bonding *bond = netdev_priv(bond_dev); |
2215 | struct slave *slave; | 2215 | struct slave *slave; |
2216 | int i, found = 0; | 2216 | int i, res = -ENODEV; |
2217 | |||
2218 | if (info->slave_id < 0) { | ||
2219 | return -ENODEV; | ||
2220 | } | ||
2221 | 2217 | ||
2222 | read_lock(&bond->lock); | 2218 | read_lock(&bond->lock); |
2223 | 2219 | ||
2224 | bond_for_each_slave(bond, slave, i) { | 2220 | bond_for_each_slave(bond, slave, i) { |
2225 | if (i == (int)info->slave_id) { | 2221 | if (i == (int)info->slave_id) { |
2226 | found = 1; | 2222 | res = 0; |
2223 | strcpy(info->slave_name, slave->dev->name); | ||
2224 | info->link = slave->link; | ||
2225 | info->state = slave->state; | ||
2226 | info->link_failure_count = slave->link_failure_count; | ||
2227 | break; | 2227 | break; |
2228 | } | 2228 | } |
2229 | } | 2229 | } |
2230 | 2230 | ||
2231 | read_unlock(&bond->lock); | 2231 | read_unlock(&bond->lock); |
2232 | 2232 | ||
2233 | if (found) { | 2233 | return res; |
2234 | strcpy(info->slave_name, slave->dev->name); | ||
2235 | info->link = slave->link; | ||
2236 | info->state = slave->state; | ||
2237 | info->link_failure_count = slave->link_failure_count; | ||
2238 | } else { | ||
2239 | return -ENODEV; | ||
2240 | } | ||
2241 | |||
2242 | return 0; | ||
2243 | } | 2234 | } |
2244 | 2235 | ||
2245 | /*-------------------------------- Monitoring -------------------------------*/ | 2236 | /*-------------------------------- Monitoring -------------------------------*/ |
@@ -5167,16 +5158,15 @@ int bond_create(char *name, struct bond_params *params) | |||
5167 | up_write(&bonding_rwsem); | 5158 | up_write(&bonding_rwsem); |
5168 | rtnl_unlock(); /* allows sysfs registration of net device */ | 5159 | rtnl_unlock(); /* allows sysfs registration of net device */ |
5169 | res = bond_create_sysfs_entry(netdev_priv(bond_dev)); | 5160 | res = bond_create_sysfs_entry(netdev_priv(bond_dev)); |
5170 | if (res < 0) { | 5161 | if (res < 0) |
5171 | rtnl_lock(); | 5162 | goto out_unreg; |
5172 | down_write(&bonding_rwsem); | ||
5173 | bond_deinit(bond_dev); | ||
5174 | unregister_netdevice(bond_dev); | ||
5175 | goto out_rtnl; | ||
5176 | } | ||
5177 | 5163 | ||
5178 | return 0; | 5164 | return 0; |
5179 | 5165 | ||
5166 | out_unreg: | ||
5167 | rtnl_lock(); | ||
5168 | down_write(&bonding_rwsem); | ||
5169 | unregister_netdevice(bond_dev); | ||
5180 | out_bond: | 5170 | out_bond: |
5181 | bond_deinit(bond_dev); | 5171 | bond_deinit(bond_dev); |
5182 | out_netdev: | 5172 | out_netdev: |
@@ -5191,7 +5181,6 @@ static int __init bonding_init(void) | |||
5191 | { | 5181 | { |
5192 | int i; | 5182 | int i; |
5193 | int res; | 5183 | int res; |
5194 | struct bonding *bond; | ||
5195 | 5184 | ||
5196 | printk(KERN_INFO "%s", version); | 5185 | printk(KERN_INFO "%s", version); |
5197 | 5186 | ||
@@ -5222,13 +5211,6 @@ static int __init bonding_init(void) | |||
5222 | 5211 | ||
5223 | goto out; | 5212 | goto out; |
5224 | err: | 5213 | err: |
5225 | list_for_each_entry(bond, &bond_dev_list, bond_list) { | ||
5226 | bond_work_cancel_all(bond); | ||
5227 | destroy_workqueue(bond->wq); | ||
5228 | } | ||
5229 | |||
5230 | bond_destroy_sysfs(); | ||
5231 | |||
5232 | rtnl_lock(); | 5214 | rtnl_lock(); |
5233 | bond_free_all(); | 5215 | bond_free_all(); |
5234 | rtnl_unlock(); | 5216 | rtnl_unlock(); |
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index e1bd690ff83..4f68aeb2679 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
@@ -3779,7 +3779,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, | |||
3779 | 3779 | ||
3780 | adapter->params.info = ai; | 3780 | adapter->params.info = ai; |
3781 | adapter->params.nports = ai->nports0 + ai->nports1; | 3781 | adapter->params.nports = ai->nports0 + ai->nports1; |
3782 | adapter->params.chan_map = !!ai->nports0 | (!!ai->nports1 << 1); | 3782 | adapter->params.chan_map = (!!ai->nports0) | (!!ai->nports1 << 1); |
3783 | adapter->params.rev = t3_read_reg(adapter, A_PL_REV); | 3783 | adapter->params.rev = t3_read_reg(adapter, A_PL_REV); |
3784 | /* | 3784 | /* |
3785 | * We used to only run the "adapter check task" once a second if | 3785 | * We used to only run the "adapter check task" once a second if |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 5c0b457c786..0f9ee134855 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2728,7 +2728,7 @@ static void __devexit e100_remove(struct pci_dev *pdev) | |||
2728 | #define E100_82552_SMARTSPEED 0x14 /* SmartSpeed Ctrl register */ | 2728 | #define E100_82552_SMARTSPEED 0x14 /* SmartSpeed Ctrl register */ |
2729 | #define E100_82552_REV_ANEG 0x0200 /* Reverse auto-negotiation */ | 2729 | #define E100_82552_REV_ANEG 0x0200 /* Reverse auto-negotiation */ |
2730 | #define E100_82552_ANEG_NOW 0x0400 /* Auto-negotiate now */ | 2730 | #define E100_82552_ANEG_NOW 0x0400 /* Auto-negotiate now */ |
2731 | static int e100_suspend(struct pci_dev *pdev, pm_message_t state) | 2731 | static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake) |
2732 | { | 2732 | { |
2733 | struct net_device *netdev = pci_get_drvdata(pdev); | 2733 | struct net_device *netdev = pci_get_drvdata(pdev); |
2734 | struct nic *nic = netdev_priv(netdev); | 2734 | struct nic *nic = netdev_priv(netdev); |
@@ -2749,19 +2749,32 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state) | |||
2749 | E100_82552_SMARTSPEED, smartspeed | | 2749 | E100_82552_SMARTSPEED, smartspeed | |
2750 | E100_82552_REV_ANEG | E100_82552_ANEG_NOW); | 2750 | E100_82552_REV_ANEG | E100_82552_ANEG_NOW); |
2751 | } | 2751 | } |
2752 | if (pci_enable_wake(pdev, PCI_D3cold, true)) | 2752 | *enable_wake = true; |
2753 | pci_enable_wake(pdev, PCI_D3hot, true); | ||
2754 | } else { | 2753 | } else { |
2755 | pci_enable_wake(pdev, PCI_D3hot, false); | 2754 | *enable_wake = false; |
2756 | } | 2755 | } |
2757 | 2756 | ||
2758 | pci_disable_device(pdev); | 2757 | pci_disable_device(pdev); |
2759 | pci_set_power_state(pdev, PCI_D3hot); | 2758 | } |
2760 | 2759 | ||
2761 | return 0; | 2760 | static int __e100_power_off(struct pci_dev *pdev, bool wake) |
2761 | { | ||
2762 | if (wake) { | ||
2763 | return pci_prepare_to_sleep(pdev); | ||
2764 | } else { | ||
2765 | pci_wake_from_d3(pdev, false); | ||
2766 | return pci_set_power_state(pdev, PCI_D3hot); | ||
2767 | } | ||
2762 | } | 2768 | } |
2763 | 2769 | ||
2764 | #ifdef CONFIG_PM | 2770 | #ifdef CONFIG_PM |
2771 | static int e100_suspend(struct pci_dev *pdev, pm_message_t state) | ||
2772 | { | ||
2773 | bool wake; | ||
2774 | __e100_shutdown(pdev, &wake); | ||
2775 | return __e100_power_off(pdev, wake); | ||
2776 | } | ||
2777 | |||
2765 | static int e100_resume(struct pci_dev *pdev) | 2778 | static int e100_resume(struct pci_dev *pdev) |
2766 | { | 2779 | { |
2767 | struct net_device *netdev = pci_get_drvdata(pdev); | 2780 | struct net_device *netdev = pci_get_drvdata(pdev); |
@@ -2792,7 +2805,10 @@ static int e100_resume(struct pci_dev *pdev) | |||
2792 | 2805 | ||
2793 | static void e100_shutdown(struct pci_dev *pdev) | 2806 | static void e100_shutdown(struct pci_dev *pdev) |
2794 | { | 2807 | { |
2795 | e100_suspend(pdev, PMSG_SUSPEND); | 2808 | bool wake; |
2809 | __e100_shutdown(pdev, &wake); | ||
2810 | if (system_state == SYSTEM_POWER_OFF) | ||
2811 | __e100_power_off(pdev, wake); | ||
2796 | } | 2812 | } |
2797 | 2813 | ||
2798 | /* ------------------ PCI Error Recovery infrastructure -------------- */ | 2814 | /* ------------------ PCI Error Recovery infrastructure -------------- */ |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 6a46ceed943..b1419e21b46 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -3738,7 +3738,7 @@ static irqreturn_t e1000_intr(int irq, void *data) | |||
3738 | struct e1000_hw *hw = &adapter->hw; | 3738 | struct e1000_hw *hw = &adapter->hw; |
3739 | u32 rctl, icr = er32(ICR); | 3739 | u32 rctl, icr = er32(ICR); |
3740 | 3740 | ||
3741 | if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags))) | 3741 | if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags))) |
3742 | return IRQ_NONE; /* Not our interrupt */ | 3742 | return IRQ_NONE; /* Not our interrupt */ |
3743 | 3743 | ||
3744 | /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is | 3744 | /* IMS will not auto-mask if INT_ASSERTED is not set, and if it is |
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index 6e317caf429..16a41389575 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
41 | 41 | ||
42 | #define DRV_NAME "ehea" | 42 | #define DRV_NAME "ehea" |
43 | #define DRV_VERSION "EHEA_0100" | 43 | #define DRV_VERSION "EHEA_0101" |
44 | 44 | ||
45 | /* eHEA capability flags */ | 45 | /* eHEA capability flags */ |
46 | #define DLPAR_PORT_ADD_REM 1 | 46 | #define DLPAR_PORT_ADD_REM 1 |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 604c844d076..b22dab9153f 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -545,14 +545,17 @@ static inline struct sk_buff *get_skb_by_index(struct sk_buff **skb_array, | |||
545 | x &= (arr_len - 1); | 545 | x &= (arr_len - 1); |
546 | 546 | ||
547 | pref = skb_array[x]; | 547 | pref = skb_array[x]; |
548 | prefetchw(pref); | 548 | if (pref) { |
549 | prefetchw(pref + EHEA_CACHE_LINE); | 549 | prefetchw(pref); |
550 | 550 | prefetchw(pref + EHEA_CACHE_LINE); | |
551 | pref = (skb_array[x]->data); | 551 | |
552 | prefetch(pref); | 552 | pref = (skb_array[x]->data); |
553 | prefetch(pref + EHEA_CACHE_LINE); | 553 | prefetch(pref); |
554 | prefetch(pref + EHEA_CACHE_LINE * 2); | 554 | prefetch(pref + EHEA_CACHE_LINE); |
555 | prefetch(pref + EHEA_CACHE_LINE * 3); | 555 | prefetch(pref + EHEA_CACHE_LINE * 2); |
556 | prefetch(pref + EHEA_CACHE_LINE * 3); | ||
557 | } | ||
558 | |||
556 | skb = skb_array[skb_index]; | 559 | skb = skb_array[skb_index]; |
557 | skb_array[skb_index] = NULL; | 560 | skb_array[skb_index] = NULL; |
558 | return skb; | 561 | return skb; |
@@ -569,12 +572,14 @@ static inline struct sk_buff *get_skb_by_index_ll(struct sk_buff **skb_array, | |||
569 | x &= (arr_len - 1); | 572 | x &= (arr_len - 1); |
570 | 573 | ||
571 | pref = skb_array[x]; | 574 | pref = skb_array[x]; |
572 | prefetchw(pref); | 575 | if (pref) { |
573 | prefetchw(pref + EHEA_CACHE_LINE); | 576 | prefetchw(pref); |
577 | prefetchw(pref + EHEA_CACHE_LINE); | ||
574 | 578 | ||
575 | pref = (skb_array[x]->data); | 579 | pref = (skb_array[x]->data); |
576 | prefetchw(pref); | 580 | prefetchw(pref); |
577 | prefetchw(pref + EHEA_CACHE_LINE); | 581 | prefetchw(pref + EHEA_CACHE_LINE); |
582 | } | ||
578 | 583 | ||
579 | skb = skb_array[wqe_index]; | 584 | skb = skb_array[wqe_index]; |
580 | skb_array[wqe_index] = NULL; | 585 | skb_array[wqe_index] = NULL; |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 11d5db16ed9..f9a846b1b92 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -1880,6 +1880,7 @@ static void nv_init_tx(struct net_device *dev) | |||
1880 | np->tx_pkts_in_progress = 0; | 1880 | np->tx_pkts_in_progress = 0; |
1881 | np->tx_change_owner = NULL; | 1881 | np->tx_change_owner = NULL; |
1882 | np->tx_end_flip = NULL; | 1882 | np->tx_end_flip = NULL; |
1883 | np->tx_stop = 0; | ||
1883 | 1884 | ||
1884 | for (i = 0; i < np->tx_ring_size; i++) { | 1885 | for (i = 0; i < np->tx_ring_size; i++) { |
1885 | if (!nv_optimized(np)) { | 1886 | if (!nv_optimized(np)) { |
@@ -2530,6 +2531,8 @@ static void nv_tx_timeout(struct net_device *dev) | |||
2530 | struct fe_priv *np = netdev_priv(dev); | 2531 | struct fe_priv *np = netdev_priv(dev); |
2531 | u8 __iomem *base = get_hwbase(dev); | 2532 | u8 __iomem *base = get_hwbase(dev); |
2532 | u32 status; | 2533 | u32 status; |
2534 | union ring_type put_tx; | ||
2535 | int saved_tx_limit; | ||
2533 | 2536 | ||
2534 | if (np->msi_flags & NV_MSI_X_ENABLED) | 2537 | if (np->msi_flags & NV_MSI_X_ENABLED) |
2535 | status = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQSTAT_MASK; | 2538 | status = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQSTAT_MASK; |
@@ -2589,24 +2592,32 @@ static void nv_tx_timeout(struct net_device *dev) | |||
2589 | /* 1) stop tx engine */ | 2592 | /* 1) stop tx engine */ |
2590 | nv_stop_tx(dev); | 2593 | nv_stop_tx(dev); |
2591 | 2594 | ||
2592 | /* 2) check that the packets were not sent already: */ | 2595 | /* 2) complete any outstanding tx and do not give HW any limited tx pkts */ |
2596 | saved_tx_limit = np->tx_limit; | ||
2597 | np->tx_limit = 0; /* prevent giving HW any limited pkts */ | ||
2598 | np->tx_stop = 0; /* prevent waking tx queue */ | ||
2593 | if (!nv_optimized(np)) | 2599 | if (!nv_optimized(np)) |
2594 | nv_tx_done(dev, np->tx_ring_size); | 2600 | nv_tx_done(dev, np->tx_ring_size); |
2595 | else | 2601 | else |
2596 | nv_tx_done_optimized(dev, np->tx_ring_size); | 2602 | nv_tx_done_optimized(dev, np->tx_ring_size); |
2597 | 2603 | ||
2598 | /* 3) if there are dead entries: clear everything */ | 2604 | /* save current HW postion */ |
2599 | if (np->get_tx_ctx != np->put_tx_ctx) { | 2605 | if (np->tx_change_owner) |
2600 | printk(KERN_DEBUG "%s: tx_timeout: dead entries!\n", dev->name); | 2606 | put_tx.ex = np->tx_change_owner->first_tx_desc; |
2601 | nv_drain_tx(dev); | 2607 | else |
2602 | nv_init_tx(dev); | 2608 | put_tx = np->put_tx; |
2603 | setup_hw_rings(dev, NV_SETUP_TX_RING); | ||
2604 | } | ||
2605 | 2609 | ||
2606 | netif_wake_queue(dev); | 2610 | /* 3) clear all tx state */ |
2611 | nv_drain_tx(dev); | ||
2612 | nv_init_tx(dev); | ||
2613 | |||
2614 | /* 4) restore state to current HW position */ | ||
2615 | np->get_tx = np->put_tx = put_tx; | ||
2616 | np->tx_limit = saved_tx_limit; | ||
2607 | 2617 | ||
2608 | /* 4) restart tx engine */ | 2618 | /* 5) restart tx engine */ |
2609 | nv_start_tx(dev); | 2619 | nv_start_tx(dev); |
2620 | netif_wake_queue(dev); | ||
2610 | spin_unlock_irq(&np->lock); | 2621 | spin_unlock_irq(&np->lock); |
2611 | } | 2622 | } |
2612 | 2623 | ||
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 08c801490c7..e25343588fc 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -2006,7 +2006,7 @@ static void igb_setup_rctl(struct igb_adapter *adapter) | |||
2006 | struct e1000_hw *hw = &adapter->hw; | 2006 | struct e1000_hw *hw = &adapter->hw; |
2007 | u32 rctl; | 2007 | u32 rctl; |
2008 | u32 srrctl = 0; | 2008 | u32 srrctl = 0; |
2009 | int i, j; | 2009 | int i; |
2010 | 2010 | ||
2011 | rctl = rd32(E1000_RCTL); | 2011 | rctl = rd32(E1000_RCTL); |
2012 | 2012 | ||
@@ -2071,8 +2071,6 @@ static void igb_setup_rctl(struct igb_adapter *adapter) | |||
2071 | if (adapter->vfs_allocated_count) { | 2071 | if (adapter->vfs_allocated_count) { |
2072 | u32 vmolr; | 2072 | u32 vmolr; |
2073 | 2073 | ||
2074 | j = adapter->rx_ring[0].reg_idx; | ||
2075 | |||
2076 | /* set all queue drop enable bits */ | 2074 | /* set all queue drop enable bits */ |
2077 | wr32(E1000_QDE, ALL_QUEUES); | 2075 | wr32(E1000_QDE, ALL_QUEUES); |
2078 | srrctl |= E1000_SRRCTL_DROP_EN; | 2076 | srrctl |= E1000_SRRCTL_DROP_EN; |
@@ -2080,16 +2078,16 @@ static void igb_setup_rctl(struct igb_adapter *adapter) | |||
2080 | /* disable queue 0 to prevent tail write w/o re-config */ | 2078 | /* disable queue 0 to prevent tail write w/o re-config */ |
2081 | wr32(E1000_RXDCTL(0), 0); | 2079 | wr32(E1000_RXDCTL(0), 0); |
2082 | 2080 | ||
2083 | vmolr = rd32(E1000_VMOLR(j)); | 2081 | vmolr = rd32(E1000_VMOLR(adapter->vfs_allocated_count)); |
2084 | if (rctl & E1000_RCTL_LPE) | 2082 | if (rctl & E1000_RCTL_LPE) |
2085 | vmolr |= E1000_VMOLR_LPE; | 2083 | vmolr |= E1000_VMOLR_LPE; |
2086 | if (adapter->num_rx_queues > 0) | 2084 | if (adapter->num_rx_queues > 1) |
2087 | vmolr |= E1000_VMOLR_RSSE; | 2085 | vmolr |= E1000_VMOLR_RSSE; |
2088 | wr32(E1000_VMOLR(j), vmolr); | 2086 | wr32(E1000_VMOLR(adapter->vfs_allocated_count), vmolr); |
2089 | } | 2087 | } |
2090 | 2088 | ||
2091 | for (i = 0; i < adapter->num_rx_queues; i++) { | 2089 | for (i = 0; i < adapter->num_rx_queues; i++) { |
2092 | j = adapter->rx_ring[i].reg_idx; | 2090 | int j = adapter->rx_ring[i].reg_idx; |
2093 | wr32(E1000_SRRCTL(j), srrctl); | 2091 | wr32(E1000_SRRCTL(j), srrctl); |
2094 | } | 2092 | } |
2095 | 2093 | ||
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c index 5567519676d..186a65069b3 100644 --- a/drivers/net/ixgbe/ixgbe_common.c +++ b/drivers/net/ixgbe/ixgbe_common.c | |||
@@ -50,7 +50,6 @@ static u16 ixgbe_calc_eeprom_checksum(struct ixgbe_hw *hw); | |||
50 | static void ixgbe_enable_rar(struct ixgbe_hw *hw, u32 index); | 50 | static void ixgbe_enable_rar(struct ixgbe_hw *hw, u32 index); |
51 | static void ixgbe_disable_rar(struct ixgbe_hw *hw, u32 index); | 51 | static void ixgbe_disable_rar(struct ixgbe_hw *hw, u32 index); |
52 | static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr); | 52 | static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr); |
53 | static void ixgbe_add_mc_addr(struct ixgbe_hw *hw, u8 *mc_addr); | ||
54 | static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq); | 53 | static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq); |
55 | 54 | ||
56 | /** | 55 | /** |
@@ -1377,8 +1376,7 @@ s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, u8 *addr_list, | |||
1377 | * Clear accounting of old secondary address list, | 1376 | * Clear accounting of old secondary address list, |
1378 | * don't count RAR[0] | 1377 | * don't count RAR[0] |
1379 | */ | 1378 | */ |
1380 | uc_addr_in_use = hw->addr_ctrl.rar_used_count - | 1379 | uc_addr_in_use = hw->addr_ctrl.rar_used_count - 1; |
1381 | hw->addr_ctrl.mc_addr_in_rar_count - 1; | ||
1382 | hw->addr_ctrl.rar_used_count -= uc_addr_in_use; | 1380 | hw->addr_ctrl.rar_used_count -= uc_addr_in_use; |
1383 | hw->addr_ctrl.overflow_promisc = 0; | 1381 | hw->addr_ctrl.overflow_promisc = 0; |
1384 | 1382 | ||
@@ -1493,40 +1491,6 @@ static void ixgbe_set_mta(struct ixgbe_hw *hw, u8 *mc_addr) | |||
1493 | } | 1491 | } |
1494 | 1492 | ||
1495 | /** | 1493 | /** |
1496 | * ixgbe_add_mc_addr - Adds a multicast address. | ||
1497 | * @hw: pointer to hardware structure | ||
1498 | * @mc_addr: new multicast address | ||
1499 | * | ||
1500 | * Adds it to unused receive address register or to the multicast table. | ||
1501 | **/ | ||
1502 | static void ixgbe_add_mc_addr(struct ixgbe_hw *hw, u8 *mc_addr) | ||
1503 | { | ||
1504 | u32 rar_entries = hw->mac.num_rar_entries; | ||
1505 | u32 rar; | ||
1506 | |||
1507 | hw_dbg(hw, " MC Addr =%.2X %.2X %.2X %.2X %.2X %.2X\n", | ||
1508 | mc_addr[0], mc_addr[1], mc_addr[2], | ||
1509 | mc_addr[3], mc_addr[4], mc_addr[5]); | ||
1510 | |||
1511 | /* | ||
1512 | * Place this multicast address in the RAR if there is room, | ||
1513 | * else put it in the MTA | ||
1514 | */ | ||
1515 | if (hw->addr_ctrl.rar_used_count < rar_entries) { | ||
1516 | /* use RAR from the end up for multicast */ | ||
1517 | rar = rar_entries - hw->addr_ctrl.mc_addr_in_rar_count - 1; | ||
1518 | hw->mac.ops.set_rar(hw, rar, mc_addr, 0, IXGBE_RAH_AV); | ||
1519 | hw_dbg(hw, "Added a multicast address to RAR[%d]\n", rar); | ||
1520 | hw->addr_ctrl.rar_used_count++; | ||
1521 | hw->addr_ctrl.mc_addr_in_rar_count++; | ||
1522 | } else { | ||
1523 | ixgbe_set_mta(hw, mc_addr); | ||
1524 | } | ||
1525 | |||
1526 | hw_dbg(hw, "ixgbe_add_mc_addr Complete\n"); | ||
1527 | } | ||
1528 | |||
1529 | /** | ||
1530 | * ixgbe_update_mc_addr_list_generic - Updates MAC list of multicast addresses | 1494 | * ixgbe_update_mc_addr_list_generic - Updates MAC list of multicast addresses |
1531 | * @hw: pointer to hardware structure | 1495 | * @hw: pointer to hardware structure |
1532 | * @mc_addr_list: the list of new multicast addresses | 1496 | * @mc_addr_list: the list of new multicast addresses |
@@ -1542,7 +1506,6 @@ s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list, | |||
1542 | u32 mc_addr_count, ixgbe_mc_addr_itr next) | 1506 | u32 mc_addr_count, ixgbe_mc_addr_itr next) |
1543 | { | 1507 | { |
1544 | u32 i; | 1508 | u32 i; |
1545 | u32 rar_entries = hw->mac.num_rar_entries; | ||
1546 | u32 vmdq; | 1509 | u32 vmdq; |
1547 | 1510 | ||
1548 | /* | 1511 | /* |
@@ -1550,18 +1513,8 @@ s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list, | |||
1550 | * use. | 1513 | * use. |
1551 | */ | 1514 | */ |
1552 | hw->addr_ctrl.num_mc_addrs = mc_addr_count; | 1515 | hw->addr_ctrl.num_mc_addrs = mc_addr_count; |
1553 | hw->addr_ctrl.rar_used_count -= hw->addr_ctrl.mc_addr_in_rar_count; | ||
1554 | hw->addr_ctrl.mc_addr_in_rar_count = 0; | ||
1555 | hw->addr_ctrl.mta_in_use = 0; | 1516 | hw->addr_ctrl.mta_in_use = 0; |
1556 | 1517 | ||
1557 | /* Zero out the other receive addresses. */ | ||
1558 | hw_dbg(hw, "Clearing RAR[%d-%d]\n", hw->addr_ctrl.rar_used_count, | ||
1559 | rar_entries - 1); | ||
1560 | for (i = hw->addr_ctrl.rar_used_count; i < rar_entries; i++) { | ||
1561 | IXGBE_WRITE_REG(hw, IXGBE_RAL(i), 0); | ||
1562 | IXGBE_WRITE_REG(hw, IXGBE_RAH(i), 0); | ||
1563 | } | ||
1564 | |||
1565 | /* Clear the MTA */ | 1518 | /* Clear the MTA */ |
1566 | hw_dbg(hw, " Clearing MTA\n"); | 1519 | hw_dbg(hw, " Clearing MTA\n"); |
1567 | for (i = 0; i < hw->mac.mcft_size; i++) | 1520 | for (i = 0; i < hw->mac.mcft_size; i++) |
@@ -1570,7 +1523,7 @@ s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list, | |||
1570 | /* Add the new addresses */ | 1523 | /* Add the new addresses */ |
1571 | for (i = 0; i < mc_addr_count; i++) { | 1524 | for (i = 0; i < mc_addr_count; i++) { |
1572 | hw_dbg(hw, " Adding the multicast addresses:\n"); | 1525 | hw_dbg(hw, " Adding the multicast addresses:\n"); |
1573 | ixgbe_add_mc_addr(hw, next(hw, &mc_addr_list, &vmdq)); | 1526 | ixgbe_set_mta(hw, next(hw, &mc_addr_list, &vmdq)); |
1574 | } | 1527 | } |
1575 | 1528 | ||
1576 | /* Enable mta */ | 1529 | /* Enable mta */ |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 01884256f4c..07e778d3e5d 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -3646,6 +3646,8 @@ static int ixgbe_resume(struct pci_dev *pdev) | |||
3646 | 3646 | ||
3647 | ixgbe_reset(adapter); | 3647 | ixgbe_reset(adapter); |
3648 | 3648 | ||
3649 | IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0); | ||
3650 | |||
3649 | if (netif_running(netdev)) { | 3651 | if (netif_running(netdev)) { |
3650 | err = ixgbe_open(adapter->netdev); | 3652 | err = ixgbe_open(adapter->netdev); |
3651 | if (err) | 3653 | if (err) |
@@ -4575,7 +4577,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
4575 | const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data]; | 4577 | const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data]; |
4576 | static int cards_found; | 4578 | static int cards_found; |
4577 | int i, err, pci_using_dac; | 4579 | int i, err, pci_using_dac; |
4578 | u16 pm_value = 0; | ||
4579 | u32 part_num, eec; | 4580 | u32 part_num, eec; |
4580 | 4581 | ||
4581 | err = pci_enable_device(pdev); | 4582 | err = pci_enable_device(pdev); |
@@ -4763,11 +4764,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
4763 | 4764 | ||
4764 | switch (pdev->device) { | 4765 | switch (pdev->device) { |
4765 | case IXGBE_DEV_ID_82599_KX4: | 4766 | case IXGBE_DEV_ID_82599_KX4: |
4766 | #define IXGBE_PCIE_PMCSR 0x44 | 4767 | adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX | |
4767 | adapter->wol = IXGBE_WUFC_MAG; | 4768 | IXGBE_WUFC_MC | IXGBE_WUFC_BC); |
4768 | pci_read_config_word(pdev, IXGBE_PCIE_PMCSR, &pm_value); | ||
4769 | pci_write_config_word(pdev, IXGBE_PCIE_PMCSR, | ||
4770 | (pm_value | (1 << 8))); | ||
4771 | break; | 4769 | break; |
4772 | default: | 4770 | default: |
4773 | adapter->wol = 0; | 4771 | adapter->wol = 0; |
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c index 438678ab2a1..7bcc49de163 100644 --- a/drivers/net/mlx4/en_netdev.c +++ b/drivers/net/mlx4/en_netdev.c | |||
@@ -583,7 +583,7 @@ int mlx4_en_start_port(struct net_device *dev) | |||
583 | err = mlx4_en_activate_cq(priv, cq); | 583 | err = mlx4_en_activate_cq(priv, cq); |
584 | if (err) { | 584 | if (err) { |
585 | mlx4_err(mdev, "Failed activating Rx CQ\n"); | 585 | mlx4_err(mdev, "Failed activating Rx CQ\n"); |
586 | goto rx_err; | 586 | goto cq_err; |
587 | } | 587 | } |
588 | for (j = 0; j < cq->size; j++) | 588 | for (j = 0; j < cq->size; j++) |
589 | cq->buf[j].owner_sr_opcode = MLX4_CQE_OWNER_MASK; | 589 | cq->buf[j].owner_sr_opcode = MLX4_CQE_OWNER_MASK; |
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c index 0cbb78ca7b2..9ee873e872b 100644 --- a/drivers/net/mlx4/en_rx.c +++ b/drivers/net/mlx4/en_rx.c | |||
@@ -610,6 +610,10 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv, | |||
610 | used_frags = mlx4_en_complete_rx_desc(priv, rx_desc, skb_frags, | 610 | used_frags = mlx4_en_complete_rx_desc(priv, rx_desc, skb_frags, |
611 | skb_shinfo(skb)->frags, | 611 | skb_shinfo(skb)->frags, |
612 | page_alloc, length); | 612 | page_alloc, length); |
613 | if (unlikely(!used_frags)) { | ||
614 | kfree_skb(skb); | ||
615 | return NULL; | ||
616 | } | ||
613 | skb_shinfo(skb)->nr_frags = used_frags; | 617 | skb_shinfo(skb)->nr_frags = used_frags; |
614 | 618 | ||
615 | /* Copy headers into the skb linear buffer */ | 619 | /* Copy headers into the skb linear buffer */ |
@@ -947,7 +951,6 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, | |||
947 | if (err) { | 951 | if (err) { |
948 | mlx4_err(mdev, "Failed to allocate qp #%d\n", qpn); | 952 | mlx4_err(mdev, "Failed to allocate qp #%d\n", qpn); |
949 | goto out; | 953 | goto out; |
950 | return err; | ||
951 | } | 954 | } |
952 | qp->event = mlx4_en_sqp_event; | 955 | qp->event = mlx4_en_sqp_event; |
953 | 956 | ||
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index b3185bf2c15..a400d7115f7 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -393,12 +393,12 @@ struct mv643xx_eth_private { | |||
393 | struct work_struct tx_timeout_task; | 393 | struct work_struct tx_timeout_task; |
394 | 394 | ||
395 | struct napi_struct napi; | 395 | struct napi_struct napi; |
396 | u8 oom; | ||
396 | u8 work_link; | 397 | u8 work_link; |
397 | u8 work_tx; | 398 | u8 work_tx; |
398 | u8 work_tx_end; | 399 | u8 work_tx_end; |
399 | u8 work_rx; | 400 | u8 work_rx; |
400 | u8 work_rx_refill; | 401 | u8 work_rx_refill; |
401 | u8 work_rx_oom; | ||
402 | 402 | ||
403 | int skb_size; | 403 | int skb_size; |
404 | struct sk_buff_head rx_recycle; | 404 | struct sk_buff_head rx_recycle; |
@@ -661,7 +661,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget) | |||
661 | dma_get_cache_alignment() - 1); | 661 | dma_get_cache_alignment() - 1); |
662 | 662 | ||
663 | if (skb == NULL) { | 663 | if (skb == NULL) { |
664 | mp->work_rx_oom |= 1 << rxq->index; | 664 | mp->oom = 1; |
665 | goto oom; | 665 | goto oom; |
666 | } | 666 | } |
667 | 667 | ||
@@ -1255,7 +1255,6 @@ static void mib_counters_update(struct mv643xx_eth_private *mp) | |||
1255 | 1255 | ||
1256 | spin_lock_bh(&mp->mib_counters_lock); | 1256 | spin_lock_bh(&mp->mib_counters_lock); |
1257 | p->good_octets_received += mib_read(mp, 0x00); | 1257 | p->good_octets_received += mib_read(mp, 0x00); |
1258 | p->good_octets_received += (u64)mib_read(mp, 0x04) << 32; | ||
1259 | p->bad_octets_received += mib_read(mp, 0x08); | 1258 | p->bad_octets_received += mib_read(mp, 0x08); |
1260 | p->internal_mac_transmit_err += mib_read(mp, 0x0c); | 1259 | p->internal_mac_transmit_err += mib_read(mp, 0x0c); |
1261 | p->good_frames_received += mib_read(mp, 0x10); | 1260 | p->good_frames_received += mib_read(mp, 0x10); |
@@ -1269,7 +1268,6 @@ static void mib_counters_update(struct mv643xx_eth_private *mp) | |||
1269 | p->frames_512_to_1023_octets += mib_read(mp, 0x30); | 1268 | p->frames_512_to_1023_octets += mib_read(mp, 0x30); |
1270 | p->frames_1024_to_max_octets += mib_read(mp, 0x34); | 1269 | p->frames_1024_to_max_octets += mib_read(mp, 0x34); |
1271 | p->good_octets_sent += mib_read(mp, 0x38); | 1270 | p->good_octets_sent += mib_read(mp, 0x38); |
1272 | p->good_octets_sent += (u64)mib_read(mp, 0x3c) << 32; | ||
1273 | p->good_frames_sent += mib_read(mp, 0x40); | 1271 | p->good_frames_sent += mib_read(mp, 0x40); |
1274 | p->excessive_collision += mib_read(mp, 0x44); | 1272 | p->excessive_collision += mib_read(mp, 0x44); |
1275 | p->multicast_frames_sent += mib_read(mp, 0x48); | 1273 | p->multicast_frames_sent += mib_read(mp, 0x48); |
@@ -2167,8 +2165,10 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
2167 | 2165 | ||
2168 | mp = container_of(napi, struct mv643xx_eth_private, napi); | 2166 | mp = container_of(napi, struct mv643xx_eth_private, napi); |
2169 | 2167 | ||
2170 | mp->work_rx_refill |= mp->work_rx_oom; | 2168 | if (unlikely(mp->oom)) { |
2171 | mp->work_rx_oom = 0; | 2169 | mp->oom = 0; |
2170 | del_timer(&mp->rx_oom); | ||
2171 | } | ||
2172 | 2172 | ||
2173 | work_done = 0; | 2173 | work_done = 0; |
2174 | while (work_done < budget) { | 2174 | while (work_done < budget) { |
@@ -2182,8 +2182,10 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
2182 | continue; | 2182 | continue; |
2183 | } | 2183 | } |
2184 | 2184 | ||
2185 | queue_mask = mp->work_tx | mp->work_tx_end | | 2185 | queue_mask = mp->work_tx | mp->work_tx_end | mp->work_rx; |
2186 | mp->work_rx | mp->work_rx_refill; | 2186 | if (likely(!mp->oom)) |
2187 | queue_mask |= mp->work_rx_refill; | ||
2188 | |||
2187 | if (!queue_mask) { | 2189 | if (!queue_mask) { |
2188 | if (mv643xx_eth_collect_events(mp)) | 2190 | if (mv643xx_eth_collect_events(mp)) |
2189 | continue; | 2191 | continue; |
@@ -2204,7 +2206,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
2204 | txq_maybe_wake(mp->txq + queue); | 2206 | txq_maybe_wake(mp->txq + queue); |
2205 | } else if (mp->work_rx & queue_mask) { | 2207 | } else if (mp->work_rx & queue_mask) { |
2206 | work_done += rxq_process(mp->rxq + queue, work_tbd); | 2208 | work_done += rxq_process(mp->rxq + queue, work_tbd); |
2207 | } else if (mp->work_rx_refill & queue_mask) { | 2209 | } else if (!mp->oom && (mp->work_rx_refill & queue_mask)) { |
2208 | work_done += rxq_refill(mp->rxq + queue, work_tbd); | 2210 | work_done += rxq_refill(mp->rxq + queue, work_tbd); |
2209 | } else { | 2211 | } else { |
2210 | BUG(); | 2212 | BUG(); |
@@ -2212,7 +2214,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
2212 | } | 2214 | } |
2213 | 2215 | ||
2214 | if (work_done < budget) { | 2216 | if (work_done < budget) { |
2215 | if (mp->work_rx_oom) | 2217 | if (mp->oom) |
2216 | mod_timer(&mp->rx_oom, jiffies + (HZ / 10)); | 2218 | mod_timer(&mp->rx_oom, jiffies + (HZ / 10)); |
2217 | napi_complete(napi); | 2219 | napi_complete(napi); |
2218 | wrlp(mp, INT_MASK, INT_TX_END | INT_RX | INT_EXT); | 2220 | wrlp(mp, INT_MASK, INT_TX_END | INT_RX | INT_EXT); |
@@ -2372,7 +2374,7 @@ static int mv643xx_eth_open(struct net_device *dev) | |||
2372 | rxq_refill(mp->rxq + i, INT_MAX); | 2374 | rxq_refill(mp->rxq + i, INT_MAX); |
2373 | } | 2375 | } |
2374 | 2376 | ||
2375 | if (mp->work_rx_oom) { | 2377 | if (mp->oom) { |
2376 | mp->rx_oom.expires = jiffies + (HZ / 10); | 2378 | mp->rx_oom.expires = jiffies + (HZ / 10); |
2377 | add_timer(&mp->rx_oom); | 2379 | add_timer(&mp->rx_oom); |
2378 | } | 2380 | } |
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index eb66f658f9d..7d83896b8c2 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
@@ -374,18 +374,17 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev, | |||
374 | dev->ethtool_ops = &ne2k_pci_ethtool_ops; | 374 | dev->ethtool_ops = &ne2k_pci_ethtool_ops; |
375 | NS8390_init(dev, 0); | 375 | NS8390_init(dev, 0); |
376 | 376 | ||
377 | memcpy(dev->dev_addr, SA_prom, 6); | ||
378 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
379 | |||
377 | i = register_netdev(dev); | 380 | i = register_netdev(dev); |
378 | if (i) | 381 | if (i) |
379 | goto err_out_free_netdev; | 382 | goto err_out_free_netdev; |
380 | 383 | ||
381 | for(i = 0; i < 6; i++) | ||
382 | dev->dev_addr[i] = SA_prom[i]; | ||
383 | printk("%s: %s found at %#lx, IRQ %d, %pM.\n", | 384 | printk("%s: %s found at %#lx, IRQ %d, %pM.\n", |
384 | dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq, | 385 | dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq, |
385 | dev->dev_addr); | 386 | dev->dev_addr); |
386 | 387 | ||
387 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
388 | |||
389 | return 0; | 388 | return 0; |
390 | 389 | ||
391 | err_out_free_netdev: | 390 | err_out_free_netdev: |
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index eceadf787a6..bf4af5248cb 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c | |||
@@ -664,7 +664,7 @@ static int netconsole_netdev_event(struct notifier_block *this, | |||
664 | struct netconsole_target *nt; | 664 | struct netconsole_target *nt; |
665 | struct net_device *dev = ptr; | 665 | struct net_device *dev = ptr; |
666 | 666 | ||
667 | if (!(event == NETDEV_CHANGENAME)) | 667 | if (!(event == NETDEV_CHANGENAME || event == NETDEV_UNREGISTER)) |
668 | goto done; | 668 | goto done; |
669 | 669 | ||
670 | spin_lock_irqsave(&target_list_lock, flags); | 670 | spin_lock_irqsave(&target_list_lock, flags); |
@@ -675,6 +675,15 @@ static int netconsole_netdev_event(struct notifier_block *this, | |||
675 | case NETDEV_CHANGENAME: | 675 | case NETDEV_CHANGENAME: |
676 | strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); | 676 | strlcpy(nt->np.dev_name, dev->name, IFNAMSIZ); |
677 | break; | 677 | break; |
678 | case NETDEV_UNREGISTER: | ||
679 | if (!nt->enabled) | ||
680 | break; | ||
681 | netpoll_cleanup(&nt->np); | ||
682 | nt->enabled = 0; | ||
683 | printk(KERN_INFO "netconsole: network logging stopped" | ||
684 | ", interface %s unregistered\n", | ||
685 | dev->name); | ||
686 | break; | ||
678 | } | 687 | } |
679 | } | 688 | } |
680 | netconsole_target_put(nt); | 689 | netconsole_target_put(nt); |
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 8ee21030e9a..dfc6cf765fb 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig | |||
@@ -180,6 +180,20 @@ config USB_NET_CDCETHER | |||
180 | IEEE 802 "local assignment" bit is set in the address, a "usbX" | 180 | IEEE 802 "local assignment" bit is set in the address, a "usbX" |
181 | name is used instead. | 181 | name is used instead. |
182 | 182 | ||
183 | config USB_NET_CDC_EEM | ||
184 | tristate "CDC EEM support" | ||
185 | depends on USB_USBNET && EXPERIMENTAL | ||
186 | help | ||
187 | This option supports devices conforming to the Communication Device | ||
188 | Class (CDC) Ethernet Emulation Model, a specification that's easy to | ||
189 | implement in device firmware. The CDC EEM specifications are available | ||
190 | from <http://www.usb.org/>. | ||
191 | |||
192 | This driver creates an interface named "ethX", where X depends on | ||
193 | what other networking devices you have in use. However, if the | ||
194 | IEEE 802 "local assignment" bit is set in the address, a "usbX" | ||
195 | name is used instead. | ||
196 | |||
183 | config USB_NET_DM9601 | 197 | config USB_NET_DM9601 |
184 | tristate "Davicom DM9601 based USB 1.1 10/100 ethernet devices" | 198 | tristate "Davicom DM9601 based USB 1.1 10/100 ethernet devices" |
185 | depends on USB_USBNET | 199 | depends on USB_USBNET |
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index 88a87eeb376..c8aef62cf2b 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile | |||
@@ -9,6 +9,7 @@ obj-$(CONFIG_USB_RTL8150) += rtl8150.o | |||
9 | obj-$(CONFIG_USB_HSO) += hso.o | 9 | obj-$(CONFIG_USB_HSO) += hso.o |
10 | obj-$(CONFIG_USB_NET_AX8817X) += asix.o | 10 | obj-$(CONFIG_USB_NET_AX8817X) += asix.o |
11 | obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o | 11 | obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o |
12 | obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o | ||
12 | obj-$(CONFIG_USB_NET_DM9601) += dm9601.o | 13 | obj-$(CONFIG_USB_NET_DM9601) += dm9601.o |
13 | obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o | 14 | obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o |
14 | obj-$(CONFIG_USB_NET_GL620A) += gl620a.o | 15 | obj-$(CONFIG_USB_NET_GL620A) += gl620a.o |
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c new file mode 100644 index 00000000000..80e01778dd3 --- /dev/null +++ b/drivers/net/usb/cdc_eem.c | |||
@@ -0,0 +1,381 @@ | |||
1 | /* | ||
2 | * USB CDC EEM network interface driver | ||
3 | * Copyright (C) 2009 Oberthur Technologies | ||
4 | * by Omar Laazimani, Olivier Condemine | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | #include <linux/module.h> | ||
22 | #include <linux/init.h> | ||
23 | #include <linux/netdevice.h> | ||
24 | #include <linux/etherdevice.h> | ||
25 | #include <linux/ctype.h> | ||
26 | #include <linux/ethtool.h> | ||
27 | #include <linux/workqueue.h> | ||
28 | #include <linux/mii.h> | ||
29 | #include <linux/usb.h> | ||
30 | #include <linux/crc32.h> | ||
31 | #include <linux/usb/cdc.h> | ||
32 | #include <linux/usb/usbnet.h> | ||
33 | |||
34 | |||
35 | /* | ||
36 | * This driver is an implementation of the CDC "Ethernet Emulation | ||
37 | * Model" (EEM) specification, which encapsulates Ethernet frames | ||
38 | * for transport over USB using a simpler USB device model than the | ||
39 | * previous CDC "Ethernet Control Model" (ECM, or "CDC Ethernet"). | ||
40 | * | ||
41 | * For details, see www.usb.org/developers/devclass_docs/CDC_EEM10.pdf | ||
42 | * | ||
43 | * This version has been tested with GIGAntIC WuaoW SIM Smart Card on 2.6.24, | ||
44 | * 2.6.27 and 2.6.30rc2 kernel. | ||
45 | * It has also been validated on Openmoko Om 2008.12 (based on 2.6.24 kernel). | ||
46 | * build on 23-April-2009 | ||
47 | */ | ||
48 | |||
49 | #define EEM_HEAD 2 /* 2 byte header */ | ||
50 | |||
51 | /*-------------------------------------------------------------------------*/ | ||
52 | |||
53 | static void eem_linkcmd_complete(struct urb *urb) | ||
54 | { | ||
55 | dev_kfree_skb(urb->context); | ||
56 | usb_free_urb(urb); | ||
57 | } | ||
58 | |||
59 | static void eem_linkcmd(struct usbnet *dev, struct sk_buff *skb) | ||
60 | { | ||
61 | struct urb *urb; | ||
62 | int status; | ||
63 | |||
64 | urb = usb_alloc_urb(0, GFP_ATOMIC); | ||
65 | if (!urb) | ||
66 | goto fail; | ||
67 | |||
68 | usb_fill_bulk_urb(urb, dev->udev, dev->out, | ||
69 | skb->data, skb->len, eem_linkcmd_complete, skb); | ||
70 | |||
71 | status = usb_submit_urb(urb, GFP_ATOMIC); | ||
72 | if (status) { | ||
73 | usb_free_urb(urb); | ||
74 | fail: | ||
75 | dev_kfree_skb(skb); | ||
76 | devwarn(dev, "link cmd failure\n"); | ||
77 | return; | ||
78 | } | ||
79 | } | ||
80 | |||
81 | static int eem_bind(struct usbnet *dev, struct usb_interface *intf) | ||
82 | { | ||
83 | int status = 0; | ||
84 | |||
85 | status = usbnet_get_endpoints(dev, intf); | ||
86 | if (status < 0) { | ||
87 | usb_set_intfdata(intf, NULL); | ||
88 | usb_driver_release_interface(driver_of(intf), intf); | ||
89 | return status; | ||
90 | } | ||
91 | |||
92 | /* no jumbogram (16K) support for now */ | ||
93 | |||
94 | dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN; | ||
95 | |||
96 | return 0; | ||
97 | } | ||
98 | |||
99 | /* | ||
100 | * EEM permits packing multiple Ethernet frames into USB transfers | ||
101 | * (a "bundle"), but for TX we don't try to do that. | ||
102 | */ | ||
103 | static struct sk_buff *eem_tx_fixup(struct usbnet *dev, struct sk_buff *skb, | ||
104 | gfp_t flags) | ||
105 | { | ||
106 | struct sk_buff *skb2 = NULL; | ||
107 | u16 len = skb->len; | ||
108 | u32 crc = 0; | ||
109 | int padlen = 0; | ||
110 | |||
111 | /* When ((len + EEM_HEAD + ETH_FCS_LEN) % dev->maxpacket) is | ||
112 | * zero, stick two bytes of zero length EEM packet on the end. | ||
113 | * Else the framework would add invalid single byte padding, | ||
114 | * since it can't know whether ZLPs will be handled right by | ||
115 | * all the relevant hardware and software. | ||
116 | */ | ||
117 | if (!((len + EEM_HEAD + ETH_FCS_LEN) % dev->maxpacket)) | ||
118 | padlen += 2; | ||
119 | |||
120 | if (!skb_cloned(skb)) { | ||
121 | int headroom = skb_headroom(skb); | ||
122 | int tailroom = skb_tailroom(skb); | ||
123 | |||
124 | if ((tailroom >= ETH_FCS_LEN + padlen) | ||
125 | && (headroom >= EEM_HEAD)) | ||
126 | goto done; | ||
127 | |||
128 | if ((headroom + tailroom) | ||
129 | > (EEM_HEAD + ETH_FCS_LEN + padlen)) { | ||
130 | skb->data = memmove(skb->head + | ||
131 | EEM_HEAD, | ||
132 | skb->data, | ||
133 | skb->len); | ||
134 | skb_set_tail_pointer(skb, len); | ||
135 | goto done; | ||
136 | } | ||
137 | } | ||
138 | |||
139 | skb2 = skb_copy_expand(skb, EEM_HEAD, ETH_FCS_LEN + padlen, flags); | ||
140 | if (!skb2) | ||
141 | return NULL; | ||
142 | |||
143 | dev_kfree_skb_any(skb); | ||
144 | skb = skb2; | ||
145 | |||
146 | done: | ||
147 | /* we don't use the "no Ethernet CRC" option */ | ||
148 | crc = crc32_le(~0, skb->data, skb->len); | ||
149 | crc = ~crc; | ||
150 | |||
151 | put_unaligned_le32(crc, skb_put(skb, 4)); | ||
152 | |||
153 | /* EEM packet header format: | ||
154 | * b0..13: length of ethernet frame | ||
155 | * b14: bmCRC (1 == valid Ethernet CRC) | ||
156 | * b15: bmType (0 == data) | ||
157 | */ | ||
158 | len = skb->len; | ||
159 | put_unaligned_le16(BIT(14) | len, skb_push(skb, 2)); | ||
160 | |||
161 | /* Bundle a zero length EEM packet if needed */ | ||
162 | if (padlen) | ||
163 | put_unaligned_le16(0, skb_put(skb, 2)); | ||
164 | |||
165 | return skb; | ||
166 | } | ||
167 | |||
168 | static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | ||
169 | { | ||
170 | /* | ||
171 | * Our task here is to strip off framing, leaving skb with one | ||
172 | * data frame for the usbnet framework code to process. But we | ||
173 | * may have received multiple EEM payloads, or command payloads. | ||
174 | * So we must process _everything_ as if it's a header, except | ||
175 | * maybe the last data payload | ||
176 | * | ||
177 | * REVISIT the framework needs updating so that when we consume | ||
178 | * all payloads (the last or only message was a command, or a | ||
179 | * zero length EEM packet) that is not accounted as an rx_error. | ||
180 | */ | ||
181 | do { | ||
182 | struct sk_buff *skb2 = NULL; | ||
183 | u16 header; | ||
184 | u16 len = 0; | ||
185 | |||
186 | /* incomplete EEM header? */ | ||
187 | if (skb->len < EEM_HEAD) | ||
188 | return 0; | ||
189 | |||
190 | /* | ||
191 | * EEM packet header format: | ||
192 | * b0..14: EEM type dependant (Data or Command) | ||
193 | * b15: bmType | ||
194 | */ | ||
195 | header = get_unaligned_le16(skb->data); | ||
196 | skb_pull(skb, EEM_HEAD); | ||
197 | |||
198 | /* | ||
199 | * The bmType bit helps to denote when EEM | ||
200 | * packet is data or command : | ||
201 | * bmType = 0 : EEM data payload | ||
202 | * bmType = 1 : EEM (link) command | ||
203 | */ | ||
204 | if (header & BIT(15)) { | ||
205 | u16 bmEEMCmd; | ||
206 | |||
207 | /* | ||
208 | * EEM (link) command packet: | ||
209 | * b0..10: bmEEMCmdParam | ||
210 | * b11..13: bmEEMCmd | ||
211 | * b14: bmReserved (must be 0) | ||
212 | * b15: 1 (EEM command) | ||
213 | */ | ||
214 | if (header & BIT(14)) { | ||
215 | devdbg(dev, "reserved command %04x\n", header); | ||
216 | continue; | ||
217 | } | ||
218 | |||
219 | bmEEMCmd = (header >> 11) & 0x7; | ||
220 | switch (bmEEMCmd) { | ||
221 | |||
222 | /* Responding to echo requests is mandatory. */ | ||
223 | case 0: /* Echo command */ | ||
224 | len = header & 0x7FF; | ||
225 | |||
226 | /* bogus command? */ | ||
227 | if (skb->len < len) | ||
228 | return 0; | ||
229 | |||
230 | skb2 = skb_clone(skb, GFP_ATOMIC); | ||
231 | if (unlikely(!skb2)) | ||
232 | goto next; | ||
233 | skb_trim(skb2, len); | ||
234 | put_unaligned_le16(BIT(15) | (1 << 11) | len, | ||
235 | skb_push(skb2, 2)); | ||
236 | eem_linkcmd(dev, skb2); | ||
237 | break; | ||
238 | |||
239 | /* | ||
240 | * Host may choose to ignore hints. | ||
241 | * - suspend: peripheral ready to suspend | ||
242 | * - response: suggest N millisec polling | ||
243 | * - response complete: suggest N sec polling | ||
244 | */ | ||
245 | case 2: /* Suspend hint */ | ||
246 | case 3: /* Response hint */ | ||
247 | case 4: /* Response complete hint */ | ||
248 | continue; | ||
249 | |||
250 | /* | ||
251 | * Hosts should never receive host-to-peripheral | ||
252 | * or reserved command codes; or responses to an | ||
253 | * echo command we didn't send. | ||
254 | */ | ||
255 | case 1: /* Echo response */ | ||
256 | case 5: /* Tickle */ | ||
257 | default: /* reserved */ | ||
258 | devwarn(dev, "unexpected link command %d\n", | ||
259 | bmEEMCmd); | ||
260 | continue; | ||
261 | } | ||
262 | |||
263 | } else { | ||
264 | u32 crc, crc2; | ||
265 | int is_last; | ||
266 | |||
267 | /* zero length EEM packet? */ | ||
268 | if (header == 0) | ||
269 | continue; | ||
270 | |||
271 | /* | ||
272 | * EEM data packet header : | ||
273 | * b0..13: length of ethernet frame | ||
274 | * b14: bmCRC | ||
275 | * b15: 0 (EEM data) | ||
276 | */ | ||
277 | len = header & 0x3FFF; | ||
278 | |||
279 | /* bogus EEM payload? */ | ||
280 | if (skb->len < len) | ||
281 | return 0; | ||
282 | |||
283 | /* bogus ethernet frame? */ | ||
284 | if (len < (ETH_HLEN + ETH_FCS_LEN)) | ||
285 | goto next; | ||
286 | |||
287 | /* | ||
288 | * Treat the last payload differently: framework | ||
289 | * code expects our "fixup" to have stripped off | ||
290 | * headers, so "skb" is a data packet (or error). | ||
291 | * Else if it's not the last payload, keep "skb" | ||
292 | * for further processing. | ||
293 | */ | ||
294 | is_last = (len == skb->len); | ||
295 | if (is_last) | ||
296 | skb2 = skb; | ||
297 | else { | ||
298 | skb2 = skb_clone(skb, GFP_ATOMIC); | ||
299 | if (unlikely(!skb2)) | ||
300 | return 0; | ||
301 | } | ||
302 | |||
303 | crc = get_unaligned_le32(skb2->data | ||
304 | + len - ETH_FCS_LEN); | ||
305 | skb_trim(skb2, len - ETH_FCS_LEN); | ||
306 | |||
307 | /* | ||
308 | * The bmCRC helps to denote when the CRC field in | ||
309 | * the Ethernet frame contains a calculated CRC: | ||
310 | * bmCRC = 1 : CRC is calculated | ||
311 | * bmCRC = 0 : CRC = 0xDEADBEEF | ||
312 | */ | ||
313 | if (header & BIT(14)) | ||
314 | crc2 = ~crc32_le(~0, skb2->data, len); | ||
315 | else | ||
316 | crc2 = 0xdeadbeef; | ||
317 | |||
318 | if (is_last) | ||
319 | return crc == crc2; | ||
320 | |||
321 | if (unlikely(crc != crc2)) { | ||
322 | dev->stats.rx_errors++; | ||
323 | dev_kfree_skb_any(skb2); | ||
324 | } else | ||
325 | usbnet_skb_return(dev, skb2); | ||
326 | } | ||
327 | |||
328 | next: | ||
329 | skb_pull(skb, len); | ||
330 | } while (skb->len); | ||
331 | |||
332 | return 1; | ||
333 | } | ||
334 | |||
335 | static const struct driver_info eem_info = { | ||
336 | .description = "CDC EEM Device", | ||
337 | .flags = FLAG_ETHER, | ||
338 | .bind = eem_bind, | ||
339 | .rx_fixup = eem_rx_fixup, | ||
340 | .tx_fixup = eem_tx_fixup, | ||
341 | }; | ||
342 | |||
343 | /*-------------------------------------------------------------------------*/ | ||
344 | |||
345 | static const struct usb_device_id products[] = { | ||
346 | { | ||
347 | USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_EEM, | ||
348 | USB_CDC_PROTO_EEM), | ||
349 | .driver_info = (unsigned long) &eem_info, | ||
350 | }, | ||
351 | { | ||
352 | /* EMPTY == end of list */ | ||
353 | }, | ||
354 | }; | ||
355 | MODULE_DEVICE_TABLE(usb, products); | ||
356 | |||
357 | static struct usb_driver eem_driver = { | ||
358 | .name = "cdc_eem", | ||
359 | .id_table = products, | ||
360 | .probe = usbnet_probe, | ||
361 | .disconnect = usbnet_disconnect, | ||
362 | .suspend = usbnet_suspend, | ||
363 | .resume = usbnet_resume, | ||
364 | }; | ||
365 | |||
366 | |||
367 | static int __init eem_init(void) | ||
368 | { | ||
369 | return usb_register(&eem_driver); | ||
370 | } | ||
371 | module_init(eem_init); | ||
372 | |||
373 | static void __exit eem_exit(void) | ||
374 | { | ||
375 | usb_deregister(&eem_driver); | ||
376 | } | ||
377 | module_exit(eem_exit); | ||
378 | |||
379 | MODULE_AUTHOR("Omar Laazimani <omar.oberthur@gmail.com>"); | ||
380 | MODULE_DESCRIPTION("USB CDC EEM"); | ||
381 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index dc166532659..5a7283372b5 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
@@ -941,6 +941,16 @@ static int smsc95xx_reset(struct usbnet *dev) | |||
941 | if (netif_msg_ifup(dev)) | 941 | if (netif_msg_ifup(dev)) |
942 | devdbg(dev, "ID_REV = 0x%08x", read_buf); | 942 | devdbg(dev, "ID_REV = 0x%08x", read_buf); |
943 | 943 | ||
944 | /* Configure GPIO pins as LED outputs */ | ||
945 | write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED | | ||
946 | LED_GPIO_CFG_FDX_LED; | ||
947 | ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf); | ||
948 | if (ret < 0) { | ||
949 | devwarn(dev, "Failed to write LED_GPIO_CFG register, ret=%d", | ||
950 | ret); | ||
951 | return ret; | ||
952 | } | ||
953 | |||
944 | /* Init Tx */ | 954 | /* Init Tx */ |
945 | write_buf = 0; | 955 | write_buf = 0; |
946 | ret = smsc95xx_write_reg(dev, FLOW, write_buf); | 956 | ret = smsc95xx_write_reg(dev, FLOW, write_buf); |
@@ -1231,6 +1241,11 @@ static const struct usb_device_id products[] = { | |||
1231 | USB_DEVICE(0x0424, 0x9500), | 1241 | USB_DEVICE(0x0424, 0x9500), |
1232 | .driver_info = (unsigned long) &smsc95xx_info, | 1242 | .driver_info = (unsigned long) &smsc95xx_info, |
1233 | }, | 1243 | }, |
1244 | { | ||
1245 | /* SMSC9512/9514 USB Hub & Ethernet Device */ | ||
1246 | USB_DEVICE(0x0424, 0xec00), | ||
1247 | .driver_info = (unsigned long) &smsc95xx_info, | ||
1248 | }, | ||
1234 | { }, /* END */ | 1249 | { }, /* END */ |
1235 | }; | 1250 | }; |
1236 | MODULE_DEVICE_TABLE(usb, products); | 1251 | MODULE_DEVICE_TABLE(usb, products); |
diff --git a/drivers/net/usb/smsc95xx.h b/drivers/net/usb/smsc95xx.h index 66b5c84f302..86bc44977fb 100644 --- a/drivers/net/usb/smsc95xx.h +++ b/drivers/net/usb/smsc95xx.h | |||
@@ -99,6 +99,9 @@ | |||
99 | #define PM_CTL_WUPS_MULTI_ (0x00000003) | 99 | #define PM_CTL_WUPS_MULTI_ (0x00000003) |
100 | 100 | ||
101 | #define LED_GPIO_CFG (0x24) | 101 | #define LED_GPIO_CFG (0x24) |
102 | #define LED_GPIO_CFG_SPD_LED (0x01000000) | ||
103 | #define LED_GPIO_CFG_LNK_LED (0x00100000) | ||
104 | #define LED_GPIO_CFG_FDX_LED (0x00010000) | ||
102 | 105 | ||
103 | #define GPIO_CFG (0x28) | 106 | #define GPIO_CFG (0x28) |
104 | 107 | ||
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 015db1cece7..8e56fcf0a0e 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c | |||
@@ -210,14 +210,11 @@ rx_drop: | |||
210 | 210 | ||
211 | static struct net_device_stats *veth_get_stats(struct net_device *dev) | 211 | static struct net_device_stats *veth_get_stats(struct net_device *dev) |
212 | { | 212 | { |
213 | struct veth_priv *priv; | 213 | struct veth_priv *priv = netdev_priv(dev); |
214 | struct net_device_stats *dev_stats; | 214 | struct net_device_stats *dev_stats = &dev->stats; |
215 | int cpu; | 215 | unsigned int cpu; |
216 | struct veth_net_stats *stats; | 216 | struct veth_net_stats *stats; |
217 | 217 | ||
218 | priv = netdev_priv(dev); | ||
219 | dev_stats = &dev->stats; | ||
220 | |||
221 | dev_stats->rx_packets = 0; | 218 | dev_stats->rx_packets = 0; |
222 | dev_stats->tx_packets = 0; | 219 | dev_stats->tx_packets = 0; |
223 | dev_stats->rx_bytes = 0; | 220 | dev_stats->rx_bytes = 0; |
@@ -225,16 +222,17 @@ static struct net_device_stats *veth_get_stats(struct net_device *dev) | |||
225 | dev_stats->tx_dropped = 0; | 222 | dev_stats->tx_dropped = 0; |
226 | dev_stats->rx_dropped = 0; | 223 | dev_stats->rx_dropped = 0; |
227 | 224 | ||
228 | for_each_online_cpu(cpu) { | 225 | if (priv->stats) |
229 | stats = per_cpu_ptr(priv->stats, cpu); | 226 | for_each_online_cpu(cpu) { |
227 | stats = per_cpu_ptr(priv->stats, cpu); | ||
230 | 228 | ||
231 | dev_stats->rx_packets += stats->rx_packets; | 229 | dev_stats->rx_packets += stats->rx_packets; |
232 | dev_stats->tx_packets += stats->tx_packets; | 230 | dev_stats->tx_packets += stats->tx_packets; |
233 | dev_stats->rx_bytes += stats->rx_bytes; | 231 | dev_stats->rx_bytes += stats->rx_bytes; |
234 | dev_stats->tx_bytes += stats->tx_bytes; | 232 | dev_stats->tx_bytes += stats->tx_bytes; |
235 | dev_stats->tx_dropped += stats->tx_dropped; | 233 | dev_stats->tx_dropped += stats->tx_dropped; |
236 | dev_stats->rx_dropped += stats->rx_dropped; | 234 | dev_stats->rx_dropped += stats->rx_dropped; |
237 | } | 235 | } |
238 | 236 | ||
239 | return dev_stats; | 237 | return dev_stats; |
240 | } | 238 | } |
@@ -261,6 +259,8 @@ static int veth_close(struct net_device *dev) | |||
261 | netif_carrier_off(dev); | 259 | netif_carrier_off(dev); |
262 | netif_carrier_off(priv->peer); | 260 | netif_carrier_off(priv->peer); |
263 | 261 | ||
262 | free_percpu(priv->stats); | ||
263 | priv->stats = NULL; | ||
264 | return 0; | 264 | return 0; |
265 | } | 265 | } |
266 | 266 | ||
@@ -291,15 +291,6 @@ static int veth_dev_init(struct net_device *dev) | |||
291 | return 0; | 291 | return 0; |
292 | } | 292 | } |
293 | 293 | ||
294 | static void veth_dev_free(struct net_device *dev) | ||
295 | { | ||
296 | struct veth_priv *priv; | ||
297 | |||
298 | priv = netdev_priv(dev); | ||
299 | free_percpu(priv->stats); | ||
300 | free_netdev(dev); | ||
301 | } | ||
302 | |||
303 | static const struct net_device_ops veth_netdev_ops = { | 294 | static const struct net_device_ops veth_netdev_ops = { |
304 | .ndo_init = veth_dev_init, | 295 | .ndo_init = veth_dev_init, |
305 | .ndo_open = veth_open, | 296 | .ndo_open = veth_open, |
@@ -317,7 +308,7 @@ static void veth_setup(struct net_device *dev) | |||
317 | dev->netdev_ops = &veth_netdev_ops; | 308 | dev->netdev_ops = &veth_netdev_ops; |
318 | dev->ethtool_ops = &veth_ethtool_ops; | 309 | dev->ethtool_ops = &veth_ethtool_ops; |
319 | dev->features |= NETIF_F_LLTX; | 310 | dev->features |= NETIF_F_LLTX; |
320 | dev->destructor = veth_dev_free; | 311 | dev->destructor = free_netdev; |
321 | } | 312 | } |
322 | 313 | ||
323 | /* | 314 | /* |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9c82a39497e..4d1d47953fc 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -616,10 +616,11 @@ static int virtnet_open(struct net_device *dev) | |||
616 | static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, | 616 | static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, |
617 | struct scatterlist *data, int out, int in) | 617 | struct scatterlist *data, int out, int in) |
618 | { | 618 | { |
619 | struct scatterlist sg[VIRTNET_SEND_COMMAND_SG_MAX + 2]; | 619 | struct scatterlist *s, sg[VIRTNET_SEND_COMMAND_SG_MAX + 2]; |
620 | struct virtio_net_ctrl_hdr ctrl; | 620 | struct virtio_net_ctrl_hdr ctrl; |
621 | virtio_net_ctrl_ack status = ~0; | 621 | virtio_net_ctrl_ack status = ~0; |
622 | unsigned int tmp; | 622 | unsigned int tmp; |
623 | int i; | ||
623 | 624 | ||
624 | if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) { | 625 | if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ)) { |
625 | BUG(); /* Caller should know better */ | 626 | BUG(); /* Caller should know better */ |
@@ -637,7 +638,8 @@ static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd, | |||
637 | sg_init_table(sg, out + in); | 638 | sg_init_table(sg, out + in); |
638 | 639 | ||
639 | sg_set_buf(&sg[0], &ctrl, sizeof(ctrl)); | 640 | sg_set_buf(&sg[0], &ctrl, sizeof(ctrl)); |
640 | memcpy(&sg[1], data, sizeof(struct scatterlist) * (out + in - 2)); | 641 | for_each_sg(data, s, out + in - 2, i) |
642 | sg_set_buf(&sg[i + 1], sg_virt(s), s->length); | ||
641 | sg_set_buf(&sg[out + in - 1], &status, sizeof(status)); | 643 | sg_set_buf(&sg[out + in - 1], &status, sizeof(status)); |
642 | 644 | ||
643 | if (vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) != 0) | 645 | if (vi->cvq->vq_ops->add_buf(vi->cvq, sg, out, in, vi) != 0) |
@@ -692,7 +694,7 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
692 | promisc = ((dev->flags & IFF_PROMISC) != 0); | 694 | promisc = ((dev->flags & IFF_PROMISC) != 0); |
693 | allmulti = ((dev->flags & IFF_ALLMULTI) != 0); | 695 | allmulti = ((dev->flags & IFF_ALLMULTI) != 0); |
694 | 696 | ||
695 | sg_set_buf(sg, &promisc, sizeof(promisc)); | 697 | sg_init_one(sg, &promisc, sizeof(promisc)); |
696 | 698 | ||
697 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, | 699 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, |
698 | VIRTIO_NET_CTRL_RX_PROMISC, | 700 | VIRTIO_NET_CTRL_RX_PROMISC, |
@@ -700,7 +702,7 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
700 | dev_warn(&dev->dev, "Failed to %sable promisc mode.\n", | 702 | dev_warn(&dev->dev, "Failed to %sable promisc mode.\n", |
701 | promisc ? "en" : "dis"); | 703 | promisc ? "en" : "dis"); |
702 | 704 | ||
703 | sg_set_buf(sg, &allmulti, sizeof(allmulti)); | 705 | sg_init_one(sg, &allmulti, sizeof(allmulti)); |
704 | 706 | ||
705 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, | 707 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_RX, |
706 | VIRTIO_NET_CTRL_RX_ALLMULTI, | 708 | VIRTIO_NET_CTRL_RX_ALLMULTI, |
@@ -716,6 +718,8 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
716 | return; | 718 | return; |
717 | } | 719 | } |
718 | 720 | ||
721 | sg_init_table(sg, 2); | ||
722 | |||
719 | /* Store the unicast list and count in the front of the buffer */ | 723 | /* Store the unicast list and count in the front of the buffer */ |
720 | mac_data->entries = dev->uc_count; | 724 | mac_data->entries = dev->uc_count; |
721 | addr = dev->uc_list; | 725 | addr = dev->uc_list; |
@@ -744,24 +748,24 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
744 | kfree(buf); | 748 | kfree(buf); |
745 | } | 749 | } |
746 | 750 | ||
747 | static void virnet_vlan_rx_add_vid(struct net_device *dev, u16 vid) | 751 | static void virtnet_vlan_rx_add_vid(struct net_device *dev, u16 vid) |
748 | { | 752 | { |
749 | struct virtnet_info *vi = netdev_priv(dev); | 753 | struct virtnet_info *vi = netdev_priv(dev); |
750 | struct scatterlist sg; | 754 | struct scatterlist sg; |
751 | 755 | ||
752 | sg_set_buf(&sg, &vid, sizeof(vid)); | 756 | sg_init_one(&sg, &vid, sizeof(vid)); |
753 | 757 | ||
754 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, | 758 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, |
755 | VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0)) | 759 | VIRTIO_NET_CTRL_VLAN_ADD, &sg, 1, 0)) |
756 | dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid); | 760 | dev_warn(&dev->dev, "Failed to add VLAN ID %d.\n", vid); |
757 | } | 761 | } |
758 | 762 | ||
759 | static void virnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid) | 763 | static void virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid) |
760 | { | 764 | { |
761 | struct virtnet_info *vi = netdev_priv(dev); | 765 | struct virtnet_info *vi = netdev_priv(dev); |
762 | struct scatterlist sg; | 766 | struct scatterlist sg; |
763 | 767 | ||
764 | sg_set_buf(&sg, &vid, sizeof(vid)); | 768 | sg_init_one(&sg, &vid, sizeof(vid)); |
765 | 769 | ||
766 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, | 770 | if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_VLAN, |
767 | VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0)) | 771 | VIRTIO_NET_CTRL_VLAN_DEL, &sg, 1, 0)) |
@@ -794,8 +798,8 @@ static const struct net_device_ops virtnet_netdev = { | |||
794 | .ndo_set_mac_address = virtnet_set_mac_address, | 798 | .ndo_set_mac_address = virtnet_set_mac_address, |
795 | .ndo_set_rx_mode = virtnet_set_rx_mode, | 799 | .ndo_set_rx_mode = virtnet_set_rx_mode, |
796 | .ndo_change_mtu = virtnet_change_mtu, | 800 | .ndo_change_mtu = virtnet_change_mtu, |
797 | .ndo_vlan_rx_add_vid = virnet_vlan_rx_add_vid, | 801 | .ndo_vlan_rx_add_vid = virtnet_vlan_rx_add_vid, |
798 | .ndo_vlan_rx_kill_vid = virnet_vlan_rx_kill_vid, | 802 | .ndo_vlan_rx_kill_vid = virtnet_vlan_rx_kill_vid, |
799 | #ifdef CONFIG_NET_POLL_CONTROLLER | 803 | #ifdef CONFIG_NET_POLL_CONTROLLER |
800 | .ndo_poll_controller = virtnet_netpoll, | 804 | .ndo_poll_controller = virtnet_netpoll, |
801 | #endif | 805 | #endif |
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 3bf7d3f447d..765a7f5d6aa 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c | |||
@@ -1249,7 +1249,7 @@ static int __devinit hss_init_one(struct platform_device *pdev) | |||
1249 | return -ENOMEM; | 1249 | return -ENOMEM; |
1250 | 1250 | ||
1251 | if ((port->npe = npe_request(0)) == NULL) { | 1251 | if ((port->npe = npe_request(0)) == NULL) { |
1252 | err = -ENOSYS; | 1252 | err = -ENODEV; |
1253 | goto err_free; | 1253 | goto err_free; |
1254 | } | 1254 | } |
1255 | 1255 | ||
@@ -1311,7 +1311,7 @@ static int __init hss_init_module(void) | |||
1311 | if ((ixp4xx_read_feature_bits() & | 1311 | if ((ixp4xx_read_feature_bits() & |
1312 | (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) != | 1312 | (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) != |
1313 | (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) | 1313 | (IXP4XX_FEATURE_HDLC | IXP4XX_FEATURE_HSS)) |
1314 | return -ENOSYS; | 1314 | return -ENODEV; |
1315 | 1315 | ||
1316 | spin_lock_init(&npe_lock); | 1316 | spin_lock_init(&npe_lock); |
1317 | 1317 | ||
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c index 9770bb3d40f..4904a07e4b5 100644 --- a/drivers/net/wireless/ath5k/debug.c +++ b/drivers/net/wireless/ath5k/debug.c | |||
@@ -424,7 +424,7 @@ ath5k_debug_dump_bands(struct ath5k_softc *sc) | |||
424 | 424 | ||
425 | for (b = 0; b < IEEE80211_NUM_BANDS; b++) { | 425 | for (b = 0; b < IEEE80211_NUM_BANDS; b++) { |
426 | struct ieee80211_supported_band *band = &sc->sbands[b]; | 426 | struct ieee80211_supported_band *band = &sc->sbands[b]; |
427 | char bname[5]; | 427 | char bname[6]; |
428 | switch (band->band) { | 428 | switch (band->band) { |
429 | case IEEE80211_BAND_2GHZ: | 429 | case IEEE80211_BAND_2GHZ: |
430 | strcpy(bname, "2 GHz"); | 430 | strcpy(bname, "2 GHz"); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 23644cf884f..e7c65c4f741 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
@@ -925,11 +925,11 @@ void iwl_bg_scan_completed(struct work_struct *work) | |||
925 | 925 | ||
926 | IWL_DEBUG_SCAN(priv, "SCAN complete scan\n"); | 926 | IWL_DEBUG_SCAN(priv, "SCAN complete scan\n"); |
927 | 927 | ||
928 | ieee80211_scan_completed(priv->hw, false); | ||
929 | |||
928 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) | 930 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) |
929 | return; | 931 | return; |
930 | 932 | ||
931 | ieee80211_scan_completed(priv->hw, false); | ||
932 | |||
933 | /* Since setting the TXPOWER may have been deferred while | 933 | /* Since setting the TXPOWER may have been deferred while |
934 | * performing the scan, fire one off */ | 934 | * performing the scan, fire one off */ |
935 | mutex_lock(&priv->mutex); | 935 | mutex_lock(&priv->mutex); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 5798fe49c77..44ab03a12e4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -719,6 +719,14 @@ static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, | |||
719 | { | 719 | { |
720 | unsigned long flags; | 720 | unsigned long flags; |
721 | int ret = 0; | 721 | int ret = 0; |
722 | __le16 key_flags = 0; | ||
723 | |||
724 | key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK); | ||
725 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); | ||
726 | key_flags &= ~STA_KEY_FLG_INVALID; | ||
727 | |||
728 | if (sta_id == priv->hw_params.bcast_sta_id) | ||
729 | key_flags |= STA_KEY_MULTICAST_MSK; | ||
722 | 730 | ||
723 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; | 731 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; |
724 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; | 732 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; |
@@ -738,6 +746,9 @@ static int iwl_set_tkip_dynamic_key_info(struct iwl_priv *priv, | |||
738 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, | 746 | WARN(priv->stations[sta_id].sta.key.key_offset == WEP_INVALID_OFFSET, |
739 | "no space for a new key"); | 747 | "no space for a new key"); |
740 | 748 | ||
749 | priv->stations[sta_id].sta.key.key_flags = key_flags; | ||
750 | |||
751 | |||
741 | /* This copy is acutally not needed: we get the key with each TX */ | 752 | /* This copy is acutally not needed: we get the key with each TX */ |
742 | memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16); | 753 | memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key, 16); |
743 | 754 | ||
@@ -754,9 +765,7 @@ void iwl_update_tkip_key(struct iwl_priv *priv, | |||
754 | { | 765 | { |
755 | u8 sta_id = IWL_INVALID_STATION; | 766 | u8 sta_id = IWL_INVALID_STATION; |
756 | unsigned long flags; | 767 | unsigned long flags; |
757 | __le16 key_flags = 0; | ||
758 | int i; | 768 | int i; |
759 | DECLARE_MAC_BUF(mac); | ||
760 | 769 | ||
761 | sta_id = iwl_find_station(priv, addr); | 770 | sta_id = iwl_find_station(priv, addr); |
762 | if (sta_id == IWL_INVALID_STATION) { | 771 | if (sta_id == IWL_INVALID_STATION) { |
@@ -771,16 +780,8 @@ void iwl_update_tkip_key(struct iwl_priv *priv, | |||
771 | return; | 780 | return; |
772 | } | 781 | } |
773 | 782 | ||
774 | key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK); | ||
775 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); | ||
776 | key_flags &= ~STA_KEY_FLG_INVALID; | ||
777 | |||
778 | if (sta_id == priv->hw_params.bcast_sta_id) | ||
779 | key_flags |= STA_KEY_MULTICAST_MSK; | ||
780 | |||
781 | spin_lock_irqsave(&priv->sta_lock, flags); | 783 | spin_lock_irqsave(&priv->sta_lock, flags); |
782 | 784 | ||
783 | priv->stations[sta_id].sta.key.key_flags = key_flags; | ||
784 | priv->stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32; | 785 | priv->stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32; |
785 | 786 | ||
786 | for (i = 0; i < 5; i++) | 787 | for (i = 0; i < 5; i++) |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 617c4235d97..4cce6613350 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -1694,7 +1694,6 @@ void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq) | |||
1694 | rxq->free_count = 0; | 1694 | rxq->free_count = 0; |
1695 | spin_unlock_irqrestore(&rxq->lock, flags); | 1695 | spin_unlock_irqrestore(&rxq->lock, flags); |
1696 | } | 1696 | } |
1697 | EXPORT_SYMBOL(iwl3945_rx_queue_reset); | ||
1698 | 1697 | ||
1699 | /* | 1698 | /* |
1700 | * this should be called while priv->lock is locked | 1699 | * this should be called while priv->lock is locked |
@@ -1745,7 +1744,6 @@ static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rx | |||
1745 | rxq->bd = NULL; | 1744 | rxq->bd = NULL; |
1746 | rxq->rb_stts = NULL; | 1745 | rxq->rb_stts = NULL; |
1747 | } | 1746 | } |
1748 | EXPORT_SYMBOL(iwl3945_rx_queue_free); | ||
1749 | 1747 | ||
1750 | 1748 | ||
1751 | /* Convert linear signal-to-noise ratio into dB */ | 1749 | /* Convert linear signal-to-noise ratio into dB */ |
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index db91db77650..bebf735cd4b 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -2558,6 +2558,11 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf) | |||
2558 | mutex_init(&priv->command_lock); | 2558 | mutex_init(&priv->command_lock); |
2559 | spin_lock_init(&priv->stats_lock); | 2559 | spin_lock_init(&priv->stats_lock); |
2560 | 2560 | ||
2561 | /* because rndis_command() sleeps we need to use workqueue */ | ||
2562 | priv->workqueue = create_singlethread_workqueue("rndis_wlan"); | ||
2563 | INIT_WORK(&priv->work, rndis_wext_worker); | ||
2564 | INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats); | ||
2565 | |||
2561 | /* try bind rndis_host */ | 2566 | /* try bind rndis_host */ |
2562 | retval = generic_rndis_bind(usbdev, intf, FLAG_RNDIS_PHYM_WIRELESS); | 2567 | retval = generic_rndis_bind(usbdev, intf, FLAG_RNDIS_PHYM_WIRELESS); |
2563 | if (retval < 0) | 2568 | if (retval < 0) |
@@ -2603,16 +2608,17 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf) | |||
2603 | disassociate(usbdev, 1); | 2608 | disassociate(usbdev, 1); |
2604 | netif_carrier_off(usbdev->net); | 2609 | netif_carrier_off(usbdev->net); |
2605 | 2610 | ||
2606 | /* because rndis_command() sleeps we need to use workqueue */ | ||
2607 | priv->workqueue = create_singlethread_workqueue("rndis_wlan"); | ||
2608 | INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats); | ||
2609 | queue_delayed_work(priv->workqueue, &priv->stats_work, | 2611 | queue_delayed_work(priv->workqueue, &priv->stats_work, |
2610 | round_jiffies_relative(STATS_UPDATE_JIFFIES)); | 2612 | round_jiffies_relative(STATS_UPDATE_JIFFIES)); |
2611 | INIT_WORK(&priv->work, rndis_wext_worker); | ||
2612 | 2613 | ||
2613 | return 0; | 2614 | return 0; |
2614 | 2615 | ||
2615 | fail: | 2616 | fail: |
2617 | cancel_delayed_work_sync(&priv->stats_work); | ||
2618 | cancel_work_sync(&priv->work); | ||
2619 | flush_workqueue(priv->workqueue); | ||
2620 | destroy_workqueue(priv->workqueue); | ||
2621 | |||
2616 | kfree(priv); | 2622 | kfree(priv); |
2617 | return retval; | 2623 | return retval; |
2618 | } | 2624 | } |
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 001b328adf8..a563fbe559d 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
@@ -59,6 +59,10 @@ | |||
59 | #define DMA_32BIT_PFN IOVA_PFN(DMA_BIT_MASK(32)) | 59 | #define DMA_32BIT_PFN IOVA_PFN(DMA_BIT_MASK(32)) |
60 | #define DMA_64BIT_PFN IOVA_PFN(DMA_BIT_MASK(64)) | 60 | #define DMA_64BIT_PFN IOVA_PFN(DMA_BIT_MASK(64)) |
61 | 61 | ||
62 | #ifndef PHYSICAL_PAGE_MASK | ||
63 | #define PHYSICAL_PAGE_MASK PAGE_MASK | ||
64 | #endif | ||
65 | |||
62 | /* global iommu list, set NULL for ignored DMAR units */ | 66 | /* global iommu list, set NULL for ignored DMAR units */ |
63 | static struct intel_iommu **g_iommus; | 67 | static struct intel_iommu **g_iommus; |
64 | 68 | ||
@@ -1216,7 +1220,7 @@ static void dmar_init_reserved_ranges(void) | |||
1216 | if (!r->flags || !(r->flags & IORESOURCE_MEM)) | 1220 | if (!r->flags || !(r->flags & IORESOURCE_MEM)) |
1217 | continue; | 1221 | continue; |
1218 | addr = r->start; | 1222 | addr = r->start; |
1219 | addr &= PAGE_MASK; | 1223 | addr &= PHYSICAL_PAGE_MASK; |
1220 | size = r->end - addr; | 1224 | size = r->end - addr; |
1221 | size = PAGE_ALIGN(size); | 1225 | size = PAGE_ALIGN(size); |
1222 | iova = reserve_iova(&reserved_iova_list, IOVA_PFN(addr), | 1226 | iova = reserve_iova(&reserved_iova_list, IOVA_PFN(addr), |
@@ -2173,7 +2177,8 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr, | |||
2173 | * is not a big problem | 2177 | * is not a big problem |
2174 | */ | 2178 | */ |
2175 | ret = domain_page_mapping(domain, start_paddr, | 2179 | ret = domain_page_mapping(domain, start_paddr, |
2176 | ((u64)paddr) & PAGE_MASK, size, prot); | 2180 | ((u64)paddr) & PHYSICAL_PAGE_MASK, |
2181 | size, prot); | ||
2177 | if (ret) | 2182 | if (ret) |
2178 | goto error; | 2183 | goto error; |
2179 | 2184 | ||
@@ -2463,8 +2468,8 @@ static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int ne | |||
2463 | addr = page_to_phys(sg_page(sg)) + sg->offset; | 2468 | addr = page_to_phys(sg_page(sg)) + sg->offset; |
2464 | size = aligned_size((u64)addr, sg->length); | 2469 | size = aligned_size((u64)addr, sg->length); |
2465 | ret = domain_page_mapping(domain, start_addr + offset, | 2470 | ret = domain_page_mapping(domain, start_addr + offset, |
2466 | ((u64)addr) & PAGE_MASK, | 2471 | ((u64)addr) & PHYSICAL_PAGE_MASK, |
2467 | size, prot); | 2472 | size, prot); |
2468 | if (ret) { | 2473 | if (ret) { |
2469 | /* clear the page */ | 2474 | /* clear the page */ |
2470 | dma_pte_clear_range(domain, start_addr, | 2475 | dma_pte_clear_range(domain, start_addr, |
diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl4030.c index a6341e4f9a0..9c8c70c497d 100644 --- a/drivers/rtc/rtc-twl4030.c +++ b/drivers/rtc/rtc-twl4030.c | |||
@@ -495,9 +495,7 @@ static int twl4030_rtc_suspend(struct platform_device *pdev, pm_message_t state) | |||
495 | { | 495 | { |
496 | irqstat = rtc_irq_bits; | 496 | irqstat = rtc_irq_bits; |
497 | 497 | ||
498 | /* REVISIT alarm may need to wake us from sleep */ | 498 | mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M); |
499 | mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M | | ||
500 | BIT_RTC_INTERRUPTS_REG_IT_ALARM_M); | ||
501 | return 0; | 499 | return 0; |
502 | } | 500 | } |
503 | 501 | ||
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 616c60ffcf2..3ac27ee4739 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c | |||
@@ -97,9 +97,7 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) | |||
97 | ccw_device_set_online(adapter->ccw_device); | 97 | ccw_device_set_online(adapter->ccw_device); |
98 | 98 | ||
99 | zfcp_erp_wait(adapter); | 99 | zfcp_erp_wait(adapter); |
100 | wait_event(adapter->erp_done_wqh, | 100 | flush_work(&unit->scsi_work); |
101 | !(atomic_read(&unit->status) & | ||
102 | ZFCP_STATUS_UNIT_SCSI_WORK_PENDING)); | ||
103 | 101 | ||
104 | down(&zfcp_data.config_sema); | 102 | down(&zfcp_data.config_sema); |
105 | zfcp_unit_put(unit); | 103 | zfcp_unit_put(unit); |
@@ -279,6 +277,7 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun) | |||
279 | 277 | ||
280 | atomic_set(&unit->refcount, 0); | 278 | atomic_set(&unit->refcount, 0); |
281 | init_waitqueue_head(&unit->remove_wq); | 279 | init_waitqueue_head(&unit->remove_wq); |
280 | INIT_WORK(&unit->scsi_work, zfcp_scsi_scan); | ||
282 | 281 | ||
283 | unit->port = port; | 282 | unit->port = port; |
284 | unit->fcp_lun = fcp_lun; | 283 | unit->fcp_lun = fcp_lun; |
@@ -525,6 +524,8 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device) | |||
525 | 524 | ||
526 | atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status); | 525 | atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status); |
527 | 526 | ||
527 | zfcp_fc_nameserver_init(adapter); | ||
528 | |||
528 | if (!zfcp_adapter_scsi_register(adapter)) | 529 | if (!zfcp_adapter_scsi_register(adapter)) |
529 | return 0; | 530 | return 0; |
530 | 531 | ||
@@ -553,7 +554,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter) | |||
553 | 554 | ||
554 | cancel_work_sync(&adapter->scan_work); | 555 | cancel_work_sync(&adapter->scan_work); |
555 | cancel_work_sync(&adapter->stat_work); | 556 | cancel_work_sync(&adapter->stat_work); |
556 | cancel_delayed_work_sync(&adapter->nsp.work); | ||
557 | zfcp_adapter_scsi_unregister(adapter); | 557 | zfcp_adapter_scsi_unregister(adapter); |
558 | sysfs_remove_group(&adapter->ccw_device->dev.kobj, | 558 | sysfs_remove_group(&adapter->ccw_device->dev.kobj, |
559 | &zfcp_sysfs_adapter_attrs); | 559 | &zfcp_sysfs_adapter_attrs); |
@@ -671,8 +671,7 @@ void zfcp_port_dequeue(struct zfcp_port *port) | |||
671 | list_del(&port->list); | 671 | list_del(&port->list); |
672 | write_unlock_irq(&zfcp_data.config_lock); | 672 | write_unlock_irq(&zfcp_data.config_lock); |
673 | if (port->rport) | 673 | if (port->rport) |
674 | fc_remote_port_delete(port->rport); | 674 | port->rport->dd_data = NULL; |
675 | port->rport = NULL; | ||
676 | zfcp_adapter_put(port->adapter); | 675 | zfcp_adapter_put(port->adapter); |
677 | sysfs_remove_group(&port->sysfs_device.kobj, &zfcp_sysfs_port_attrs); | 676 | sysfs_remove_group(&port->sysfs_device.kobj, &zfcp_sysfs_port_attrs); |
678 | device_unregister(&port->sysfs_device); | 677 | device_unregister(&port->sysfs_device); |
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c index cfb0dcb6e3f..733fe3bf628 100644 --- a/drivers/s390/scsi/zfcp_ccw.c +++ b/drivers/s390/scsi/zfcp_ccw.c | |||
@@ -108,7 +108,6 @@ static int zfcp_ccw_set_online(struct ccw_device *ccw_device) | |||
108 | /* initialize request counter */ | 108 | /* initialize request counter */ |
109 | BUG_ON(!zfcp_reqlist_isempty(adapter)); | 109 | BUG_ON(!zfcp_reqlist_isempty(adapter)); |
110 | adapter->req_no = 0; | 110 | adapter->req_no = 0; |
111 | zfcp_fc_nameserver_init(adapter); | ||
112 | 111 | ||
113 | zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL, | 112 | zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL, |
114 | ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET); | 113 | ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET); |
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c index 10cbfd172a2..8305c874e86 100644 --- a/drivers/s390/scsi/zfcp_cfdc.c +++ b/drivers/s390/scsi/zfcp_cfdc.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Userspace interface for accessing the | 4 | * Userspace interface for accessing the |
5 | * Access Control Lists / Control File Data Channel | 5 | * Access Control Lists / Control File Data Channel |
6 | * | 6 | * |
7 | * Copyright IBM Corporation 2008 | 7 | * Copyright IBM Corporation 2008, 2009 |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #define KMSG_COMPONENT "zfcp" | 10 | #define KMSG_COMPONENT "zfcp" |
@@ -197,6 +197,7 @@ static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command, | |||
197 | retval = -ENXIO; | 197 | retval = -ENXIO; |
198 | goto free_buffer; | 198 | goto free_buffer; |
199 | } | 199 | } |
200 | zfcp_adapter_get(adapter); | ||
200 | 201 | ||
201 | retval = zfcp_cfdc_sg_setup(data->command, fsf_cfdc->sg, | 202 | retval = zfcp_cfdc_sg_setup(data->command, fsf_cfdc->sg, |
202 | data_user->control_file); | 203 | data_user->control_file); |
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index a0318630f04..4c362a9069f 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
@@ -255,7 +255,6 @@ enum zfcp_wka_status { | |||
255 | /* logical unit status */ | 255 | /* logical unit status */ |
256 | #define ZFCP_STATUS_UNIT_SHARED 0x00000004 | 256 | #define ZFCP_STATUS_UNIT_SHARED 0x00000004 |
257 | #define ZFCP_STATUS_UNIT_READONLY 0x00000008 | 257 | #define ZFCP_STATUS_UNIT_READONLY 0x00000008 |
258 | #define ZFCP_STATUS_UNIT_SCSI_WORK_PENDING 0x00000020 | ||
259 | 258 | ||
260 | /* FSF request status (this does not have a common part) */ | 259 | /* FSF request status (this does not have a common part) */ |
261 | #define ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT 0x00000002 | 260 | #define ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT 0x00000002 |
@@ -530,6 +529,7 @@ struct zfcp_unit { | |||
530 | struct zfcp_erp_action erp_action; /* pending error recovery */ | 529 | struct zfcp_erp_action erp_action; /* pending error recovery */ |
531 | atomic_t erp_counter; | 530 | atomic_t erp_counter; |
532 | struct zfcp_latencies latencies; | 531 | struct zfcp_latencies latencies; |
532 | struct work_struct scsi_work; | ||
533 | }; | 533 | }; |
534 | 534 | ||
535 | /* FSF request */ | 535 | /* FSF request */ |
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 631bdb1dfd6..fdc9b4352a6 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
@@ -719,6 +719,7 @@ static void zfcp_erp_adapter_strategy_close(struct zfcp_erp_action *act) | |||
719 | zfcp_qdio_close(adapter); | 719 | zfcp_qdio_close(adapter); |
720 | zfcp_fsf_req_dismiss_all(adapter); | 720 | zfcp_fsf_req_dismiss_all(adapter); |
721 | adapter->fsf_req_seq_no = 0; | 721 | adapter->fsf_req_seq_no = 0; |
722 | zfcp_fc_wka_port_force_offline(&adapter->nsp); | ||
722 | /* all ports and units are closed */ | 723 | /* all ports and units are closed */ |
723 | zfcp_erp_modify_adapter_status(adapter, "erascl1", NULL, | 724 | zfcp_erp_modify_adapter_status(adapter, "erascl1", NULL, |
724 | ZFCP_STATUS_COMMON_OPEN, ZFCP_CLEAR); | 725 | ZFCP_STATUS_COMMON_OPEN, ZFCP_CLEAR); |
@@ -1176,48 +1177,6 @@ static void zfcp_erp_action_dequeue(struct zfcp_erp_action *erp_action) | |||
1176 | } | 1177 | } |
1177 | } | 1178 | } |
1178 | 1179 | ||
1179 | struct zfcp_erp_add_work { | ||
1180 | struct zfcp_unit *unit; | ||
1181 | struct work_struct work; | ||
1182 | }; | ||
1183 | |||
1184 | static void zfcp_erp_scsi_scan(struct work_struct *work) | ||
1185 | { | ||
1186 | struct zfcp_erp_add_work *p = | ||
1187 | container_of(work, struct zfcp_erp_add_work, work); | ||
1188 | struct zfcp_unit *unit = p->unit; | ||
1189 | struct fc_rport *rport = unit->port->rport; | ||
1190 | |||
1191 | if (rport && rport->port_state == FC_PORTSTATE_ONLINE) | ||
1192 | scsi_scan_target(&rport->dev, 0, rport->scsi_target_id, | ||
1193 | scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0); | ||
1194 | atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status); | ||
1195 | zfcp_unit_put(unit); | ||
1196 | wake_up(&unit->port->adapter->erp_done_wqh); | ||
1197 | kfree(p); | ||
1198 | } | ||
1199 | |||
1200 | static void zfcp_erp_schedule_work(struct zfcp_unit *unit) | ||
1201 | { | ||
1202 | struct zfcp_erp_add_work *p; | ||
1203 | |||
1204 | p = kzalloc(sizeof(*p), GFP_KERNEL); | ||
1205 | if (!p) { | ||
1206 | dev_err(&unit->port->adapter->ccw_device->dev, | ||
1207 | "Registering unit 0x%016Lx on port 0x%016Lx failed\n", | ||
1208 | (unsigned long long)unit->fcp_lun, | ||
1209 | (unsigned long long)unit->port->wwpn); | ||
1210 | return; | ||
1211 | } | ||
1212 | |||
1213 | zfcp_unit_get(unit); | ||
1214 | atomic_set_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status); | ||
1215 | INIT_WORK(&p->work, zfcp_erp_scsi_scan); | ||
1216 | p->unit = unit; | ||
1217 | if (!queue_work(zfcp_data.work_queue, &p->work)) | ||
1218 | zfcp_unit_put(unit); | ||
1219 | } | ||
1220 | |||
1221 | static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result) | 1180 | static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result) |
1222 | { | 1181 | { |
1223 | struct zfcp_adapter *adapter = act->adapter; | 1182 | struct zfcp_adapter *adapter = act->adapter; |
@@ -1226,11 +1185,11 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result) | |||
1226 | 1185 | ||
1227 | switch (act->action) { | 1186 | switch (act->action) { |
1228 | case ZFCP_ERP_ACTION_REOPEN_UNIT: | 1187 | case ZFCP_ERP_ACTION_REOPEN_UNIT: |
1229 | flush_work(&port->rport_work); | ||
1230 | if ((result == ZFCP_ERP_SUCCEEDED) && !unit->device) { | 1188 | if ((result == ZFCP_ERP_SUCCEEDED) && !unit->device) { |
1231 | if (!(atomic_read(&unit->status) & | 1189 | zfcp_unit_get(unit); |
1232 | ZFCP_STATUS_UNIT_SCSI_WORK_PENDING)) | 1190 | if (scsi_queue_work(unit->port->adapter->scsi_host, |
1233 | zfcp_erp_schedule_work(unit); | 1191 | &unit->scsi_work) <= 0) |
1192 | zfcp_unit_put(unit); | ||
1234 | } | 1193 | } |
1235 | zfcp_unit_put(unit); | 1194 | zfcp_unit_put(unit); |
1236 | break; | 1195 | break; |
@@ -1352,6 +1311,11 @@ static int zfcp_erp_thread(void *data) | |||
1352 | 1311 | ||
1353 | while (!(atomic_read(&adapter->status) & | 1312 | while (!(atomic_read(&adapter->status) & |
1354 | ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL)) { | 1313 | ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL)) { |
1314 | |||
1315 | zfcp_rec_dbf_event_thread_lock("erthrd1", adapter); | ||
1316 | ignore = down_interruptible(&adapter->erp_ready_sem); | ||
1317 | zfcp_rec_dbf_event_thread_lock("erthrd2", adapter); | ||
1318 | |||
1355 | write_lock_irqsave(&adapter->erp_lock, flags); | 1319 | write_lock_irqsave(&adapter->erp_lock, flags); |
1356 | next = adapter->erp_ready_head.next; | 1320 | next = adapter->erp_ready_head.next; |
1357 | write_unlock_irqrestore(&adapter->erp_lock, flags); | 1321 | write_unlock_irqrestore(&adapter->erp_lock, flags); |
@@ -1363,10 +1327,6 @@ static int zfcp_erp_thread(void *data) | |||
1363 | if (zfcp_erp_strategy(act) != ZFCP_ERP_DISMISSED) | 1327 | if (zfcp_erp_strategy(act) != ZFCP_ERP_DISMISSED) |
1364 | zfcp_erp_wakeup(adapter); | 1328 | zfcp_erp_wakeup(adapter); |
1365 | } | 1329 | } |
1366 | |||
1367 | zfcp_rec_dbf_event_thread_lock("erthrd1", adapter); | ||
1368 | ignore = down_interruptible(&adapter->erp_ready_sem); | ||
1369 | zfcp_rec_dbf_event_thread_lock("erthrd2", adapter); | ||
1370 | } | 1330 | } |
1371 | 1331 | ||
1372 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status); | 1332 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status); |
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index f6399ca97bc..2e31b536548 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h | |||
@@ -106,6 +106,7 @@ extern void zfcp_fc_plogi_evaluate(struct zfcp_port *, struct fsf_plogi *); | |||
106 | extern void zfcp_test_link(struct zfcp_port *); | 106 | extern void zfcp_test_link(struct zfcp_port *); |
107 | extern void zfcp_fc_link_test_work(struct work_struct *); | 107 | extern void zfcp_fc_link_test_work(struct work_struct *); |
108 | extern void zfcp_fc_nameserver_init(struct zfcp_adapter *); | 108 | extern void zfcp_fc_nameserver_init(struct zfcp_adapter *); |
109 | extern void zfcp_fc_wka_port_force_offline(struct zfcp_wka_port *); | ||
109 | 110 | ||
110 | /* zfcp_fsf.c */ | 111 | /* zfcp_fsf.c */ |
111 | extern int zfcp_fsf_open_port(struct zfcp_erp_action *); | 112 | extern int zfcp_fsf_open_port(struct zfcp_erp_action *); |
@@ -158,6 +159,7 @@ extern void zfcp_scsi_rport_work(struct work_struct *); | |||
158 | extern void zfcp_scsi_schedule_rport_register(struct zfcp_port *); | 159 | extern void zfcp_scsi_schedule_rport_register(struct zfcp_port *); |
159 | extern void zfcp_scsi_schedule_rport_block(struct zfcp_port *); | 160 | extern void zfcp_scsi_schedule_rport_block(struct zfcp_port *); |
160 | extern void zfcp_scsi_schedule_rports_block(struct zfcp_adapter *); | 161 | extern void zfcp_scsi_schedule_rports_block(struct zfcp_adapter *); |
162 | extern void zfcp_scsi_scan(struct work_struct *); | ||
161 | 163 | ||
162 | /* zfcp_sysfs.c */ | 164 | /* zfcp_sysfs.c */ |
163 | extern struct attribute_group zfcp_sysfs_unit_attrs; | 165 | extern struct attribute_group zfcp_sysfs_unit_attrs; |
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index e8d032b9dfb..19ae0842047 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
@@ -98,13 +98,6 @@ static void zfcp_wka_port_offline(struct work_struct *work) | |||
98 | struct zfcp_wka_port *wka_port = | 98 | struct zfcp_wka_port *wka_port = |
99 | container_of(dw, struct zfcp_wka_port, work); | 99 | container_of(dw, struct zfcp_wka_port, work); |
100 | 100 | ||
101 | /* Don't wait forvever. If the wka_port is too busy take it offline | ||
102 | through a new call later */ | ||
103 | if (!wait_event_timeout(wka_port->completion_wq, | ||
104 | atomic_read(&wka_port->refcount) == 0, | ||
105 | HZ >> 1)) | ||
106 | return; | ||
107 | |||
108 | mutex_lock(&wka_port->mutex); | 101 | mutex_lock(&wka_port->mutex); |
109 | if ((atomic_read(&wka_port->refcount) != 0) || | 102 | if ((atomic_read(&wka_port->refcount) != 0) || |
110 | (wka_port->status != ZFCP_WKA_PORT_ONLINE)) | 103 | (wka_port->status != ZFCP_WKA_PORT_ONLINE)) |
@@ -142,6 +135,14 @@ void zfcp_fc_nameserver_init(struct zfcp_adapter *adapter) | |||
142 | INIT_DELAYED_WORK(&wka_port->work, zfcp_wka_port_offline); | 135 | INIT_DELAYED_WORK(&wka_port->work, zfcp_wka_port_offline); |
143 | } | 136 | } |
144 | 137 | ||
138 | void zfcp_fc_wka_port_force_offline(struct zfcp_wka_port *wka) | ||
139 | { | ||
140 | cancel_delayed_work_sync(&wka->work); | ||
141 | mutex_lock(&wka->mutex); | ||
142 | wka->status = ZFCP_WKA_PORT_OFFLINE; | ||
143 | mutex_unlock(&wka->mutex); | ||
144 | } | ||
145 | |||
145 | static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, | 146 | static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, |
146 | struct fcp_rscn_element *elem) | 147 | struct fcp_rscn_element *elem) |
147 | { | 148 | { |
@@ -372,7 +373,8 @@ static void zfcp_fc_adisc_handler(unsigned long data) | |||
372 | 373 | ||
373 | if (adisc->els.status) { | 374 | if (adisc->els.status) { |
374 | /* request rejected or timed out */ | 375 | /* request rejected or timed out */ |
375 | zfcp_erp_port_forced_reopen(port, 0, "fcadh_1", NULL); | 376 | zfcp_erp_port_forced_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED, |
377 | "fcadh_1", NULL); | ||
376 | goto out; | 378 | goto out; |
377 | } | 379 | } |
378 | 380 | ||
@@ -431,11 +433,6 @@ void zfcp_fc_link_test_work(struct work_struct *work) | |||
431 | container_of(work, struct zfcp_port, test_link_work); | 433 | container_of(work, struct zfcp_port, test_link_work); |
432 | int retval; | 434 | int retval; |
433 | 435 | ||
434 | if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_UNBLOCKED)) { | ||
435 | zfcp_port_put(port); | ||
436 | return; /* port erp is running and will update rport status */ | ||
437 | } | ||
438 | |||
439 | zfcp_port_get(port); | 436 | zfcp_port_get(port); |
440 | port->rport_task = RPORT_DEL; | 437 | port->rport_task = RPORT_DEL; |
441 | zfcp_scsi_rport_work(&port->rport_work); | 438 | zfcp_scsi_rport_work(&port->rport_work); |
@@ -542,6 +539,9 @@ static void zfcp_validate_port(struct zfcp_port *port) | |||
542 | { | 539 | { |
543 | struct zfcp_adapter *adapter = port->adapter; | 540 | struct zfcp_adapter *adapter = port->adapter; |
544 | 541 | ||
542 | if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_NOESC)) | ||
543 | return; | ||
544 | |||
545 | atomic_clear_mask(ZFCP_STATUS_COMMON_NOESC, &port->status); | 545 | atomic_clear_mask(ZFCP_STATUS_COMMON_NOESC, &port->status); |
546 | 546 | ||
547 | if ((port->supported_classes != 0) || | 547 | if ((port->supported_classes != 0) || |
@@ -602,10 +602,8 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft, int max_entries) | |||
602 | if (acc->wwpn == fc_host_port_name(adapter->scsi_host)) | 602 | if (acc->wwpn == fc_host_port_name(adapter->scsi_host)) |
603 | continue; | 603 | continue; |
604 | port = zfcp_get_port_by_wwpn(adapter, acc->wwpn); | 604 | port = zfcp_get_port_by_wwpn(adapter, acc->wwpn); |
605 | if (port) { | 605 | if (port) |
606 | zfcp_port_get(port); | ||
607 | continue; | 606 | continue; |
608 | } | ||
609 | 607 | ||
610 | port = zfcp_port_enqueue(adapter, acc->wwpn, | 608 | port = zfcp_port_enqueue(adapter, acc->wwpn, |
611 | ZFCP_STATUS_COMMON_NOESC, d_id); | 609 | ZFCP_STATUS_COMMON_NOESC, d_id); |
@@ -637,7 +635,8 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter) | |||
637 | max_entries = chain ? ZFCP_GPN_FT_MAX_ENTRIES : ZFCP_GPN_FT_ENTRIES; | 635 | max_entries = chain ? ZFCP_GPN_FT_MAX_ENTRIES : ZFCP_GPN_FT_ENTRIES; |
638 | max_bytes = chain ? ZFCP_GPN_FT_MAX_SIZE : ZFCP_CT_SIZE_ONE_PAGE; | 636 | max_bytes = chain ? ZFCP_GPN_FT_MAX_SIZE : ZFCP_CT_SIZE_ONE_PAGE; |
639 | 637 | ||
640 | if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT) | 638 | if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT && |
639 | fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPIV) | ||
641 | return 0; | 640 | return 0; |
642 | 641 | ||
643 | ret = zfcp_wka_port_get(&adapter->nsp); | 642 | ret = zfcp_wka_port_get(&adapter->nsp); |
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index b29f3121b66..74dee32afba 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
@@ -172,12 +172,16 @@ static void zfcp_fsf_link_down_info_eval(struct zfcp_fsf_req *req, char *id, | |||
172 | struct fsf_link_down_info *link_down) | 172 | struct fsf_link_down_info *link_down) |
173 | { | 173 | { |
174 | struct zfcp_adapter *adapter = req->adapter; | 174 | struct zfcp_adapter *adapter = req->adapter; |
175 | unsigned long flags; | ||
175 | 176 | ||
176 | if (atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED) | 177 | if (atomic_read(&adapter->status) & ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED) |
177 | return; | 178 | return; |
178 | 179 | ||
179 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status); | 180 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status); |
181 | |||
182 | read_lock_irqsave(&zfcp_data.config_lock, flags); | ||
180 | zfcp_scsi_schedule_rports_block(adapter); | 183 | zfcp_scsi_schedule_rports_block(adapter); |
184 | read_unlock_irqrestore(&zfcp_data.config_lock, flags); | ||
181 | 185 | ||
182 | if (!link_down) | 186 | if (!link_down) |
183 | goto out; | 187 | goto out; |
@@ -645,30 +649,30 @@ static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req) | |||
645 | } | 649 | } |
646 | } | 650 | } |
647 | 651 | ||
648 | static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter) | 652 | static int zfcp_fsf_sbal_check(struct zfcp_adapter *adapter) |
649 | __releases(&adapter->req_q_lock) | ||
650 | __acquires(&adapter->req_q_lock) | ||
651 | { | 653 | { |
652 | struct zfcp_qdio_queue *req_q = &adapter->req_q; | 654 | struct zfcp_qdio_queue *req_q = &adapter->req_q; |
653 | long ret; | ||
654 | 655 | ||
655 | if (atomic_read(&req_q->count) <= -REQUEST_LIST_SIZE) | 656 | spin_lock_bh(&adapter->req_q_lock); |
656 | return -EIO; | 657 | if (atomic_read(&req_q->count)) |
657 | if (atomic_read(&req_q->count) > 0) | 658 | return 1; |
658 | return 0; | 659 | spin_unlock_bh(&adapter->req_q_lock); |
660 | return 0; | ||
661 | } | ||
662 | |||
663 | static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter) | ||
664 | { | ||
665 | long ret; | ||
659 | 666 | ||
660 | atomic_dec(&req_q->count); | ||
661 | spin_unlock_bh(&adapter->req_q_lock); | 667 | spin_unlock_bh(&adapter->req_q_lock); |
662 | ret = wait_event_interruptible_timeout(adapter->request_wq, | 668 | ret = wait_event_interruptible_timeout(adapter->request_wq, |
663 | atomic_read(&req_q->count) >= 0, | 669 | zfcp_fsf_sbal_check(adapter), 5 * HZ); |
664 | 5 * HZ); | ||
665 | spin_lock_bh(&adapter->req_q_lock); | ||
666 | atomic_inc(&req_q->count); | ||
667 | |||
668 | if (ret > 0) | 670 | if (ret > 0) |
669 | return 0; | 671 | return 0; |
670 | if (!ret) | 672 | if (!ret) |
671 | atomic_inc(&adapter->qdio_outb_full); | 673 | atomic_inc(&adapter->qdio_outb_full); |
674 | |||
675 | spin_lock_bh(&adapter->req_q_lock); | ||
672 | return -EIO; | 676 | return -EIO; |
673 | } | 677 | } |
674 | 678 | ||
@@ -766,8 +770,9 @@ static struct zfcp_fsf_req *zfcp_fsf_req_create(struct zfcp_adapter *adapter, | |||
766 | static int zfcp_fsf_req_send(struct zfcp_fsf_req *req) | 770 | static int zfcp_fsf_req_send(struct zfcp_fsf_req *req) |
767 | { | 771 | { |
768 | struct zfcp_adapter *adapter = req->adapter; | 772 | struct zfcp_adapter *adapter = req->adapter; |
769 | unsigned long flags; | 773 | unsigned long flags; |
770 | int idx; | 774 | int idx; |
775 | int with_qtcb = (req->qtcb != NULL); | ||
771 | 776 | ||
772 | /* put allocated FSF request into hash table */ | 777 | /* put allocated FSF request into hash table */ |
773 | spin_lock_irqsave(&adapter->req_list_lock, flags); | 778 | spin_lock_irqsave(&adapter->req_list_lock, flags); |
@@ -789,7 +794,7 @@ static int zfcp_fsf_req_send(struct zfcp_fsf_req *req) | |||
789 | } | 794 | } |
790 | 795 | ||
791 | /* Don't increase for unsolicited status */ | 796 | /* Don't increase for unsolicited status */ |
792 | if (req->qtcb) | 797 | if (with_qtcb) |
793 | adapter->fsf_req_seq_no++; | 798 | adapter->fsf_req_seq_no++; |
794 | adapter->req_no++; | 799 | adapter->req_no++; |
795 | 800 | ||
@@ -1253,13 +1258,13 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter, | |||
1253 | 1258 | ||
1254 | spin_lock_bh(&adapter->req_q_lock); | 1259 | spin_lock_bh(&adapter->req_q_lock); |
1255 | if (zfcp_fsf_req_sbal_get(adapter)) | 1260 | if (zfcp_fsf_req_sbal_get(adapter)) |
1256 | goto out; | 1261 | goto out_unlock; |
1257 | 1262 | ||
1258 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA, | 1263 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA, |
1259 | 0, NULL); | 1264 | 0, NULL); |
1260 | if (IS_ERR(req)) { | 1265 | if (IS_ERR(req)) { |
1261 | retval = PTR_ERR(req); | 1266 | retval = PTR_ERR(req); |
1262 | goto out; | 1267 | goto out_unlock; |
1263 | } | 1268 | } |
1264 | 1269 | ||
1265 | sbale = zfcp_qdio_sbale_req(req); | 1270 | sbale = zfcp_qdio_sbale_req(req); |
@@ -1278,14 +1283,16 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter, | |||
1278 | 1283 | ||
1279 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); | 1284 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); |
1280 | retval = zfcp_fsf_req_send(req); | 1285 | retval = zfcp_fsf_req_send(req); |
1281 | out: | ||
1282 | spin_unlock_bh(&adapter->req_q_lock); | 1286 | spin_unlock_bh(&adapter->req_q_lock); |
1283 | if (!retval) | 1287 | if (!retval) |
1284 | wait_event(req->completion_wq, | 1288 | wait_event(req->completion_wq, |
1285 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); | 1289 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); |
1286 | 1290 | ||
1287 | zfcp_fsf_req_free(req); | 1291 | zfcp_fsf_req_free(req); |
1292 | return retval; | ||
1288 | 1293 | ||
1294 | out_unlock: | ||
1295 | spin_unlock_bh(&adapter->req_q_lock); | ||
1289 | return retval; | 1296 | return retval; |
1290 | } | 1297 | } |
1291 | 1298 | ||
@@ -1352,13 +1359,13 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter, | |||
1352 | 1359 | ||
1353 | spin_lock_bh(&adapter->req_q_lock); | 1360 | spin_lock_bh(&adapter->req_q_lock); |
1354 | if (zfcp_fsf_req_sbal_get(adapter)) | 1361 | if (zfcp_fsf_req_sbal_get(adapter)) |
1355 | goto out; | 1362 | goto out_unlock; |
1356 | 1363 | ||
1357 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0, | 1364 | req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0, |
1358 | NULL); | 1365 | NULL); |
1359 | if (IS_ERR(req)) { | 1366 | if (IS_ERR(req)) { |
1360 | retval = PTR_ERR(req); | 1367 | retval = PTR_ERR(req); |
1361 | goto out; | 1368 | goto out_unlock; |
1362 | } | 1369 | } |
1363 | 1370 | ||
1364 | if (data) | 1371 | if (data) |
@@ -1371,14 +1378,18 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter, | |||
1371 | req->handler = zfcp_fsf_exchange_port_data_handler; | 1378 | req->handler = zfcp_fsf_exchange_port_data_handler; |
1372 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); | 1379 | zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT); |
1373 | retval = zfcp_fsf_req_send(req); | 1380 | retval = zfcp_fsf_req_send(req); |
1374 | out: | ||
1375 | spin_unlock_bh(&adapter->req_q_lock); | 1381 | spin_unlock_bh(&adapter->req_q_lock); |
1382 | |||
1376 | if (!retval) | 1383 | if (!retval) |
1377 | wait_event(req->completion_wq, | 1384 | wait_event(req->completion_wq, |
1378 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); | 1385 | req->status & ZFCP_STATUS_FSFREQ_COMPLETED); |
1379 | zfcp_fsf_req_free(req); | 1386 | zfcp_fsf_req_free(req); |
1380 | 1387 | ||
1381 | return retval; | 1388 | return retval; |
1389 | |||
1390 | out_unlock: | ||
1391 | spin_unlock_bh(&adapter->req_q_lock); | ||
1392 | return retval; | ||
1382 | } | 1393 | } |
1383 | 1394 | ||
1384 | static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req) | 1395 | static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req) |
@@ -2472,8 +2483,6 @@ out: | |||
2472 | 2483 | ||
2473 | static void zfcp_fsf_control_file_handler(struct zfcp_fsf_req *req) | 2484 | static void zfcp_fsf_control_file_handler(struct zfcp_fsf_req *req) |
2474 | { | 2485 | { |
2475 | if (req->qtcb->header.fsf_status != FSF_GOOD) | ||
2476 | req->status |= ZFCP_STATUS_FSFREQ_ERROR; | ||
2477 | } | 2486 | } |
2478 | 2487 | ||
2479 | /** | 2488 | /** |
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 58201e1ae47..e8fbeaeb5fb 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
@@ -171,7 +171,7 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt) | |||
171 | write_unlock_irqrestore(&adapter->abort_lock, flags); | 171 | write_unlock_irqrestore(&adapter->abort_lock, flags); |
172 | zfcp_scsi_dbf_event_abort("lte1", adapter, scpnt, NULL, | 172 | zfcp_scsi_dbf_event_abort("lte1", adapter, scpnt, NULL, |
173 | old_req_id); | 173 | old_req_id); |
174 | return SUCCESS; | 174 | return FAILED; /* completion could be in progress */ |
175 | } | 175 | } |
176 | old_req->data = NULL; | 176 | old_req->data = NULL; |
177 | 177 | ||
@@ -486,10 +486,12 @@ static void zfcp_set_rport_dev_loss_tmo(struct fc_rport *rport, u32 timeout) | |||
486 | */ | 486 | */ |
487 | static void zfcp_scsi_dev_loss_tmo_callbk(struct fc_rport *rport) | 487 | static void zfcp_scsi_dev_loss_tmo_callbk(struct fc_rport *rport) |
488 | { | 488 | { |
489 | struct zfcp_port *port = rport->dd_data; | 489 | struct zfcp_port *port; |
490 | 490 | ||
491 | write_lock_irq(&zfcp_data.config_lock); | 491 | write_lock_irq(&zfcp_data.config_lock); |
492 | port->rport = NULL; | 492 | port = rport->dd_data; |
493 | if (port) | ||
494 | port->rport = NULL; | ||
493 | write_unlock_irq(&zfcp_data.config_lock); | 495 | write_unlock_irq(&zfcp_data.config_lock); |
494 | } | 496 | } |
495 | 497 | ||
@@ -503,9 +505,18 @@ static void zfcp_scsi_dev_loss_tmo_callbk(struct fc_rport *rport) | |||
503 | */ | 505 | */ |
504 | static void zfcp_scsi_terminate_rport_io(struct fc_rport *rport) | 506 | static void zfcp_scsi_terminate_rport_io(struct fc_rport *rport) |
505 | { | 507 | { |
506 | struct zfcp_port *port = rport->dd_data; | 508 | struct zfcp_port *port; |
509 | |||
510 | write_lock_irq(&zfcp_data.config_lock); | ||
511 | port = rport->dd_data; | ||
512 | if (port) | ||
513 | zfcp_port_get(port); | ||
514 | write_unlock_irq(&zfcp_data.config_lock); | ||
507 | 515 | ||
508 | zfcp_erp_port_reopen(port, 0, "sctrpi1", NULL); | 516 | if (port) { |
517 | zfcp_erp_port_reopen(port, 0, "sctrpi1", NULL); | ||
518 | zfcp_port_put(port); | ||
519 | } | ||
509 | } | 520 | } |
510 | 521 | ||
511 | static void zfcp_scsi_rport_register(struct zfcp_port *port) | 522 | static void zfcp_scsi_rport_register(struct zfcp_port *port) |
@@ -534,8 +545,10 @@ static void zfcp_scsi_rport_register(struct zfcp_port *port) | |||
534 | 545 | ||
535 | static void zfcp_scsi_rport_block(struct zfcp_port *port) | 546 | static void zfcp_scsi_rport_block(struct zfcp_port *port) |
536 | { | 547 | { |
537 | if (port->rport) | 548 | struct fc_rport *rport = port->rport; |
538 | fc_remote_port_delete(port->rport); | 549 | |
550 | if (rport) | ||
551 | fc_remote_port_delete(rport); | ||
539 | } | 552 | } |
540 | 553 | ||
541 | void zfcp_scsi_schedule_rport_register(struct zfcp_port *port) | 554 | void zfcp_scsi_schedule_rport_register(struct zfcp_port *port) |
@@ -583,6 +596,23 @@ void zfcp_scsi_rport_work(struct work_struct *work) | |||
583 | } | 596 | } |
584 | 597 | ||
585 | 598 | ||
599 | void zfcp_scsi_scan(struct work_struct *work) | ||
600 | { | ||
601 | struct zfcp_unit *unit = container_of(work, struct zfcp_unit, | ||
602 | scsi_work); | ||
603 | struct fc_rport *rport; | ||
604 | |||
605 | flush_work(&unit->port->rport_work); | ||
606 | rport = unit->port->rport; | ||
607 | |||
608 | if (rport && rport->port_state == FC_PORTSTATE_ONLINE) | ||
609 | scsi_scan_target(&rport->dev, 0, rport->scsi_target_id, | ||
610 | scsilun_to_int((struct scsi_lun *) | ||
611 | &unit->fcp_lun), 0); | ||
612 | |||
613 | zfcp_unit_put(unit); | ||
614 | } | ||
615 | |||
586 | struct fc_function_template zfcp_transport_functions = { | 616 | struct fc_function_template zfcp_transport_functions = { |
587 | .show_starget_port_id = 1, | 617 | .show_starget_port_id = 1, |
588 | .show_starget_port_name = 1, | 618 | .show_starget_port_name = 1, |
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index 9a3b8e261c0..3e51e64d110 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c | |||
@@ -254,12 +254,21 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev, | |||
254 | 254 | ||
255 | write_lock_irq(&zfcp_data.config_lock); | 255 | write_lock_irq(&zfcp_data.config_lock); |
256 | unit = zfcp_get_unit_by_lun(port, fcp_lun); | 256 | unit = zfcp_get_unit_by_lun(port, fcp_lun); |
257 | if (unit && (atomic_read(&unit->refcount) == 0)) { | 257 | if (unit) { |
258 | zfcp_unit_get(unit); | 258 | write_unlock_irq(&zfcp_data.config_lock); |
259 | atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &unit->status); | 259 | /* wait for possible timeout during SCSI probe */ |
260 | list_move(&unit->list, &unit_remove_lh); | 260 | flush_work(&unit->scsi_work); |
261 | } else | 261 | write_lock_irq(&zfcp_data.config_lock); |
262 | unit = NULL; | 262 | |
263 | if (atomic_read(&unit->refcount) == 0) { | ||
264 | zfcp_unit_get(unit); | ||
265 | atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, | ||
266 | &unit->status); | ||
267 | list_move(&unit->list, &unit_remove_lh); | ||
268 | } else { | ||
269 | unit = NULL; | ||
270 | } | ||
271 | } | ||
263 | 272 | ||
264 | write_unlock_irq(&zfcp_data.config_lock); | 273 | write_unlock_irq(&zfcp_data.config_lock); |
265 | 274 | ||
diff --git a/drivers/scsi/cxgb3i/cxgb3i.h b/drivers/scsi/cxgb3i/cxgb3i.h index d362860e750..59b0958d2d1 100644 --- a/drivers/scsi/cxgb3i/cxgb3i.h +++ b/drivers/scsi/cxgb3i/cxgb3i.h | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "cxgb3i_offload.h" | 34 | #include "cxgb3i_offload.h" |
35 | #include "cxgb3i_ddp.h" | 35 | #include "cxgb3i_ddp.h" |
36 | 36 | ||
37 | #define CXGB3I_SCSI_QDEPTH_DFLT 128 | 37 | #define CXGB3I_SCSI_HOST_QDEPTH 1024 |
38 | #define CXGB3I_MAX_TARGET CXGB3I_MAX_CONN | 38 | #define CXGB3I_MAX_TARGET CXGB3I_MAX_CONN |
39 | #define CXGB3I_MAX_LUN 512 | 39 | #define CXGB3I_MAX_LUN 512 |
40 | #define ISCSI_PDU_NONPAYLOAD_MAX \ | 40 | #define ISCSI_PDU_NONPAYLOAD_MAX \ |
diff --git a/drivers/scsi/cxgb3i/cxgb3i_ddp.c b/drivers/scsi/cxgb3i/cxgb3i_ddp.c index d06a661c209..99c91254790 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_ddp.c +++ b/drivers/scsi/cxgb3i/cxgb3i_ddp.c | |||
@@ -120,20 +120,26 @@ static void clear_ddp_map(struct cxgb3i_ddp_info *ddp, unsigned int tag, | |||
120 | } | 120 | } |
121 | 121 | ||
122 | static inline int ddp_find_unused_entries(struct cxgb3i_ddp_info *ddp, | 122 | static inline int ddp_find_unused_entries(struct cxgb3i_ddp_info *ddp, |
123 | int start, int max, int count, | 123 | unsigned int start, unsigned int max, |
124 | unsigned int count, | ||
124 | struct cxgb3i_gather_list *gl) | 125 | struct cxgb3i_gather_list *gl) |
125 | { | 126 | { |
126 | unsigned int i, j; | 127 | unsigned int i, j, k; |
127 | 128 | ||
129 | /* not enough entries */ | ||
130 | if ((max - start) < count) | ||
131 | return -EBUSY; | ||
132 | |||
133 | max -= count; | ||
128 | spin_lock(&ddp->map_lock); | 134 | spin_lock(&ddp->map_lock); |
129 | for (i = start; i <= max;) { | 135 | for (i = start; i < max;) { |
130 | for (j = 0; j < count; j++) { | 136 | for (j = 0, k = i; j < count; j++, k++) { |
131 | if (ddp->gl_map[i + j]) | 137 | if (ddp->gl_map[k]) |
132 | break; | 138 | break; |
133 | } | 139 | } |
134 | if (j == count) { | 140 | if (j == count) { |
135 | for (j = 0; j < count; j++) | 141 | for (j = 0, k = i; j < count; j++, k++) |
136 | ddp->gl_map[i + j] = gl; | 142 | ddp->gl_map[k] = gl; |
137 | spin_unlock(&ddp->map_lock); | 143 | spin_unlock(&ddp->map_lock); |
138 | return i; | 144 | return i; |
139 | } | 145 | } |
@@ -354,7 +360,7 @@ int cxgb3i_ddp_tag_reserve(struct t3cdev *tdev, unsigned int tid, | |||
354 | struct cxgb3i_ddp_info *ddp = tdev->ulp_iscsi; | 360 | struct cxgb3i_ddp_info *ddp = tdev->ulp_iscsi; |
355 | struct pagepod_hdr hdr; | 361 | struct pagepod_hdr hdr; |
356 | unsigned int npods; | 362 | unsigned int npods; |
357 | int idx = -1, idx_max; | 363 | int idx = -1; |
358 | int err = -ENOMEM; | 364 | int err = -ENOMEM; |
359 | u32 sw_tag = *tagp; | 365 | u32 sw_tag = *tagp; |
360 | u32 tag; | 366 | u32 tag; |
@@ -367,17 +373,17 @@ int cxgb3i_ddp_tag_reserve(struct t3cdev *tdev, unsigned int tid, | |||
367 | } | 373 | } |
368 | 374 | ||
369 | npods = (gl->nelem + PPOD_PAGES_MAX - 1) >> PPOD_PAGES_SHIFT; | 375 | npods = (gl->nelem + PPOD_PAGES_MAX - 1) >> PPOD_PAGES_SHIFT; |
370 | idx_max = ddp->nppods - npods + 1; | ||
371 | 376 | ||
372 | if (ddp->idx_last == ddp->nppods) | 377 | if (ddp->idx_last == ddp->nppods) |
373 | idx = ddp_find_unused_entries(ddp, 0, idx_max, npods, gl); | 378 | idx = ddp_find_unused_entries(ddp, 0, ddp->nppods, npods, gl); |
374 | else { | 379 | else { |
375 | idx = ddp_find_unused_entries(ddp, ddp->idx_last + 1, | 380 | idx = ddp_find_unused_entries(ddp, ddp->idx_last + 1, |
376 | idx_max, npods, gl); | 381 | ddp->nppods, npods, gl); |
377 | if (idx < 0 && ddp->idx_last >= npods) | 382 | if (idx < 0 && ddp->idx_last >= npods) { |
378 | idx = ddp_find_unused_entries(ddp, 0, | 383 | idx = ddp_find_unused_entries(ddp, 0, |
379 | ddp->idx_last - npods + 1, | 384 | min(ddp->idx_last + npods, ddp->nppods), |
380 | npods, gl); | 385 | npods, gl); |
386 | } | ||
381 | } | 387 | } |
382 | if (idx < 0) { | 388 | if (idx < 0) { |
383 | ddp_log_debug("xferlen %u, gl %u, npods %u NO DDP.\n", | 389 | ddp_log_debug("xferlen %u, gl %u, npods %u NO DDP.\n", |
diff --git a/drivers/scsi/cxgb3i/cxgb3i_iscsi.c b/drivers/scsi/cxgb3i/cxgb3i_iscsi.c index fff8e432764..9212400b9b1 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_iscsi.c +++ b/drivers/scsi/cxgb3i/cxgb3i_iscsi.c | |||
@@ -876,13 +876,14 @@ static struct scsi_host_template cxgb3i_host_template = { | |||
876 | .proc_name = "cxgb3i", | 876 | .proc_name = "cxgb3i", |
877 | .queuecommand = iscsi_queuecommand, | 877 | .queuecommand = iscsi_queuecommand, |
878 | .change_queue_depth = iscsi_change_queue_depth, | 878 | .change_queue_depth = iscsi_change_queue_depth, |
879 | .can_queue = CXGB3I_SCSI_QDEPTH_DFLT - 1, | 879 | .can_queue = CXGB3I_SCSI_HOST_QDEPTH, |
880 | .sg_tablesize = SG_ALL, | 880 | .sg_tablesize = SG_ALL, |
881 | .max_sectors = 0xFFFF, | 881 | .max_sectors = 0xFFFF, |
882 | .cmd_per_lun = CXGB3I_SCSI_QDEPTH_DFLT, | 882 | .cmd_per_lun = ISCSI_DEF_CMD_PER_LUN, |
883 | .eh_abort_handler = iscsi_eh_abort, | 883 | .eh_abort_handler = iscsi_eh_abort, |
884 | .eh_device_reset_handler = iscsi_eh_device_reset, | 884 | .eh_device_reset_handler = iscsi_eh_device_reset, |
885 | .eh_target_reset_handler = iscsi_eh_target_reset, | 885 | .eh_target_reset_handler = iscsi_eh_target_reset, |
886 | .target_alloc = iscsi_target_alloc, | ||
886 | .use_clustering = DISABLE_CLUSTERING, | 887 | .use_clustering = DISABLE_CLUSTERING, |
887 | .this_id = -1, | 888 | .this_id = -1, |
888 | }; | 889 | }; |
diff --git a/drivers/scsi/cxgb3i/cxgb3i_offload.c b/drivers/scsi/cxgb3i/cxgb3i_offload.c index 4d8654cdbda..e11c9c180f3 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_offload.c +++ b/drivers/scsi/cxgb3i/cxgb3i_offload.c | |||
@@ -1737,7 +1737,7 @@ int cxgb3i_c3cn_send_pdus(struct s3_conn *c3cn, struct sk_buff *skb) | |||
1737 | c3cn_tx_debug("c3cn 0x%p, snd %u - %u > %u.\n", | 1737 | c3cn_tx_debug("c3cn 0x%p, snd %u - %u > %u.\n", |
1738 | c3cn, c3cn->write_seq, c3cn->snd_una, | 1738 | c3cn, c3cn->write_seq, c3cn->snd_una, |
1739 | cxgb3_snd_win); | 1739 | cxgb3_snd_win); |
1740 | err = -EAGAIN; | 1740 | err = -ENOBUFS; |
1741 | goto out_err; | 1741 | goto out_err; |
1742 | } | 1742 | } |
1743 | 1743 | ||
@@ -1775,6 +1775,8 @@ done: | |||
1775 | out_err: | 1775 | out_err: |
1776 | if (copied == 0 && err == -EPIPE) | 1776 | if (copied == 0 && err == -EPIPE) |
1777 | copied = c3cn->err ? c3cn->err : -EPIPE; | 1777 | copied = c3cn->err ? c3cn->err : -EPIPE; |
1778 | else | ||
1779 | copied = err; | ||
1778 | goto done; | 1780 | goto done; |
1779 | } | 1781 | } |
1780 | 1782 | ||
diff --git a/drivers/scsi/cxgb3i/cxgb3i_pdu.c b/drivers/scsi/cxgb3i/cxgb3i_pdu.c index 7eebc9a7cb3..70910507117 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_pdu.c +++ b/drivers/scsi/cxgb3i/cxgb3i_pdu.c | |||
@@ -400,17 +400,18 @@ int cxgb3i_conn_xmit_pdu(struct iscsi_task *task) | |||
400 | return 0; | 400 | return 0; |
401 | } | 401 | } |
402 | 402 | ||
403 | if (err < 0 && err != -EAGAIN) { | 403 | if (err == -EAGAIN || err == -ENOBUFS) { |
404 | kfree_skb(skb); | 404 | /* reset skb to send when we are called again */ |
405 | cxgb3i_tx_debug("itt 0x%x, skb 0x%p, len %u/%u, xmit err %d.\n", | 405 | tdata->skb = skb; |
406 | task->itt, skb, skb->len, skb->data_len, err); | ||
407 | iscsi_conn_printk(KERN_ERR, task->conn, "xmit err %d.\n", err); | ||
408 | iscsi_conn_failure(task->conn, ISCSI_ERR_XMIT_FAILED); | ||
409 | return err; | 406 | return err; |
410 | } | 407 | } |
411 | /* reset skb to send when we are called again */ | 408 | |
412 | tdata->skb = skb; | 409 | kfree_skb(skb); |
413 | return -EAGAIN; | 410 | cxgb3i_tx_debug("itt 0x%x, skb 0x%p, len %u/%u, xmit err %d.\n", |
411 | task->itt, skb, skb->len, skb->data_len, err); | ||
412 | iscsi_conn_printk(KERN_ERR, task->conn, "xmit err %d.\n", err); | ||
413 | iscsi_conn_failure(task->conn, ISCSI_ERR_XMIT_FAILED); | ||
414 | return err; | ||
414 | } | 415 | } |
415 | 416 | ||
416 | int cxgb3i_pdu_init(void) | 417 | int cxgb3i_pdu_init(void) |
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 94e1e318977..03e1926f40b 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -57,7 +57,7 @@ DEFINE_RWLOCK(fcoe_hostlist_lock); | |||
57 | DEFINE_TIMER(fcoe_timer, NULL, 0, 0); | 57 | DEFINE_TIMER(fcoe_timer, NULL, 0, 0); |
58 | DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu); | 58 | DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu); |
59 | 59 | ||
60 | /* Function Prototyes */ | 60 | /* Function Prototypes */ |
61 | static int fcoe_reset(struct Scsi_Host *shost); | 61 | static int fcoe_reset(struct Scsi_Host *shost); |
62 | static int fcoe_xmit(struct fc_lport *, struct fc_frame *); | 62 | static int fcoe_xmit(struct fc_lport *, struct fc_frame *); |
63 | static int fcoe_rcv(struct sk_buff *, struct net_device *, | 63 | static int fcoe_rcv(struct sk_buff *, struct net_device *, |
@@ -138,7 +138,6 @@ static struct scsi_host_template fcoe_shost_template = { | |||
138 | /** | 138 | /** |
139 | * fcoe_lport_config() - sets up the fc_lport | 139 | * fcoe_lport_config() - sets up the fc_lport |
140 | * @lp: ptr to the fc_lport | 140 | * @lp: ptr to the fc_lport |
141 | * @shost: ptr to the parent scsi host | ||
142 | * | 141 | * |
143 | * Returns: 0 for success | 142 | * Returns: 0 for success |
144 | */ | 143 | */ |
@@ -256,6 +255,7 @@ static int fcoe_netdev_config(struct fc_lport *lp, struct net_device *netdev) | |||
256 | rtnl_lock(); | 255 | rtnl_lock(); |
257 | memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN); | 256 | memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN); |
258 | dev_unicast_add(fc->real_dev, flogi_maddr, ETH_ALEN); | 257 | dev_unicast_add(fc->real_dev, flogi_maddr, ETH_ALEN); |
258 | dev_mc_add(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); | ||
259 | rtnl_unlock(); | 259 | rtnl_unlock(); |
260 | 260 | ||
261 | /* | 261 | /* |
@@ -380,7 +380,7 @@ static int fcoe_if_destroy(struct net_device *netdev) | |||
380 | dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); | 380 | dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); |
381 | rtnl_unlock(); | 381 | rtnl_unlock(); |
382 | 382 | ||
383 | /* Free the per-CPU revieve threads */ | 383 | /* Free the per-CPU receive threads */ |
384 | fcoe_percpu_clean(lp); | 384 | fcoe_percpu_clean(lp); |
385 | 385 | ||
386 | /* Free existing skbs */ | 386 | /* Free existing skbs */ |
@@ -720,7 +720,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu) | |||
720 | } | 720 | } |
721 | #else | 721 | #else |
722 | /* | 722 | /* |
723 | * This a non-SMP scenario where the singluar Rx thread is | 723 | * This a non-SMP scenario where the singular Rx thread is |
724 | * being removed. Free all skbs and stop the thread. | 724 | * being removed. Free all skbs and stop the thread. |
725 | */ | 725 | */ |
726 | spin_lock_bh(&p->fcoe_rx_list.lock); | 726 | spin_lock_bh(&p->fcoe_rx_list.lock); |
@@ -777,7 +777,7 @@ static struct notifier_block fcoe_cpu_notifier = { | |||
777 | * @skb: the receive skb | 777 | * @skb: the receive skb |
778 | * @dev: associated net device | 778 | * @dev: associated net device |
779 | * @ptype: context | 779 | * @ptype: context |
780 | * @odldev: last device | 780 | * @olddev: last device |
781 | * | 781 | * |
782 | * this function will receive the packet and build fc frame and pass it up | 782 | * this function will receive the packet and build fc frame and pass it up |
783 | * | 783 | * |
@@ -884,7 +884,6 @@ err2: | |||
884 | kfree_skb(skb); | 884 | kfree_skb(skb); |
885 | return -1; | 885 | return -1; |
886 | } | 886 | } |
887 | EXPORT_SYMBOL_GPL(fcoe_rcv); | ||
888 | 887 | ||
889 | /** | 888 | /** |
890 | * fcoe_start_io() - pass to netdev to start xmit for fcoe | 889 | * fcoe_start_io() - pass to netdev to start xmit for fcoe |
@@ -905,7 +904,7 @@ static inline int fcoe_start_io(struct sk_buff *skb) | |||
905 | } | 904 | } |
906 | 905 | ||
907 | /** | 906 | /** |
908 | * fcoe_get_paged_crc_eof() - in case we need alloc a page for crc_eof | 907 | * fcoe_get_paged_crc_eof() - in case we need to alloc a page for crc_eof |
909 | * @skb: the skb to be xmitted | 908 | * @skb: the skb to be xmitted |
910 | * @tlen: total len | 909 | * @tlen: total len |
911 | * | 910 | * |
@@ -947,7 +946,7 @@ static int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen) | |||
947 | 946 | ||
948 | /** | 947 | /** |
949 | * fcoe_fc_crc() - calculates FC CRC in this fcoe skb | 948 | * fcoe_fc_crc() - calculates FC CRC in this fcoe skb |
950 | * @fp: the fc_frame containg data to be checksummed | 949 | * @fp: the fc_frame containing data to be checksummed |
951 | * | 950 | * |
952 | * This uses crc32() to calculate the crc for fc frame | 951 | * This uses crc32() to calculate the crc for fc frame |
953 | * Return : 32 bit crc | 952 | * Return : 32 bit crc |
@@ -1011,7 +1010,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp) | |||
1011 | wlen = skb->len / FCOE_WORD_TO_BYTE; | 1010 | wlen = skb->len / FCOE_WORD_TO_BYTE; |
1012 | 1011 | ||
1013 | if (!lp->link_up) { | 1012 | if (!lp->link_up) { |
1014 | kfree(skb); | 1013 | kfree_skb(skb); |
1015 | return 0; | 1014 | return 0; |
1016 | } | 1015 | } |
1017 | 1016 | ||
@@ -1062,7 +1061,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp) | |||
1062 | cp = NULL; | 1061 | cp = NULL; |
1063 | } | 1062 | } |
1064 | 1063 | ||
1065 | /* adjust skb netowrk/transport offsets to match mac/fcoe/fc */ | 1064 | /* adjust skb network/transport offsets to match mac/fcoe/fc */ |
1066 | skb_push(skb, elen + hlen); | 1065 | skb_push(skb, elen + hlen); |
1067 | skb_reset_mac_header(skb); | 1066 | skb_reset_mac_header(skb); |
1068 | skb_reset_network_header(skb); | 1067 | skb_reset_network_header(skb); |
@@ -1123,7 +1122,6 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp) | |||
1123 | 1122 | ||
1124 | return 0; | 1123 | return 0; |
1125 | } | 1124 | } |
1126 | EXPORT_SYMBOL_GPL(fcoe_xmit); | ||
1127 | 1125 | ||
1128 | /** | 1126 | /** |
1129 | * fcoe_percpu_receive_thread() - recv thread per cpu | 1127 | * fcoe_percpu_receive_thread() - recv thread per cpu |
@@ -1296,17 +1294,16 @@ void fcoe_watchdog(ulong vp) | |||
1296 | 1294 | ||
1297 | 1295 | ||
1298 | /** | 1296 | /** |
1299 | * fcoe_check_wait_queue() - put the skb into fcoe pending xmit queue | 1297 | * fcoe_check_wait_queue() - attempt to clear the transmit backlog |
1300 | * @lp: the fc_port for this skb | 1298 | * @lp: the fc_lport |
1301 | * @skb: the associated skb to be xmitted | ||
1302 | * | 1299 | * |
1303 | * This empties the wait_queue, dequeue the head of the wait_queue queue | 1300 | * This empties the wait_queue, dequeue the head of the wait_queue queue |
1304 | * and calls fcoe_start_io() for each packet, if all skb have been | 1301 | * and calls fcoe_start_io() for each packet, if all skb have been |
1305 | * transmitted, return qlen or -1 if a error occurs, then restore | 1302 | * transmitted, return qlen or -1 if a error occurs, then restore |
1306 | * wait_queue and try again later. | 1303 | * wait_queue and try again later. |
1307 | * | 1304 | * |
1308 | * The wait_queue is used when the skb transmit fails. skb will go | 1305 | * The wait_queue is used when the skb transmit fails. skb will go |
1309 | * in the wait_queue which will be emptied by the time function OR | 1306 | * in the wait_queue which will be emptied by the timer function or |
1310 | * by the next skb transmit. | 1307 | * by the next skb transmit. |
1311 | * | 1308 | * |
1312 | * Returns: 0 for success | 1309 | * Returns: 0 for success |
@@ -1355,10 +1352,6 @@ out: | |||
1355 | */ | 1352 | */ |
1356 | static void fcoe_dev_setup() | 1353 | static void fcoe_dev_setup() |
1357 | { | 1354 | { |
1358 | /* | ||
1359 | * here setup a interface specific wd time to | ||
1360 | * monitor the link state | ||
1361 | */ | ||
1362 | register_netdevice_notifier(&fcoe_notifier); | 1355 | register_netdevice_notifier(&fcoe_notifier); |
1363 | } | 1356 | } |
1364 | 1357 | ||
@@ -1437,10 +1430,9 @@ out: | |||
1437 | 1430 | ||
1438 | /** | 1431 | /** |
1439 | * fcoe_if_to_netdev() - parse a name buffer to get netdev | 1432 | * fcoe_if_to_netdev() - parse a name buffer to get netdev |
1440 | * @ifname: fixed array for output parsed ifname | ||
1441 | * @buffer: incoming buffer to be copied | 1433 | * @buffer: incoming buffer to be copied |
1442 | * | 1434 | * |
1443 | * Returns: NULL or ptr to netdeive | 1435 | * Returns: NULL or ptr to net_device |
1444 | */ | 1436 | */ |
1445 | static struct net_device *fcoe_if_to_netdev(const char *buffer) | 1437 | static struct net_device *fcoe_if_to_netdev(const char *buffer) |
1446 | { | 1438 | { |
@@ -1458,7 +1450,7 @@ static struct net_device *fcoe_if_to_netdev(const char *buffer) | |||
1458 | } | 1450 | } |
1459 | 1451 | ||
1460 | /** | 1452 | /** |
1461 | * fcoe_netdev_to_module_owner() - finds out the nic drive moddule of the netdev | 1453 | * fcoe_netdev_to_module_owner() - finds out the driver module of the netdev |
1462 | * @netdev: the target netdev | 1454 | * @netdev: the target netdev |
1463 | * | 1455 | * |
1464 | * Returns: ptr to the struct module, NULL for failure | 1456 | * Returns: ptr to the struct module, NULL for failure |
@@ -1488,7 +1480,7 @@ fcoe_netdev_to_module_owner(const struct net_device *netdev) | |||
1488 | * Holds the Ethernet driver module by try_module_get() for | 1480 | * Holds the Ethernet driver module by try_module_get() for |
1489 | * the corresponding netdev. | 1481 | * the corresponding netdev. |
1490 | * | 1482 | * |
1491 | * Returns: 0 for succsss | 1483 | * Returns: 0 for success |
1492 | */ | 1484 | */ |
1493 | static int fcoe_ethdrv_get(const struct net_device *netdev) | 1485 | static int fcoe_ethdrv_get(const struct net_device *netdev) |
1494 | { | 1486 | { |
@@ -1510,7 +1502,7 @@ static int fcoe_ethdrv_get(const struct net_device *netdev) | |||
1510 | * Releases the Ethernet driver module by module_put for | 1502 | * Releases the Ethernet driver module by module_put for |
1511 | * the corresponding netdev. | 1503 | * the corresponding netdev. |
1512 | * | 1504 | * |
1513 | * Returns: 0 for succsss | 1505 | * Returns: 0 for success |
1514 | */ | 1506 | */ |
1515 | static int fcoe_ethdrv_put(const struct net_device *netdev) | 1507 | static int fcoe_ethdrv_put(const struct net_device *netdev) |
1516 | { | 1508 | { |
@@ -1528,7 +1520,7 @@ static int fcoe_ethdrv_put(const struct net_device *netdev) | |||
1528 | 1520 | ||
1529 | /** | 1521 | /** |
1530 | * fcoe_destroy() - handles the destroy from sysfs | 1522 | * fcoe_destroy() - handles the destroy from sysfs |
1531 | * @buffer: expcted to be a eth if name | 1523 | * @buffer: expected to be an eth if name |
1532 | * @kp: associated kernel param | 1524 | * @kp: associated kernel param |
1533 | * | 1525 | * |
1534 | * Returns: 0 for success | 1526 | * Returns: 0 for success |
@@ -1565,7 +1557,7 @@ out_nodev: | |||
1565 | 1557 | ||
1566 | /** | 1558 | /** |
1567 | * fcoe_create() - Handles the create call from sysfs | 1559 | * fcoe_create() - Handles the create call from sysfs |
1568 | * @buffer: expcted to be a eth if name | 1560 | * @buffer: expected to be an eth if name |
1569 | * @kp: associated kernel param | 1561 | * @kp: associated kernel param |
1570 | * | 1562 | * |
1571 | * Returns: 0 for success | 1563 | * Returns: 0 for success |
@@ -1652,7 +1644,6 @@ int fcoe_link_ok(struct fc_lport *lp) | |||
1652 | 1644 | ||
1653 | return rc; | 1645 | return rc; |
1654 | } | 1646 | } |
1655 | EXPORT_SYMBOL_GPL(fcoe_link_ok); | ||
1656 | 1647 | ||
1657 | /** | 1648 | /** |
1658 | * fcoe_percpu_clean() - Clear the pending skbs for an lport | 1649 | * fcoe_percpu_clean() - Clear the pending skbs for an lport |
@@ -1684,7 +1675,6 @@ void fcoe_percpu_clean(struct fc_lport *lp) | |||
1684 | spin_unlock_bh(&pp->fcoe_rx_list.lock); | 1675 | spin_unlock_bh(&pp->fcoe_rx_list.lock); |
1685 | } | 1676 | } |
1686 | } | 1677 | } |
1687 | EXPORT_SYMBOL_GPL(fcoe_percpu_clean); | ||
1688 | 1678 | ||
1689 | /** | 1679 | /** |
1690 | * fcoe_clean_pending_queue() - Dequeue a skb and free it | 1680 | * fcoe_clean_pending_queue() - Dequeue a skb and free it |
@@ -1705,7 +1695,6 @@ void fcoe_clean_pending_queue(struct fc_lport *lp) | |||
1705 | } | 1695 | } |
1706 | spin_unlock_bh(&fc->fcoe_pending_queue.lock); | 1696 | spin_unlock_bh(&fc->fcoe_pending_queue.lock); |
1707 | } | 1697 | } |
1708 | EXPORT_SYMBOL_GPL(fcoe_clean_pending_queue); | ||
1709 | 1698 | ||
1710 | /** | 1699 | /** |
1711 | * fcoe_reset() - Resets the fcoe | 1700 | * fcoe_reset() - Resets the fcoe |
@@ -1719,11 +1708,10 @@ int fcoe_reset(struct Scsi_Host *shost) | |||
1719 | fc_lport_reset(lport); | 1708 | fc_lport_reset(lport); |
1720 | return 0; | 1709 | return 0; |
1721 | } | 1710 | } |
1722 | EXPORT_SYMBOL_GPL(fcoe_reset); | ||
1723 | 1711 | ||
1724 | /** | 1712 | /** |
1725 | * fcoe_hostlist_lookup_softc() - find the corresponding lport by a given device | 1713 | * fcoe_hostlist_lookup_softc() - find the corresponding lport by a given device |
1726 | * @device: this is currently ptr to net_device | 1714 | * @dev: this is currently ptr to net_device |
1727 | * | 1715 | * |
1728 | * Returns: NULL or the located fcoe_softc | 1716 | * Returns: NULL or the located fcoe_softc |
1729 | */ | 1717 | */ |
@@ -1757,11 +1745,10 @@ struct fc_lport *fcoe_hostlist_lookup(const struct net_device *netdev) | |||
1757 | 1745 | ||
1758 | return (fc) ? fc->ctlr.lp : NULL; | 1746 | return (fc) ? fc->ctlr.lp : NULL; |
1759 | } | 1747 | } |
1760 | EXPORT_SYMBOL_GPL(fcoe_hostlist_lookup); | ||
1761 | 1748 | ||
1762 | /** | 1749 | /** |
1763 | * fcoe_hostlist_add() - Add a lport to lports list | 1750 | * fcoe_hostlist_add() - Add a lport to lports list |
1764 | * @lp: ptr to the fc_lport to badded | 1751 | * @lp: ptr to the fc_lport to be added |
1765 | * | 1752 | * |
1766 | * Returns: 0 for success | 1753 | * Returns: 0 for success |
1767 | */ | 1754 | */ |
@@ -1778,11 +1765,10 @@ int fcoe_hostlist_add(const struct fc_lport *lp) | |||
1778 | } | 1765 | } |
1779 | return 0; | 1766 | return 0; |
1780 | } | 1767 | } |
1781 | EXPORT_SYMBOL_GPL(fcoe_hostlist_add); | ||
1782 | 1768 | ||
1783 | /** | 1769 | /** |
1784 | * fcoe_hostlist_remove() - remove a lport from lports list | 1770 | * fcoe_hostlist_remove() - remove a lport from lports list |
1785 | * @lp: ptr to the fc_lport to badded | 1771 | * @lp: ptr to the fc_lport to be removed |
1786 | * | 1772 | * |
1787 | * Returns: 0 for success | 1773 | * Returns: 0 for success |
1788 | */ | 1774 | */ |
@@ -1798,7 +1784,6 @@ int fcoe_hostlist_remove(const struct fc_lport *lp) | |||
1798 | 1784 | ||
1799 | return 0; | 1785 | return 0; |
1800 | } | 1786 | } |
1801 | EXPORT_SYMBOL_GPL(fcoe_hostlist_remove); | ||
1802 | 1787 | ||
1803 | /** | 1788 | /** |
1804 | * fcoe_init() - fcoe module loading initialization | 1789 | * fcoe_init() - fcoe module loading initialization |
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c index f410f4abb54..62ba0f39c6b 100644 --- a/drivers/scsi/fcoe/libfcoe.c +++ b/drivers/scsi/fcoe/libfcoe.c | |||
@@ -122,7 +122,7 @@ static void fcoe_ctlr_reset_fcfs(struct fcoe_ctlr *fip) | |||
122 | } | 122 | } |
123 | 123 | ||
124 | /** | 124 | /** |
125 | * fcoe_ctrl_destroy() - Disable and tear-down the FCoE controller. | 125 | * fcoe_ctlr_destroy() - Disable and tear-down the FCoE controller. |
126 | * @fip: FCoE controller. | 126 | * @fip: FCoE controller. |
127 | * | 127 | * |
128 | * This is called by FCoE drivers before freeing the &fcoe_ctlr. | 128 | * This is called by FCoE drivers before freeing the &fcoe_ctlr. |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index c09d77591f9..dd689ded860 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -3654,6 +3654,7 @@ static int ipr_slave_configure(struct scsi_device *sdev) | |||
3654 | { | 3654 | { |
3655 | struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *) sdev->host->hostdata; | 3655 | struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *) sdev->host->hostdata; |
3656 | struct ipr_resource_entry *res; | 3656 | struct ipr_resource_entry *res; |
3657 | struct ata_port *ap = NULL; | ||
3657 | unsigned long lock_flags = 0; | 3658 | unsigned long lock_flags = 0; |
3658 | 3659 | ||
3659 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); | 3660 | spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
@@ -3672,12 +3673,16 @@ static int ipr_slave_configure(struct scsi_device *sdev) | |||
3672 | } | 3673 | } |
3673 | if (ipr_is_vset_device(res) || ipr_is_scsi_disk(res)) | 3674 | if (ipr_is_vset_device(res) || ipr_is_scsi_disk(res)) |
3674 | sdev->allow_restart = 1; | 3675 | sdev->allow_restart = 1; |
3675 | if (ipr_is_gata(res) && res->sata_port) { | 3676 | if (ipr_is_gata(res) && res->sata_port) |
3677 | ap = res->sata_port->ap; | ||
3678 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); | ||
3679 | |||
3680 | if (ap) { | ||
3676 | scsi_adjust_queue_depth(sdev, 0, IPR_MAX_CMD_PER_ATA_LUN); | 3681 | scsi_adjust_queue_depth(sdev, 0, IPR_MAX_CMD_PER_ATA_LUN); |
3677 | ata_sas_slave_configure(sdev, res->sata_port->ap); | 3682 | ata_sas_slave_configure(sdev, ap); |
3678 | } else { | 3683 | } else |
3679 | scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun); | 3684 | scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun); |
3680 | } | 3685 | return 0; |
3681 | } | 3686 | } |
3682 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); | 3687 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); |
3683 | return 0; | 3688 | return 0; |
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index b3e5e08e44a..b7c092d63bb 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -463,7 +463,7 @@ static int iscsi_sw_tcp_pdu_init(struct iscsi_task *task, | |||
463 | } | 463 | } |
464 | 464 | ||
465 | if (err) { | 465 | if (err) { |
466 | iscsi_conn_failure(conn, err); | 466 | /* got invalid offset/len */ |
467 | return -EIO; | 467 | return -EIO; |
468 | } | 468 | } |
469 | return 0; | 469 | return 0; |
@@ -851,6 +851,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = { | |||
851 | .use_clustering = DISABLE_CLUSTERING, | 851 | .use_clustering = DISABLE_CLUSTERING, |
852 | .slave_alloc = iscsi_sw_tcp_slave_alloc, | 852 | .slave_alloc = iscsi_sw_tcp_slave_alloc, |
853 | .slave_configure = iscsi_sw_tcp_slave_configure, | 853 | .slave_configure = iscsi_sw_tcp_slave_configure, |
854 | .target_alloc = iscsi_target_alloc, | ||
854 | .proc_name = "iscsi_tcp", | 855 | .proc_name = "iscsi_tcp", |
855 | .this_id = -1, | 856 | .this_id = -1, |
856 | }; | 857 | }; |
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c index e57556ea5b4..4c880656990 100644 --- a/drivers/scsi/libfc/fc_disc.c +++ b/drivers/scsi/libfc/fc_disc.c | |||
@@ -113,6 +113,11 @@ void fc_disc_stop_rports(struct fc_disc *disc) | |||
113 | lport->tt.rport_logoff(rport); | 113 | lport->tt.rport_logoff(rport); |
114 | } | 114 | } |
115 | 115 | ||
116 | list_for_each_entry_safe(rdata, next, &disc->rogue_rports, peers) { | ||
117 | rport = PRIV_TO_RPORT(rdata); | ||
118 | lport->tt.rport_logoff(rport); | ||
119 | } | ||
120 | |||
116 | mutex_unlock(&disc->disc_mutex); | 121 | mutex_unlock(&disc->disc_mutex); |
117 | } | 122 | } |
118 | 123 | ||
@@ -131,23 +136,32 @@ static void fc_disc_rport_callback(struct fc_lport *lport, | |||
131 | { | 136 | { |
132 | struct fc_rport_libfc_priv *rdata = rport->dd_data; | 137 | struct fc_rport_libfc_priv *rdata = rport->dd_data; |
133 | struct fc_disc *disc = &lport->disc; | 138 | struct fc_disc *disc = &lport->disc; |
134 | int found = 0; | ||
135 | 139 | ||
136 | FC_DEBUG_DISC("Received a %d event for port (%6x)\n", event, | 140 | FC_DEBUG_DISC("Received a %d event for port (%6x)\n", event, |
137 | rport->port_id); | 141 | rport->port_id); |
138 | 142 | ||
139 | if (event == RPORT_EV_CREATED) { | 143 | switch (event) { |
144 | case RPORT_EV_CREATED: | ||
140 | if (disc) { | 145 | if (disc) { |
141 | found = 1; | ||
142 | mutex_lock(&disc->disc_mutex); | 146 | mutex_lock(&disc->disc_mutex); |
143 | list_add_tail(&rdata->peers, &disc->rports); | 147 | list_add_tail(&rdata->peers, &disc->rports); |
144 | mutex_unlock(&disc->disc_mutex); | 148 | mutex_unlock(&disc->disc_mutex); |
145 | } | 149 | } |
150 | break; | ||
151 | case RPORT_EV_LOGO: | ||
152 | case RPORT_EV_FAILED: | ||
153 | case RPORT_EV_STOP: | ||
154 | mutex_lock(&disc->disc_mutex); | ||
155 | mutex_lock(&rdata->rp_mutex); | ||
156 | if (rdata->trans_state == FC_PORTSTATE_ROGUE) | ||
157 | list_del(&rdata->peers); | ||
158 | mutex_unlock(&rdata->rp_mutex); | ||
159 | mutex_unlock(&disc->disc_mutex); | ||
160 | break; | ||
161 | default: | ||
162 | break; | ||
146 | } | 163 | } |
147 | 164 | ||
148 | if (!found) | ||
149 | FC_DEBUG_DISC("The rport (%6x) is not maintained " | ||
150 | "by the discovery layer\n", rport->port_id); | ||
151 | } | 165 | } |
152 | 166 | ||
153 | /** | 167 | /** |
@@ -439,6 +453,7 @@ static int fc_disc_new_target(struct fc_disc *disc, | |||
439 | rdata = rport->dd_data; | 453 | rdata = rport->dd_data; |
440 | rdata->ops = &fc_disc_rport_ops; | 454 | rdata->ops = &fc_disc_rport_ops; |
441 | rdata->rp_state = RPORT_ST_INIT; | 455 | rdata->rp_state = RPORT_ST_INIT; |
456 | list_add_tail(&rdata->peers, &disc->rogue_rports); | ||
442 | lport->tt.rport_login(rport); | 457 | lport->tt.rport_login(rport); |
443 | } | 458 | } |
444 | } | 459 | } |
@@ -461,21 +476,29 @@ static void fc_disc_del_target(struct fc_disc *disc, struct fc_rport *rport) | |||
461 | /** | 476 | /** |
462 | * fc_disc_done() - Discovery has been completed | 477 | * fc_disc_done() - Discovery has been completed |
463 | * @disc: FC discovery context | 478 | * @disc: FC discovery context |
479 | * Locking Note: This function expects that the disc mutex is locked before | ||
480 | * it is called. The discovery callback is then made with the lock released, | ||
481 | * and the lock is re-taken before returning from this function | ||
464 | */ | 482 | */ |
465 | static void fc_disc_done(struct fc_disc *disc) | 483 | static void fc_disc_done(struct fc_disc *disc) |
466 | { | 484 | { |
467 | struct fc_lport *lport = disc->lport; | 485 | struct fc_lport *lport = disc->lport; |
486 | enum fc_disc_event event; | ||
468 | 487 | ||
469 | FC_DEBUG_DISC("Discovery complete for port (%6x)\n", | 488 | FC_DEBUG_DISC("Discovery complete for port (%6x)\n", |
470 | fc_host_port_id(lport->host)); | 489 | fc_host_port_id(lport->host)); |
471 | 490 | ||
472 | disc->disc_callback(lport, disc->event); | 491 | event = disc->event; |
473 | disc->event = DISC_EV_NONE; | 492 | disc->event = DISC_EV_NONE; |
474 | 493 | ||
475 | if (disc->requested) | 494 | if (disc->requested) |
476 | fc_disc_gpn_ft_req(disc); | 495 | fc_disc_gpn_ft_req(disc); |
477 | else | 496 | else |
478 | disc->pending = 0; | 497 | disc->pending = 0; |
498 | |||
499 | mutex_unlock(&disc->disc_mutex); | ||
500 | disc->disc_callback(lport, event); | ||
501 | mutex_lock(&disc->disc_mutex); | ||
479 | } | 502 | } |
480 | 503 | ||
481 | /** | 504 | /** |
@@ -622,6 +645,8 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len) | |||
622 | rdata = rport->dd_data; | 645 | rdata = rport->dd_data; |
623 | rdata->ops = &fc_disc_rport_ops; | 646 | rdata->ops = &fc_disc_rport_ops; |
624 | rdata->local_port = lport; | 647 | rdata->local_port = lport; |
648 | list_add_tail(&rdata->peers, | ||
649 | &disc->rogue_rports); | ||
625 | lport->tt.rport_login(rport); | 650 | lport->tt.rport_login(rport); |
626 | } else | 651 | } else |
627 | FC_DBG("Failed to allocate memory for " | 652 | FC_DBG("Failed to allocate memory for " |
@@ -681,8 +706,8 @@ static void fc_disc_timeout(struct work_struct *work) | |||
681 | * @fp: response frame | 706 | * @fp: response frame |
682 | * @lp_arg: Fibre Channel host port instance | 707 | * @lp_arg: Fibre Channel host port instance |
683 | * | 708 | * |
684 | * Locking Note: This function expects that the disc_mutex is locked | 709 | * Locking Note: This function is called without disc mutex held, and |
685 | * before it is called. | 710 | * should do all its processing with the mutex held |
686 | */ | 711 | */ |
687 | static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, | 712 | static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, |
688 | void *disc_arg) | 713 | void *disc_arg) |
@@ -695,11 +720,13 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
695 | unsigned int len; | 720 | unsigned int len; |
696 | int error; | 721 | int error; |
697 | 722 | ||
723 | mutex_lock(&disc->disc_mutex); | ||
698 | FC_DEBUG_DISC("Received a GPN_FT response on port (%6x)\n", | 724 | FC_DEBUG_DISC("Received a GPN_FT response on port (%6x)\n", |
699 | fc_host_port_id(disc->lport->host)); | 725 | fc_host_port_id(disc->lport->host)); |
700 | 726 | ||
701 | if (IS_ERR(fp)) { | 727 | if (IS_ERR(fp)) { |
702 | fc_disc_error(disc, fp); | 728 | fc_disc_error(disc, fp); |
729 | mutex_unlock(&disc->disc_mutex); | ||
703 | return; | 730 | return; |
704 | } | 731 | } |
705 | 732 | ||
@@ -744,6 +771,8 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
744 | disc->seq_count++; | 771 | disc->seq_count++; |
745 | } | 772 | } |
746 | fc_frame_free(fp); | 773 | fc_frame_free(fp); |
774 | |||
775 | mutex_unlock(&disc->disc_mutex); | ||
747 | } | 776 | } |
748 | 777 | ||
749 | /** | 778 | /** |
@@ -757,7 +786,6 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
757 | static void fc_disc_single(struct fc_disc *disc, struct fc_disc_port *dp) | 786 | static void fc_disc_single(struct fc_disc *disc, struct fc_disc_port *dp) |
758 | { | 787 | { |
759 | struct fc_lport *lport; | 788 | struct fc_lport *lport; |
760 | struct fc_rport *rport; | ||
761 | struct fc_rport *new_rport; | 789 | struct fc_rport *new_rport; |
762 | struct fc_rport_libfc_priv *rdata; | 790 | struct fc_rport_libfc_priv *rdata; |
763 | 791 | ||
@@ -766,15 +794,12 @@ static void fc_disc_single(struct fc_disc *disc, struct fc_disc_port *dp) | |||
766 | if (dp->ids.port_id == fc_host_port_id(lport->host)) | 794 | if (dp->ids.port_id == fc_host_port_id(lport->host)) |
767 | goto out; | 795 | goto out; |
768 | 796 | ||
769 | rport = lport->tt.rport_lookup(lport, dp->ids.port_id); | ||
770 | if (rport) | ||
771 | fc_disc_del_target(disc, rport); | ||
772 | |||
773 | new_rport = lport->tt.rport_create(dp); | 797 | new_rport = lport->tt.rport_create(dp); |
774 | if (new_rport) { | 798 | if (new_rport) { |
775 | rdata = new_rport->dd_data; | 799 | rdata = new_rport->dd_data; |
776 | rdata->ops = &fc_disc_rport_ops; | 800 | rdata->ops = &fc_disc_rport_ops; |
777 | kfree(dp); | 801 | kfree(dp); |
802 | list_add_tail(&rdata->peers, &disc->rogue_rports); | ||
778 | lport->tt.rport_login(new_rport); | 803 | lport->tt.rport_login(new_rport); |
779 | } | 804 | } |
780 | return; | 805 | return; |
@@ -836,6 +861,7 @@ int fc_disc_init(struct fc_lport *lport) | |||
836 | INIT_DELAYED_WORK(&disc->disc_work, fc_disc_timeout); | 861 | INIT_DELAYED_WORK(&disc->disc_work, fc_disc_timeout); |
837 | mutex_init(&disc->disc_mutex); | 862 | mutex_init(&disc->disc_mutex); |
838 | INIT_LIST_HEAD(&disc->rports); | 863 | INIT_LIST_HEAD(&disc->rports); |
864 | INIT_LIST_HEAD(&disc->rogue_rports); | ||
839 | 865 | ||
840 | disc->lport = lport; | 866 | disc->lport = lport; |
841 | disc->delay = FC_DISC_DELAY; | 867 | disc->delay = FC_DISC_DELAY; |
diff --git a/drivers/scsi/libfc/fc_elsct.c b/drivers/scsi/libfc/fc_elsct.c index dd47fe619d1..5878b34bff1 100644 --- a/drivers/scsi/libfc/fc_elsct.c +++ b/drivers/scsi/libfc/fc_elsct.c | |||
@@ -41,7 +41,7 @@ static struct fc_seq *fc_elsct_send(struct fc_lport *lport, | |||
41 | void *arg, u32 timer_msec) | 41 | void *arg, u32 timer_msec) |
42 | { | 42 | { |
43 | enum fc_rctl r_ctl; | 43 | enum fc_rctl r_ctl; |
44 | u32 did; | 44 | u32 did = FC_FID_NONE; |
45 | enum fc_fh_type fh_type; | 45 | enum fc_fh_type fh_type; |
46 | int rc; | 46 | int rc; |
47 | 47 | ||
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index f555ae99ad4..521f996f9b1 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c | |||
@@ -713,7 +713,7 @@ done: | |||
713 | static void fc_fcp_recv(struct fc_seq *seq, struct fc_frame *fp, void *arg) | 713 | static void fc_fcp_recv(struct fc_seq *seq, struct fc_frame *fp, void *arg) |
714 | { | 714 | { |
715 | struct fc_fcp_pkt *fsp = (struct fc_fcp_pkt *)arg; | 715 | struct fc_fcp_pkt *fsp = (struct fc_fcp_pkt *)arg; |
716 | struct fc_lport *lp; | 716 | struct fc_lport *lport = fsp->lp; |
717 | struct fc_frame_header *fh; | 717 | struct fc_frame_header *fh; |
718 | struct fcp_txrdy *dd; | 718 | struct fcp_txrdy *dd; |
719 | u8 r_ctl; | 719 | u8 r_ctl; |
@@ -724,9 +724,8 @@ static void fc_fcp_recv(struct fc_seq *seq, struct fc_frame *fp, void *arg) | |||
724 | 724 | ||
725 | fh = fc_frame_header_get(fp); | 725 | fh = fc_frame_header_get(fp); |
726 | r_ctl = fh->fh_r_ctl; | 726 | r_ctl = fh->fh_r_ctl; |
727 | lp = fsp->lp; | ||
728 | 727 | ||
729 | if (!(lp->state & LPORT_ST_READY)) | 728 | if (!(lport->state & LPORT_ST_READY)) |
730 | goto out; | 729 | goto out; |
731 | if (fc_fcp_lock_pkt(fsp)) | 730 | if (fc_fcp_lock_pkt(fsp)) |
732 | goto out; | 731 | goto out; |
@@ -779,7 +778,7 @@ errout: | |||
779 | if (IS_ERR(fp)) | 778 | if (IS_ERR(fp)) |
780 | fc_fcp_error(fsp, fp); | 779 | fc_fcp_error(fsp, fp); |
781 | else if (rc == -ENOMEM) | 780 | else if (rc == -ENOMEM) |
782 | fc_fcp_reduce_can_queue(lp); | 781 | fc_fcp_reduce_can_queue(lport); |
783 | } | 782 | } |
784 | 783 | ||
785 | static void fc_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp) | 784 | static void fc_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp) |
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c index b8178ef398d..e0c247724d2 100644 --- a/drivers/scsi/libfc/fc_lport.c +++ b/drivers/scsi/libfc/fc_lport.c | |||
@@ -618,6 +618,11 @@ int fc_fabric_logoff(struct fc_lport *lport) | |||
618 | { | 618 | { |
619 | lport->tt.disc_stop_final(lport); | 619 | lport->tt.disc_stop_final(lport); |
620 | mutex_lock(&lport->lp_mutex); | 620 | mutex_lock(&lport->lp_mutex); |
621 | if (lport->dns_rp) | ||
622 | lport->tt.rport_logoff(lport->dns_rp); | ||
623 | mutex_unlock(&lport->lp_mutex); | ||
624 | lport->tt.rport_flush_queue(); | ||
625 | mutex_lock(&lport->lp_mutex); | ||
621 | fc_lport_enter_logo(lport); | 626 | fc_lport_enter_logo(lport); |
622 | mutex_unlock(&lport->lp_mutex); | 627 | mutex_unlock(&lport->lp_mutex); |
623 | cancel_delayed_work_sync(&lport->retry_work); | 628 | cancel_delayed_work_sync(&lport->retry_work); |
@@ -639,7 +644,12 @@ EXPORT_SYMBOL(fc_fabric_logoff); | |||
639 | */ | 644 | */ |
640 | int fc_lport_destroy(struct fc_lport *lport) | 645 | int fc_lport_destroy(struct fc_lport *lport) |
641 | { | 646 | { |
647 | mutex_lock(&lport->lp_mutex); | ||
648 | lport->state = LPORT_ST_NONE; | ||
649 | lport->link_up = 0; | ||
642 | lport->tt.frame_send = fc_frame_drop; | 650 | lport->tt.frame_send = fc_frame_drop; |
651 | mutex_unlock(&lport->lp_mutex); | ||
652 | |||
643 | lport->tt.fcp_abort_io(lport); | 653 | lport->tt.fcp_abort_io(lport); |
644 | lport->tt.exch_mgr_reset(lport, 0, 0); | 654 | lport->tt.exch_mgr_reset(lport, 0, 0); |
645 | return 0; | 655 | return 0; |
@@ -1032,17 +1042,19 @@ static void fc_lport_rft_id_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
1032 | 1042 | ||
1033 | FC_DEBUG_LPORT("Received a RFT_ID response\n"); | 1043 | FC_DEBUG_LPORT("Received a RFT_ID response\n"); |
1034 | 1044 | ||
1035 | if (IS_ERR(fp)) { | ||
1036 | fc_lport_error(lport, fp); | ||
1037 | goto err; | ||
1038 | } | ||
1039 | |||
1040 | if (lport->state != LPORT_ST_RFT_ID) { | 1045 | if (lport->state != LPORT_ST_RFT_ID) { |
1041 | FC_DBG("Received a RFT_ID response, but in state %s\n", | 1046 | FC_DBG("Received a RFT_ID response, but in state %s\n", |
1042 | fc_lport_state(lport)); | 1047 | fc_lport_state(lport)); |
1048 | if (IS_ERR(fp)) | ||
1049 | goto err; | ||
1043 | goto out; | 1050 | goto out; |
1044 | } | 1051 | } |
1045 | 1052 | ||
1053 | if (IS_ERR(fp)) { | ||
1054 | fc_lport_error(lport, fp); | ||
1055 | goto err; | ||
1056 | } | ||
1057 | |||
1046 | fh = fc_frame_header_get(fp); | 1058 | fh = fc_frame_header_get(fp); |
1047 | ct = fc_frame_payload_get(fp, sizeof(*ct)); | 1059 | ct = fc_frame_payload_get(fp, sizeof(*ct)); |
1048 | 1060 | ||
@@ -1084,17 +1096,19 @@ static void fc_lport_rpn_id_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
1084 | 1096 | ||
1085 | FC_DEBUG_LPORT("Received a RPN_ID response\n"); | 1097 | FC_DEBUG_LPORT("Received a RPN_ID response\n"); |
1086 | 1098 | ||
1087 | if (IS_ERR(fp)) { | ||
1088 | fc_lport_error(lport, fp); | ||
1089 | goto err; | ||
1090 | } | ||
1091 | |||
1092 | if (lport->state != LPORT_ST_RPN_ID) { | 1099 | if (lport->state != LPORT_ST_RPN_ID) { |
1093 | FC_DBG("Received a RPN_ID response, but in state %s\n", | 1100 | FC_DBG("Received a RPN_ID response, but in state %s\n", |
1094 | fc_lport_state(lport)); | 1101 | fc_lport_state(lport)); |
1102 | if (IS_ERR(fp)) | ||
1103 | goto err; | ||
1095 | goto out; | 1104 | goto out; |
1096 | } | 1105 | } |
1097 | 1106 | ||
1107 | if (IS_ERR(fp)) { | ||
1108 | fc_lport_error(lport, fp); | ||
1109 | goto err; | ||
1110 | } | ||
1111 | |||
1098 | fh = fc_frame_header_get(fp); | 1112 | fh = fc_frame_header_get(fp); |
1099 | ct = fc_frame_payload_get(fp, sizeof(*ct)); | 1113 | ct = fc_frame_payload_get(fp, sizeof(*ct)); |
1100 | if (fh && ct && fh->fh_type == FC_TYPE_CT && | 1114 | if (fh && ct && fh->fh_type == FC_TYPE_CT && |
@@ -1134,17 +1148,19 @@ static void fc_lport_scr_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
1134 | 1148 | ||
1135 | FC_DEBUG_LPORT("Received a SCR response\n"); | 1149 | FC_DEBUG_LPORT("Received a SCR response\n"); |
1136 | 1150 | ||
1137 | if (IS_ERR(fp)) { | ||
1138 | fc_lport_error(lport, fp); | ||
1139 | goto err; | ||
1140 | } | ||
1141 | |||
1142 | if (lport->state != LPORT_ST_SCR) { | 1151 | if (lport->state != LPORT_ST_SCR) { |
1143 | FC_DBG("Received a SCR response, but in state %s\n", | 1152 | FC_DBG("Received a SCR response, but in state %s\n", |
1144 | fc_lport_state(lport)); | 1153 | fc_lport_state(lport)); |
1154 | if (IS_ERR(fp)) | ||
1155 | goto err; | ||
1145 | goto out; | 1156 | goto out; |
1146 | } | 1157 | } |
1147 | 1158 | ||
1159 | if (IS_ERR(fp)) { | ||
1160 | fc_lport_error(lport, fp); | ||
1161 | goto err; | ||
1162 | } | ||
1163 | |||
1148 | op = fc_frame_payload_op(fp); | 1164 | op = fc_frame_payload_op(fp); |
1149 | if (op == ELS_LS_ACC) | 1165 | if (op == ELS_LS_ACC) |
1150 | fc_lport_enter_ready(lport); | 1166 | fc_lport_enter_ready(lport); |
@@ -1360,17 +1376,19 @@ static void fc_lport_logo_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
1360 | 1376 | ||
1361 | FC_DEBUG_LPORT("Received a LOGO response\n"); | 1377 | FC_DEBUG_LPORT("Received a LOGO response\n"); |
1362 | 1378 | ||
1363 | if (IS_ERR(fp)) { | ||
1364 | fc_lport_error(lport, fp); | ||
1365 | goto err; | ||
1366 | } | ||
1367 | |||
1368 | if (lport->state != LPORT_ST_LOGO) { | 1379 | if (lport->state != LPORT_ST_LOGO) { |
1369 | FC_DBG("Received a LOGO response, but in state %s\n", | 1380 | FC_DBG("Received a LOGO response, but in state %s\n", |
1370 | fc_lport_state(lport)); | 1381 | fc_lport_state(lport)); |
1382 | if (IS_ERR(fp)) | ||
1383 | goto err; | ||
1371 | goto out; | 1384 | goto out; |
1372 | } | 1385 | } |
1373 | 1386 | ||
1387 | if (IS_ERR(fp)) { | ||
1388 | fc_lport_error(lport, fp); | ||
1389 | goto err; | ||
1390 | } | ||
1391 | |||
1374 | op = fc_frame_payload_op(fp); | 1392 | op = fc_frame_payload_op(fp); |
1375 | if (op == ELS_LS_ACC) | 1393 | if (op == ELS_LS_ACC) |
1376 | fc_lport_enter_reset(lport); | 1394 | fc_lport_enter_reset(lport); |
@@ -1400,10 +1418,6 @@ static void fc_lport_enter_logo(struct fc_lport *lport) | |||
1400 | 1418 | ||
1401 | fc_lport_state_enter(lport, LPORT_ST_LOGO); | 1419 | fc_lport_state_enter(lport, LPORT_ST_LOGO); |
1402 | 1420 | ||
1403 | /* DNS session should be closed so we can release it here */ | ||
1404 | if (lport->dns_rp) | ||
1405 | lport->tt.rport_logoff(lport->dns_rp); | ||
1406 | |||
1407 | fp = fc_frame_alloc(lport, sizeof(*logo)); | 1421 | fp = fc_frame_alloc(lport, sizeof(*logo)); |
1408 | if (!fp) { | 1422 | if (!fp) { |
1409 | fc_lport_error(lport, fp); | 1423 | fc_lport_error(lport, fp); |
@@ -1444,17 +1458,19 @@ static void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
1444 | 1458 | ||
1445 | FC_DEBUG_LPORT("Received a FLOGI response\n"); | 1459 | FC_DEBUG_LPORT("Received a FLOGI response\n"); |
1446 | 1460 | ||
1447 | if (IS_ERR(fp)) { | ||
1448 | fc_lport_error(lport, fp); | ||
1449 | goto err; | ||
1450 | } | ||
1451 | |||
1452 | if (lport->state != LPORT_ST_FLOGI) { | 1461 | if (lport->state != LPORT_ST_FLOGI) { |
1453 | FC_DBG("Received a FLOGI response, but in state %s\n", | 1462 | FC_DBG("Received a FLOGI response, but in state %s\n", |
1454 | fc_lport_state(lport)); | 1463 | fc_lport_state(lport)); |
1464 | if (IS_ERR(fp)) | ||
1465 | goto err; | ||
1455 | goto out; | 1466 | goto out; |
1456 | } | 1467 | } |
1457 | 1468 | ||
1469 | if (IS_ERR(fp)) { | ||
1470 | fc_lport_error(lport, fp); | ||
1471 | goto err; | ||
1472 | } | ||
1473 | |||
1458 | fh = fc_frame_header_get(fp); | 1474 | fh = fc_frame_header_get(fp); |
1459 | did = ntoh24(fh->fh_d_id); | 1475 | did = ntoh24(fh->fh_d_id); |
1460 | if (fc_frame_payload_op(fp) == ELS_LS_ACC && did != 0) { | 1476 | if (fc_frame_payload_op(fp) == ELS_LS_ACC && did != 0) { |
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c index 0472bb73221..747d73c5c8a 100644 --- a/drivers/scsi/libfc/fc_rport.c +++ b/drivers/scsi/libfc/fc_rport.c | |||
@@ -267,6 +267,10 @@ static void fc_rport_work(struct work_struct *work) | |||
267 | "(%6x).\n", ids.port_id); | 267 | "(%6x).\n", ids.port_id); |
268 | event = RPORT_EV_FAILED; | 268 | event = RPORT_EV_FAILED; |
269 | } | 269 | } |
270 | if (rport->port_id != FC_FID_DIR_SERV) | ||
271 | if (rport_ops->event_callback) | ||
272 | rport_ops->event_callback(lport, rport, | ||
273 | RPORT_EV_FAILED); | ||
270 | put_device(&rport->dev); | 274 | put_device(&rport->dev); |
271 | rport = new_rport; | 275 | rport = new_rport; |
272 | rdata = new_rport->dd_data; | 276 | rdata = new_rport->dd_data; |
@@ -325,11 +329,20 @@ int fc_rport_login(struct fc_rport *rport) | |||
325 | int fc_rport_logoff(struct fc_rport *rport) | 329 | int fc_rport_logoff(struct fc_rport *rport) |
326 | { | 330 | { |
327 | struct fc_rport_libfc_priv *rdata = rport->dd_data; | 331 | struct fc_rport_libfc_priv *rdata = rport->dd_data; |
332 | struct fc_lport *lport = rdata->local_port; | ||
328 | 333 | ||
329 | mutex_lock(&rdata->rp_mutex); | 334 | mutex_lock(&rdata->rp_mutex); |
330 | 335 | ||
331 | FC_DEBUG_RPORT("Remove port (%6x)\n", rport->port_id); | 336 | FC_DEBUG_RPORT("Remove port (%6x)\n", rport->port_id); |
332 | 337 | ||
338 | if (rdata->rp_state == RPORT_ST_NONE) { | ||
339 | FC_DEBUG_RPORT("(%6x): Port (%6x) in NONE state," | ||
340 | " not removing", fc_host_port_id(lport->host), | ||
341 | rport->port_id); | ||
342 | mutex_unlock(&rdata->rp_mutex); | ||
343 | goto out; | ||
344 | } | ||
345 | |||
333 | fc_rport_enter_logo(rport); | 346 | fc_rport_enter_logo(rport); |
334 | 347 | ||
335 | /* | 348 | /* |
@@ -349,6 +362,7 @@ int fc_rport_logoff(struct fc_rport *rport) | |||
349 | 362 | ||
350 | mutex_unlock(&rdata->rp_mutex); | 363 | mutex_unlock(&rdata->rp_mutex); |
351 | 364 | ||
365 | out: | ||
352 | return 0; | 366 | return 0; |
353 | } | 367 | } |
354 | 368 | ||
@@ -430,6 +444,7 @@ static void fc_rport_error(struct fc_rport *rport, struct fc_frame *fp) | |||
430 | case RPORT_ST_PRLI: | 444 | case RPORT_ST_PRLI: |
431 | case RPORT_ST_LOGO: | 445 | case RPORT_ST_LOGO: |
432 | rdata->event = RPORT_EV_FAILED; | 446 | rdata->event = RPORT_EV_FAILED; |
447 | fc_rport_state_enter(rport, RPORT_ST_NONE); | ||
433 | queue_work(rport_event_queue, | 448 | queue_work(rport_event_queue, |
434 | &rdata->event_work); | 449 | &rdata->event_work); |
435 | break; | 450 | break; |
@@ -494,7 +509,7 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
494 | struct fc_rport *rport = rp_arg; | 509 | struct fc_rport *rport = rp_arg; |
495 | struct fc_rport_libfc_priv *rdata = rport->dd_data; | 510 | struct fc_rport_libfc_priv *rdata = rport->dd_data; |
496 | struct fc_lport *lport = rdata->local_port; | 511 | struct fc_lport *lport = rdata->local_port; |
497 | struct fc_els_flogi *plp; | 512 | struct fc_els_flogi *plp = NULL; |
498 | unsigned int tov; | 513 | unsigned int tov; |
499 | u16 csp_seq; | 514 | u16 csp_seq; |
500 | u16 cssp_seq; | 515 | u16 cssp_seq; |
@@ -505,17 +520,19 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
505 | FC_DEBUG_RPORT("Received a PLOGI response from port (%6x)\n", | 520 | FC_DEBUG_RPORT("Received a PLOGI response from port (%6x)\n", |
506 | rport->port_id); | 521 | rport->port_id); |
507 | 522 | ||
508 | if (IS_ERR(fp)) { | ||
509 | fc_rport_error_retry(rport, fp); | ||
510 | goto err; | ||
511 | } | ||
512 | |||
513 | if (rdata->rp_state != RPORT_ST_PLOGI) { | 523 | if (rdata->rp_state != RPORT_ST_PLOGI) { |
514 | FC_DBG("Received a PLOGI response, but in state %s\n", | 524 | FC_DBG("Received a PLOGI response, but in state %s\n", |
515 | fc_rport_state(rport)); | 525 | fc_rport_state(rport)); |
526 | if (IS_ERR(fp)) | ||
527 | goto err; | ||
516 | goto out; | 528 | goto out; |
517 | } | 529 | } |
518 | 530 | ||
531 | if (IS_ERR(fp)) { | ||
532 | fc_rport_error_retry(rport, fp); | ||
533 | goto err; | ||
534 | } | ||
535 | |||
519 | op = fc_frame_payload_op(fp); | 536 | op = fc_frame_payload_op(fp); |
520 | if (op == ELS_LS_ACC && | 537 | if (op == ELS_LS_ACC && |
521 | (plp = fc_frame_payload_get(fp, sizeof(*plp))) != NULL) { | 538 | (plp = fc_frame_payload_get(fp, sizeof(*plp))) != NULL) { |
@@ -614,17 +631,19 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
614 | FC_DEBUG_RPORT("Received a PRLI response from port (%6x)\n", | 631 | FC_DEBUG_RPORT("Received a PRLI response from port (%6x)\n", |
615 | rport->port_id); | 632 | rport->port_id); |
616 | 633 | ||
617 | if (IS_ERR(fp)) { | ||
618 | fc_rport_error_retry(rport, fp); | ||
619 | goto err; | ||
620 | } | ||
621 | |||
622 | if (rdata->rp_state != RPORT_ST_PRLI) { | 634 | if (rdata->rp_state != RPORT_ST_PRLI) { |
623 | FC_DBG("Received a PRLI response, but in state %s\n", | 635 | FC_DBG("Received a PRLI response, but in state %s\n", |
624 | fc_rport_state(rport)); | 636 | fc_rport_state(rport)); |
637 | if (IS_ERR(fp)) | ||
638 | goto err; | ||
625 | goto out; | 639 | goto out; |
626 | } | 640 | } |
627 | 641 | ||
642 | if (IS_ERR(fp)) { | ||
643 | fc_rport_error_retry(rport, fp); | ||
644 | goto err; | ||
645 | } | ||
646 | |||
628 | op = fc_frame_payload_op(fp); | 647 | op = fc_frame_payload_op(fp); |
629 | if (op == ELS_LS_ACC) { | 648 | if (op == ELS_LS_ACC) { |
630 | pp = fc_frame_payload_get(fp, sizeof(*pp)); | 649 | pp = fc_frame_payload_get(fp, sizeof(*pp)); |
@@ -646,6 +665,7 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
646 | } else { | 665 | } else { |
647 | FC_DBG("Bad ELS response\n"); | 666 | FC_DBG("Bad ELS response\n"); |
648 | rdata->event = RPORT_EV_FAILED; | 667 | rdata->event = RPORT_EV_FAILED; |
668 | fc_rport_state_enter(rport, RPORT_ST_NONE); | ||
649 | queue_work(rport_event_queue, &rdata->event_work); | 669 | queue_work(rport_event_queue, &rdata->event_work); |
650 | } | 670 | } |
651 | 671 | ||
@@ -678,23 +698,26 @@ static void fc_rport_logo_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
678 | FC_DEBUG_RPORT("Received a LOGO response from port (%6x)\n", | 698 | FC_DEBUG_RPORT("Received a LOGO response from port (%6x)\n", |
679 | rport->port_id); | 699 | rport->port_id); |
680 | 700 | ||
681 | if (IS_ERR(fp)) { | ||
682 | fc_rport_error_retry(rport, fp); | ||
683 | goto err; | ||
684 | } | ||
685 | |||
686 | if (rdata->rp_state != RPORT_ST_LOGO) { | 701 | if (rdata->rp_state != RPORT_ST_LOGO) { |
687 | FC_DEBUG_RPORT("Received a LOGO response, but in state %s\n", | 702 | FC_DEBUG_RPORT("Received a LOGO response, but in state %s\n", |
688 | fc_rport_state(rport)); | 703 | fc_rport_state(rport)); |
704 | if (IS_ERR(fp)) | ||
705 | goto err; | ||
689 | goto out; | 706 | goto out; |
690 | } | 707 | } |
691 | 708 | ||
709 | if (IS_ERR(fp)) { | ||
710 | fc_rport_error_retry(rport, fp); | ||
711 | goto err; | ||
712 | } | ||
713 | |||
692 | op = fc_frame_payload_op(fp); | 714 | op = fc_frame_payload_op(fp); |
693 | if (op == ELS_LS_ACC) { | 715 | if (op == ELS_LS_ACC) { |
694 | fc_rport_enter_rtv(rport); | 716 | fc_rport_enter_rtv(rport); |
695 | } else { | 717 | } else { |
696 | FC_DBG("Bad ELS response\n"); | 718 | FC_DBG("Bad ELS response\n"); |
697 | rdata->event = RPORT_EV_LOGO; | 719 | rdata->event = RPORT_EV_LOGO; |
720 | fc_rport_state_enter(rport, RPORT_ST_NONE); | ||
698 | queue_work(rport_event_queue, &rdata->event_work); | 721 | queue_work(rport_event_queue, &rdata->event_work); |
699 | } | 722 | } |
700 | 723 | ||
@@ -764,17 +787,19 @@ static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp, | |||
764 | FC_DEBUG_RPORT("Received a RTV response from port (%6x)\n", | 787 | FC_DEBUG_RPORT("Received a RTV response from port (%6x)\n", |
765 | rport->port_id); | 788 | rport->port_id); |
766 | 789 | ||
767 | if (IS_ERR(fp)) { | ||
768 | fc_rport_error(rport, fp); | ||
769 | goto err; | ||
770 | } | ||
771 | |||
772 | if (rdata->rp_state != RPORT_ST_RTV) { | 790 | if (rdata->rp_state != RPORT_ST_RTV) { |
773 | FC_DBG("Received a RTV response, but in state %s\n", | 791 | FC_DBG("Received a RTV response, but in state %s\n", |
774 | fc_rport_state(rport)); | 792 | fc_rport_state(rport)); |
793 | if (IS_ERR(fp)) | ||
794 | goto err; | ||
775 | goto out; | 795 | goto out; |
776 | } | 796 | } |
777 | 797 | ||
798 | if (IS_ERR(fp)) { | ||
799 | fc_rport_error(rport, fp); | ||
800 | goto err; | ||
801 | } | ||
802 | |||
778 | op = fc_frame_payload_op(fp); | 803 | op = fc_frame_payload_op(fp); |
779 | if (op == ELS_LS_ACC) { | 804 | if (op == ELS_LS_ACC) { |
780 | struct fc_els_rtv_acc *rtv; | 805 | struct fc_els_rtv_acc *rtv; |
@@ -1007,6 +1032,8 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport, | |||
1007 | default: | 1032 | default: |
1008 | FC_DEBUG_RPORT("incoming PLOGI from %x in unexpected " | 1033 | FC_DEBUG_RPORT("incoming PLOGI from %x in unexpected " |
1009 | "state %d\n", sid, rdata->rp_state); | 1034 | "state %d\n", sid, rdata->rp_state); |
1035 | fc_frame_free(fp); | ||
1036 | return; | ||
1010 | break; | 1037 | break; |
1011 | } | 1038 | } |
1012 | 1039 | ||
@@ -1098,6 +1125,8 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport, | |||
1098 | reason = ELS_RJT_NONE; | 1125 | reason = ELS_RJT_NONE; |
1099 | break; | 1126 | break; |
1100 | default: | 1127 | default: |
1128 | fc_frame_free(rx_fp); | ||
1129 | return; | ||
1101 | break; | 1130 | break; |
1102 | } | 1131 | } |
1103 | len = fr_len(rx_fp) - sizeof(*fh); | 1132 | len = fr_len(rx_fp) - sizeof(*fh); |
@@ -1227,6 +1256,11 @@ static void fc_rport_recv_prlo_req(struct fc_rport *rport, struct fc_seq *sp, | |||
1227 | "while in state %s\n", ntoh24(fh->fh_s_id), | 1256 | "while in state %s\n", ntoh24(fh->fh_s_id), |
1228 | fc_rport_state(rport)); | 1257 | fc_rport_state(rport)); |
1229 | 1258 | ||
1259 | if (rdata->rp_state == RPORT_ST_NONE) { | ||
1260 | fc_frame_free(fp); | ||
1261 | return; | ||
1262 | } | ||
1263 | |||
1230 | rjt_data.fp = NULL; | 1264 | rjt_data.fp = NULL; |
1231 | rjt_data.reason = ELS_RJT_UNAB; | 1265 | rjt_data.reason = ELS_RJT_UNAB; |
1232 | rjt_data.explan = ELS_EXPL_NONE; | 1266 | rjt_data.explan = ELS_EXPL_NONE; |
@@ -1256,7 +1290,13 @@ static void fc_rport_recv_logo_req(struct fc_rport *rport, struct fc_seq *sp, | |||
1256 | "while in state %s\n", ntoh24(fh->fh_s_id), | 1290 | "while in state %s\n", ntoh24(fh->fh_s_id), |
1257 | fc_rport_state(rport)); | 1291 | fc_rport_state(rport)); |
1258 | 1292 | ||
1293 | if (rdata->rp_state == RPORT_ST_NONE) { | ||
1294 | fc_frame_free(fp); | ||
1295 | return; | ||
1296 | } | ||
1297 | |||
1259 | rdata->event = RPORT_EV_LOGO; | 1298 | rdata->event = RPORT_EV_LOGO; |
1299 | fc_rport_state_enter(rport, RPORT_ST_NONE); | ||
1260 | queue_work(rport_event_queue, &rdata->event_work); | 1300 | queue_work(rport_event_queue, &rdata->event_work); |
1261 | 1301 | ||
1262 | lport->tt.seq_els_rsp_send(sp, ELS_LS_ACC, NULL); | 1302 | lport->tt.seq_els_rsp_send(sp, ELS_LS_ACC, NULL); |
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 68962835916..e72b4ad47d3 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
@@ -1463,6 +1463,16 @@ int iscsi_change_queue_depth(struct scsi_device *sdev, int depth) | |||
1463 | } | 1463 | } |
1464 | EXPORT_SYMBOL_GPL(iscsi_change_queue_depth); | 1464 | EXPORT_SYMBOL_GPL(iscsi_change_queue_depth); |
1465 | 1465 | ||
1466 | int iscsi_target_alloc(struct scsi_target *starget) | ||
1467 | { | ||
1468 | struct iscsi_cls_session *cls_session = starget_to_session(starget); | ||
1469 | struct iscsi_session *session = cls_session->dd_data; | ||
1470 | |||
1471 | starget->can_queue = session->scsi_cmds_max; | ||
1472 | return 0; | ||
1473 | } | ||
1474 | EXPORT_SYMBOL_GPL(iscsi_target_alloc); | ||
1475 | |||
1466 | void iscsi_session_recovery_timedout(struct iscsi_cls_session *cls_session) | 1476 | void iscsi_session_recovery_timedout(struct iscsi_cls_session *cls_session) |
1467 | { | 1477 | { |
1468 | struct iscsi_session *session = cls_session->dd_data; | 1478 | struct iscsi_session *session = cls_session->dd_data; |
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c index 91f8ce4d8d0..b579ca9f483 100644 --- a/drivers/scsi/libiscsi_tcp.c +++ b/drivers/scsi/libiscsi_tcp.c | |||
@@ -1036,8 +1036,11 @@ flush: | |||
1036 | 1036 | ||
1037 | rc = conn->session->tt->init_pdu(task, r2t->data_offset + r2t->sent, | 1037 | rc = conn->session->tt->init_pdu(task, r2t->data_offset + r2t->sent, |
1038 | r2t->data_count); | 1038 | r2t->data_count); |
1039 | if (rc) | 1039 | if (rc) { |
1040 | iscsi_conn_failure(conn, ISCSI_ERR_XMIT_FAILED); | ||
1040 | return rc; | 1041 | return rc; |
1042 | } | ||
1043 | |||
1041 | r2t->sent += r2t->data_count; | 1044 | r2t->sent += r2t->data_count; |
1042 | goto flush; | 1045 | goto flush; |
1043 | } | 1046 | } |
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index dcba267db71..1105f9a111b 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h | |||
@@ -443,6 +443,7 @@ struct lpfc_hba { | |||
443 | uint32_t hba_flag; /* hba generic flags */ | 443 | uint32_t hba_flag; /* hba generic flags */ |
444 | #define HBA_ERATT_HANDLED 0x1 /* This flag is set when eratt handled */ | 444 | #define HBA_ERATT_HANDLED 0x1 /* This flag is set when eratt handled */ |
445 | 445 | ||
446 | #define DEFER_ERATT 0x4 /* Deferred error attention in progress */ | ||
446 | struct lpfc_dmabuf slim2p; | 447 | struct lpfc_dmabuf slim2p; |
447 | 448 | ||
448 | MAILBOX_t *mbox; | 449 | MAILBOX_t *mbox; |
@@ -723,4 +724,3 @@ lpfc_sli_read_hs(struct lpfc_hba *phba) | |||
723 | 724 | ||
724 | return; | 725 | return; |
725 | } | 726 | } |
726 | |||
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 40cf0f4f327..c14f0cbdb12 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #define LPFC_LINK_SPEED_STRING "0, 1, 2, 4, 8" | 51 | #define LPFC_LINK_SPEED_STRING "0, 1, 2, 4, 8" |
52 | 52 | ||
53 | /** | 53 | /** |
54 | * lpfc_jedec_to_ascii: Hex to ascii convertor according to JEDEC rules. | 54 | * lpfc_jedec_to_ascii - Hex to ascii convertor according to JEDEC rules |
55 | * @incr: integer to convert. | 55 | * @incr: integer to convert. |
56 | * @hdw: ascii string holding converted integer plus a string terminator. | 56 | * @hdw: ascii string holding converted integer plus a string terminator. |
57 | * | 57 | * |
@@ -82,7 +82,7 @@ lpfc_jedec_to_ascii(int incr, char hdw[]) | |||
82 | } | 82 | } |
83 | 83 | ||
84 | /** | 84 | /** |
85 | * lpfc_drvr_version_show: Return the Emulex driver string with version number. | 85 | * lpfc_drvr_version_show - Return the Emulex driver string with version number |
86 | * @dev: class unused variable. | 86 | * @dev: class unused variable. |
87 | * @attr: device attribute, not used. | 87 | * @attr: device attribute, not used. |
88 | * @buf: on return contains the module description text. | 88 | * @buf: on return contains the module description text. |
@@ -152,7 +152,7 @@ lpfc_bg_reftag_err_show(struct device *dev, struct device_attribute *attr, | |||
152 | } | 152 | } |
153 | 153 | ||
154 | /** | 154 | /** |
155 | * lpfc_info_show: Return some pci info about the host in ascii. | 155 | * lpfc_info_show - Return some pci info about the host in ascii |
156 | * @dev: class converted to a Scsi_host structure. | 156 | * @dev: class converted to a Scsi_host structure. |
157 | * @attr: device attribute, not used. | 157 | * @attr: device attribute, not used. |
158 | * @buf: on return contains the formatted text from lpfc_info(). | 158 | * @buf: on return contains the formatted text from lpfc_info(). |
@@ -169,7 +169,7 @@ lpfc_info_show(struct device *dev, struct device_attribute *attr, | |||
169 | } | 169 | } |
170 | 170 | ||
171 | /** | 171 | /** |
172 | * lpfc_serialnum_show: Return the hba serial number in ascii. | 172 | * lpfc_serialnum_show - Return the hba serial number in ascii |
173 | * @dev: class converted to a Scsi_host structure. | 173 | * @dev: class converted to a Scsi_host structure. |
174 | * @attr: device attribute, not used. | 174 | * @attr: device attribute, not used. |
175 | * @buf: on return contains the formatted text serial number. | 175 | * @buf: on return contains the formatted text serial number. |
@@ -188,7 +188,7 @@ lpfc_serialnum_show(struct device *dev, struct device_attribute *attr, | |||
188 | } | 188 | } |
189 | 189 | ||
190 | /** | 190 | /** |
191 | * lpfc_temp_sensor_show: Return the temperature sensor level. | 191 | * lpfc_temp_sensor_show - Return the temperature sensor level |
192 | * @dev: class converted to a Scsi_host structure. | 192 | * @dev: class converted to a Scsi_host structure. |
193 | * @attr: device attribute, not used. | 193 | * @attr: device attribute, not used. |
194 | * @buf: on return contains the formatted support level. | 194 | * @buf: on return contains the formatted support level. |
@@ -210,7 +210,7 @@ lpfc_temp_sensor_show(struct device *dev, struct device_attribute *attr, | |||
210 | } | 210 | } |
211 | 211 | ||
212 | /** | 212 | /** |
213 | * lpfc_modeldesc_show: Return the model description of the hba. | 213 | * lpfc_modeldesc_show - Return the model description of the hba |
214 | * @dev: class converted to a Scsi_host structure. | 214 | * @dev: class converted to a Scsi_host structure. |
215 | * @attr: device attribute, not used. | 215 | * @attr: device attribute, not used. |
216 | * @buf: on return contains the scsi vpd model description. | 216 | * @buf: on return contains the scsi vpd model description. |
@@ -229,7 +229,7 @@ lpfc_modeldesc_show(struct device *dev, struct device_attribute *attr, | |||
229 | } | 229 | } |
230 | 230 | ||
231 | /** | 231 | /** |
232 | * lpfc_modelname_show: Return the model name of the hba. | 232 | * lpfc_modelname_show - Return the model name of the hba |
233 | * @dev: class converted to a Scsi_host structure. | 233 | * @dev: class converted to a Scsi_host structure. |
234 | * @attr: device attribute, not used. | 234 | * @attr: device attribute, not used. |
235 | * @buf: on return contains the scsi vpd model name. | 235 | * @buf: on return contains the scsi vpd model name. |
@@ -248,7 +248,7 @@ lpfc_modelname_show(struct device *dev, struct device_attribute *attr, | |||
248 | } | 248 | } |
249 | 249 | ||
250 | /** | 250 | /** |
251 | * lpfc_programtype_show: Return the program type of the hba. | 251 | * lpfc_programtype_show - Return the program type of the hba |
252 | * @dev: class converted to a Scsi_host structure. | 252 | * @dev: class converted to a Scsi_host structure. |
253 | * @attr: device attribute, not used. | 253 | * @attr: device attribute, not used. |
254 | * @buf: on return contains the scsi vpd program type. | 254 | * @buf: on return contains the scsi vpd program type. |
@@ -267,7 +267,7 @@ lpfc_programtype_show(struct device *dev, struct device_attribute *attr, | |||
267 | } | 267 | } |
268 | 268 | ||
269 | /** | 269 | /** |
270 | * lpfc_mlomgmt_show: Return the Menlo Maintenance sli flag. | 270 | * lpfc_mlomgmt_show - Return the Menlo Maintenance sli flag |
271 | * @dev: class converted to a Scsi_host structure. | 271 | * @dev: class converted to a Scsi_host structure. |
272 | * @attr: device attribute, not used. | 272 | * @attr: device attribute, not used. |
273 | * @buf: on return contains the Menlo Maintenance sli flag. | 273 | * @buf: on return contains the Menlo Maintenance sli flag. |
@@ -286,7 +286,7 @@ lpfc_mlomgmt_show(struct device *dev, struct device_attribute *attr, char *buf) | |||
286 | } | 286 | } |
287 | 287 | ||
288 | /** | 288 | /** |
289 | * lpfc_vportnum_show: Return the port number in ascii of the hba. | 289 | * lpfc_vportnum_show - Return the port number in ascii of the hba |
290 | * @dev: class converted to a Scsi_host structure. | 290 | * @dev: class converted to a Scsi_host structure. |
291 | * @attr: device attribute, not used. | 291 | * @attr: device attribute, not used. |
292 | * @buf: on return contains scsi vpd program type. | 292 | * @buf: on return contains scsi vpd program type. |
@@ -305,7 +305,7 @@ lpfc_vportnum_show(struct device *dev, struct device_attribute *attr, | |||
305 | } | 305 | } |
306 | 306 | ||
307 | /** | 307 | /** |
308 | * lpfc_fwrev_show: Return the firmware rev running in the hba. | 308 | * lpfc_fwrev_show - Return the firmware rev running in the hba |
309 | * @dev: class converted to a Scsi_host structure. | 309 | * @dev: class converted to a Scsi_host structure. |
310 | * @attr: device attribute, not used. | 310 | * @attr: device attribute, not used. |
311 | * @buf: on return contains the scsi vpd program type. | 311 | * @buf: on return contains the scsi vpd program type. |
@@ -326,7 +326,7 @@ lpfc_fwrev_show(struct device *dev, struct device_attribute *attr, | |||
326 | } | 326 | } |
327 | 327 | ||
328 | /** | 328 | /** |
329 | * lpfc_hdw_show: Return the jedec information about the hba. | 329 | * lpfc_hdw_show - Return the jedec information about the hba |
330 | * @dev: class converted to a Scsi_host structure. | 330 | * @dev: class converted to a Scsi_host structure. |
331 | * @attr: device attribute, not used. | 331 | * @attr: device attribute, not used. |
332 | * @buf: on return contains the scsi vpd program type. | 332 | * @buf: on return contains the scsi vpd program type. |
@@ -347,7 +347,7 @@ lpfc_hdw_show(struct device *dev, struct device_attribute *attr, char *buf) | |||
347 | } | 347 | } |
348 | 348 | ||
349 | /** | 349 | /** |
350 | * lpfc_option_rom_version_show: Return the adapter ROM FCode version. | 350 | * lpfc_option_rom_version_show - Return the adapter ROM FCode version |
351 | * @dev: class converted to a Scsi_host structure. | 351 | * @dev: class converted to a Scsi_host structure. |
352 | * @attr: device attribute, not used. | 352 | * @attr: device attribute, not used. |
353 | * @buf: on return contains the ROM and FCode ascii strings. | 353 | * @buf: on return contains the ROM and FCode ascii strings. |
@@ -366,7 +366,7 @@ lpfc_option_rom_version_show(struct device *dev, struct device_attribute *attr, | |||
366 | } | 366 | } |
367 | 367 | ||
368 | /** | 368 | /** |
369 | * lpfc_state_show: Return the link state of the port. | 369 | * lpfc_state_show - Return the link state of the port |
370 | * @dev: class converted to a Scsi_host structure. | 370 | * @dev: class converted to a Scsi_host structure. |
371 | * @attr: device attribute, not used. | 371 | * @attr: device attribute, not used. |
372 | * @buf: on return contains text describing the state of the link. | 372 | * @buf: on return contains text describing the state of the link. |
@@ -451,7 +451,7 @@ lpfc_link_state_show(struct device *dev, struct device_attribute *attr, | |||
451 | } | 451 | } |
452 | 452 | ||
453 | /** | 453 | /** |
454 | * lpfc_num_discovered_ports_show: Return sum of mapped and unmapped vports. | 454 | * lpfc_num_discovered_ports_show - Return sum of mapped and unmapped vports |
455 | * @dev: class device that is converted into a Scsi_host. | 455 | * @dev: class device that is converted into a Scsi_host. |
456 | * @attr: device attribute, not used. | 456 | * @attr: device attribute, not used. |
457 | * @buf: on return contains the sum of fc mapped and unmapped. | 457 | * @buf: on return contains the sum of fc mapped and unmapped. |
@@ -474,7 +474,7 @@ lpfc_num_discovered_ports_show(struct device *dev, | |||
474 | } | 474 | } |
475 | 475 | ||
476 | /** | 476 | /** |
477 | * lpfc_issue_lip: Misnomer, name carried over from long ago. | 477 | * lpfc_issue_lip - Misnomer, name carried over from long ago |
478 | * @shost: Scsi_Host pointer. | 478 | * @shost: Scsi_Host pointer. |
479 | * | 479 | * |
480 | * Description: | 480 | * Description: |
@@ -529,7 +529,7 @@ lpfc_issue_lip(struct Scsi_Host *shost) | |||
529 | } | 529 | } |
530 | 530 | ||
531 | /** | 531 | /** |
532 | * lpfc_do_offline: Issues a mailbox command to bring the link down. | 532 | * lpfc_do_offline - Issues a mailbox command to bring the link down |
533 | * @phba: lpfc_hba pointer. | 533 | * @phba: lpfc_hba pointer. |
534 | * @type: LPFC_EVT_OFFLINE, LPFC_EVT_WARM_START, LPFC_EVT_KILL. | 534 | * @type: LPFC_EVT_OFFLINE, LPFC_EVT_WARM_START, LPFC_EVT_KILL. |
535 | * | 535 | * |
@@ -537,7 +537,7 @@ lpfc_issue_lip(struct Scsi_Host *shost) | |||
537 | * Assumes any error from lpfc_do_offline() will be negative. | 537 | * Assumes any error from lpfc_do_offline() will be negative. |
538 | * Can wait up to 5 seconds for the port ring buffers count | 538 | * Can wait up to 5 seconds for the port ring buffers count |
539 | * to reach zero, prints a warning if it is not zero and continues. | 539 | * to reach zero, prints a warning if it is not zero and continues. |
540 | * lpfc_workq_post_event() returns a non-zero return coce if call fails. | 540 | * lpfc_workq_post_event() returns a non-zero return code if call fails. |
541 | * | 541 | * |
542 | * Returns: | 542 | * Returns: |
543 | * -EIO error posting the event | 543 | * -EIO error posting the event |
@@ -591,7 +591,7 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type) | |||
591 | } | 591 | } |
592 | 592 | ||
593 | /** | 593 | /** |
594 | * lpfc_selective_reset: Offline then onlines the port. | 594 | * lpfc_selective_reset - Offline then onlines the port |
595 | * @phba: lpfc_hba pointer. | 595 | * @phba: lpfc_hba pointer. |
596 | * | 596 | * |
597 | * Description: | 597 | * Description: |
@@ -632,7 +632,7 @@ lpfc_selective_reset(struct lpfc_hba *phba) | |||
632 | } | 632 | } |
633 | 633 | ||
634 | /** | 634 | /** |
635 | * lpfc_issue_reset: Selectively resets an adapter. | 635 | * lpfc_issue_reset - Selectively resets an adapter |
636 | * @dev: class device that is converted into a Scsi_host. | 636 | * @dev: class device that is converted into a Scsi_host. |
637 | * @attr: device attribute, not used. | 637 | * @attr: device attribute, not used. |
638 | * @buf: containing the string "selective". | 638 | * @buf: containing the string "selective". |
@@ -672,7 +672,7 @@ lpfc_issue_reset(struct device *dev, struct device_attribute *attr, | |||
672 | } | 672 | } |
673 | 673 | ||
674 | /** | 674 | /** |
675 | * lpfc_nport_evt_cnt_show: Return the number of nport events. | 675 | * lpfc_nport_evt_cnt_show - Return the number of nport events |
676 | * @dev: class device that is converted into a Scsi_host. | 676 | * @dev: class device that is converted into a Scsi_host. |
677 | * @attr: device attribute, not used. | 677 | * @attr: device attribute, not used. |
678 | * @buf: on return contains the ascii number of nport events. | 678 | * @buf: on return contains the ascii number of nport events. |
@@ -691,7 +691,7 @@ lpfc_nport_evt_cnt_show(struct device *dev, struct device_attribute *attr, | |||
691 | } | 691 | } |
692 | 692 | ||
693 | /** | 693 | /** |
694 | * lpfc_board_mode_show: Return the state of the board. | 694 | * lpfc_board_mode_show - Return the state of the board |
695 | * @dev: class device that is converted into a Scsi_host. | 695 | * @dev: class device that is converted into a Scsi_host. |
696 | * @attr: device attribute, not used. | 696 | * @attr: device attribute, not used. |
697 | * @buf: on return contains the state of the adapter. | 697 | * @buf: on return contains the state of the adapter. |
@@ -720,7 +720,7 @@ lpfc_board_mode_show(struct device *dev, struct device_attribute *attr, | |||
720 | } | 720 | } |
721 | 721 | ||
722 | /** | 722 | /** |
723 | * lpfc_board_mode_store: Puts the hba in online, offline, warm or error state. | 723 | * lpfc_board_mode_store - Puts the hba in online, offline, warm or error state |
724 | * @dev: class device that is converted into a Scsi_host. | 724 | * @dev: class device that is converted into a Scsi_host. |
725 | * @attr: device attribute, not used. | 725 | * @attr: device attribute, not used. |
726 | * @buf: containing one of the strings "online", "offline", "warm" or "error". | 726 | * @buf: containing one of the strings "online", "offline", "warm" or "error". |
@@ -766,14 +766,14 @@ lpfc_board_mode_store(struct device *dev, struct device_attribute *attr, | |||
766 | } | 766 | } |
767 | 767 | ||
768 | /** | 768 | /** |
769 | * lpfc_get_hba_info: Return various bits of informaton about the adapter. | 769 | * lpfc_get_hba_info - Return various bits of informaton about the adapter |
770 | * @phba: pointer to the adapter structure. | 770 | * @phba: pointer to the adapter structure. |
771 | * @mxri max xri count. | 771 | * @mxri: max xri count. |
772 | * @axri available xri count. | 772 | * @axri: available xri count. |
773 | * @mrpi max rpi count. | 773 | * @mrpi: max rpi count. |
774 | * @arpi available rpi count. | 774 | * @arpi: available rpi count. |
775 | * @mvpi max vpi count. | 775 | * @mvpi: max vpi count. |
776 | * @avpi available vpi count. | 776 | * @avpi: available vpi count. |
777 | * | 777 | * |
778 | * Description: | 778 | * Description: |
779 | * If an integer pointer for an count is not null then the value for the | 779 | * If an integer pointer for an count is not null then the value for the |
@@ -846,7 +846,7 @@ lpfc_get_hba_info(struct lpfc_hba *phba, | |||
846 | } | 846 | } |
847 | 847 | ||
848 | /** | 848 | /** |
849 | * lpfc_max_rpi_show: Return maximum rpi. | 849 | * lpfc_max_rpi_show - Return maximum rpi |
850 | * @dev: class device that is converted into a Scsi_host. | 850 | * @dev: class device that is converted into a Scsi_host. |
851 | * @attr: device attribute, not used. | 851 | * @attr: device attribute, not used. |
852 | * @buf: on return contains the maximum rpi count in decimal or "Unknown". | 852 | * @buf: on return contains the maximum rpi count in decimal or "Unknown". |
@@ -874,7 +874,7 @@ lpfc_max_rpi_show(struct device *dev, struct device_attribute *attr, | |||
874 | } | 874 | } |
875 | 875 | ||
876 | /** | 876 | /** |
877 | * lpfc_used_rpi_show: Return maximum rpi minus available rpi. | 877 | * lpfc_used_rpi_show - Return maximum rpi minus available rpi |
878 | * @dev: class device that is converted into a Scsi_host. | 878 | * @dev: class device that is converted into a Scsi_host. |
879 | * @attr: device attribute, not used. | 879 | * @attr: device attribute, not used. |
880 | * @buf: containing the used rpi count in decimal or "Unknown". | 880 | * @buf: containing the used rpi count in decimal or "Unknown". |
@@ -902,7 +902,7 @@ lpfc_used_rpi_show(struct device *dev, struct device_attribute *attr, | |||
902 | } | 902 | } |
903 | 903 | ||
904 | /** | 904 | /** |
905 | * lpfc_max_xri_show: Return maximum xri. | 905 | * lpfc_max_xri_show - Return maximum xri |
906 | * @dev: class device that is converted into a Scsi_host. | 906 | * @dev: class device that is converted into a Scsi_host. |
907 | * @attr: device attribute, not used. | 907 | * @attr: device attribute, not used. |
908 | * @buf: on return contains the maximum xri count in decimal or "Unknown". | 908 | * @buf: on return contains the maximum xri count in decimal or "Unknown". |
@@ -930,7 +930,7 @@ lpfc_max_xri_show(struct device *dev, struct device_attribute *attr, | |||
930 | } | 930 | } |
931 | 931 | ||
932 | /** | 932 | /** |
933 | * lpfc_used_xri_show: Return maximum xpi minus the available xpi. | 933 | * lpfc_used_xri_show - Return maximum xpi minus the available xpi |
934 | * @dev: class device that is converted into a Scsi_host. | 934 | * @dev: class device that is converted into a Scsi_host. |
935 | * @attr: device attribute, not used. | 935 | * @attr: device attribute, not used. |
936 | * @buf: on return contains the used xri count in decimal or "Unknown". | 936 | * @buf: on return contains the used xri count in decimal or "Unknown". |
@@ -958,7 +958,7 @@ lpfc_used_xri_show(struct device *dev, struct device_attribute *attr, | |||
958 | } | 958 | } |
959 | 959 | ||
960 | /** | 960 | /** |
961 | * lpfc_max_vpi_show: Return maximum vpi. | 961 | * lpfc_max_vpi_show - Return maximum vpi |
962 | * @dev: class device that is converted into a Scsi_host. | 962 | * @dev: class device that is converted into a Scsi_host. |
963 | * @attr: device attribute, not used. | 963 | * @attr: device attribute, not used. |
964 | * @buf: on return contains the maximum vpi count in decimal or "Unknown". | 964 | * @buf: on return contains the maximum vpi count in decimal or "Unknown". |
@@ -986,7 +986,7 @@ lpfc_max_vpi_show(struct device *dev, struct device_attribute *attr, | |||
986 | } | 986 | } |
987 | 987 | ||
988 | /** | 988 | /** |
989 | * lpfc_used_vpi_show: Return maximum vpi minus the available vpi. | 989 | * lpfc_used_vpi_show - Return maximum vpi minus the available vpi |
990 | * @dev: class device that is converted into a Scsi_host. | 990 | * @dev: class device that is converted into a Scsi_host. |
991 | * @attr: device attribute, not used. | 991 | * @attr: device attribute, not used. |
992 | * @buf: on return contains the used vpi count in decimal or "Unknown". | 992 | * @buf: on return contains the used vpi count in decimal or "Unknown". |
@@ -1014,7 +1014,7 @@ lpfc_used_vpi_show(struct device *dev, struct device_attribute *attr, | |||
1014 | } | 1014 | } |
1015 | 1015 | ||
1016 | /** | 1016 | /** |
1017 | * lpfc_npiv_info_show: Return text about NPIV support for the adapter. | 1017 | * lpfc_npiv_info_show - Return text about NPIV support for the adapter |
1018 | * @dev: class device that is converted into a Scsi_host. | 1018 | * @dev: class device that is converted into a Scsi_host. |
1019 | * @attr: device attribute, not used. | 1019 | * @attr: device attribute, not used. |
1020 | * @buf: text that must be interpreted to determine if npiv is supported. | 1020 | * @buf: text that must be interpreted to determine if npiv is supported. |
@@ -1042,7 +1042,7 @@ lpfc_npiv_info_show(struct device *dev, struct device_attribute *attr, | |||
1042 | } | 1042 | } |
1043 | 1043 | ||
1044 | /** | 1044 | /** |
1045 | * lpfc_poll_show: Return text about poll support for the adapter. | 1045 | * lpfc_poll_show - Return text about poll support for the adapter |
1046 | * @dev: class device that is converted into a Scsi_host. | 1046 | * @dev: class device that is converted into a Scsi_host. |
1047 | * @attr: device attribute, not used. | 1047 | * @attr: device attribute, not used. |
1048 | * @buf: on return contains the cfg_poll in hex. | 1048 | * @buf: on return contains the cfg_poll in hex. |
@@ -1064,7 +1064,7 @@ lpfc_poll_show(struct device *dev, struct device_attribute *attr, | |||
1064 | } | 1064 | } |
1065 | 1065 | ||
1066 | /** | 1066 | /** |
1067 | * lpfc_poll_store: Set the value of cfg_poll for the adapter. | 1067 | * lpfc_poll_store - Set the value of cfg_poll for the adapter |
1068 | * @dev: class device that is converted into a Scsi_host. | 1068 | * @dev: class device that is converted into a Scsi_host. |
1069 | * @attr: device attribute, not used. | 1069 | * @attr: device attribute, not used. |
1070 | * @buf: one or more lpfc_polling_flags values. | 1070 | * @buf: one or more lpfc_polling_flags values. |
@@ -1136,7 +1136,7 @@ lpfc_poll_store(struct device *dev, struct device_attribute *attr, | |||
1136 | } | 1136 | } |
1137 | 1137 | ||
1138 | /** | 1138 | /** |
1139 | * lpfc_param_show: Return a cfg attribute value in decimal. | 1139 | * lpfc_param_show - Return a cfg attribute value in decimal |
1140 | * | 1140 | * |
1141 | * Description: | 1141 | * Description: |
1142 | * Macro that given an attr e.g. hba_queue_depth expands | 1142 | * Macro that given an attr e.g. hba_queue_depth expands |
@@ -1164,7 +1164,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ | |||
1164 | } | 1164 | } |
1165 | 1165 | ||
1166 | /** | 1166 | /** |
1167 | * lpfc_param_hex_show: Return a cfg attribute value in hex. | 1167 | * lpfc_param_hex_show - Return a cfg attribute value in hex |
1168 | * | 1168 | * |
1169 | * Description: | 1169 | * Description: |
1170 | * Macro that given an attr e.g. hba_queue_depth expands | 1170 | * Macro that given an attr e.g. hba_queue_depth expands |
@@ -1173,7 +1173,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ | |||
1173 | * lpfc_##attr##_show: Return the hex value of an adapters cfg_xxx field. | 1173 | * lpfc_##attr##_show: Return the hex value of an adapters cfg_xxx field. |
1174 | * @dev: class device that is converted into a Scsi_host. | 1174 | * @dev: class device that is converted into a Scsi_host. |
1175 | * @attr: device attribute, not used. | 1175 | * @attr: device attribute, not used. |
1176 | * @buf: on return contains the attribute value in hexidecimal. | 1176 | * @buf: on return contains the attribute value in hexadecimal. |
1177 | * | 1177 | * |
1178 | * Returns: size of formatted string. | 1178 | * Returns: size of formatted string. |
1179 | **/ | 1179 | **/ |
@@ -1192,7 +1192,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ | |||
1192 | } | 1192 | } |
1193 | 1193 | ||
1194 | /** | 1194 | /** |
1195 | * lpfc_param_init: Intializes a cfg attribute. | 1195 | * lpfc_param_init - Intializes a cfg attribute |
1196 | * | 1196 | * |
1197 | * Description: | 1197 | * Description: |
1198 | * Macro that given an attr e.g. hba_queue_depth expands | 1198 | * Macro that given an attr e.g. hba_queue_depth expands |
@@ -1226,7 +1226,7 @@ lpfc_##attr##_init(struct lpfc_hba *phba, int val) \ | |||
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | /** | 1228 | /** |
1229 | * lpfc_param_set: Set a cfg attribute value. | 1229 | * lpfc_param_set - Set a cfg attribute value |
1230 | * | 1230 | * |
1231 | * Description: | 1231 | * Description: |
1232 | * Macro that given an attr e.g. hba_queue_depth expands | 1232 | * Macro that given an attr e.g. hba_queue_depth expands |
@@ -1260,7 +1260,7 @@ lpfc_##attr##_set(struct lpfc_hba *phba, int val) \ | |||
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | /** | 1262 | /** |
1263 | * lpfc_param_store: Set a vport attribute value. | 1263 | * lpfc_param_store - Set a vport attribute value |
1264 | * | 1264 | * |
1265 | * Description: | 1265 | * Description: |
1266 | * Macro that given an attr e.g. hba_queue_depth expands | 1266 | * Macro that given an attr e.g. hba_queue_depth expands |
@@ -1300,7 +1300,7 @@ lpfc_##attr##_store(struct device *dev, struct device_attribute *attr, \ | |||
1300 | } | 1300 | } |
1301 | 1301 | ||
1302 | /** | 1302 | /** |
1303 | * lpfc_vport_param_show: Return decimal formatted cfg attribute value. | 1303 | * lpfc_vport_param_show - Return decimal formatted cfg attribute value |
1304 | * | 1304 | * |
1305 | * Description: | 1305 | * Description: |
1306 | * Macro that given an attr e.g. hba_queue_depth expands | 1306 | * Macro that given an attr e.g. hba_queue_depth expands |
@@ -1326,17 +1326,17 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ | |||
1326 | } | 1326 | } |
1327 | 1327 | ||
1328 | /** | 1328 | /** |
1329 | * lpfc_vport_param_hex_show: Return hex formatted attribute value. | 1329 | * lpfc_vport_param_hex_show - Return hex formatted attribute value |
1330 | * | 1330 | * |
1331 | * Description: | 1331 | * Description: |
1332 | * Macro that given an attr e.g. | 1332 | * Macro that given an attr e.g. |
1333 | * hba_queue_depth expands into a function with the name | 1333 | * hba_queue_depth expands into a function with the name |
1334 | * lpfc_hba_queue_depth_show | 1334 | * lpfc_hba_queue_depth_show |
1335 | * | 1335 | * |
1336 | * lpfc_##attr##_show: prints the attribute value in hexidecimal. | 1336 | * lpfc_##attr##_show: prints the attribute value in hexadecimal. |
1337 | * @dev: class device that is converted into a Scsi_host. | 1337 | * @dev: class device that is converted into a Scsi_host. |
1338 | * @attr: device attribute, not used. | 1338 | * @attr: device attribute, not used. |
1339 | * @buf: on return contains the attribute value in hexidecimal. | 1339 | * @buf: on return contains the attribute value in hexadecimal. |
1340 | * | 1340 | * |
1341 | * Returns: length of formatted string. | 1341 | * Returns: length of formatted string. |
1342 | **/ | 1342 | **/ |
@@ -1353,7 +1353,7 @@ lpfc_##attr##_show(struct device *dev, struct device_attribute *attr, \ | |||
1353 | } | 1353 | } |
1354 | 1354 | ||
1355 | /** | 1355 | /** |
1356 | * lpfc_vport_param_init: Initialize a vport cfg attribute. | 1356 | * lpfc_vport_param_init - Initialize a vport cfg attribute |
1357 | * | 1357 | * |
1358 | * Description: | 1358 | * Description: |
1359 | * Macro that given an attr e.g. hba_queue_depth expands | 1359 | * Macro that given an attr e.g. hba_queue_depth expands |
@@ -1386,7 +1386,7 @@ lpfc_##attr##_init(struct lpfc_vport *vport, int val) \ | |||
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | /** | 1388 | /** |
1389 | * lpfc_vport_param_set: Set a vport cfg attribute. | 1389 | * lpfc_vport_param_set - Set a vport cfg attribute |
1390 | * | 1390 | * |
1391 | * Description: | 1391 | * Description: |
1392 | * Macro that given an attr e.g. hba_queue_depth expands | 1392 | * Macro that given an attr e.g. hba_queue_depth expands |
@@ -1417,7 +1417,7 @@ lpfc_##attr##_set(struct lpfc_vport *vport, int val) \ | |||
1417 | } | 1417 | } |
1418 | 1418 | ||
1419 | /** | 1419 | /** |
1420 | * lpfc_vport_param_store: Set a vport attribute. | 1420 | * lpfc_vport_param_store - Set a vport attribute |
1421 | * | 1421 | * |
1422 | * Description: | 1422 | * Description: |
1423 | * Macro that given an attr e.g. hba_queue_depth | 1423 | * Macro that given an attr e.g. hba_queue_depth |
@@ -1576,7 +1576,7 @@ static DEVICE_ATTR(lpfc_temp_sensor, S_IRUGO, lpfc_temp_sensor_show, NULL); | |||
1576 | static char *lpfc_soft_wwn_key = "C99G71SL8032A"; | 1576 | static char *lpfc_soft_wwn_key = "C99G71SL8032A"; |
1577 | 1577 | ||
1578 | /** | 1578 | /** |
1579 | * lpfc_soft_wwn_enable_store: Allows setting of the wwn if the key is valid. | 1579 | * lpfc_soft_wwn_enable_store - Allows setting of the wwn if the key is valid |
1580 | * @dev: class device that is converted into a Scsi_host. | 1580 | * @dev: class device that is converted into a Scsi_host. |
1581 | * @attr: device attribute, not used. | 1581 | * @attr: device attribute, not used. |
1582 | * @buf: containing the string lpfc_soft_wwn_key. | 1582 | * @buf: containing the string lpfc_soft_wwn_key. |
@@ -1623,10 +1623,10 @@ static DEVICE_ATTR(lpfc_soft_wwn_enable, S_IWUSR, NULL, | |||
1623 | lpfc_soft_wwn_enable_store); | 1623 | lpfc_soft_wwn_enable_store); |
1624 | 1624 | ||
1625 | /** | 1625 | /** |
1626 | * lpfc_soft_wwpn_show: Return the cfg soft ww port name of the adapter. | 1626 | * lpfc_soft_wwpn_show - Return the cfg soft ww port name of the adapter |
1627 | * @dev: class device that is converted into a Scsi_host. | 1627 | * @dev: class device that is converted into a Scsi_host. |
1628 | * @attr: device attribute, not used. | 1628 | * @attr: device attribute, not used. |
1629 | * @buf: on return contains the wwpn in hexidecimal. | 1629 | * @buf: on return contains the wwpn in hexadecimal. |
1630 | * | 1630 | * |
1631 | * Returns: size of formatted string. | 1631 | * Returns: size of formatted string. |
1632 | **/ | 1632 | **/ |
@@ -1643,10 +1643,10 @@ lpfc_soft_wwpn_show(struct device *dev, struct device_attribute *attr, | |||
1643 | } | 1643 | } |
1644 | 1644 | ||
1645 | /** | 1645 | /** |
1646 | * lpfc_soft_wwpn_store: Set the ww port name of the adapter. | 1646 | * lpfc_soft_wwpn_store - Set the ww port name of the adapter |
1647 | * @dev class device that is converted into a Scsi_host. | 1647 | * @dev class device that is converted into a Scsi_host. |
1648 | * @attr: device attribute, not used. | 1648 | * @attr: device attribute, not used. |
1649 | * @buf: contains the wwpn in hexidecimal. | 1649 | * @buf: contains the wwpn in hexadecimal. |
1650 | * @count: number of wwpn bytes in buf | 1650 | * @count: number of wwpn bytes in buf |
1651 | * | 1651 | * |
1652 | * Returns: | 1652 | * Returns: |
@@ -1729,10 +1729,10 @@ static DEVICE_ATTR(lpfc_soft_wwpn, S_IRUGO | S_IWUSR,\ | |||
1729 | lpfc_soft_wwpn_show, lpfc_soft_wwpn_store); | 1729 | lpfc_soft_wwpn_show, lpfc_soft_wwpn_store); |
1730 | 1730 | ||
1731 | /** | 1731 | /** |
1732 | * lpfc_soft_wwnn_show: Return the cfg soft ww node name for the adapter. | 1732 | * lpfc_soft_wwnn_show - Return the cfg soft ww node name for the adapter |
1733 | * @dev: class device that is converted into a Scsi_host. | 1733 | * @dev: class device that is converted into a Scsi_host. |
1734 | * @attr: device attribute, not used. | 1734 | * @attr: device attribute, not used. |
1735 | * @buf: on return contains the wwnn in hexidecimal. | 1735 | * @buf: on return contains the wwnn in hexadecimal. |
1736 | * | 1736 | * |
1737 | * Returns: size of formatted string. | 1737 | * Returns: size of formatted string. |
1738 | **/ | 1738 | **/ |
@@ -1747,9 +1747,9 @@ lpfc_soft_wwnn_show(struct device *dev, struct device_attribute *attr, | |||
1747 | } | 1747 | } |
1748 | 1748 | ||
1749 | /** | 1749 | /** |
1750 | * lpfc_soft_wwnn_store: sets the ww node name of the adapter. | 1750 | * lpfc_soft_wwnn_store - sets the ww node name of the adapter |
1751 | * @cdev: class device that is converted into a Scsi_host. | 1751 | * @cdev: class device that is converted into a Scsi_host. |
1752 | * @buf: contains the ww node name in hexidecimal. | 1752 | * @buf: contains the ww node name in hexadecimal. |
1753 | * @count: number of wwnn bytes in buf. | 1753 | * @count: number of wwnn bytes in buf. |
1754 | * | 1754 | * |
1755 | * Returns: | 1755 | * Returns: |
@@ -1845,7 +1845,7 @@ MODULE_PARM_DESC(lpfc_nodev_tmo, | |||
1845 | "for a device to come back"); | 1845 | "for a device to come back"); |
1846 | 1846 | ||
1847 | /** | 1847 | /** |
1848 | * lpfc_nodev_tmo_show: Return the hba dev loss timeout value. | 1848 | * lpfc_nodev_tmo_show - Return the hba dev loss timeout value |
1849 | * @dev: class converted to a Scsi_host structure. | 1849 | * @dev: class converted to a Scsi_host structure. |
1850 | * @attr: device attribute, not used. | 1850 | * @attr: device attribute, not used. |
1851 | * @buf: on return contains the dev loss timeout in decimal. | 1851 | * @buf: on return contains the dev loss timeout in decimal. |
@@ -1864,7 +1864,7 @@ lpfc_nodev_tmo_show(struct device *dev, struct device_attribute *attr, | |||
1864 | } | 1864 | } |
1865 | 1865 | ||
1866 | /** | 1866 | /** |
1867 | * lpfc_nodev_tmo_init: Set the hba nodev timeout value. | 1867 | * lpfc_nodev_tmo_init - Set the hba nodev timeout value |
1868 | * @vport: lpfc vport structure pointer. | 1868 | * @vport: lpfc vport structure pointer. |
1869 | * @val: contains the nodev timeout value. | 1869 | * @val: contains the nodev timeout value. |
1870 | * | 1870 | * |
@@ -1905,7 +1905,7 @@ lpfc_nodev_tmo_init(struct lpfc_vport *vport, int val) | |||
1905 | } | 1905 | } |
1906 | 1906 | ||
1907 | /** | 1907 | /** |
1908 | * lpfc_update_rport_devloss_tmo: Update dev loss tmo value. | 1908 | * lpfc_update_rport_devloss_tmo - Update dev loss tmo value |
1909 | * @vport: lpfc vport structure pointer. | 1909 | * @vport: lpfc vport structure pointer. |
1910 | * | 1910 | * |
1911 | * Description: | 1911 | * Description: |
@@ -1926,7 +1926,7 @@ lpfc_update_rport_devloss_tmo(struct lpfc_vport *vport) | |||
1926 | } | 1926 | } |
1927 | 1927 | ||
1928 | /** | 1928 | /** |
1929 | * lpfc_nodev_tmo_set: Set the vport nodev tmo and devloss tmo values. | 1929 | * lpfc_nodev_tmo_set - Set the vport nodev tmo and devloss tmo values |
1930 | * @vport: lpfc vport structure pointer. | 1930 | * @vport: lpfc vport structure pointer. |
1931 | * @val: contains the tmo value. | 1931 | * @val: contains the tmo value. |
1932 | * | 1932 | * |
@@ -1982,7 +1982,7 @@ lpfc_vport_param_init(devloss_tmo, LPFC_DEF_DEVLOSS_TMO, | |||
1982 | lpfc_vport_param_show(devloss_tmo) | 1982 | lpfc_vport_param_show(devloss_tmo) |
1983 | 1983 | ||
1984 | /** | 1984 | /** |
1985 | * lpfc_devloss_tmo_set: Sets vport nodev tmo, devloss tmo values, changed bit. | 1985 | * lpfc_devloss_tmo_set - Sets vport nodev tmo, devloss tmo values, changed bit |
1986 | * @vport: lpfc vport structure pointer. | 1986 | * @vport: lpfc vport structure pointer. |
1987 | * @val: contains the tmo value. | 1987 | * @val: contains the tmo value. |
1988 | * | 1988 | * |
@@ -2094,7 +2094,7 @@ MODULE_PARM_DESC(lpfc_restrict_login, | |||
2094 | lpfc_vport_param_show(restrict_login); | 2094 | lpfc_vport_param_show(restrict_login); |
2095 | 2095 | ||
2096 | /** | 2096 | /** |
2097 | * lpfc_restrict_login_init: Set the vport restrict login flag. | 2097 | * lpfc_restrict_login_init - Set the vport restrict login flag |
2098 | * @vport: lpfc vport structure pointer. | 2098 | * @vport: lpfc vport structure pointer. |
2099 | * @val: contains the restrict login value. | 2099 | * @val: contains the restrict login value. |
2100 | * | 2100 | * |
@@ -2128,7 +2128,7 @@ lpfc_restrict_login_init(struct lpfc_vport *vport, int val) | |||
2128 | } | 2128 | } |
2129 | 2129 | ||
2130 | /** | 2130 | /** |
2131 | * lpfc_restrict_login_set: Set the vport restrict login flag. | 2131 | * lpfc_restrict_login_set - Set the vport restrict login flag |
2132 | * @vport: lpfc vport structure pointer. | 2132 | * @vport: lpfc vport structure pointer. |
2133 | * @val: contains the restrict login value. | 2133 | * @val: contains the restrict login value. |
2134 | * | 2134 | * |
@@ -2201,7 +2201,7 @@ LPFC_VPORT_ATTR_R(scan_down, 1, 0, 1, | |||
2201 | */ | 2201 | */ |
2202 | 2202 | ||
2203 | /** | 2203 | /** |
2204 | * lpfc_topology_set: Set the adapters topology field. | 2204 | * lpfc_topology_set - Set the adapters topology field |
2205 | * @phba: lpfc_hba pointer. | 2205 | * @phba: lpfc_hba pointer. |
2206 | * @val: topology value. | 2206 | * @val: topology value. |
2207 | * | 2207 | * |
@@ -2216,18 +2216,41 @@ LPFC_VPORT_ATTR_R(scan_down, 1, 0, 1, | |||
2216 | * non-zero return value from lpfc_issue_lip() | 2216 | * non-zero return value from lpfc_issue_lip() |
2217 | * -EINVAL val out of range | 2217 | * -EINVAL val out of range |
2218 | **/ | 2218 | **/ |
2219 | static int | 2219 | static ssize_t |
2220 | lpfc_topology_set(struct lpfc_hba *phba, int val) | 2220 | lpfc_topology_store(struct device *dev, struct device_attribute *attr, |
2221 | const char *buf, size_t count) | ||
2221 | { | 2222 | { |
2223 | struct Scsi_Host *shost = class_to_shost(dev); | ||
2224 | struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; | ||
2225 | struct lpfc_hba *phba = vport->phba; | ||
2226 | int val = 0; | ||
2227 | int nolip = 0; | ||
2228 | const char *val_buf = buf; | ||
2222 | int err; | 2229 | int err; |
2223 | uint32_t prev_val; | 2230 | uint32_t prev_val; |
2231 | |||
2232 | if (!strncmp(buf, "nolip ", strlen("nolip "))) { | ||
2233 | nolip = 1; | ||
2234 | val_buf = &buf[strlen("nolip ")]; | ||
2235 | } | ||
2236 | |||
2237 | if (!isdigit(val_buf[0])) | ||
2238 | return -EINVAL; | ||
2239 | if (sscanf(val_buf, "%i", &val) != 1) | ||
2240 | return -EINVAL; | ||
2241 | |||
2224 | if (val >= 0 && val <= 6) { | 2242 | if (val >= 0 && val <= 6) { |
2225 | prev_val = phba->cfg_topology; | 2243 | prev_val = phba->cfg_topology; |
2226 | phba->cfg_topology = val; | 2244 | phba->cfg_topology = val; |
2245 | if (nolip) | ||
2246 | return strlen(buf); | ||
2247 | |||
2227 | err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport)); | 2248 | err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport)); |
2228 | if (err) | 2249 | if (err) { |
2229 | phba->cfg_topology = prev_val; | 2250 | phba->cfg_topology = prev_val; |
2230 | return err; | 2251 | return -EINVAL; |
2252 | } else | ||
2253 | return strlen(buf); | ||
2231 | } | 2254 | } |
2232 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, | 2255 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, |
2233 | "%d:0467 lpfc_topology attribute cannot be set to %d, " | 2256 | "%d:0467 lpfc_topology attribute cannot be set to %d, " |
@@ -2240,14 +2263,12 @@ module_param(lpfc_topology, int, 0); | |||
2240 | MODULE_PARM_DESC(lpfc_topology, "Select Fibre Channel topology"); | 2263 | MODULE_PARM_DESC(lpfc_topology, "Select Fibre Channel topology"); |
2241 | lpfc_param_show(topology) | 2264 | lpfc_param_show(topology) |
2242 | lpfc_param_init(topology, 0, 0, 6) | 2265 | lpfc_param_init(topology, 0, 0, 6) |
2243 | lpfc_param_store(topology) | ||
2244 | static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR, | 2266 | static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR, |
2245 | lpfc_topology_show, lpfc_topology_store); | 2267 | lpfc_topology_show, lpfc_topology_store); |
2246 | 2268 | ||
2247 | 2269 | ||
2248 | /** | 2270 | /** |
2249 | * lpfc_stat_data_ctrl_store: write call back for lpfc_stat_data_ctrl | 2271 | * lpfc_stat_data_ctrl_store - write call back for lpfc_stat_data_ctrl sysfs file |
2250 | * sysfs file. | ||
2251 | * @dev: Pointer to class device. | 2272 | * @dev: Pointer to class device. |
2252 | * @buf: Data buffer. | 2273 | * @buf: Data buffer. |
2253 | * @count: Size of the data buffer. | 2274 | * @count: Size of the data buffer. |
@@ -2282,7 +2303,7 @@ lpfc_stat_data_ctrl_store(struct device *dev, struct device_attribute *attr, | |||
2282 | unsigned long base, step, bucket_type; | 2303 | unsigned long base, step, bucket_type; |
2283 | 2304 | ||
2284 | if (!strncmp(buf, "setbucket", strlen("setbucket"))) { | 2305 | if (!strncmp(buf, "setbucket", strlen("setbucket"))) { |
2285 | if (strlen(buf) > LPFC_MAX_DATA_CTRL_LEN) | 2306 | if (strlen(buf) > (LPFC_MAX_DATA_CTRL_LEN - 1)) |
2286 | return -EINVAL; | 2307 | return -EINVAL; |
2287 | 2308 | ||
2288 | strcpy(bucket_data, buf); | 2309 | strcpy(bucket_data, buf); |
@@ -2411,8 +2432,7 @@ lpfc_stat_data_ctrl_store(struct device *dev, struct device_attribute *attr, | |||
2411 | 2432 | ||
2412 | 2433 | ||
2413 | /** | 2434 | /** |
2414 | * lpfc_stat_data_ctrl_show: Read callback function for | 2435 | * lpfc_stat_data_ctrl_show - Read function for lpfc_stat_data_ctrl sysfs file |
2415 | * lpfc_stat_data_ctrl sysfs file. | ||
2416 | * @dev: Pointer to class device object. | 2436 | * @dev: Pointer to class device object. |
2417 | * @buf: Data buffer. | 2437 | * @buf: Data buffer. |
2418 | * | 2438 | * |
@@ -2489,8 +2509,7 @@ static DEVICE_ATTR(lpfc_stat_data_ctrl, S_IRUGO | S_IWUSR, | |||
2489 | 2509 | ||
2490 | 2510 | ||
2491 | /** | 2511 | /** |
2492 | * sysfs_drvr_stat_data_read: Read callback function for lpfc_drvr_stat_data | 2512 | * sysfs_drvr_stat_data_read - Read function for lpfc_drvr_stat_data attribute |
2493 | * sysfs attribute. | ||
2494 | * @kobj: Pointer to the kernel object | 2513 | * @kobj: Pointer to the kernel object |
2495 | * @bin_attr: Attribute object | 2514 | * @bin_attr: Attribute object |
2496 | * @buff: Buffer pointer | 2515 | * @buff: Buffer pointer |
@@ -2585,7 +2604,7 @@ static struct bin_attribute sysfs_drvr_stat_data_attr = { | |||
2585 | */ | 2604 | */ |
2586 | 2605 | ||
2587 | /** | 2606 | /** |
2588 | * lpfc_link_speed_set: Set the adapters link speed. | 2607 | * lpfc_link_speed_set - Set the adapters link speed |
2589 | * @phba: lpfc_hba pointer. | 2608 | * @phba: lpfc_hba pointer. |
2590 | * @val: link speed value. | 2609 | * @val: link speed value. |
2591 | * | 2610 | * |
@@ -2601,12 +2620,29 @@ static struct bin_attribute sysfs_drvr_stat_data_attr = { | |||
2601 | * non-zero return value from lpfc_issue_lip() | 2620 | * non-zero return value from lpfc_issue_lip() |
2602 | * -EINVAL val out of range | 2621 | * -EINVAL val out of range |
2603 | **/ | 2622 | **/ |
2604 | static int | 2623 | static ssize_t |
2605 | lpfc_link_speed_set(struct lpfc_hba *phba, int val) | 2624 | lpfc_link_speed_store(struct device *dev, struct device_attribute *attr, |
2625 | const char *buf, size_t count) | ||
2606 | { | 2626 | { |
2627 | struct Scsi_Host *shost = class_to_shost(dev); | ||
2628 | struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; | ||
2629 | struct lpfc_hba *phba = vport->phba; | ||
2630 | int val = 0; | ||
2631 | int nolip = 0; | ||
2632 | const char *val_buf = buf; | ||
2607 | int err; | 2633 | int err; |
2608 | uint32_t prev_val; | 2634 | uint32_t prev_val; |
2609 | 2635 | ||
2636 | if (!strncmp(buf, "nolip ", strlen("nolip "))) { | ||
2637 | nolip = 1; | ||
2638 | val_buf = &buf[strlen("nolip ")]; | ||
2639 | } | ||
2640 | |||
2641 | if (!isdigit(val_buf[0])) | ||
2642 | return -EINVAL; | ||
2643 | if (sscanf(val_buf, "%i", &val) != 1) | ||
2644 | return -EINVAL; | ||
2645 | |||
2610 | if (((val == LINK_SPEED_1G) && !(phba->lmt & LMT_1Gb)) || | 2646 | if (((val == LINK_SPEED_1G) && !(phba->lmt & LMT_1Gb)) || |
2611 | ((val == LINK_SPEED_2G) && !(phba->lmt & LMT_2Gb)) || | 2647 | ((val == LINK_SPEED_2G) && !(phba->lmt & LMT_2Gb)) || |
2612 | ((val == LINK_SPEED_4G) && !(phba->lmt & LMT_4Gb)) || | 2648 | ((val == LINK_SPEED_4G) && !(phba->lmt & LMT_4Gb)) || |
@@ -2614,14 +2650,19 @@ lpfc_link_speed_set(struct lpfc_hba *phba, int val) | |||
2614 | ((val == LINK_SPEED_10G) && !(phba->lmt & LMT_10Gb))) | 2650 | ((val == LINK_SPEED_10G) && !(phba->lmt & LMT_10Gb))) |
2615 | return -EINVAL; | 2651 | return -EINVAL; |
2616 | 2652 | ||
2617 | if ((val >= 0 && val <= LPFC_MAX_LINK_SPEED) | 2653 | if ((val >= 0 && val <= 8) |
2618 | && (LPFC_LINK_SPEED_BITMAP & (1 << val))) { | 2654 | && (LPFC_LINK_SPEED_BITMAP & (1 << val))) { |
2619 | prev_val = phba->cfg_link_speed; | 2655 | prev_val = phba->cfg_link_speed; |
2620 | phba->cfg_link_speed = val; | 2656 | phba->cfg_link_speed = val; |
2657 | if (nolip) | ||
2658 | return strlen(buf); | ||
2659 | |||
2621 | err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport)); | 2660 | err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport)); |
2622 | if (err) | 2661 | if (err) { |
2623 | phba->cfg_link_speed = prev_val; | 2662 | phba->cfg_link_speed = prev_val; |
2624 | return err; | 2663 | return -EINVAL; |
2664 | } else | ||
2665 | return strlen(buf); | ||
2625 | } | 2666 | } |
2626 | 2667 | ||
2627 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, | 2668 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, |
@@ -2637,7 +2678,7 @@ MODULE_PARM_DESC(lpfc_link_speed, "Select link speed"); | |||
2637 | lpfc_param_show(link_speed) | 2678 | lpfc_param_show(link_speed) |
2638 | 2679 | ||
2639 | /** | 2680 | /** |
2640 | * lpfc_link_speed_init: Set the adapters link speed. | 2681 | * lpfc_link_speed_init - Set the adapters link speed |
2641 | * @phba: lpfc_hba pointer. | 2682 | * @phba: lpfc_hba pointer. |
2642 | * @val: link speed value. | 2683 | * @val: link speed value. |
2643 | * | 2684 | * |
@@ -2668,7 +2709,6 @@ lpfc_link_speed_init(struct lpfc_hba *phba, int val) | |||
2668 | return -EINVAL; | 2709 | return -EINVAL; |
2669 | } | 2710 | } |
2670 | 2711 | ||
2671 | lpfc_param_store(link_speed) | ||
2672 | static DEVICE_ATTR(lpfc_link_speed, S_IRUGO | S_IWUSR, | 2712 | static DEVICE_ATTR(lpfc_link_speed, S_IRUGO | S_IWUSR, |
2673 | lpfc_link_speed_show, lpfc_link_speed_store); | 2713 | lpfc_link_speed_show, lpfc_link_speed_store); |
2674 | 2714 | ||
@@ -2865,7 +2905,7 @@ MODULE_PARM_DESC(lpfc_prot_guard, "host protection guard type"); | |||
2865 | 2905 | ||
2866 | 2906 | ||
2867 | /* | 2907 | /* |
2868 | * lpfc_sg_seg_cnt: Initial Maximum DMA Segment Count | 2908 | * lpfc_sg_seg_cnt - Initial Maximum DMA Segment Count |
2869 | * This value can be set to values between 64 and 256. The default value is | 2909 | * This value can be set to values between 64 and 256. The default value is |
2870 | * 64, but may be increased to allow for larger Max I/O sizes. The scsi layer | 2910 | * 64, but may be increased to allow for larger Max I/O sizes. The scsi layer |
2871 | * will be allowed to request I/Os of sizes up to (MAX_SEG_COUNT * SEG_SIZE). | 2911 | * will be allowed to request I/Os of sizes up to (MAX_SEG_COUNT * SEG_SIZE). |
@@ -2967,7 +3007,7 @@ struct device_attribute *lpfc_vport_attrs[] = { | |||
2967 | }; | 3007 | }; |
2968 | 3008 | ||
2969 | /** | 3009 | /** |
2970 | * sysfs_ctlreg_write: Write method for writing to ctlreg. | 3010 | * sysfs_ctlreg_write - Write method for writing to ctlreg |
2971 | * @kobj: kernel kobject that contains the kernel class device. | 3011 | * @kobj: kernel kobject that contains the kernel class device. |
2972 | * @bin_attr: kernel attributes passed to us. | 3012 | * @bin_attr: kernel attributes passed to us. |
2973 | * @buf: contains the data to be written to the adapter IOREG space. | 3013 | * @buf: contains the data to be written to the adapter IOREG space. |
@@ -3017,7 +3057,7 @@ sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr, | |||
3017 | } | 3057 | } |
3018 | 3058 | ||
3019 | /** | 3059 | /** |
3020 | * sysfs_ctlreg_read: Read method for reading from ctlreg. | 3060 | * sysfs_ctlreg_read - Read method for reading from ctlreg |
3021 | * @kobj: kernel kobject that contains the kernel class device. | 3061 | * @kobj: kernel kobject that contains the kernel class device. |
3022 | * @bin_attr: kernel attributes passed to us. | 3062 | * @bin_attr: kernel attributes passed to us. |
3023 | * @buf: if succesful contains the data from the adapter IOREG space. | 3063 | * @buf: if succesful contains the data from the adapter IOREG space. |
@@ -3078,7 +3118,7 @@ static struct bin_attribute sysfs_ctlreg_attr = { | |||
3078 | }; | 3118 | }; |
3079 | 3119 | ||
3080 | /** | 3120 | /** |
3081 | * sysfs_mbox_idle: frees the sysfs mailbox. | 3121 | * sysfs_mbox_idle - frees the sysfs mailbox |
3082 | * @phba: lpfc_hba pointer | 3122 | * @phba: lpfc_hba pointer |
3083 | **/ | 3123 | **/ |
3084 | static void | 3124 | static void |
@@ -3095,7 +3135,7 @@ sysfs_mbox_idle(struct lpfc_hba *phba) | |||
3095 | } | 3135 | } |
3096 | 3136 | ||
3097 | /** | 3137 | /** |
3098 | * sysfs_mbox_write: Write method for writing information via mbox. | 3138 | * sysfs_mbox_write - Write method for writing information via mbox |
3099 | * @kobj: kernel kobject that contains the kernel class device. | 3139 | * @kobj: kernel kobject that contains the kernel class device. |
3100 | * @bin_attr: kernel attributes passed to us. | 3140 | * @bin_attr: kernel attributes passed to us. |
3101 | * @buf: contains the data to be written to sysfs mbox. | 3141 | * @buf: contains the data to be written to sysfs mbox. |
@@ -3170,7 +3210,7 @@ sysfs_mbox_write(struct kobject *kobj, struct bin_attribute *bin_attr, | |||
3170 | } | 3210 | } |
3171 | 3211 | ||
3172 | /** | 3212 | /** |
3173 | * sysfs_mbox_read: Read method for reading information via mbox. | 3213 | * sysfs_mbox_read - Read method for reading information via mbox |
3174 | * @kobj: kernel kobject that contains the kernel class device. | 3214 | * @kobj: kernel kobject that contains the kernel class device. |
3175 | * @bin_attr: kernel attributes passed to us. | 3215 | * @bin_attr: kernel attributes passed to us. |
3176 | * @buf: contains the data to be read from sysfs mbox. | 3216 | * @buf: contains the data to be read from sysfs mbox. |
@@ -3374,7 +3414,7 @@ static struct bin_attribute sysfs_mbox_attr = { | |||
3374 | }; | 3414 | }; |
3375 | 3415 | ||
3376 | /** | 3416 | /** |
3377 | * lpfc_alloc_sysfs_attr: Creates the ctlreg and mbox entries. | 3417 | * lpfc_alloc_sysfs_attr - Creates the ctlreg and mbox entries |
3378 | * @vport: address of lpfc vport structure. | 3418 | * @vport: address of lpfc vport structure. |
3379 | * | 3419 | * |
3380 | * Return codes: | 3420 | * Return codes: |
@@ -3415,7 +3455,7 @@ out: | |||
3415 | } | 3455 | } |
3416 | 3456 | ||
3417 | /** | 3457 | /** |
3418 | * lpfc_free_sysfs_attr: Removes the ctlreg and mbox entries. | 3458 | * lpfc_free_sysfs_attr - Removes the ctlreg and mbox entries |
3419 | * @vport: address of lpfc vport structure. | 3459 | * @vport: address of lpfc vport structure. |
3420 | **/ | 3460 | **/ |
3421 | void | 3461 | void |
@@ -3437,7 +3477,7 @@ lpfc_free_sysfs_attr(struct lpfc_vport *vport) | |||
3437 | */ | 3477 | */ |
3438 | 3478 | ||
3439 | /** | 3479 | /** |
3440 | * lpfc_get_host_port_id: Copy the vport DID into the scsi host port id. | 3480 | * lpfc_get_host_port_id - Copy the vport DID into the scsi host port id |
3441 | * @shost: kernel scsi host pointer. | 3481 | * @shost: kernel scsi host pointer. |
3442 | **/ | 3482 | **/ |
3443 | static void | 3483 | static void |
@@ -3450,7 +3490,7 @@ lpfc_get_host_port_id(struct Scsi_Host *shost) | |||
3450 | } | 3490 | } |
3451 | 3491 | ||
3452 | /** | 3492 | /** |
3453 | * lpfc_get_host_port_type: Set the value of the scsi host port type. | 3493 | * lpfc_get_host_port_type - Set the value of the scsi host port type |
3454 | * @shost: kernel scsi host pointer. | 3494 | * @shost: kernel scsi host pointer. |
3455 | **/ | 3495 | **/ |
3456 | static void | 3496 | static void |
@@ -3482,7 +3522,7 @@ lpfc_get_host_port_type(struct Scsi_Host *shost) | |||
3482 | } | 3522 | } |
3483 | 3523 | ||
3484 | /** | 3524 | /** |
3485 | * lpfc_get_host_port_state: Set the value of the scsi host port state. | 3525 | * lpfc_get_host_port_state - Set the value of the scsi host port state |
3486 | * @shost: kernel scsi host pointer. | 3526 | * @shost: kernel scsi host pointer. |
3487 | **/ | 3527 | **/ |
3488 | static void | 3528 | static void |
@@ -3520,7 +3560,7 @@ lpfc_get_host_port_state(struct Scsi_Host *shost) | |||
3520 | } | 3560 | } |
3521 | 3561 | ||
3522 | /** | 3562 | /** |
3523 | * lpfc_get_host_speed: Set the value of the scsi host speed. | 3563 | * lpfc_get_host_speed - Set the value of the scsi host speed |
3524 | * @shost: kernel scsi host pointer. | 3564 | * @shost: kernel scsi host pointer. |
3525 | **/ | 3565 | **/ |
3526 | static void | 3566 | static void |
@@ -3556,7 +3596,7 @@ lpfc_get_host_speed(struct Scsi_Host *shost) | |||
3556 | } | 3596 | } |
3557 | 3597 | ||
3558 | /** | 3598 | /** |
3559 | * lpfc_get_host_fabric_name: Set the value of the scsi host fabric name. | 3599 | * lpfc_get_host_fabric_name - Set the value of the scsi host fabric name |
3560 | * @shost: kernel scsi host pointer. | 3600 | * @shost: kernel scsi host pointer. |
3561 | **/ | 3601 | **/ |
3562 | static void | 3602 | static void |
@@ -3582,7 +3622,7 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost) | |||
3582 | } | 3622 | } |
3583 | 3623 | ||
3584 | /** | 3624 | /** |
3585 | * lpfc_get_stats: Return statistical information about the adapter. | 3625 | * lpfc_get_stats - Return statistical information about the adapter |
3586 | * @shost: kernel scsi host pointer. | 3626 | * @shost: kernel scsi host pointer. |
3587 | * | 3627 | * |
3588 | * Notes: | 3628 | * Notes: |
@@ -3707,7 +3747,7 @@ lpfc_get_stats(struct Scsi_Host *shost) | |||
3707 | } | 3747 | } |
3708 | 3748 | ||
3709 | /** | 3749 | /** |
3710 | * lpfc_reset_stats: Copy the adapter link stats information. | 3750 | * lpfc_reset_stats - Copy the adapter link stats information |
3711 | * @shost: kernel scsi host pointer. | 3751 | * @shost: kernel scsi host pointer. |
3712 | **/ | 3752 | **/ |
3713 | static void | 3753 | static void |
@@ -3788,7 +3828,7 @@ lpfc_reset_stats(struct Scsi_Host *shost) | |||
3788 | */ | 3828 | */ |
3789 | 3829 | ||
3790 | /** | 3830 | /** |
3791 | * lpfc_get_node_by_target: Return the nodelist for a target. | 3831 | * lpfc_get_node_by_target - Return the nodelist for a target |
3792 | * @starget: kernel scsi target pointer. | 3832 | * @starget: kernel scsi target pointer. |
3793 | * | 3833 | * |
3794 | * Returns: | 3834 | * Returns: |
@@ -3817,7 +3857,7 @@ lpfc_get_node_by_target(struct scsi_target *starget) | |||
3817 | } | 3857 | } |
3818 | 3858 | ||
3819 | /** | 3859 | /** |
3820 | * lpfc_get_starget_port_id: Set the target port id to the ndlp DID or -1. | 3860 | * lpfc_get_starget_port_id - Set the target port id to the ndlp DID or -1 |
3821 | * @starget: kernel scsi target pointer. | 3861 | * @starget: kernel scsi target pointer. |
3822 | **/ | 3862 | **/ |
3823 | static void | 3863 | static void |
@@ -3829,7 +3869,7 @@ lpfc_get_starget_port_id(struct scsi_target *starget) | |||
3829 | } | 3869 | } |
3830 | 3870 | ||
3831 | /** | 3871 | /** |
3832 | * lpfc_get_starget_node_name: Set the target node name. | 3872 | * lpfc_get_starget_node_name - Set the target node name |
3833 | * @starget: kernel scsi target pointer. | 3873 | * @starget: kernel scsi target pointer. |
3834 | * | 3874 | * |
3835 | * Description: Set the target node name to the ndlp node name wwn or zero. | 3875 | * Description: Set the target node name to the ndlp node name wwn or zero. |
@@ -3844,7 +3884,7 @@ lpfc_get_starget_node_name(struct scsi_target *starget) | |||
3844 | } | 3884 | } |
3845 | 3885 | ||
3846 | /** | 3886 | /** |
3847 | * lpfc_get_starget_port_name: Set the target port name. | 3887 | * lpfc_get_starget_port_name - Set the target port name |
3848 | * @starget: kernel scsi target pointer. | 3888 | * @starget: kernel scsi target pointer. |
3849 | * | 3889 | * |
3850 | * Description: set the target port name to the ndlp port name wwn or zero. | 3890 | * Description: set the target port name to the ndlp port name wwn or zero. |
@@ -3859,7 +3899,7 @@ lpfc_get_starget_port_name(struct scsi_target *starget) | |||
3859 | } | 3899 | } |
3860 | 3900 | ||
3861 | /** | 3901 | /** |
3862 | * lpfc_set_rport_loss_tmo: Set the rport dev loss tmo. | 3902 | * lpfc_set_rport_loss_tmo - Set the rport dev loss tmo |
3863 | * @rport: fc rport address. | 3903 | * @rport: fc rport address. |
3864 | * @timeout: new value for dev loss tmo. | 3904 | * @timeout: new value for dev loss tmo. |
3865 | * | 3905 | * |
@@ -3877,7 +3917,7 @@ lpfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout) | |||
3877 | } | 3917 | } |
3878 | 3918 | ||
3879 | /** | 3919 | /** |
3880 | * lpfc_rport_show_function: Return rport target information. | 3920 | * lpfc_rport_show_function - Return rport target information |
3881 | * | 3921 | * |
3882 | * Description: | 3922 | * Description: |
3883 | * Macro that uses field to generate a function with the name lpfc_show_rport_ | 3923 | * Macro that uses field to generate a function with the name lpfc_show_rport_ |
@@ -3905,7 +3945,7 @@ lpfc_show_rport_##field (struct device *dev, \ | |||
3905 | static FC_RPORT_ATTR(field, S_IRUGO, lpfc_show_rport_##field, NULL) | 3945 | static FC_RPORT_ATTR(field, S_IRUGO, lpfc_show_rport_##field, NULL) |
3906 | 3946 | ||
3907 | /** | 3947 | /** |
3908 | * lpfc_set_vport_symbolic_name: Set the vport's symbolic name. | 3948 | * lpfc_set_vport_symbolic_name - Set the vport's symbolic name |
3909 | * @fc_vport: The fc_vport who's symbolic name has been changed. | 3949 | * @fc_vport: The fc_vport who's symbolic name has been changed. |
3910 | * | 3950 | * |
3911 | * Description: | 3951 | * Description: |
@@ -4048,7 +4088,7 @@ struct fc_function_template lpfc_vport_transport_functions = { | |||
4048 | }; | 4088 | }; |
4049 | 4089 | ||
4050 | /** | 4090 | /** |
4051 | * lpfc_get_cfgparam: Used during probe_one to init the adapter structure. | 4091 | * lpfc_get_cfgparam - Used during probe_one to init the adapter structure |
4052 | * @phba: lpfc_hba pointer. | 4092 | * @phba: lpfc_hba pointer. |
4053 | **/ | 4093 | **/ |
4054 | void | 4094 | void |
@@ -4097,7 +4137,7 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) | |||
4097 | } | 4137 | } |
4098 | 4138 | ||
4099 | /** | 4139 | /** |
4100 | * lpfc_get_vport_cfgparam: Used during port create, init the vport structure. | 4140 | * lpfc_get_vport_cfgparam - Used during port create, init the vport structure |
4101 | * @vport: lpfc_vport pointer. | 4141 | * @vport: lpfc_vport pointer. |
4102 | **/ | 4142 | **/ |
4103 | void | 4143 | void |
diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h index 07f4976319a..f88ce3f2619 100644 --- a/drivers/scsi/lpfc/lpfc_crtn.h +++ b/drivers/scsi/lpfc/lpfc_crtn.h | |||
@@ -184,6 +184,8 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *); | |||
184 | struct lpfc_iocbq * lpfc_sli_get_iocbq(struct lpfc_hba *); | 184 | struct lpfc_iocbq * lpfc_sli_get_iocbq(struct lpfc_hba *); |
185 | void lpfc_sli_release_iocbq(struct lpfc_hba *, struct lpfc_iocbq *); | 185 | void lpfc_sli_release_iocbq(struct lpfc_hba *, struct lpfc_iocbq *); |
186 | uint16_t lpfc_sli_next_iotag(struct lpfc_hba *, struct lpfc_iocbq *); | 186 | uint16_t lpfc_sli_next_iotag(struct lpfc_hba *, struct lpfc_iocbq *); |
187 | void lpfc_sli_cancel_iocbs(struct lpfc_hba *, struct list_head *, uint32_t, | ||
188 | uint32_t); | ||
187 | 189 | ||
188 | void lpfc_reset_barrier(struct lpfc_hba * phba); | 190 | void lpfc_reset_barrier(struct lpfc_hba * phba); |
189 | int lpfc_sli_brdready(struct lpfc_hba *, uint32_t); | 191 | int lpfc_sli_brdready(struct lpfc_hba *, uint32_t); |
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index 81cdcf46c47..52be5644e07 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include "lpfc_debugfs.h" | 47 | #include "lpfc_debugfs.h" |
48 | 48 | ||
49 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS | 49 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
50 | /** | 50 | /* |
51 | * debugfs interface | 51 | * debugfs interface |
52 | * | 52 | * |
53 | * To access this interface the user should: | 53 | * To access this interface the user should: |
@@ -95,7 +95,7 @@ module_param(lpfc_debugfs_max_slow_ring_trc, int, 0); | |||
95 | MODULE_PARM_DESC(lpfc_debugfs_max_slow_ring_trc, | 95 | MODULE_PARM_DESC(lpfc_debugfs_max_slow_ring_trc, |
96 | "Set debugfs slow ring trace depth"); | 96 | "Set debugfs slow ring trace depth"); |
97 | 97 | ||
98 | int lpfc_debugfs_mask_disc_trc; | 98 | static int lpfc_debugfs_mask_disc_trc; |
99 | module_param(lpfc_debugfs_mask_disc_trc, int, 0); | 99 | module_param(lpfc_debugfs_mask_disc_trc, int, 0); |
100 | MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc, | 100 | MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc, |
101 | "Set debugfs discovery trace mask"); | 101 | "Set debugfs discovery trace mask"); |
@@ -127,7 +127,7 @@ static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0); | |||
127 | static unsigned long lpfc_debugfs_start_time = 0L; | 127 | static unsigned long lpfc_debugfs_start_time = 0L; |
128 | 128 | ||
129 | /** | 129 | /** |
130 | * lpfc_debugfs_disc_trc_data - Dump discovery logging to a buffer. | 130 | * lpfc_debugfs_disc_trc_data - Dump discovery logging to a buffer |
131 | * @vport: The vport to gather the log info from. | 131 | * @vport: The vport to gather the log info from. |
132 | * @buf: The buffer to dump log into. | 132 | * @buf: The buffer to dump log into. |
133 | * @size: The maximum amount of data to process. | 133 | * @size: The maximum amount of data to process. |
@@ -187,7 +187,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size) | |||
187 | } | 187 | } |
188 | 188 | ||
189 | /** | 189 | /** |
190 | * lpfc_debugfs_slow_ring_trc_data - Dump slow ring logging to a buffer. | 190 | * lpfc_debugfs_slow_ring_trc_data - Dump slow ring logging to a buffer |
191 | * @phba: The HBA to gather the log info from. | 191 | * @phba: The HBA to gather the log info from. |
192 | * @buf: The buffer to dump log into. | 192 | * @buf: The buffer to dump log into. |
193 | * @size: The maximum amount of data to process. | 193 | * @size: The maximum amount of data to process. |
@@ -250,7 +250,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size) | |||
250 | static int lpfc_debugfs_last_hbq = -1; | 250 | static int lpfc_debugfs_last_hbq = -1; |
251 | 251 | ||
252 | /** | 252 | /** |
253 | * lpfc_debugfs_hbqinfo_data - Dump host buffer queue info to a buffer. | 253 | * lpfc_debugfs_hbqinfo_data - Dump host buffer queue info to a buffer |
254 | * @phba: The HBA to gather host buffer info from. | 254 | * @phba: The HBA to gather host buffer info from. |
255 | * @buf: The buffer to dump log into. | 255 | * @buf: The buffer to dump log into. |
256 | * @size: The maximum amount of data to process. | 256 | * @size: The maximum amount of data to process. |
@@ -369,7 +369,7 @@ skipit: | |||
369 | static int lpfc_debugfs_last_hba_slim_off; | 369 | static int lpfc_debugfs_last_hba_slim_off; |
370 | 370 | ||
371 | /** | 371 | /** |
372 | * lpfc_debugfs_dumpHBASlim_data - Dump HBA SLIM info to a buffer. | 372 | * lpfc_debugfs_dumpHBASlim_data - Dump HBA SLIM info to a buffer |
373 | * @phba: The HBA to gather SLIM info from. | 373 | * @phba: The HBA to gather SLIM info from. |
374 | * @buf: The buffer to dump log into. | 374 | * @buf: The buffer to dump log into. |
375 | * @size: The maximum amount of data to process. | 375 | * @size: The maximum amount of data to process. |
@@ -399,8 +399,7 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size) | |||
399 | 399 | ||
400 | len += snprintf(buf+len, size-len, "HBA SLIM\n"); | 400 | len += snprintf(buf+len, size-len, "HBA SLIM\n"); |
401 | lpfc_memcpy_from_slim(buffer, | 401 | lpfc_memcpy_from_slim(buffer, |
402 | ((uint8_t *)phba->MBslimaddr) + lpfc_debugfs_last_hba_slim_off, | 402 | phba->MBslimaddr + lpfc_debugfs_last_hba_slim_off, 1024); |
403 | 1024); | ||
404 | 403 | ||
405 | ptr = (uint32_t *)&buffer[0]; | 404 | ptr = (uint32_t *)&buffer[0]; |
406 | off = lpfc_debugfs_last_hba_slim_off; | 405 | off = lpfc_debugfs_last_hba_slim_off; |
@@ -426,7 +425,7 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size) | |||
426 | } | 425 | } |
427 | 426 | ||
428 | /** | 427 | /** |
429 | * lpfc_debugfs_dumpHostSlim_data - Dump host SLIM info to a buffer. | 428 | * lpfc_debugfs_dumpHostSlim_data - Dump host SLIM info to a buffer |
430 | * @phba: The HBA to gather Host SLIM info from. | 429 | * @phba: The HBA to gather Host SLIM info from. |
431 | * @buf: The buffer to dump log into. | 430 | * @buf: The buffer to dump log into. |
432 | * @size: The maximum amount of data to process. | 431 | * @size: The maximum amount of data to process. |
@@ -501,7 +500,7 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size) | |||
501 | } | 500 | } |
502 | 501 | ||
503 | /** | 502 | /** |
504 | * lpfc_debugfs_nodelist_data - Dump target node list to a buffer. | 503 | * lpfc_debugfs_nodelist_data - Dump target node list to a buffer |
505 | * @vport: The vport to gather target node info from. | 504 | * @vport: The vport to gather target node info from. |
506 | * @buf: The buffer to dump log into. | 505 | * @buf: The buffer to dump log into. |
507 | * @size: The maximum amount of data to process. | 506 | * @size: The maximum amount of data to process. |
@@ -599,7 +598,7 @@ lpfc_debugfs_nodelist_data(struct lpfc_vport *vport, char *buf, int size) | |||
599 | #endif | 598 | #endif |
600 | 599 | ||
601 | /** | 600 | /** |
602 | * lpfc_debugfs_disc_trc - Store discovery trace log. | 601 | * lpfc_debugfs_disc_trc - Store discovery trace log |
603 | * @vport: The vport to associate this trace string with for retrieval. | 602 | * @vport: The vport to associate this trace string with for retrieval. |
604 | * @mask: Log entry classification. | 603 | * @mask: Log entry classification. |
605 | * @fmt: Format string to be displayed when dumping the log. | 604 | * @fmt: Format string to be displayed when dumping the log. |
@@ -643,7 +642,7 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt, | |||
643 | } | 642 | } |
644 | 643 | ||
645 | /** | 644 | /** |
646 | * lpfc_debugfs_slow_ring_trc - Store slow ring trace log. | 645 | * lpfc_debugfs_slow_ring_trc - Store slow ring trace log |
647 | * @phba: The phba to associate this trace string with for retrieval. | 646 | * @phba: The phba to associate this trace string with for retrieval. |
648 | * @fmt: Format string to be displayed when dumping the log. | 647 | * @fmt: Format string to be displayed when dumping the log. |
649 | * @data1: 1st data parameter to be applied to @fmt. | 648 | * @data1: 1st data parameter to be applied to @fmt. |
@@ -682,7 +681,7 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt, | |||
682 | 681 | ||
683 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS | 682 | #ifdef CONFIG_SCSI_LPFC_DEBUG_FS |
684 | /** | 683 | /** |
685 | * lpfc_debugfs_disc_trc_open - Open the discovery trace log. | 684 | * lpfc_debugfs_disc_trc_open - Open the discovery trace log |
686 | * @inode: The inode pointer that contains a vport pointer. | 685 | * @inode: The inode pointer that contains a vport pointer. |
687 | * @file: The file pointer to attach the log output. | 686 | * @file: The file pointer to attach the log output. |
688 | * | 687 | * |
@@ -732,7 +731,7 @@ out: | |||
732 | } | 731 | } |
733 | 732 | ||
734 | /** | 733 | /** |
735 | * lpfc_debugfs_slow_ring_trc_open - Open the Slow Ring trace log. | 734 | * lpfc_debugfs_slow_ring_trc_open - Open the Slow Ring trace log |
736 | * @inode: The inode pointer that contains a vport pointer. | 735 | * @inode: The inode pointer that contains a vport pointer. |
737 | * @file: The file pointer to attach the log output. | 736 | * @file: The file pointer to attach the log output. |
738 | * | 737 | * |
@@ -782,7 +781,7 @@ out: | |||
782 | } | 781 | } |
783 | 782 | ||
784 | /** | 783 | /** |
785 | * lpfc_debugfs_hbqinfo_open - Open the hbqinfo debugfs buffer. | 784 | * lpfc_debugfs_hbqinfo_open - Open the hbqinfo debugfs buffer |
786 | * @inode: The inode pointer that contains a vport pointer. | 785 | * @inode: The inode pointer that contains a vport pointer. |
787 | * @file: The file pointer to attach the log output. | 786 | * @file: The file pointer to attach the log output. |
788 | * | 787 | * |
@@ -824,7 +823,7 @@ out: | |||
824 | } | 823 | } |
825 | 824 | ||
826 | /** | 825 | /** |
827 | * lpfc_debugfs_dumpHBASlim_open - Open the Dump HBA SLIM debugfs buffer. | 826 | * lpfc_debugfs_dumpHBASlim_open - Open the Dump HBA SLIM debugfs buffer |
828 | * @inode: The inode pointer that contains a vport pointer. | 827 | * @inode: The inode pointer that contains a vport pointer. |
829 | * @file: The file pointer to attach the log output. | 828 | * @file: The file pointer to attach the log output. |
830 | * | 829 | * |
@@ -866,7 +865,7 @@ out: | |||
866 | } | 865 | } |
867 | 866 | ||
868 | /** | 867 | /** |
869 | * lpfc_debugfs_dumpHostSlim_open - Open the Dump Host SLIM debugfs buffer. | 868 | * lpfc_debugfs_dumpHostSlim_open - Open the Dump Host SLIM debugfs buffer |
870 | * @inode: The inode pointer that contains a vport pointer. | 869 | * @inode: The inode pointer that contains a vport pointer. |
871 | * @file: The file pointer to attach the log output. | 870 | * @file: The file pointer to attach the log output. |
872 | * | 871 | * |
@@ -993,7 +992,7 @@ lpfc_debugfs_dumpDataDif_write(struct file *file, const char __user *buf, | |||
993 | 992 | ||
994 | 993 | ||
995 | /** | 994 | /** |
996 | * lpfc_debugfs_nodelist_open - Open the nodelist debugfs file. | 995 | * lpfc_debugfs_nodelist_open - Open the nodelist debugfs file |
997 | * @inode: The inode pointer that contains a vport pointer. | 996 | * @inode: The inode pointer that contains a vport pointer. |
998 | * @file: The file pointer to attach the log output. | 997 | * @file: The file pointer to attach the log output. |
999 | * | 998 | * |
@@ -1035,7 +1034,7 @@ out: | |||
1035 | } | 1034 | } |
1036 | 1035 | ||
1037 | /** | 1036 | /** |
1038 | * lpfc_debugfs_lseek - Seek through a debugfs file. | 1037 | * lpfc_debugfs_lseek - Seek through a debugfs file |
1039 | * @file: The file pointer to seek through. | 1038 | * @file: The file pointer to seek through. |
1040 | * @off: The offset to seek to or the amount to seek by. | 1039 | * @off: The offset to seek to or the amount to seek by. |
1041 | * @whence: Indicates how to seek. | 1040 | * @whence: Indicates how to seek. |
@@ -1073,7 +1072,7 @@ lpfc_debugfs_lseek(struct file *file, loff_t off, int whence) | |||
1073 | } | 1072 | } |
1074 | 1073 | ||
1075 | /** | 1074 | /** |
1076 | * lpfc_debugfs_read - Read a debugfs file. | 1075 | * lpfc_debugfs_read - Read a debugfs file |
1077 | * @file: The file pointer to read from. | 1076 | * @file: The file pointer to read from. |
1078 | * @buf: The buffer to copy the data to. | 1077 | * @buf: The buffer to copy the data to. |
1079 | * @nbytes: The number of bytes to read. | 1078 | * @nbytes: The number of bytes to read. |
@@ -1098,7 +1097,7 @@ lpfc_debugfs_read(struct file *file, char __user *buf, | |||
1098 | } | 1097 | } |
1099 | 1098 | ||
1100 | /** | 1099 | /** |
1101 | * lpfc_debugfs_release - Release the buffer used to store debugfs file data. | 1100 | * lpfc_debugfs_release - Release the buffer used to store debugfs file data |
1102 | * @inode: The inode pointer that contains a vport pointer. (unused) | 1101 | * @inode: The inode pointer that contains a vport pointer. (unused) |
1103 | * @file: The file pointer that contains the buffer to release. | 1102 | * @file: The file pointer that contains the buffer to release. |
1104 | * | 1103 | * |
@@ -1210,7 +1209,7 @@ static atomic_t lpfc_debugfs_hba_count; | |||
1210 | #endif | 1209 | #endif |
1211 | 1210 | ||
1212 | /** | 1211 | /** |
1213 | * lpfc_debugfs_initialize - Initialize debugfs for a vport. | 1212 | * lpfc_debugfs_initialize - Initialize debugfs for a vport |
1214 | * @vport: The vport pointer to initialize. | 1213 | * @vport: The vport pointer to initialize. |
1215 | * | 1214 | * |
1216 | * Description: | 1215 | * Description: |
@@ -1434,7 +1433,7 @@ debug_failed: | |||
1434 | } | 1433 | } |
1435 | 1434 | ||
1436 | /** | 1435 | /** |
1437 | * lpfc_debugfs_terminate - Tear down debugfs infrastructure for this vport. | 1436 | * lpfc_debugfs_terminate - Tear down debugfs infrastructure for this vport |
1438 | * @vport: The vport pointer to remove from debugfs. | 1437 | * @vport: The vport pointer to remove from debugfs. |
1439 | * | 1438 | * |
1440 | * Description: | 1439 | * Description: |
diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h index f29e548a90d..ffd10897207 100644 --- a/drivers/scsi/lpfc/lpfc_disc.h +++ b/drivers/scsi/lpfc/lpfc_disc.h | |||
@@ -99,6 +99,7 @@ struct lpfc_nodelist { | |||
99 | #define NLP_USG_FREE_ACK_BIT 0x8 /* Indicate ndlp memory free invoked */ | 99 | #define NLP_USG_FREE_ACK_BIT 0x8 /* Indicate ndlp memory free invoked */ |
100 | 100 | ||
101 | struct timer_list nlp_delayfunc; /* Used for delayed ELS cmds */ | 101 | struct timer_list nlp_delayfunc; /* Used for delayed ELS cmds */ |
102 | struct lpfc_hba *phba; | ||
102 | struct fc_rport *rport; /* Corresponding FC transport | 103 | struct fc_rport *rport; /* Corresponding FC transport |
103 | port structure */ | 104 | port structure */ |
104 | struct lpfc_vport *vport; | 105 | struct lpfc_vport *vport; |
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index a7302480bc4..b8b34cf5c3d 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
@@ -55,7 +55,7 @@ static void lpfc_register_new_vport(struct lpfc_hba *phba, | |||
55 | static int lpfc_max_els_tries = 3; | 55 | static int lpfc_max_els_tries = 3; |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * lpfc_els_chk_latt: Check host link attention event for a vport. | 58 | * lpfc_els_chk_latt - Check host link attention event for a vport |
59 | * @vport: pointer to a host virtual N_Port data structure. | 59 | * @vport: pointer to a host virtual N_Port data structure. |
60 | * | 60 | * |
61 | * This routine checks whether there is an outstanding host link | 61 | * This routine checks whether there is an outstanding host link |
@@ -116,7 +116,7 @@ lpfc_els_chk_latt(struct lpfc_vport *vport) | |||
116 | } | 116 | } |
117 | 117 | ||
118 | /** | 118 | /** |
119 | * lpfc_prep_els_iocb: Allocate and prepare a lpfc iocb data structure. | 119 | * lpfc_prep_els_iocb - Allocate and prepare a lpfc iocb data structure |
120 | * @vport: pointer to a host virtual N_Port data structure. | 120 | * @vport: pointer to a host virtual N_Port data structure. |
121 | * @expectRsp: flag indicating whether response is expected. | 121 | * @expectRsp: flag indicating whether response is expected. |
122 | * @cmdSize: size of the ELS command. | 122 | * @cmdSize: size of the ELS command. |
@@ -290,7 +290,7 @@ els_iocb_free_pcmb_exit: | |||
290 | } | 290 | } |
291 | 291 | ||
292 | /** | 292 | /** |
293 | * lpfc_issue_fabric_reglogin: Issue fabric registration login for a vport. | 293 | * lpfc_issue_fabric_reglogin - Issue fabric registration login for a vport |
294 | * @vport: pointer to a host virtual N_Port data structure. | 294 | * @vport: pointer to a host virtual N_Port data structure. |
295 | * | 295 | * |
296 | * This routine issues a fabric registration login for a @vport. An | 296 | * This routine issues a fabric registration login for a @vport. An |
@@ -386,7 +386,7 @@ fail: | |||
386 | } | 386 | } |
387 | 387 | ||
388 | /** | 388 | /** |
389 | * lpfc_cmpl_els_flogi_fabric: Completion function for flogi to a fabric port. | 389 | * lpfc_cmpl_els_flogi_fabric - Completion function for flogi to a fabric port |
390 | * @vport: pointer to a host virtual N_Port data structure. | 390 | * @vport: pointer to a host virtual N_Port data structure. |
391 | * @ndlp: pointer to a node-list data structure. | 391 | * @ndlp: pointer to a node-list data structure. |
392 | * @sp: pointer to service parameter data structure. | 392 | * @sp: pointer to service parameter data structure. |
@@ -509,7 +509,7 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
509 | } | 509 | } |
510 | 510 | ||
511 | /** | 511 | /** |
512 | * lpfc_cmpl_els_flogi_nport: Completion function for flogi to an N_Port. | 512 | * lpfc_cmpl_els_flogi_nport - Completion function for flogi to an N_Port |
513 | * @vport: pointer to a host virtual N_Port data structure. | 513 | * @vport: pointer to a host virtual N_Port data structure. |
514 | * @ndlp: pointer to a node-list data structure. | 514 | * @ndlp: pointer to a node-list data structure. |
515 | * @sp: pointer to service parameter data structure. | 515 | * @sp: pointer to service parameter data structure. |
@@ -626,7 +626,7 @@ fail: | |||
626 | } | 626 | } |
627 | 627 | ||
628 | /** | 628 | /** |
629 | * lpfc_cmpl_els_flogi: Completion callback function for flogi. | 629 | * lpfc_cmpl_els_flogi - Completion callback function for flogi |
630 | * @phba: pointer to lpfc hba data structure. | 630 | * @phba: pointer to lpfc hba data structure. |
631 | * @cmdiocb: pointer to lpfc command iocb data structure. | 631 | * @cmdiocb: pointer to lpfc command iocb data structure. |
632 | * @rspiocb: pointer to lpfc response iocb data structure. | 632 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -751,7 +751,7 @@ out: | |||
751 | } | 751 | } |
752 | 752 | ||
753 | /** | 753 | /** |
754 | * lpfc_issue_els_flogi: Issue an flogi iocb command for a vport. | 754 | * lpfc_issue_els_flogi - Issue an flogi iocb command for a vport |
755 | * @vport: pointer to a host virtual N_Port data structure. | 755 | * @vport: pointer to a host virtual N_Port data structure. |
756 | * @ndlp: pointer to a node-list data structure. | 756 | * @ndlp: pointer to a node-list data structure. |
757 | * @retry: number of retries to the command IOCB. | 757 | * @retry: number of retries to the command IOCB. |
@@ -849,7 +849,7 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
849 | } | 849 | } |
850 | 850 | ||
851 | /** | 851 | /** |
852 | * lpfc_els_abort_flogi: Abort all outstanding flogi iocbs. | 852 | * lpfc_els_abort_flogi - Abort all outstanding flogi iocbs |
853 | * @phba: pointer to lpfc hba data structure. | 853 | * @phba: pointer to lpfc hba data structure. |
854 | * | 854 | * |
855 | * This routine aborts all the outstanding Fabric Login (FLOGI) IOCBs | 855 | * This routine aborts all the outstanding Fabric Login (FLOGI) IOCBs |
@@ -898,7 +898,7 @@ lpfc_els_abort_flogi(struct lpfc_hba *phba) | |||
898 | } | 898 | } |
899 | 899 | ||
900 | /** | 900 | /** |
901 | * lpfc_initial_flogi: Issue an initial fabric login for a vport. | 901 | * lpfc_initial_flogi - Issue an initial fabric login for a vport |
902 | * @vport: pointer to a host virtual N_Port data structure. | 902 | * @vport: pointer to a host virtual N_Port data structure. |
903 | * | 903 | * |
904 | * This routine issues an initial Fabric Login (FLOGI) for the @vport | 904 | * This routine issues an initial Fabric Login (FLOGI) for the @vport |
@@ -949,7 +949,7 @@ lpfc_initial_flogi(struct lpfc_vport *vport) | |||
949 | } | 949 | } |
950 | 950 | ||
951 | /** | 951 | /** |
952 | * lpfc_initial_fdisc: Issue an initial fabric discovery for a vport. | 952 | * lpfc_initial_fdisc - Issue an initial fabric discovery for a vport |
953 | * @vport: pointer to a host virtual N_Port data structure. | 953 | * @vport: pointer to a host virtual N_Port data structure. |
954 | * | 954 | * |
955 | * This routine issues an initial Fabric Discover (FDISC) for the @vport | 955 | * This routine issues an initial Fabric Discover (FDISC) for the @vport |
@@ -998,7 +998,7 @@ lpfc_initial_fdisc(struct lpfc_vport *vport) | |||
998 | } | 998 | } |
999 | 999 | ||
1000 | /** | 1000 | /** |
1001 | * lpfc_more_plogi: Check and issue remaining plogis for a vport. | 1001 | * lpfc_more_plogi - Check and issue remaining plogis for a vport |
1002 | * @vport: pointer to a host virtual N_Port data structure. | 1002 | * @vport: pointer to a host virtual N_Port data structure. |
1003 | * | 1003 | * |
1004 | * This routine checks whether there are more remaining Port Logins | 1004 | * This routine checks whether there are more remaining Port Logins |
@@ -1031,7 +1031,7 @@ lpfc_more_plogi(struct lpfc_vport *vport) | |||
1031 | } | 1031 | } |
1032 | 1032 | ||
1033 | /** | 1033 | /** |
1034 | * lpfc_plogi_confirm_nport: Confirm pologi wwpn matches stored ndlp. | 1034 | * lpfc_plogi_confirm_nport - Confirm pologi wwpn matches stored ndlp |
1035 | * @phba: pointer to lpfc hba data structure. | 1035 | * @phba: pointer to lpfc hba data structure. |
1036 | * @prsp: pointer to response IOCB payload. | 1036 | * @prsp: pointer to response IOCB payload. |
1037 | * @ndlp: pointer to a node-list data structure. | 1037 | * @ndlp: pointer to a node-list data structure. |
@@ -1165,7 +1165,7 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp, | |||
1165 | } | 1165 | } |
1166 | 1166 | ||
1167 | /** | 1167 | /** |
1168 | * lpfc_end_rscn: Check and handle more rscn for a vport. | 1168 | * lpfc_end_rscn - Check and handle more rscn for a vport |
1169 | * @vport: pointer to a host virtual N_Port data structure. | 1169 | * @vport: pointer to a host virtual N_Port data structure. |
1170 | * | 1170 | * |
1171 | * This routine checks whether more Registration State Change | 1171 | * This routine checks whether more Registration State Change |
@@ -1197,7 +1197,7 @@ lpfc_end_rscn(struct lpfc_vport *vport) | |||
1197 | } | 1197 | } |
1198 | 1198 | ||
1199 | /** | 1199 | /** |
1200 | * lpfc_cmpl_els_plogi: Completion callback function for plogi. | 1200 | * lpfc_cmpl_els_plogi - Completion callback function for plogi |
1201 | * @phba: pointer to lpfc hba data structure. | 1201 | * @phba: pointer to lpfc hba data structure. |
1202 | * @cmdiocb: pointer to lpfc command iocb data structure. | 1202 | * @cmdiocb: pointer to lpfc command iocb data structure. |
1203 | * @rspiocb: pointer to lpfc response iocb data structure. | 1203 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -1322,7 +1322,7 @@ out: | |||
1322 | } | 1322 | } |
1323 | 1323 | ||
1324 | /** | 1324 | /** |
1325 | * lpfc_issue_els_plogi: Issue an plogi iocb command for a vport. | 1325 | * lpfc_issue_els_plogi - Issue an plogi iocb command for a vport |
1326 | * @vport: pointer to a host virtual N_Port data structure. | 1326 | * @vport: pointer to a host virtual N_Port data structure. |
1327 | * @did: destination port identifier. | 1327 | * @did: destination port identifier. |
1328 | * @retry: number of retries to the command IOCB. | 1328 | * @retry: number of retries to the command IOCB. |
@@ -1401,7 +1401,7 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry) | |||
1401 | } | 1401 | } |
1402 | 1402 | ||
1403 | /** | 1403 | /** |
1404 | * lpfc_cmpl_els_prli: Completion callback function for prli. | 1404 | * lpfc_cmpl_els_prli - Completion callback function for prli |
1405 | * @phba: pointer to lpfc hba data structure. | 1405 | * @phba: pointer to lpfc hba data structure. |
1406 | * @cmdiocb: pointer to lpfc command iocb data structure. | 1406 | * @cmdiocb: pointer to lpfc command iocb data structure. |
1407 | * @rspiocb: pointer to lpfc response iocb data structure. | 1407 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -1472,7 +1472,7 @@ out: | |||
1472 | } | 1472 | } |
1473 | 1473 | ||
1474 | /** | 1474 | /** |
1475 | * lpfc_issue_els_prli: Issue a prli iocb command for a vport. | 1475 | * lpfc_issue_els_prli - Issue a prli iocb command for a vport |
1476 | * @vport: pointer to a host virtual N_Port data structure. | 1476 | * @vport: pointer to a host virtual N_Port data structure. |
1477 | * @ndlp: pointer to a node-list data structure. | 1477 | * @ndlp: pointer to a node-list data structure. |
1478 | * @retry: number of retries to the command IOCB. | 1478 | * @retry: number of retries to the command IOCB. |
@@ -1562,7 +1562,7 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
1562 | } | 1562 | } |
1563 | 1563 | ||
1564 | /** | 1564 | /** |
1565 | * lpfc_rscn_disc: Perform rscn discovery for a vport. | 1565 | * lpfc_rscn_disc - Perform rscn discovery for a vport |
1566 | * @vport: pointer to a host virtual N_Port data structure. | 1566 | * @vport: pointer to a host virtual N_Port data structure. |
1567 | * | 1567 | * |
1568 | * This routine performs Registration State Change Notification (RSCN) | 1568 | * This routine performs Registration State Change Notification (RSCN) |
@@ -1588,7 +1588,7 @@ lpfc_rscn_disc(struct lpfc_vport *vport) | |||
1588 | } | 1588 | } |
1589 | 1589 | ||
1590 | /** | 1590 | /** |
1591 | * lpfc_adisc_done: Complete the adisc phase of discovery. | 1591 | * lpfc_adisc_done - Complete the adisc phase of discovery |
1592 | * @vport: pointer to lpfc_vport hba data structure that finished all ADISCs. | 1592 | * @vport: pointer to lpfc_vport hba data structure that finished all ADISCs. |
1593 | * | 1593 | * |
1594 | * This function is called when the final ADISC is completed during discovery. | 1594 | * This function is called when the final ADISC is completed during discovery. |
@@ -1639,7 +1639,7 @@ lpfc_adisc_done(struct lpfc_vport *vport) | |||
1639 | } | 1639 | } |
1640 | 1640 | ||
1641 | /** | 1641 | /** |
1642 | * lpfc_more_adisc: Issue more adisc as needed. | 1642 | * lpfc_more_adisc - Issue more adisc as needed |
1643 | * @vport: pointer to a host virtual N_Port data structure. | 1643 | * @vport: pointer to a host virtual N_Port data structure. |
1644 | * | 1644 | * |
1645 | * This routine determines whether there are more ndlps on a @vport | 1645 | * This routine determines whether there are more ndlps on a @vport |
@@ -1672,7 +1672,7 @@ lpfc_more_adisc(struct lpfc_vport *vport) | |||
1672 | } | 1672 | } |
1673 | 1673 | ||
1674 | /** | 1674 | /** |
1675 | * lpfc_cmpl_els_adisc: Completion callback function for adisc. | 1675 | * lpfc_cmpl_els_adisc - Completion callback function for adisc |
1676 | * @phba: pointer to lpfc hba data structure. | 1676 | * @phba: pointer to lpfc hba data structure. |
1677 | * @cmdiocb: pointer to lpfc command iocb data structure. | 1677 | * @cmdiocb: pointer to lpfc command iocb data structure. |
1678 | * @rspiocb: pointer to lpfc response iocb data structure. | 1678 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -1760,7 +1760,7 @@ out: | |||
1760 | } | 1760 | } |
1761 | 1761 | ||
1762 | /** | 1762 | /** |
1763 | * lpfc_issue_els_adisc: Issue an address discover iocb to an node on a vport. | 1763 | * lpfc_issue_els_adisc - Issue an address discover iocb to an node on a vport |
1764 | * @vport: pointer to a virtual N_Port data structure. | 1764 | * @vport: pointer to a virtual N_Port data structure. |
1765 | * @ndlp: pointer to a node-list data structure. | 1765 | * @ndlp: pointer to a node-list data structure. |
1766 | * @retry: number of retries to the command IOCB. | 1766 | * @retry: number of retries to the command IOCB. |
@@ -1833,7 +1833,7 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
1833 | } | 1833 | } |
1834 | 1834 | ||
1835 | /** | 1835 | /** |
1836 | * lpfc_cmpl_els_logo: Completion callback function for logo. | 1836 | * lpfc_cmpl_els_logo - Completion callback function for logo |
1837 | * @phba: pointer to lpfc hba data structure. | 1837 | * @phba: pointer to lpfc hba data structure. |
1838 | * @cmdiocb: pointer to lpfc command iocb data structure. | 1838 | * @cmdiocb: pointer to lpfc command iocb data structure. |
1839 | * @rspiocb: pointer to lpfc response iocb data structure. | 1839 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -1910,7 +1910,7 @@ out: | |||
1910 | } | 1910 | } |
1911 | 1911 | ||
1912 | /** | 1912 | /** |
1913 | * lpfc_issue_els_logo: Issue a logo to an node on a vport. | 1913 | * lpfc_issue_els_logo - Issue a logo to an node on a vport |
1914 | * @vport: pointer to a virtual N_Port data structure. | 1914 | * @vport: pointer to a virtual N_Port data structure. |
1915 | * @ndlp: pointer to a node-list data structure. | 1915 | * @ndlp: pointer to a node-list data structure. |
1916 | * @retry: number of retries to the command IOCB. | 1916 | * @retry: number of retries to the command IOCB. |
@@ -1991,7 +1991,7 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
1991 | } | 1991 | } |
1992 | 1992 | ||
1993 | /** | 1993 | /** |
1994 | * lpfc_cmpl_els_cmd: Completion callback function for generic els command. | 1994 | * lpfc_cmpl_els_cmd - Completion callback function for generic els command |
1995 | * @phba: pointer to lpfc hba data structure. | 1995 | * @phba: pointer to lpfc hba data structure. |
1996 | * @cmdiocb: pointer to lpfc command iocb data structure. | 1996 | * @cmdiocb: pointer to lpfc command iocb data structure. |
1997 | * @rspiocb: pointer to lpfc response iocb data structure. | 1997 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -2031,7 +2031,7 @@ lpfc_cmpl_els_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
2031 | } | 2031 | } |
2032 | 2032 | ||
2033 | /** | 2033 | /** |
2034 | * lpfc_issue_els_scr: Issue a scr to an node on a vport. | 2034 | * lpfc_issue_els_scr - Issue a scr to an node on a vport |
2035 | * @vport: pointer to a host virtual N_Port data structure. | 2035 | * @vport: pointer to a host virtual N_Port data structure. |
2036 | * @nportid: N_Port identifier to the remote node. | 2036 | * @nportid: N_Port identifier to the remote node. |
2037 | * @retry: number of retries to the command IOCB. | 2037 | * @retry: number of retries to the command IOCB. |
@@ -2125,7 +2125,7 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) | |||
2125 | } | 2125 | } |
2126 | 2126 | ||
2127 | /** | 2127 | /** |
2128 | * lpfc_issue_els_farpr: Issue a farp to an node on a vport. | 2128 | * lpfc_issue_els_farpr - Issue a farp to an node on a vport |
2129 | * @vport: pointer to a host virtual N_Port data structure. | 2129 | * @vport: pointer to a host virtual N_Port data structure. |
2130 | * @nportid: N_Port identifier to the remote node. | 2130 | * @nportid: N_Port identifier to the remote node. |
2131 | * @retry: number of retries to the command IOCB. | 2131 | * @retry: number of retries to the command IOCB. |
@@ -2236,7 +2236,7 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) | |||
2236 | } | 2236 | } |
2237 | 2237 | ||
2238 | /** | 2238 | /** |
2239 | * lpfc_cancel_retry_delay_tmo: Cancel the timer with delayed iocb-cmd retry. | 2239 | * lpfc_cancel_retry_delay_tmo - Cancel the timer with delayed iocb-cmd retry |
2240 | * @vport: pointer to a host virtual N_Port data structure. | 2240 | * @vport: pointer to a host virtual N_Port data structure. |
2241 | * @nlp: pointer to a node-list data structure. | 2241 | * @nlp: pointer to a node-list data structure. |
2242 | * | 2242 | * |
@@ -2291,7 +2291,7 @@ lpfc_cancel_retry_delay_tmo(struct lpfc_vport *vport, struct lpfc_nodelist *nlp) | |||
2291 | } | 2291 | } |
2292 | 2292 | ||
2293 | /** | 2293 | /** |
2294 | * lpfc_els_retry_delay: Timer function with a ndlp delayed function timer. | 2294 | * lpfc_els_retry_delay - Timer function with a ndlp delayed function timer |
2295 | * @ptr: holder for the pointer to the timer function associated data (ndlp). | 2295 | * @ptr: holder for the pointer to the timer function associated data (ndlp). |
2296 | * | 2296 | * |
2297 | * This routine is invoked by the ndlp delayed-function timer to check | 2297 | * This routine is invoked by the ndlp delayed-function timer to check |
@@ -2333,7 +2333,7 @@ lpfc_els_retry_delay(unsigned long ptr) | |||
2333 | } | 2333 | } |
2334 | 2334 | ||
2335 | /** | 2335 | /** |
2336 | * lpfc_els_retry_delay_handler: Work thread handler for ndlp delayed function. | 2336 | * lpfc_els_retry_delay_handler - Work thread handler for ndlp delayed function |
2337 | * @ndlp: pointer to a node-list data structure. | 2337 | * @ndlp: pointer to a node-list data structure. |
2338 | * | 2338 | * |
2339 | * This routine is the worker-thread handler for processing the @ndlp delayed | 2339 | * This routine is the worker-thread handler for processing the @ndlp delayed |
@@ -2404,7 +2404,7 @@ lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp) | |||
2404 | } | 2404 | } |
2405 | 2405 | ||
2406 | /** | 2406 | /** |
2407 | * lpfc_els_retry: Make retry decision on an els command iocb. | 2407 | * lpfc_els_retry - Make retry decision on an els command iocb |
2408 | * @phba: pointer to lpfc hba data structure. | 2408 | * @phba: pointer to lpfc hba data structure. |
2409 | * @cmdiocb: pointer to lpfc command iocb data structure. | 2409 | * @cmdiocb: pointer to lpfc command iocb data structure. |
2410 | * @rspiocb: pointer to lpfc response iocb data structure. | 2410 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -2732,7 +2732,7 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
2732 | } | 2732 | } |
2733 | 2733 | ||
2734 | /** | 2734 | /** |
2735 | * lpfc_els_free_data: Free lpfc dma buffer and data structure with an iocb. | 2735 | * lpfc_els_free_data - Free lpfc dma buffer and data structure with an iocb |
2736 | * @phba: pointer to lpfc hba data structure. | 2736 | * @phba: pointer to lpfc hba data structure. |
2737 | * @buf_ptr1: pointer to the lpfc DMA buffer data structure. | 2737 | * @buf_ptr1: pointer to the lpfc DMA buffer data structure. |
2738 | * | 2738 | * |
@@ -2764,7 +2764,7 @@ lpfc_els_free_data(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr1) | |||
2764 | } | 2764 | } |
2765 | 2765 | ||
2766 | /** | 2766 | /** |
2767 | * lpfc_els_free_bpl: Free lpfc dma buffer and data structure with bpl. | 2767 | * lpfc_els_free_bpl - Free lpfc dma buffer and data structure with bpl |
2768 | * @phba: pointer to lpfc hba data structure. | 2768 | * @phba: pointer to lpfc hba data structure. |
2769 | * @buf_ptr: pointer to the lpfc dma buffer data structure. | 2769 | * @buf_ptr: pointer to the lpfc dma buffer data structure. |
2770 | * | 2770 | * |
@@ -2784,7 +2784,7 @@ lpfc_els_free_bpl(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr) | |||
2784 | } | 2784 | } |
2785 | 2785 | ||
2786 | /** | 2786 | /** |
2787 | * lpfc_els_free_iocb: Free a command iocb and its associated resources. | 2787 | * lpfc_els_free_iocb - Free a command iocb and its associated resources |
2788 | * @phba: pointer to lpfc hba data structure. | 2788 | * @phba: pointer to lpfc hba data structure. |
2789 | * @elsiocb: pointer to lpfc els command iocb data structure. | 2789 | * @elsiocb: pointer to lpfc els command iocb data structure. |
2790 | * | 2790 | * |
@@ -2877,7 +2877,7 @@ lpfc_els_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *elsiocb) | |||
2877 | } | 2877 | } |
2878 | 2878 | ||
2879 | /** | 2879 | /** |
2880 | * lpfc_cmpl_els_logo_acc: Completion callback function to logo acc response. | 2880 | * lpfc_cmpl_els_logo_acc - Completion callback function to logo acc response |
2881 | * @phba: pointer to lpfc hba data structure. | 2881 | * @phba: pointer to lpfc hba data structure. |
2882 | * @cmdiocb: pointer to lpfc command iocb data structure. | 2882 | * @cmdiocb: pointer to lpfc command iocb data structure. |
2883 | * @rspiocb: pointer to lpfc response iocb data structure. | 2883 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -2931,7 +2931,7 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
2931 | } | 2931 | } |
2932 | 2932 | ||
2933 | /** | 2933 | /** |
2934 | * lpfc_mbx_cmpl_dflt_rpi: Completion callbk func for unreg dflt rpi mbox cmd. | 2934 | * lpfc_mbx_cmpl_dflt_rpi - Completion callbk func for unreg dflt rpi mbox cmd |
2935 | * @phba: pointer to lpfc hba data structure. | 2935 | * @phba: pointer to lpfc hba data structure. |
2936 | * @pmb: pointer to the driver internal queue element for mailbox command. | 2936 | * @pmb: pointer to the driver internal queue element for mailbox command. |
2937 | * | 2937 | * |
@@ -2965,7 +2965,7 @@ lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) | |||
2965 | } | 2965 | } |
2966 | 2966 | ||
2967 | /** | 2967 | /** |
2968 | * lpfc_cmpl_els_rsp: Completion callback function for els response iocb cmd. | 2968 | * lpfc_cmpl_els_rsp - Completion callback function for els response iocb cmd |
2969 | * @phba: pointer to lpfc hba data structure. | 2969 | * @phba: pointer to lpfc hba data structure. |
2970 | * @cmdiocb: pointer to lpfc command iocb data structure. | 2970 | * @cmdiocb: pointer to lpfc command iocb data structure. |
2971 | * @rspiocb: pointer to lpfc response iocb data structure. | 2971 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -3136,7 +3136,7 @@ out: | |||
3136 | } | 3136 | } |
3137 | 3137 | ||
3138 | /** | 3138 | /** |
3139 | * lpfc_els_rsp_acc: Prepare and issue an acc response iocb command. | 3139 | * lpfc_els_rsp_acc - Prepare and issue an acc response iocb command |
3140 | * @vport: pointer to a host virtual N_Port data structure. | 3140 | * @vport: pointer to a host virtual N_Port data structure. |
3141 | * @flag: the els command code to be accepted. | 3141 | * @flag: the els command code to be accepted. |
3142 | * @oldiocb: pointer to the original lpfc command iocb data structure. | 3142 | * @oldiocb: pointer to the original lpfc command iocb data structure. |
@@ -3275,7 +3275,7 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, | |||
3275 | } | 3275 | } |
3276 | 3276 | ||
3277 | /** | 3277 | /** |
3278 | * lpfc_els_rsp_reject: Propare and issue a rjt response iocb command. | 3278 | * lpfc_els_rsp_reject - Propare and issue a rjt response iocb command |
3279 | * @vport: pointer to a virtual N_Port data structure. | 3279 | * @vport: pointer to a virtual N_Port data structure. |
3280 | * @rejectError: | 3280 | * @rejectError: |
3281 | * @oldiocb: pointer to the original lpfc command iocb data structure. | 3281 | * @oldiocb: pointer to the original lpfc command iocb data structure. |
@@ -3356,7 +3356,7 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError, | |||
3356 | } | 3356 | } |
3357 | 3357 | ||
3358 | /** | 3358 | /** |
3359 | * lpfc_els_rsp_adisc_acc: Prepare and issue acc response to adisc iocb cmd. | 3359 | * lpfc_els_rsp_adisc_acc - Prepare and issue acc response to adisc iocb cmd |
3360 | * @vport: pointer to a virtual N_Port data structure. | 3360 | * @vport: pointer to a virtual N_Port data structure. |
3361 | * @oldiocb: pointer to the original lpfc command iocb data structure. | 3361 | * @oldiocb: pointer to the original lpfc command iocb data structure. |
3362 | * @ndlp: pointer to a node-list data structure. | 3362 | * @ndlp: pointer to a node-list data structure. |
@@ -3431,7 +3431,7 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, | |||
3431 | } | 3431 | } |
3432 | 3432 | ||
3433 | /** | 3433 | /** |
3434 | * lpfc_els_rsp_prli_acc: Prepare and issue acc response to prli iocb cmd. | 3434 | * lpfc_els_rsp_prli_acc - Prepare and issue acc response to prli iocb cmd |
3435 | * @vport: pointer to a virtual N_Port data structure. | 3435 | * @vport: pointer to a virtual N_Port data structure. |
3436 | * @oldiocb: pointer to the original lpfc command iocb data structure. | 3436 | * @oldiocb: pointer to the original lpfc command iocb data structure. |
3437 | * @ndlp: pointer to a node-list data structure. | 3437 | * @ndlp: pointer to a node-list data structure. |
@@ -3529,7 +3529,7 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, | |||
3529 | } | 3529 | } |
3530 | 3530 | ||
3531 | /** | 3531 | /** |
3532 | * lpfc_els_rsp_rnid_acc: Issue rnid acc response iocb command. | 3532 | * lpfc_els_rsp_rnid_acc - Issue rnid acc response iocb command |
3533 | * @vport: pointer to a virtual N_Port data structure. | 3533 | * @vport: pointer to a virtual N_Port data structure. |
3534 | * @format: rnid command format. | 3534 | * @format: rnid command format. |
3535 | * @oldiocb: pointer to the original lpfc command iocb data structure. | 3535 | * @oldiocb: pointer to the original lpfc command iocb data structure. |
@@ -3635,7 +3635,7 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, | |||
3635 | } | 3635 | } |
3636 | 3636 | ||
3637 | /** | 3637 | /** |
3638 | * lpfc_els_disc_adisc: Issue remaining adisc iocbs to npr nodes of a vport. | 3638 | * lpfc_els_disc_adisc - Issue remaining adisc iocbs to npr nodes of a vport |
3639 | * @vport: pointer to a host virtual N_Port data structure. | 3639 | * @vport: pointer to a host virtual N_Port data structure. |
3640 | * | 3640 | * |
3641 | * This routine issues Address Discover (ADISC) ELS commands to those | 3641 | * This routine issues Address Discover (ADISC) ELS commands to those |
@@ -3693,7 +3693,7 @@ lpfc_els_disc_adisc(struct lpfc_vport *vport) | |||
3693 | } | 3693 | } |
3694 | 3694 | ||
3695 | /** | 3695 | /** |
3696 | * lpfc_els_disc_plogi: Issue plogi for all npr nodes of a vport before adisc. | 3696 | * lpfc_els_disc_plogi - Issue plogi for all npr nodes of a vport before adisc |
3697 | * @vport: pointer to a host virtual N_Port data structure. | 3697 | * @vport: pointer to a host virtual N_Port data structure. |
3698 | * | 3698 | * |
3699 | * This routine issues Port Login (PLOGI) ELS commands to all the N_Ports | 3699 | * This routine issues Port Login (PLOGI) ELS commands to all the N_Ports |
@@ -3752,7 +3752,7 @@ lpfc_els_disc_plogi(struct lpfc_vport *vport) | |||
3752 | } | 3752 | } |
3753 | 3753 | ||
3754 | /** | 3754 | /** |
3755 | * lpfc_els_flush_rscn: Clean up any rscn activities with a vport. | 3755 | * lpfc_els_flush_rscn - Clean up any rscn activities with a vport |
3756 | * @vport: pointer to a host virtual N_Port data structure. | 3756 | * @vport: pointer to a host virtual N_Port data structure. |
3757 | * | 3757 | * |
3758 | * This routine cleans up any Registration State Change Notification | 3758 | * This routine cleans up any Registration State Change Notification |
@@ -3791,7 +3791,7 @@ lpfc_els_flush_rscn(struct lpfc_vport *vport) | |||
3791 | } | 3791 | } |
3792 | 3792 | ||
3793 | /** | 3793 | /** |
3794 | * lpfc_rscn_payload_check: Check whether there is a pending rscn to a did. | 3794 | * lpfc_rscn_payload_check - Check whether there is a pending rscn to a did |
3795 | * @vport: pointer to a host virtual N_Port data structure. | 3795 | * @vport: pointer to a host virtual N_Port data structure. |
3796 | * @did: remote destination port identifier. | 3796 | * @did: remote destination port identifier. |
3797 | * | 3797 | * |
@@ -3866,7 +3866,7 @@ return_did_out: | |||
3866 | } | 3866 | } |
3867 | 3867 | ||
3868 | /** | 3868 | /** |
3869 | * lpfc_rscn_recovery_check: Send recovery event to vport nodes matching rscn | 3869 | * lpfc_rscn_recovery_check - Send recovery event to vport nodes matching rscn |
3870 | * @vport: pointer to a host virtual N_Port data structure. | 3870 | * @vport: pointer to a host virtual N_Port data structure. |
3871 | * | 3871 | * |
3872 | * This routine sends recovery (NLP_EVT_DEVICE_RECOVERY) event to the | 3872 | * This routine sends recovery (NLP_EVT_DEVICE_RECOVERY) event to the |
@@ -3895,7 +3895,7 @@ lpfc_rscn_recovery_check(struct lpfc_vport *vport) | |||
3895 | } | 3895 | } |
3896 | 3896 | ||
3897 | /** | 3897 | /** |
3898 | * lpfc_send_rscn_event: Send an RSCN event to management application. | 3898 | * lpfc_send_rscn_event - Send an RSCN event to management application |
3899 | * @vport: pointer to a host virtual N_Port data structure. | 3899 | * @vport: pointer to a host virtual N_Port data structure. |
3900 | * @cmdiocb: pointer to lpfc command iocb data structure. | 3900 | * @cmdiocb: pointer to lpfc command iocb data structure. |
3901 | * | 3901 | * |
@@ -3938,7 +3938,7 @@ lpfc_send_rscn_event(struct lpfc_vport *vport, | |||
3938 | } | 3938 | } |
3939 | 3939 | ||
3940 | /** | 3940 | /** |
3941 | * lpfc_els_rcv_rscn: Process an unsolicited rscn iocb. | 3941 | * lpfc_els_rcv_rscn - Process an unsolicited rscn iocb |
3942 | * @vport: pointer to a host virtual N_Port data structure. | 3942 | * @vport: pointer to a host virtual N_Port data structure. |
3943 | * @cmdiocb: pointer to lpfc command iocb data structure. | 3943 | * @cmdiocb: pointer to lpfc command iocb data structure. |
3944 | * @ndlp: pointer to a node-list data structure. | 3944 | * @ndlp: pointer to a node-list data structure. |
@@ -4134,7 +4134,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4134 | } | 4134 | } |
4135 | 4135 | ||
4136 | /** | 4136 | /** |
4137 | * lpfc_els_handle_rscn: Handle rscn for a vport. | 4137 | * lpfc_els_handle_rscn - Handle rscn for a vport |
4138 | * @vport: pointer to a host virtual N_Port data structure. | 4138 | * @vport: pointer to a host virtual N_Port data structure. |
4139 | * | 4139 | * |
4140 | * This routine handles the Registration State Configuration Notification | 4140 | * This routine handles the Registration State Configuration Notification |
@@ -4222,7 +4222,7 @@ lpfc_els_handle_rscn(struct lpfc_vport *vport) | |||
4222 | } | 4222 | } |
4223 | 4223 | ||
4224 | /** | 4224 | /** |
4225 | * lpfc_els_rcv_flogi: Process an unsolicited flogi iocb. | 4225 | * lpfc_els_rcv_flogi - Process an unsolicited flogi iocb |
4226 | * @vport: pointer to a host virtual N_Port data structure. | 4226 | * @vport: pointer to a host virtual N_Port data structure. |
4227 | * @cmdiocb: pointer to lpfc command iocb data structure. | 4227 | * @cmdiocb: pointer to lpfc command iocb data structure. |
4228 | * @ndlp: pointer to a node-list data structure. | 4228 | * @ndlp: pointer to a node-list data structure. |
@@ -4336,7 +4336,7 @@ lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4336 | } | 4336 | } |
4337 | 4337 | ||
4338 | /** | 4338 | /** |
4339 | * lpfc_els_rcv_rnid: Process an unsolicited rnid iocb. | 4339 | * lpfc_els_rcv_rnid - Process an unsolicited rnid iocb |
4340 | * @vport: pointer to a host virtual N_Port data structure. | 4340 | * @vport: pointer to a host virtual N_Port data structure. |
4341 | * @cmdiocb: pointer to lpfc command iocb data structure. | 4341 | * @cmdiocb: pointer to lpfc command iocb data structure. |
4342 | * @ndlp: pointer to a node-list data structure. | 4342 | * @ndlp: pointer to a node-list data structure. |
@@ -4391,7 +4391,7 @@ lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4391 | } | 4391 | } |
4392 | 4392 | ||
4393 | /** | 4393 | /** |
4394 | * lpfc_els_rcv_lirr: Process an unsolicited lirr iocb. | 4394 | * lpfc_els_rcv_lirr - Process an unsolicited lirr iocb |
4395 | * @vport: pointer to a host virtual N_Port data structure. | 4395 | * @vport: pointer to a host virtual N_Port data structure. |
4396 | * @cmdiocb: pointer to lpfc command iocb data structure. | 4396 | * @cmdiocb: pointer to lpfc command iocb data structure. |
4397 | * @ndlp: pointer to a node-list data structure. | 4397 | * @ndlp: pointer to a node-list data structure. |
@@ -4419,7 +4419,7 @@ lpfc_els_rcv_lirr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4419 | } | 4419 | } |
4420 | 4420 | ||
4421 | /** | 4421 | /** |
4422 | * lpfc_els_rsp_rps_acc: Completion callbk func for MBX_READ_LNK_STAT mbox cmd. | 4422 | * lpfc_els_rsp_rps_acc - Completion callbk func for MBX_READ_LNK_STAT mbox cmd |
4423 | * @phba: pointer to lpfc hba data structure. | 4423 | * @phba: pointer to lpfc hba data structure. |
4424 | * @pmb: pointer to the driver internal queue element for mailbox command. | 4424 | * @pmb: pointer to the driver internal queue element for mailbox command. |
4425 | * | 4425 | * |
@@ -4513,7 +4513,7 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) | |||
4513 | } | 4513 | } |
4514 | 4514 | ||
4515 | /** | 4515 | /** |
4516 | * lpfc_els_rcv_rps: Process an unsolicited rps iocb. | 4516 | * lpfc_els_rcv_rps - Process an unsolicited rps iocb |
4517 | * @vport: pointer to a host virtual N_Port data structure. | 4517 | * @vport: pointer to a host virtual N_Port data structure. |
4518 | * @cmdiocb: pointer to lpfc command iocb data structure. | 4518 | * @cmdiocb: pointer to lpfc command iocb data structure. |
4519 | * @ndlp: pointer to a node-list data structure. | 4519 | * @ndlp: pointer to a node-list data structure. |
@@ -4590,7 +4590,7 @@ reject_out: | |||
4590 | } | 4590 | } |
4591 | 4591 | ||
4592 | /** | 4592 | /** |
4593 | * lpfc_els_rsp_rpl_acc: Issue an accept rpl els command. | 4593 | * lpfc_els_rsp_rpl_acc - Issue an accept rpl els command |
4594 | * @vport: pointer to a host virtual N_Port data structure. | 4594 | * @vport: pointer to a host virtual N_Port data structure. |
4595 | * @cmdsize: size of the ELS command. | 4595 | * @cmdsize: size of the ELS command. |
4596 | * @oldiocb: pointer to the original lpfc command iocb data structure. | 4596 | * @oldiocb: pointer to the original lpfc command iocb data structure. |
@@ -4662,7 +4662,7 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, | |||
4662 | } | 4662 | } |
4663 | 4663 | ||
4664 | /** | 4664 | /** |
4665 | * lpfc_els_rcv_rpl: Process an unsolicited rpl iocb. | 4665 | * lpfc_els_rcv_rpl - Process an unsolicited rpl iocb |
4666 | * @vport: pointer to a host virtual N_Port data structure. | 4666 | * @vport: pointer to a host virtual N_Port data structure. |
4667 | * @cmdiocb: pointer to lpfc command iocb data structure. | 4667 | * @cmdiocb: pointer to lpfc command iocb data structure. |
4668 | * @ndlp: pointer to a node-list data structure. | 4668 | * @ndlp: pointer to a node-list data structure. |
@@ -4721,7 +4721,7 @@ lpfc_els_rcv_rpl(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4721 | } | 4721 | } |
4722 | 4722 | ||
4723 | /** | 4723 | /** |
4724 | * lpfc_els_rcv_farp: Process an unsolicited farp request els command. | 4724 | * lpfc_els_rcv_farp - Process an unsolicited farp request els command |
4725 | * @vport: pointer to a virtual N_Port data structure. | 4725 | * @vport: pointer to a virtual N_Port data structure. |
4726 | * @cmdiocb: pointer to lpfc command iocb data structure. | 4726 | * @cmdiocb: pointer to lpfc command iocb data structure. |
4727 | * @ndlp: pointer to a node-list data structure. | 4727 | * @ndlp: pointer to a node-list data structure. |
@@ -4804,7 +4804,7 @@ lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4804 | } | 4804 | } |
4805 | 4805 | ||
4806 | /** | 4806 | /** |
4807 | * lpfc_els_rcv_farpr: Process an unsolicited farp response iocb. | 4807 | * lpfc_els_rcv_farpr - Process an unsolicited farp response iocb |
4808 | * @vport: pointer to a host virtual N_Port data structure. | 4808 | * @vport: pointer to a host virtual N_Port data structure. |
4809 | * @cmdiocb: pointer to lpfc command iocb data structure. | 4809 | * @cmdiocb: pointer to lpfc command iocb data structure. |
4810 | * @ndlp: pointer to a node-list data structure. | 4810 | * @ndlp: pointer to a node-list data structure. |
@@ -4842,7 +4842,7 @@ lpfc_els_rcv_farpr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4842 | } | 4842 | } |
4843 | 4843 | ||
4844 | /** | 4844 | /** |
4845 | * lpfc_els_rcv_fan: Process an unsolicited fan iocb command. | 4845 | * lpfc_els_rcv_fan - Process an unsolicited fan iocb command |
4846 | * @vport: pointer to a host virtual N_Port data structure. | 4846 | * @vport: pointer to a host virtual N_Port data structure. |
4847 | * @cmdiocb: pointer to lpfc command iocb data structure. | 4847 | * @cmdiocb: pointer to lpfc command iocb data structure. |
4848 | * @fan_ndlp: pointer to a node-list data structure. | 4848 | * @fan_ndlp: pointer to a node-list data structure. |
@@ -4890,7 +4890,7 @@ lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4890 | } | 4890 | } |
4891 | 4891 | ||
4892 | /** | 4892 | /** |
4893 | * lpfc_els_timeout: Handler funciton to the els timer. | 4893 | * lpfc_els_timeout - Handler funciton to the els timer |
4894 | * @ptr: holder for the timer function associated data. | 4894 | * @ptr: holder for the timer function associated data. |
4895 | * | 4895 | * |
4896 | * This routine is invoked by the ELS timer after timeout. It posts the ELS | 4896 | * This routine is invoked by the ELS timer after timeout. It posts the ELS |
@@ -4919,7 +4919,7 @@ lpfc_els_timeout(unsigned long ptr) | |||
4919 | } | 4919 | } |
4920 | 4920 | ||
4921 | /** | 4921 | /** |
4922 | * lpfc_els_timeout_handler: Process an els timeout event. | 4922 | * lpfc_els_timeout_handler - Process an els timeout event |
4923 | * @vport: pointer to a virtual N_Port data structure. | 4923 | * @vport: pointer to a virtual N_Port data structure. |
4924 | * | 4924 | * |
4925 | * This routine is the actual handler function that processes an ELS timeout | 4925 | * This routine is the actual handler function that processes an ELS timeout |
@@ -4994,7 +4994,7 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport) | |||
4994 | } | 4994 | } |
4995 | 4995 | ||
4996 | /** | 4996 | /** |
4997 | * lpfc_els_flush_cmd: Clean up the outstanding els commands to a vport. | 4997 | * lpfc_els_flush_cmd - Clean up the outstanding els commands to a vport |
4998 | * @vport: pointer to a host virtual N_Port data structure. | 4998 | * @vport: pointer to a host virtual N_Port data structure. |
4999 | * | 4999 | * |
5000 | * This routine is used to clean up all the outstanding ELS commands on a | 5000 | * This routine is used to clean up all the outstanding ELS commands on a |
@@ -5058,25 +5058,15 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport) | |||
5058 | } | 5058 | } |
5059 | spin_unlock_irq(&phba->hbalock); | 5059 | spin_unlock_irq(&phba->hbalock); |
5060 | 5060 | ||
5061 | while (!list_empty(&completions)) { | 5061 | /* Cancell all the IOCBs from the completions list */ |
5062 | piocb = list_get_first(&completions, struct lpfc_iocbq, list); | 5062 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
5063 | cmd = &piocb->iocb; | 5063 | IOERR_SLI_ABORTED); |
5064 | list_del_init(&piocb->list); | ||
5065 | |||
5066 | if (!piocb->iocb_cmpl) | ||
5067 | lpfc_sli_release_iocbq(phba, piocb); | ||
5068 | else { | ||
5069 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
5070 | cmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
5071 | (piocb->iocb_cmpl) (phba, piocb, piocb); | ||
5072 | } | ||
5073 | } | ||
5074 | 5064 | ||
5075 | return; | 5065 | return; |
5076 | } | 5066 | } |
5077 | 5067 | ||
5078 | /** | 5068 | /** |
5079 | * lpfc_els_flush_all_cmd: Clean up all the outstanding els commands to a HBA. | 5069 | * lpfc_els_flush_all_cmd - Clean up all the outstanding els commands to a HBA |
5080 | * @phba: pointer to lpfc hba data structure. | 5070 | * @phba: pointer to lpfc hba data structure. |
5081 | * | 5071 | * |
5082 | * This routine is used to clean up all the outstanding ELS commands on a | 5072 | * This routine is used to clean up all the outstanding ELS commands on a |
@@ -5121,23 +5111,16 @@ lpfc_els_flush_all_cmd(struct lpfc_hba *phba) | |||
5121 | lpfc_sli_issue_abort_iotag(phba, pring, piocb); | 5111 | lpfc_sli_issue_abort_iotag(phba, pring, piocb); |
5122 | } | 5112 | } |
5123 | spin_unlock_irq(&phba->hbalock); | 5113 | spin_unlock_irq(&phba->hbalock); |
5124 | while (!list_empty(&completions)) { | 5114 | |
5125 | piocb = list_get_first(&completions, struct lpfc_iocbq, list); | 5115 | /* Cancel all the IOCBs from the completions list */ |
5126 | cmd = &piocb->iocb; | 5116 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
5127 | list_del_init(&piocb->list); | 5117 | IOERR_SLI_ABORTED); |
5128 | if (!piocb->iocb_cmpl) | 5118 | |
5129 | lpfc_sli_release_iocbq(phba, piocb); | ||
5130 | else { | ||
5131 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
5132 | cmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
5133 | (piocb->iocb_cmpl) (phba, piocb, piocb); | ||
5134 | } | ||
5135 | } | ||
5136 | return; | 5119 | return; |
5137 | } | 5120 | } |
5138 | 5121 | ||
5139 | /** | 5122 | /** |
5140 | * lpfc_send_els_failure_event: Posts an ELS command failure event. | 5123 | * lpfc_send_els_failure_event - Posts an ELS command failure event |
5141 | * @phba: Pointer to hba context object. | 5124 | * @phba: Pointer to hba context object. |
5142 | * @cmdiocbp: Pointer to command iocb which reported error. | 5125 | * @cmdiocbp: Pointer to command iocb which reported error. |
5143 | * @rspiocbp: Pointer to response iocb which reported error. | 5126 | * @rspiocbp: Pointer to response iocb which reported error. |
@@ -5204,7 +5187,7 @@ lpfc_send_els_failure_event(struct lpfc_hba *phba, | |||
5204 | } | 5187 | } |
5205 | 5188 | ||
5206 | /** | 5189 | /** |
5207 | * lpfc_send_els_event: Posts unsolicited els event. | 5190 | * lpfc_send_els_event - Posts unsolicited els event |
5208 | * @vport: Pointer to vport object. | 5191 | * @vport: Pointer to vport object. |
5209 | * @ndlp: Pointer FC node object. | 5192 | * @ndlp: Pointer FC node object. |
5210 | * @cmd: ELS command code. | 5193 | * @cmd: ELS command code. |
@@ -5284,7 +5267,7 @@ lpfc_send_els_event(struct lpfc_vport *vport, | |||
5284 | 5267 | ||
5285 | 5268 | ||
5286 | /** | 5269 | /** |
5287 | * lpfc_els_unsol_buffer: Process an unsolicited event data buffer. | 5270 | * lpfc_els_unsol_buffer - Process an unsolicited event data buffer |
5288 | * @phba: pointer to lpfc hba data structure. | 5271 | * @phba: pointer to lpfc hba data structure. |
5289 | * @pring: pointer to a SLI ring. | 5272 | * @pring: pointer to a SLI ring. |
5290 | * @vport: pointer to a host virtual N_Port data structure. | 5273 | * @vport: pointer to a host virtual N_Port data structure. |
@@ -5592,7 +5575,7 @@ dropit: | |||
5592 | } | 5575 | } |
5593 | 5576 | ||
5594 | /** | 5577 | /** |
5595 | * lpfc_find_vport_by_vpid: Find a vport on a HBA through vport identifier. | 5578 | * lpfc_find_vport_by_vpid - Find a vport on a HBA through vport identifier |
5596 | * @phba: pointer to lpfc hba data structure. | 5579 | * @phba: pointer to lpfc hba data structure. |
5597 | * @vpi: host virtual N_Port identifier. | 5580 | * @vpi: host virtual N_Port identifier. |
5598 | * | 5581 | * |
@@ -5622,7 +5605,7 @@ lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi) | |||
5622 | } | 5605 | } |
5623 | 5606 | ||
5624 | /** | 5607 | /** |
5625 | * lpfc_els_unsol_event: Process an unsolicited event from an els sli ring. | 5608 | * lpfc_els_unsol_event - Process an unsolicited event from an els sli ring |
5626 | * @phba: pointer to lpfc hba data structure. | 5609 | * @phba: pointer to lpfc hba data structure. |
5627 | * @pring: pointer to a SLI ring. | 5610 | * @pring: pointer to a SLI ring. |
5628 | * @elsiocb: pointer to lpfc els iocb data structure. | 5611 | * @elsiocb: pointer to lpfc els iocb data structure. |
@@ -5710,7 +5693,7 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
5710 | } | 5693 | } |
5711 | 5694 | ||
5712 | /** | 5695 | /** |
5713 | * lpfc_do_scr_ns_plogi: Issue a plogi to the name server for scr. | 5696 | * lpfc_do_scr_ns_plogi - Issue a plogi to the name server for scr |
5714 | * @phba: pointer to lpfc hba data structure. | 5697 | * @phba: pointer to lpfc hba data structure. |
5715 | * @vport: pointer to a virtual N_Port data structure. | 5698 | * @vport: pointer to a virtual N_Port data structure. |
5716 | * | 5699 | * |
@@ -5781,7 +5764,7 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport) | |||
5781 | } | 5764 | } |
5782 | 5765 | ||
5783 | /** | 5766 | /** |
5784 | * lpfc_cmpl_reg_new_vport: Completion callback function to register new vport. | 5767 | * lpfc_cmpl_reg_new_vport - Completion callback function to register new vport |
5785 | * @phba: pointer to lpfc hba data structure. | 5768 | * @phba: pointer to lpfc hba data structure. |
5786 | * @pmb: pointer to the driver internal queue element for mailbox command. | 5769 | * @pmb: pointer to the driver internal queue element for mailbox command. |
5787 | * | 5770 | * |
@@ -5850,7 +5833,7 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) | |||
5850 | } | 5833 | } |
5851 | 5834 | ||
5852 | /** | 5835 | /** |
5853 | * lpfc_register_new_vport: Register a new vport with a HBA. | 5836 | * lpfc_register_new_vport - Register a new vport with a HBA |
5854 | * @phba: pointer to lpfc hba data structure. | 5837 | * @phba: pointer to lpfc hba data structure. |
5855 | * @vport: pointer to a host virtual N_Port data structure. | 5838 | * @vport: pointer to a host virtual N_Port data structure. |
5856 | * @ndlp: pointer to a node-list data structure. | 5839 | * @ndlp: pointer to a node-list data structure. |
@@ -5899,7 +5882,7 @@ mbox_err_exit: | |||
5899 | } | 5882 | } |
5900 | 5883 | ||
5901 | /** | 5884 | /** |
5902 | * lpfc_cmpl_els_fdisc: Completion function for fdisc iocb command. | 5885 | * lpfc_cmpl_els_fdisc - Completion function for fdisc iocb command |
5903 | * @phba: pointer to lpfc hba data structure. | 5886 | * @phba: pointer to lpfc hba data structure. |
5904 | * @cmdiocb: pointer to lpfc command iocb data structure. | 5887 | * @cmdiocb: pointer to lpfc command iocb data structure. |
5905 | * @rspiocb: pointer to lpfc response iocb data structure. | 5888 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -6007,7 +5990,7 @@ out: | |||
6007 | } | 5990 | } |
6008 | 5991 | ||
6009 | /** | 5992 | /** |
6010 | * lpfc_issue_els_fdisc: Issue a fdisc iocb command. | 5993 | * lpfc_issue_els_fdisc - Issue a fdisc iocb command |
6011 | * @vport: pointer to a virtual N_Port data structure. | 5994 | * @vport: pointer to a virtual N_Port data structure. |
6012 | * @ndlp: pointer to a node-list data structure. | 5995 | * @ndlp: pointer to a node-list data structure. |
6013 | * @retry: number of retries to the command IOCB. | 5996 | * @retry: number of retries to the command IOCB. |
@@ -6101,7 +6084,7 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
6101 | } | 6084 | } |
6102 | 6085 | ||
6103 | /** | 6086 | /** |
6104 | * lpfc_cmpl_els_npiv_logo: Completion function with vport logo. | 6087 | * lpfc_cmpl_els_npiv_logo - Completion function with vport logo |
6105 | * @phba: pointer to lpfc hba data structure. | 6088 | * @phba: pointer to lpfc hba data structure. |
6106 | * @cmdiocb: pointer to lpfc command iocb data structure. | 6089 | * @cmdiocb: pointer to lpfc command iocb data structure. |
6107 | * @rspiocb: pointer to lpfc response iocb data structure. | 6090 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -6136,7 +6119,7 @@ lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
6136 | } | 6119 | } |
6137 | 6120 | ||
6138 | /** | 6121 | /** |
6139 | * lpfc_issue_els_npiv_logo: Issue a logo off a vport. | 6122 | * lpfc_issue_els_npiv_logo - Issue a logo off a vport |
6140 | * @vport: pointer to a virtual N_Port data structure. | 6123 | * @vport: pointer to a virtual N_Port data structure. |
6141 | * @ndlp: pointer to a node-list data structure. | 6124 | * @ndlp: pointer to a node-list data structure. |
6142 | * | 6125 | * |
@@ -6197,7 +6180,7 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) | |||
6197 | } | 6180 | } |
6198 | 6181 | ||
6199 | /** | 6182 | /** |
6200 | * lpfc_fabric_block_timeout: Handler function to the fabric block timer. | 6183 | * lpfc_fabric_block_timeout - Handler function to the fabric block timer |
6201 | * @ptr: holder for the timer function associated data. | 6184 | * @ptr: holder for the timer function associated data. |
6202 | * | 6185 | * |
6203 | * This routine is invoked by the fabric iocb block timer after | 6186 | * This routine is invoked by the fabric iocb block timer after |
@@ -6226,7 +6209,7 @@ lpfc_fabric_block_timeout(unsigned long ptr) | |||
6226 | } | 6209 | } |
6227 | 6210 | ||
6228 | /** | 6211 | /** |
6229 | * lpfc_resume_fabric_iocbs: Issue a fabric iocb from driver internal list. | 6212 | * lpfc_resume_fabric_iocbs - Issue a fabric iocb from driver internal list |
6230 | * @phba: pointer to lpfc hba data structure. | 6213 | * @phba: pointer to lpfc hba data structure. |
6231 | * | 6214 | * |
6232 | * This routine issues one fabric iocb from the driver internal list to | 6215 | * This routine issues one fabric iocb from the driver internal list to |
@@ -6285,7 +6268,7 @@ repeat: | |||
6285 | } | 6268 | } |
6286 | 6269 | ||
6287 | /** | 6270 | /** |
6288 | * lpfc_unblock_fabric_iocbs: Unblock issuing fabric iocb command. | 6271 | * lpfc_unblock_fabric_iocbs - Unblock issuing fabric iocb command |
6289 | * @phba: pointer to lpfc hba data structure. | 6272 | * @phba: pointer to lpfc hba data structure. |
6290 | * | 6273 | * |
6291 | * This routine unblocks the issuing fabric iocb command. The function | 6274 | * This routine unblocks the issuing fabric iocb command. The function |
@@ -6303,7 +6286,7 @@ lpfc_unblock_fabric_iocbs(struct lpfc_hba *phba) | |||
6303 | } | 6286 | } |
6304 | 6287 | ||
6305 | /** | 6288 | /** |
6306 | * lpfc_block_fabric_iocbs: Block issuing fabric iocb command. | 6289 | * lpfc_block_fabric_iocbs - Block issuing fabric iocb command |
6307 | * @phba: pointer to lpfc hba data structure. | 6290 | * @phba: pointer to lpfc hba data structure. |
6308 | * | 6291 | * |
6309 | * This routine blocks the issuing fabric iocb for a specified amount of | 6292 | * This routine blocks the issuing fabric iocb for a specified amount of |
@@ -6325,7 +6308,7 @@ lpfc_block_fabric_iocbs(struct lpfc_hba *phba) | |||
6325 | } | 6308 | } |
6326 | 6309 | ||
6327 | /** | 6310 | /** |
6328 | * lpfc_cmpl_fabric_iocb: Completion callback function for fabric iocb. | 6311 | * lpfc_cmpl_fabric_iocb - Completion callback function for fabric iocb |
6329 | * @phba: pointer to lpfc hba data structure. | 6312 | * @phba: pointer to lpfc hba data structure. |
6330 | * @cmdiocb: pointer to lpfc command iocb data structure. | 6313 | * @cmdiocb: pointer to lpfc command iocb data structure. |
6331 | * @rspiocb: pointer to lpfc response iocb data structure. | 6314 | * @rspiocb: pointer to lpfc response iocb data structure. |
@@ -6384,7 +6367,7 @@ lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
6384 | } | 6367 | } |
6385 | 6368 | ||
6386 | /** | 6369 | /** |
6387 | * lpfc_issue_fabric_iocb: Issue a fabric iocb command. | 6370 | * lpfc_issue_fabric_iocb - Issue a fabric iocb command |
6388 | * @phba: pointer to lpfc hba data structure. | 6371 | * @phba: pointer to lpfc hba data structure. |
6389 | * @iocb: pointer to lpfc command iocb data structure. | 6372 | * @iocb: pointer to lpfc command iocb data structure. |
6390 | * | 6373 | * |
@@ -6453,7 +6436,7 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb) | |||
6453 | } | 6436 | } |
6454 | 6437 | ||
6455 | /** | 6438 | /** |
6456 | * lpfc_fabric_abort_vport: Abort a vport's iocbs from driver fabric iocb list. | 6439 | * lpfc_fabric_abort_vport - Abort a vport's iocbs from driver fabric iocb list |
6457 | * @vport: pointer to a virtual N_Port data structure. | 6440 | * @vport: pointer to a virtual N_Port data structure. |
6458 | * | 6441 | * |
6459 | * This routine aborts all the IOCBs associated with a @vport from the | 6442 | * This routine aborts all the IOCBs associated with a @vport from the |
@@ -6468,7 +6451,6 @@ static void lpfc_fabric_abort_vport(struct lpfc_vport *vport) | |||
6468 | LIST_HEAD(completions); | 6451 | LIST_HEAD(completions); |
6469 | struct lpfc_hba *phba = vport->phba; | 6452 | struct lpfc_hba *phba = vport->phba; |
6470 | struct lpfc_iocbq *tmp_iocb, *piocb; | 6453 | struct lpfc_iocbq *tmp_iocb, *piocb; |
6471 | IOCB_t *cmd; | ||
6472 | 6454 | ||
6473 | spin_lock_irq(&phba->hbalock); | 6455 | spin_lock_irq(&phba->hbalock); |
6474 | list_for_each_entry_safe(piocb, tmp_iocb, &phba->fabric_iocb_list, | 6456 | list_for_each_entry_safe(piocb, tmp_iocb, &phba->fabric_iocb_list, |
@@ -6481,19 +6463,13 @@ static void lpfc_fabric_abort_vport(struct lpfc_vport *vport) | |||
6481 | } | 6463 | } |
6482 | spin_unlock_irq(&phba->hbalock); | 6464 | spin_unlock_irq(&phba->hbalock); |
6483 | 6465 | ||
6484 | while (!list_empty(&completions)) { | 6466 | /* Cancel all the IOCBs from the completions list */ |
6485 | piocb = list_get_first(&completions, struct lpfc_iocbq, list); | 6467 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
6486 | list_del_init(&piocb->list); | 6468 | IOERR_SLI_ABORTED); |
6487 | |||
6488 | cmd = &piocb->iocb; | ||
6489 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
6490 | cmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
6491 | (piocb->iocb_cmpl) (phba, piocb, piocb); | ||
6492 | } | ||
6493 | } | 6469 | } |
6494 | 6470 | ||
6495 | /** | 6471 | /** |
6496 | * lpfc_fabric_abort_nport: Abort a ndlp's iocbs from driver fabric iocb list. | 6472 | * lpfc_fabric_abort_nport - Abort a ndlp's iocbs from driver fabric iocb list |
6497 | * @ndlp: pointer to a node-list data structure. | 6473 | * @ndlp: pointer to a node-list data structure. |
6498 | * | 6474 | * |
6499 | * This routine aborts all the IOCBs associated with an @ndlp from the | 6475 | * This routine aborts all the IOCBs associated with an @ndlp from the |
@@ -6506,10 +6482,9 @@ static void lpfc_fabric_abort_vport(struct lpfc_vport *vport) | |||
6506 | void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp) | 6482 | void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp) |
6507 | { | 6483 | { |
6508 | LIST_HEAD(completions); | 6484 | LIST_HEAD(completions); |
6509 | struct lpfc_hba *phba = ndlp->vport->phba; | 6485 | struct lpfc_hba *phba = ndlp->phba; |
6510 | struct lpfc_iocbq *tmp_iocb, *piocb; | 6486 | struct lpfc_iocbq *tmp_iocb, *piocb; |
6511 | struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING]; | 6487 | struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING]; |
6512 | IOCB_t *cmd; | ||
6513 | 6488 | ||
6514 | spin_lock_irq(&phba->hbalock); | 6489 | spin_lock_irq(&phba->hbalock); |
6515 | list_for_each_entry_safe(piocb, tmp_iocb, &phba->fabric_iocb_list, | 6490 | list_for_each_entry_safe(piocb, tmp_iocb, &phba->fabric_iocb_list, |
@@ -6521,19 +6496,13 @@ void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp) | |||
6521 | } | 6496 | } |
6522 | spin_unlock_irq(&phba->hbalock); | 6497 | spin_unlock_irq(&phba->hbalock); |
6523 | 6498 | ||
6524 | while (!list_empty(&completions)) { | 6499 | /* Cancel all the IOCBs from the completions list */ |
6525 | piocb = list_get_first(&completions, struct lpfc_iocbq, list); | 6500 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
6526 | list_del_init(&piocb->list); | 6501 | IOERR_SLI_ABORTED); |
6527 | |||
6528 | cmd = &piocb->iocb; | ||
6529 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
6530 | cmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
6531 | (piocb->iocb_cmpl) (phba, piocb, piocb); | ||
6532 | } | ||
6533 | } | 6502 | } |
6534 | 6503 | ||
6535 | /** | 6504 | /** |
6536 | * lpfc_fabric_abort_hba: Abort all iocbs on driver fabric iocb list. | 6505 | * lpfc_fabric_abort_hba - Abort all iocbs on driver fabric iocb list |
6537 | * @phba: pointer to lpfc hba data structure. | 6506 | * @phba: pointer to lpfc hba data structure. |
6538 | * | 6507 | * |
6539 | * This routine aborts all the IOCBs currently on the driver internal | 6508 | * This routine aborts all the IOCBs currently on the driver internal |
@@ -6546,20 +6515,12 @@ void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp) | |||
6546 | void lpfc_fabric_abort_hba(struct lpfc_hba *phba) | 6515 | void lpfc_fabric_abort_hba(struct lpfc_hba *phba) |
6547 | { | 6516 | { |
6548 | LIST_HEAD(completions); | 6517 | LIST_HEAD(completions); |
6549 | struct lpfc_iocbq *piocb; | ||
6550 | IOCB_t *cmd; | ||
6551 | 6518 | ||
6552 | spin_lock_irq(&phba->hbalock); | 6519 | spin_lock_irq(&phba->hbalock); |
6553 | list_splice_init(&phba->fabric_iocb_list, &completions); | 6520 | list_splice_init(&phba->fabric_iocb_list, &completions); |
6554 | spin_unlock_irq(&phba->hbalock); | 6521 | spin_unlock_irq(&phba->hbalock); |
6555 | 6522 | ||
6556 | while (!list_empty(&completions)) { | 6523 | /* Cancel all the IOCBs from the completions list */ |
6557 | piocb = list_get_first(&completions, struct lpfc_iocbq, list); | 6524 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
6558 | list_del_init(&piocb->list); | 6525 | IOERR_SLI_ABORTED); |
6559 | |||
6560 | cmd = &piocb->iocb; | ||
6561 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
6562 | cmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
6563 | (piocb->iocb_cmpl) (phba, piocb, piocb); | ||
6564 | } | ||
6565 | } | 6526 | } |
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 311ed6dea72..e764ce0bf70 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c | |||
@@ -78,7 +78,7 @@ lpfc_terminate_rport_io(struct fc_rport *rport) | |||
78 | return; | 78 | return; |
79 | } | 79 | } |
80 | 80 | ||
81 | phba = ndlp->vport->phba; | 81 | phba = ndlp->phba; |
82 | 82 | ||
83 | lpfc_debugfs_disc_trc(ndlp->vport, LPFC_DISC_TRC_RPORT, | 83 | lpfc_debugfs_disc_trc(ndlp->vport, LPFC_DISC_TRC_RPORT, |
84 | "rport terminate: sid:x%x did:x%x flg:x%x", | 84 | "rport terminate: sid:x%x did:x%x flg:x%x", |
@@ -276,7 +276,7 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp) | |||
276 | } | 276 | } |
277 | 277 | ||
278 | /** | 278 | /** |
279 | * lpfc_alloc_fast_evt: Allocates data structure for posting event. | 279 | * lpfc_alloc_fast_evt - Allocates data structure for posting event |
280 | * @phba: Pointer to hba context object. | 280 | * @phba: Pointer to hba context object. |
281 | * | 281 | * |
282 | * This function is called from the functions which need to post | 282 | * This function is called from the functions which need to post |
@@ -303,7 +303,7 @@ lpfc_alloc_fast_evt(struct lpfc_hba *phba) { | |||
303 | } | 303 | } |
304 | 304 | ||
305 | /** | 305 | /** |
306 | * lpfc_free_fast_evt: Frees event data structure. | 306 | * lpfc_free_fast_evt - Frees event data structure |
307 | * @phba: Pointer to hba context object. | 307 | * @phba: Pointer to hba context object. |
308 | * @evt: Event object which need to be freed. | 308 | * @evt: Event object which need to be freed. |
309 | * | 309 | * |
@@ -319,7 +319,7 @@ lpfc_free_fast_evt(struct lpfc_hba *phba, | |||
319 | } | 319 | } |
320 | 320 | ||
321 | /** | 321 | /** |
322 | * lpfc_send_fastpath_evt: Posts events generated from fast path. | 322 | * lpfc_send_fastpath_evt - Posts events generated from fast path |
323 | * @phba: Pointer to hba context object. | 323 | * @phba: Pointer to hba context object. |
324 | * @evtp: Event data structure. | 324 | * @evtp: Event data structure. |
325 | * | 325 | * |
@@ -1858,13 +1858,18 @@ lpfc_disable_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) | |||
1858 | NLP_STE_UNUSED_NODE); | 1858 | NLP_STE_UNUSED_NODE); |
1859 | } | 1859 | } |
1860 | /** | 1860 | /** |
1861 | * lpfc_initialize_node: Initialize all fields of node object. | 1861 | * lpfc_initialize_node - Initialize all fields of node object |
1862 | * @vport: Pointer to Virtual Port object. | 1862 | * @vport: Pointer to Virtual Port object. |
1863 | * @ndlp: Pointer to FC node object. | 1863 | * @ndlp: Pointer to FC node object. |
1864 | * @did: FC_ID of the node. | 1864 | * @did: FC_ID of the node. |
1865 | * This function is always called when node object need to | 1865 | * |
1866 | * be initialized. It initializes all the fields of the node | 1866 | * This function is always called when node object need to be initialized. |
1867 | * object. | 1867 | * It initializes all the fields of the node object. Although the reference |
1868 | * to phba from @ndlp can be obtained indirectly through it's reference to | ||
1869 | * @vport, a direct reference to phba is taken here by @ndlp. This is due | ||
1870 | * to the life-span of the @ndlp might go beyond the existence of @vport as | ||
1871 | * the final release of ndlp is determined by its reference count. And, the | ||
1872 | * operation on @ndlp needs the reference to phba. | ||
1868 | **/ | 1873 | **/ |
1869 | static inline void | 1874 | static inline void |
1870 | lpfc_initialize_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | 1875 | lpfc_initialize_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, |
@@ -1877,6 +1882,7 @@ lpfc_initialize_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, | |||
1877 | ndlp->nlp_delayfunc.data = (unsigned long)ndlp; | 1882 | ndlp->nlp_delayfunc.data = (unsigned long)ndlp; |
1878 | ndlp->nlp_DID = did; | 1883 | ndlp->nlp_DID = did; |
1879 | ndlp->vport = vport; | 1884 | ndlp->vport = vport; |
1885 | ndlp->phba = vport->phba; | ||
1880 | ndlp->nlp_sid = NLP_NO_SID; | 1886 | ndlp->nlp_sid = NLP_NO_SID; |
1881 | kref_init(&ndlp->kref); | 1887 | kref_init(&ndlp->kref); |
1882 | NLP_INT_NODE_ACT(ndlp); | 1888 | NLP_INT_NODE_ACT(ndlp); |
@@ -2086,7 +2092,6 @@ lpfc_no_rpi(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) | |||
2086 | struct lpfc_sli *psli; | 2092 | struct lpfc_sli *psli; |
2087 | struct lpfc_sli_ring *pring; | 2093 | struct lpfc_sli_ring *pring; |
2088 | struct lpfc_iocbq *iocb, *next_iocb; | 2094 | struct lpfc_iocbq *iocb, *next_iocb; |
2089 | IOCB_t *icmd; | ||
2090 | uint32_t rpi, i; | 2095 | uint32_t rpi, i; |
2091 | 2096 | ||
2092 | lpfc_fabric_abort_nport(ndlp); | 2097 | lpfc_fabric_abort_nport(ndlp); |
@@ -2122,19 +2127,9 @@ lpfc_no_rpi(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) | |||
2122 | } | 2127 | } |
2123 | } | 2128 | } |
2124 | 2129 | ||
2125 | while (!list_empty(&completions)) { | 2130 | /* Cancel all the IOCBs from the completions list */ |
2126 | iocb = list_get_first(&completions, struct lpfc_iocbq, list); | 2131 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
2127 | list_del_init(&iocb->list); | 2132 | IOERR_SLI_ABORTED); |
2128 | |||
2129 | if (!iocb->iocb_cmpl) | ||
2130 | lpfc_sli_release_iocbq(phba, iocb); | ||
2131 | else { | ||
2132 | icmd = &iocb->iocb; | ||
2133 | icmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
2134 | icmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
2135 | (iocb->iocb_cmpl)(phba, iocb, iocb); | ||
2136 | } | ||
2137 | } | ||
2138 | 2133 | ||
2139 | return 0; | 2134 | return 0; |
2140 | } | 2135 | } |
@@ -2186,9 +2181,13 @@ lpfc_unreg_all_rpis(struct lpfc_vport *vport) | |||
2186 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; | 2181 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; |
2187 | mbox->context1 = NULL; | 2182 | mbox->context1 = NULL; |
2188 | rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO); | 2183 | rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO); |
2189 | if (rc == MBX_NOT_FINISHED) { | 2184 | if (rc != MBX_TIMEOUT) |
2190 | mempool_free(mbox, phba->mbox_mem_pool); | 2185 | mempool_free(mbox, phba->mbox_mem_pool); |
2191 | } | 2186 | |
2187 | if ((rc == MBX_TIMEOUT) || (rc == MBX_NOT_FINISHED)) | ||
2188 | lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX | LOG_VPORT, | ||
2189 | "1836 Could not issue " | ||
2190 | "unreg_login(all_rpis) status %d\n", rc); | ||
2192 | } | 2191 | } |
2193 | } | 2192 | } |
2194 | 2193 | ||
@@ -2206,12 +2205,14 @@ lpfc_unreg_default_rpis(struct lpfc_vport *vport) | |||
2206 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; | 2205 | mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; |
2207 | mbox->context1 = NULL; | 2206 | mbox->context1 = NULL; |
2208 | rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO); | 2207 | rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO); |
2209 | if (rc == MBX_NOT_FINISHED) { | 2208 | if (rc != MBX_TIMEOUT) |
2209 | mempool_free(mbox, phba->mbox_mem_pool); | ||
2210 | |||
2211 | if ((rc == MBX_TIMEOUT) || (rc == MBX_NOT_FINISHED)) | ||
2210 | lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX | LOG_VPORT, | 2212 | lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX | LOG_VPORT, |
2211 | "1815 Could not issue " | 2213 | "1815 Could not issue " |
2212 | "unreg_did (default rpis)\n"); | 2214 | "unreg_did (default rpis) status %d\n", |
2213 | mempool_free(mbox, phba->mbox_mem_pool); | 2215 | rc); |
2214 | } | ||
2215 | } | 2216 | } |
2216 | } | 2217 | } |
2217 | 2218 | ||
@@ -2470,14 +2471,13 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did) | |||
2470 | if (ndlp->nlp_flag & NLP_RCV_PLOGI) | 2471 | if (ndlp->nlp_flag & NLP_RCV_PLOGI) |
2471 | return NULL; | 2472 | return NULL; |
2472 | 2473 | ||
2473 | spin_lock_irq(shost->host_lock); | ||
2474 | ndlp->nlp_flag |= NLP_NPR_2B_DISC; | ||
2475 | spin_unlock_irq(shost->host_lock); | ||
2476 | |||
2477 | /* Since this node is marked for discovery, | 2474 | /* Since this node is marked for discovery, |
2478 | * delay timeout is not needed. | 2475 | * delay timeout is not needed. |
2479 | */ | 2476 | */ |
2480 | lpfc_cancel_retry_delay_tmo(vport, ndlp); | 2477 | lpfc_cancel_retry_delay_tmo(vport, ndlp); |
2478 | spin_lock_irq(shost->host_lock); | ||
2479 | ndlp->nlp_flag |= NLP_NPR_2B_DISC; | ||
2480 | spin_unlock_irq(shost->host_lock); | ||
2481 | } else | 2481 | } else |
2482 | ndlp = NULL; | 2482 | ndlp = NULL; |
2483 | } else { | 2483 | } else { |
@@ -2740,19 +2740,9 @@ lpfc_free_tx(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) | |||
2740 | } | 2740 | } |
2741 | spin_unlock_irq(&phba->hbalock); | 2741 | spin_unlock_irq(&phba->hbalock); |
2742 | 2742 | ||
2743 | while (!list_empty(&completions)) { | 2743 | /* Cancel all the IOCBs from the completions list */ |
2744 | iocb = list_get_first(&completions, struct lpfc_iocbq, list); | 2744 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
2745 | list_del_init(&iocb->list); | 2745 | IOERR_SLI_ABORTED); |
2746 | |||
2747 | if (!iocb->iocb_cmpl) | ||
2748 | lpfc_sli_release_iocbq(phba, iocb); | ||
2749 | else { | ||
2750 | icmd = &iocb->iocb; | ||
2751 | icmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
2752 | icmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
2753 | (iocb->iocb_cmpl) (phba, iocb, iocb); | ||
2754 | } | ||
2755 | } | ||
2756 | } | 2746 | } |
2757 | 2747 | ||
2758 | static void | 2748 | static void |
@@ -3173,7 +3163,7 @@ lpfc_nlp_release(struct kref *kref) | |||
3173 | lpfc_nlp_remove(ndlp->vport, ndlp); | 3163 | lpfc_nlp_remove(ndlp->vport, ndlp); |
3174 | 3164 | ||
3175 | /* clear the ndlp active flag for all release cases */ | 3165 | /* clear the ndlp active flag for all release cases */ |
3176 | phba = ndlp->vport->phba; | 3166 | phba = ndlp->phba; |
3177 | spin_lock_irqsave(&phba->ndlp_lock, flags); | 3167 | spin_lock_irqsave(&phba->ndlp_lock, flags); |
3178 | NLP_CLR_NODE_ACT(ndlp); | 3168 | NLP_CLR_NODE_ACT(ndlp); |
3179 | spin_unlock_irqrestore(&phba->ndlp_lock, flags); | 3169 | spin_unlock_irqrestore(&phba->ndlp_lock, flags); |
@@ -3181,7 +3171,7 @@ lpfc_nlp_release(struct kref *kref) | |||
3181 | /* free ndlp memory for final ndlp release */ | 3171 | /* free ndlp memory for final ndlp release */ |
3182 | if (NLP_CHK_FREE_REQ(ndlp)) { | 3172 | if (NLP_CHK_FREE_REQ(ndlp)) { |
3183 | kfree(ndlp->lat_data); | 3173 | kfree(ndlp->lat_data); |
3184 | mempool_free(ndlp, ndlp->vport->phba->nlp_mem_pool); | 3174 | mempool_free(ndlp, ndlp->phba->nlp_mem_pool); |
3185 | } | 3175 | } |
3186 | } | 3176 | } |
3187 | 3177 | ||
@@ -3204,7 +3194,7 @@ lpfc_nlp_get(struct lpfc_nodelist *ndlp) | |||
3204 | * ndlp reference count that is in the process of being | 3194 | * ndlp reference count that is in the process of being |
3205 | * released. | 3195 | * released. |
3206 | */ | 3196 | */ |
3207 | phba = ndlp->vport->phba; | 3197 | phba = ndlp->phba; |
3208 | spin_lock_irqsave(&phba->ndlp_lock, flags); | 3198 | spin_lock_irqsave(&phba->ndlp_lock, flags); |
3209 | if (!NLP_CHK_NODE_ACT(ndlp) || NLP_CHK_FREE_ACK(ndlp)) { | 3199 | if (!NLP_CHK_NODE_ACT(ndlp) || NLP_CHK_FREE_ACK(ndlp)) { |
3210 | spin_unlock_irqrestore(&phba->ndlp_lock, flags); | 3200 | spin_unlock_irqrestore(&phba->ndlp_lock, flags); |
@@ -3240,7 +3230,7 @@ lpfc_nlp_put(struct lpfc_nodelist *ndlp) | |||
3240 | "node put: did:x%x flg:x%x refcnt:x%x", | 3230 | "node put: did:x%x flg:x%x refcnt:x%x", |
3241 | ndlp->nlp_DID, ndlp->nlp_flag, | 3231 | ndlp->nlp_DID, ndlp->nlp_flag, |
3242 | atomic_read(&ndlp->kref.refcount)); | 3232 | atomic_read(&ndlp->kref.refcount)); |
3243 | phba = ndlp->vport->phba; | 3233 | phba = ndlp->phba; |
3244 | spin_lock_irqsave(&phba->ndlp_lock, flags); | 3234 | spin_lock_irqsave(&phba->ndlp_lock, flags); |
3245 | /* Check the ndlp memory free acknowledge flag to avoid the | 3235 | /* Check the ndlp memory free acknowledge flag to avoid the |
3246 | * possible race condition that kref_put got invoked again | 3236 | * possible race condition that kref_put got invoked again |
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 06874e6009e..86d1bdcbf2d 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
@@ -60,7 +60,7 @@ static struct scsi_transport_template *lpfc_vport_transport_template = NULL; | |||
60 | static DEFINE_IDR(lpfc_hba_index); | 60 | static DEFINE_IDR(lpfc_hba_index); |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * lpfc_config_port_prep: Perform lpfc initialization prior to config port. | 63 | * lpfc_config_port_prep - Perform lpfc initialization prior to config port |
64 | * @phba: pointer to lpfc hba data structure. | 64 | * @phba: pointer to lpfc hba data structure. |
65 | * | 65 | * |
66 | * This routine will do LPFC initialization prior to issuing the CONFIG_PORT | 66 | * This routine will do LPFC initialization prior to issuing the CONFIG_PORT |
@@ -221,7 +221,7 @@ out_free_mbox: | |||
221 | } | 221 | } |
222 | 222 | ||
223 | /** | 223 | /** |
224 | * lpfc_config_async_cmpl: Completion handler for config async event mbox cmd. | 224 | * lpfc_config_async_cmpl - Completion handler for config async event mbox cmd |
225 | * @phba: pointer to lpfc hba data structure. | 225 | * @phba: pointer to lpfc hba data structure. |
226 | * @pmboxq: pointer to the driver internal queue element for mailbox command. | 226 | * @pmboxq: pointer to the driver internal queue element for mailbox command. |
227 | * | 227 | * |
@@ -242,8 +242,7 @@ lpfc_config_async_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq) | |||
242 | } | 242 | } |
243 | 243 | ||
244 | /** | 244 | /** |
245 | * lpfc_dump_wakeup_param_cmpl: Completion handler for dump memory mailbox | 245 | * lpfc_dump_wakeup_param_cmpl - dump memory mailbox command completion handler |
246 | * command used for getting wake up parameters. | ||
247 | * @phba: pointer to lpfc hba data structure. | 246 | * @phba: pointer to lpfc hba data structure. |
248 | * @pmboxq: pointer to the driver internal queue element for mailbox command. | 247 | * @pmboxq: pointer to the driver internal queue element for mailbox command. |
249 | * | 248 | * |
@@ -287,7 +286,7 @@ lpfc_dump_wakeup_param_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq) | |||
287 | } | 286 | } |
288 | 287 | ||
289 | /** | 288 | /** |
290 | * lpfc_config_port_post: Perform lpfc initialization after config port. | 289 | * lpfc_config_port_post - Perform lpfc initialization after config port |
291 | * @phba: pointer to lpfc hba data structure. | 290 | * @phba: pointer to lpfc hba data structure. |
292 | * | 291 | * |
293 | * This routine will do LPFC initialization after the CONFIG_PORT mailbox | 292 | * This routine will do LPFC initialization after the CONFIG_PORT mailbox |
@@ -303,6 +302,7 @@ int | |||
303 | lpfc_config_port_post(struct lpfc_hba *phba) | 302 | lpfc_config_port_post(struct lpfc_hba *phba) |
304 | { | 303 | { |
305 | struct lpfc_vport *vport = phba->pport; | 304 | struct lpfc_vport *vport = phba->pport; |
305 | struct Scsi_Host *shost = lpfc_shost_from_vport(vport); | ||
306 | LPFC_MBOXQ_t *pmb; | 306 | LPFC_MBOXQ_t *pmb; |
307 | MAILBOX_t *mb; | 307 | MAILBOX_t *mb; |
308 | struct lpfc_dmabuf *mp; | 308 | struct lpfc_dmabuf *mp; |
@@ -360,6 +360,11 @@ lpfc_config_port_post(struct lpfc_hba *phba) | |||
360 | sizeof (struct lpfc_name)); | 360 | sizeof (struct lpfc_name)); |
361 | memcpy(&vport->fc_portname, &vport->fc_sparam.portName, | 361 | memcpy(&vport->fc_portname, &vport->fc_sparam.portName, |
362 | sizeof (struct lpfc_name)); | 362 | sizeof (struct lpfc_name)); |
363 | |||
364 | /* Update the fc_host data structures with new wwn. */ | ||
365 | fc_host_node_name(shost) = wwn_to_u64(vport->fc_nodename.u.wwn); | ||
366 | fc_host_port_name(shost) = wwn_to_u64(vport->fc_portname.u.wwn); | ||
367 | |||
363 | /* If no serial number in VPD data, use low 6 bytes of WWNN */ | 368 | /* If no serial number in VPD data, use low 6 bytes of WWNN */ |
364 | /* This should be consolidated into parse_vpd ? - mr */ | 369 | /* This should be consolidated into parse_vpd ? - mr */ |
365 | if (phba->SerialNumber[0] == 0) { | 370 | if (phba->SerialNumber[0] == 0) { |
@@ -551,7 +556,7 @@ lpfc_config_port_post(struct lpfc_hba *phba) | |||
551 | } | 556 | } |
552 | 557 | ||
553 | /** | 558 | /** |
554 | * lpfc_hba_down_prep: Perform lpfc uninitialization prior to HBA reset. | 559 | * lpfc_hba_down_prep - Perform lpfc uninitialization prior to HBA reset |
555 | * @phba: pointer to lpfc HBA data structure. | 560 | * @phba: pointer to lpfc HBA data structure. |
556 | * | 561 | * |
557 | * This routine will do LPFC uninitialization before the HBA is reset when | 562 | * This routine will do LPFC uninitialization before the HBA is reset when |
@@ -583,7 +588,7 @@ lpfc_hba_down_prep(struct lpfc_hba *phba) | |||
583 | } | 588 | } |
584 | 589 | ||
585 | /** | 590 | /** |
586 | * lpfc_hba_down_post: Perform lpfc uninitialization after HBA reset. | 591 | * lpfc_hba_down_post - Perform lpfc uninitialization after HBA reset |
587 | * @phba: pointer to lpfc HBA data structure. | 592 | * @phba: pointer to lpfc HBA data structure. |
588 | * | 593 | * |
589 | * This routine will do uninitialization after the HBA is reset when bring | 594 | * This routine will do uninitialization after the HBA is reset when bring |
@@ -599,8 +604,6 @@ lpfc_hba_down_post(struct lpfc_hba *phba) | |||
599 | struct lpfc_sli *psli = &phba->sli; | 604 | struct lpfc_sli *psli = &phba->sli; |
600 | struct lpfc_sli_ring *pring; | 605 | struct lpfc_sli_ring *pring; |
601 | struct lpfc_dmabuf *mp, *next_mp; | 606 | struct lpfc_dmabuf *mp, *next_mp; |
602 | struct lpfc_iocbq *iocb; | ||
603 | IOCB_t *cmd = NULL; | ||
604 | LIST_HEAD(completions); | 607 | LIST_HEAD(completions); |
605 | int i; | 608 | int i; |
606 | 609 | ||
@@ -628,20 +631,9 @@ lpfc_hba_down_post(struct lpfc_hba *phba) | |||
628 | pring->txcmplq_cnt = 0; | 631 | pring->txcmplq_cnt = 0; |
629 | spin_unlock_irq(&phba->hbalock); | 632 | spin_unlock_irq(&phba->hbalock); |
630 | 633 | ||
631 | while (!list_empty(&completions)) { | 634 | /* Cancel all the IOCBs from the completions list */ |
632 | iocb = list_get_first(&completions, struct lpfc_iocbq, | 635 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
633 | list); | 636 | IOERR_SLI_ABORTED); |
634 | cmd = &iocb->iocb; | ||
635 | list_del_init(&iocb->list); | ||
636 | |||
637 | if (!iocb->iocb_cmpl) | ||
638 | lpfc_sli_release_iocbq(phba, iocb); | ||
639 | else { | ||
640 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
641 | cmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
642 | (iocb->iocb_cmpl) (phba, iocb, iocb); | ||
643 | } | ||
644 | } | ||
645 | 637 | ||
646 | lpfc_sli_abort_iocb_ring(phba, pring); | 638 | lpfc_sli_abort_iocb_ring(phba, pring); |
647 | spin_lock_irq(&phba->hbalock); | 639 | spin_lock_irq(&phba->hbalock); |
@@ -652,7 +644,7 @@ lpfc_hba_down_post(struct lpfc_hba *phba) | |||
652 | } | 644 | } |
653 | 645 | ||
654 | /** | 646 | /** |
655 | * lpfc_hb_timeout: The HBA-timer timeout handler. | 647 | * lpfc_hb_timeout - The HBA-timer timeout handler |
656 | * @ptr: unsigned long holds the pointer to lpfc hba data structure. | 648 | * @ptr: unsigned long holds the pointer to lpfc hba data structure. |
657 | * | 649 | * |
658 | * This is the HBA-timer timeout handler registered to the lpfc driver. When | 650 | * This is the HBA-timer timeout handler registered to the lpfc driver. When |
@@ -686,7 +678,7 @@ lpfc_hb_timeout(unsigned long ptr) | |||
686 | } | 678 | } |
687 | 679 | ||
688 | /** | 680 | /** |
689 | * lpfc_hb_mbox_cmpl: The lpfc heart-beat mailbox command callback function. | 681 | * lpfc_hb_mbox_cmpl - The lpfc heart-beat mailbox command callback function |
690 | * @phba: pointer to lpfc hba data structure. | 682 | * @phba: pointer to lpfc hba data structure. |
691 | * @pmboxq: pointer to the driver internal queue element for mailbox command. | 683 | * @pmboxq: pointer to the driver internal queue element for mailbox command. |
692 | * | 684 | * |
@@ -721,7 +713,7 @@ lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq) | |||
721 | } | 713 | } |
722 | 714 | ||
723 | /** | 715 | /** |
724 | * lpfc_hb_timeout_handler: The HBA-timer timeout handler. | 716 | * lpfc_hb_timeout_handler - The HBA-timer timeout handler |
725 | * @phba: pointer to lpfc hba data structure. | 717 | * @phba: pointer to lpfc hba data structure. |
726 | * | 718 | * |
727 | * This is the actual HBA-timer timeout handler to be invoked by the worker | 719 | * This is the actual HBA-timer timeout handler to be invoked by the worker |
@@ -830,7 +822,7 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba) | |||
830 | } | 822 | } |
831 | 823 | ||
832 | /** | 824 | /** |
833 | * lpfc_offline_eratt: Bring lpfc offline on hardware error attention. | 825 | * lpfc_offline_eratt - Bring lpfc offline on hardware error attention |
834 | * @phba: pointer to lpfc hba data structure. | 826 | * @phba: pointer to lpfc hba data structure. |
835 | * | 827 | * |
836 | * This routine is called to bring the HBA offline when HBA hardware error | 828 | * This routine is called to bring the HBA offline when HBA hardware error |
@@ -857,7 +849,73 @@ lpfc_offline_eratt(struct lpfc_hba *phba) | |||
857 | } | 849 | } |
858 | 850 | ||
859 | /** | 851 | /** |
860 | * lpfc_handle_eratt: The HBA hardware error handler. | 852 | * lpfc_handle_deferred_eratt - The HBA hardware deferred error handler |
853 | * @phba: pointer to lpfc hba data structure. | ||
854 | * | ||
855 | * This routine is invoked to handle the deferred HBA hardware error | ||
856 | * conditions. This type of error is indicated by HBA by setting ER1 | ||
857 | * and another ER bit in the host status register. The driver will | ||
858 | * wait until the ER1 bit clears before handling the error condition. | ||
859 | **/ | ||
860 | static void | ||
861 | lpfc_handle_deferred_eratt(struct lpfc_hba *phba) | ||
862 | { | ||
863 | uint32_t old_host_status = phba->work_hs; | ||
864 | struct lpfc_sli_ring *pring; | ||
865 | struct lpfc_sli *psli = &phba->sli; | ||
866 | |||
867 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, | ||
868 | "0479 Deferred Adapter Hardware Error " | ||
869 | "Data: x%x x%x x%x\n", | ||
870 | phba->work_hs, | ||
871 | phba->work_status[0], phba->work_status[1]); | ||
872 | |||
873 | spin_lock_irq(&phba->hbalock); | ||
874 | psli->sli_flag &= ~LPFC_SLI2_ACTIVE; | ||
875 | spin_unlock_irq(&phba->hbalock); | ||
876 | |||
877 | |||
878 | /* | ||
879 | * Firmware stops when it triggred erratt. That could cause the I/Os | ||
880 | * dropped by the firmware. Error iocb (I/O) on txcmplq and let the | ||
881 | * SCSI layer retry it after re-establishing link. | ||
882 | */ | ||
883 | pring = &psli->ring[psli->fcp_ring]; | ||
884 | lpfc_sli_abort_iocb_ring(phba, pring); | ||
885 | |||
886 | /* | ||
887 | * There was a firmware error. Take the hba offline and then | ||
888 | * attempt to restart it. | ||
889 | */ | ||
890 | lpfc_offline_prep(phba); | ||
891 | lpfc_offline(phba); | ||
892 | |||
893 | /* Wait for the ER1 bit to clear.*/ | ||
894 | while (phba->work_hs & HS_FFER1) { | ||
895 | msleep(100); | ||
896 | phba->work_hs = readl(phba->HSregaddr); | ||
897 | /* If driver is unloading let the worker thread continue */ | ||
898 | if (phba->pport->load_flag & FC_UNLOADING) { | ||
899 | phba->work_hs = 0; | ||
900 | break; | ||
901 | } | ||
902 | } | ||
903 | |||
904 | /* | ||
905 | * This is to ptrotect against a race condition in which | ||
906 | * first write to the host attention register clear the | ||
907 | * host status register. | ||
908 | */ | ||
909 | if ((!phba->work_hs) && (!(phba->pport->load_flag & FC_UNLOADING))) | ||
910 | phba->work_hs = old_host_status & ~HS_FFER1; | ||
911 | |||
912 | phba->hba_flag &= ~DEFER_ERATT; | ||
913 | phba->work_status[0] = readl(phba->MBslimaddr + 0xa8); | ||
914 | phba->work_status[1] = readl(phba->MBslimaddr + 0xac); | ||
915 | } | ||
916 | |||
917 | /** | ||
918 | * lpfc_handle_eratt - The HBA hardware error handler | ||
861 | * @phba: pointer to lpfc hba data structure. | 919 | * @phba: pointer to lpfc hba data structure. |
862 | * | 920 | * |
863 | * This routine is invoked to handle the following HBA hardware error | 921 | * This routine is invoked to handle the following HBA hardware error |
@@ -895,6 +953,9 @@ lpfc_handle_eratt(struct lpfc_hba *phba) | |||
895 | (char *) &board_event, | 953 | (char *) &board_event, |
896 | LPFC_NL_VENDOR_ID); | 954 | LPFC_NL_VENDOR_ID); |
897 | 955 | ||
956 | if (phba->hba_flag & DEFER_ERATT) | ||
957 | lpfc_handle_deferred_eratt(phba); | ||
958 | |||
898 | if (phba->work_hs & HS_FFER6) { | 959 | if (phba->work_hs & HS_FFER6) { |
899 | /* Re-establishing Link */ | 960 | /* Re-establishing Link */ |
900 | lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT, | 961 | lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT, |
@@ -976,7 +1037,7 @@ lpfc_handle_eratt(struct lpfc_hba *phba) | |||
976 | } | 1037 | } |
977 | 1038 | ||
978 | /** | 1039 | /** |
979 | * lpfc_handle_latt: The HBA link event handler. | 1040 | * lpfc_handle_latt - The HBA link event handler |
980 | * @phba: pointer to lpfc hba data structure. | 1041 | * @phba: pointer to lpfc hba data structure. |
981 | * | 1042 | * |
982 | * This routine is invoked from the worker thread to handle a HBA host | 1043 | * This routine is invoked from the worker thread to handle a HBA host |
@@ -1063,7 +1124,7 @@ lpfc_handle_latt_err_exit: | |||
1063 | } | 1124 | } |
1064 | 1125 | ||
1065 | /** | 1126 | /** |
1066 | * lpfc_parse_vpd: Parse VPD (Vital Product Data). | 1127 | * lpfc_parse_vpd - Parse VPD (Vital Product Data) |
1067 | * @phba: pointer to lpfc hba data structure. | 1128 | * @phba: pointer to lpfc hba data structure. |
1068 | * @vpd: pointer to the vital product data. | 1129 | * @vpd: pointer to the vital product data. |
1069 | * @len: length of the vital product data in bytes. | 1130 | * @len: length of the vital product data in bytes. |
@@ -1213,7 +1274,7 @@ lpfc_parse_vpd(struct lpfc_hba *phba, uint8_t *vpd, int len) | |||
1213 | } | 1274 | } |
1214 | 1275 | ||
1215 | /** | 1276 | /** |
1216 | * lpfc_get_hba_model_desc: Retrieve HBA device model name and description. | 1277 | * lpfc_get_hba_model_desc - Retrieve HBA device model name and description |
1217 | * @phba: pointer to lpfc hba data structure. | 1278 | * @phba: pointer to lpfc hba data structure. |
1218 | * @mdp: pointer to the data structure to hold the derived model name. | 1279 | * @mdp: pointer to the data structure to hold the derived model name. |
1219 | * @descp: pointer to the data structure to hold the derived description. | 1280 | * @descp: pointer to the data structure to hold the derived description. |
@@ -1322,7 +1383,8 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp) | |||
1322 | m = (typeof(m)){"LPe11000", max_speed, "PCIe"}; | 1383 | m = (typeof(m)){"LPe11000", max_speed, "PCIe"}; |
1323 | break; | 1384 | break; |
1324 | case PCI_DEVICE_ID_ZEPHYR_DCSP: | 1385 | case PCI_DEVICE_ID_ZEPHYR_DCSP: |
1325 | m = (typeof(m)){"LPe11002-SP", max_speed, "PCIe"}; | 1386 | m = (typeof(m)){"LP2105", max_speed, "PCIe"}; |
1387 | GE = 1; | ||
1326 | break; | 1388 | break; |
1327 | case PCI_DEVICE_ID_ZMID: | 1389 | case PCI_DEVICE_ID_ZMID: |
1328 | m = (typeof(m)){"LPe1150", max_speed, "PCIe"}; | 1390 | m = (typeof(m)){"LPe1150", max_speed, "PCIe"}; |
@@ -1392,7 +1454,7 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp) | |||
1392 | } | 1454 | } |
1393 | 1455 | ||
1394 | /** | 1456 | /** |
1395 | * lpfc_post_buffer: Post IOCB(s) with DMA buffer descriptor(s) to a IOCB ring. | 1457 | * lpfc_post_buffer - Post IOCB(s) with DMA buffer descriptor(s) to a IOCB ring |
1396 | * @phba: pointer to lpfc hba data structure. | 1458 | * @phba: pointer to lpfc hba data structure. |
1397 | * @pring: pointer to a IOCB ring. | 1459 | * @pring: pointer to a IOCB ring. |
1398 | * @cnt: the number of IOCBs to be posted to the IOCB ring. | 1460 | * @cnt: the number of IOCBs to be posted to the IOCB ring. |
@@ -1493,7 +1555,7 @@ lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt) | |||
1493 | } | 1555 | } |
1494 | 1556 | ||
1495 | /** | 1557 | /** |
1496 | * lpfc_post_rcv_buf: Post the initial receive IOCB buffers to ELS ring. | 1558 | * lpfc_post_rcv_buf - Post the initial receive IOCB buffers to ELS ring |
1497 | * @phba: pointer to lpfc hba data structure. | 1559 | * @phba: pointer to lpfc hba data structure. |
1498 | * | 1560 | * |
1499 | * This routine posts initial receive IOCB buffers to the ELS ring. The | 1561 | * This routine posts initial receive IOCB buffers to the ELS ring. The |
@@ -1518,7 +1580,7 @@ lpfc_post_rcv_buf(struct lpfc_hba *phba) | |||
1518 | #define S(N,V) (((V)<<(N))|((V)>>(32-(N)))) | 1580 | #define S(N,V) (((V)<<(N))|((V)>>(32-(N)))) |
1519 | 1581 | ||
1520 | /** | 1582 | /** |
1521 | * lpfc_sha_init: Set up initial array of hash table entries. | 1583 | * lpfc_sha_init - Set up initial array of hash table entries |
1522 | * @HashResultPointer: pointer to an array as hash table. | 1584 | * @HashResultPointer: pointer to an array as hash table. |
1523 | * | 1585 | * |
1524 | * This routine sets up the initial values to the array of hash table entries | 1586 | * This routine sets up the initial values to the array of hash table entries |
@@ -1535,7 +1597,7 @@ lpfc_sha_init(uint32_t * HashResultPointer) | |||
1535 | } | 1597 | } |
1536 | 1598 | ||
1537 | /** | 1599 | /** |
1538 | * lpfc_sha_iterate: Iterate initial hash table with the working hash table. | 1600 | * lpfc_sha_iterate - Iterate initial hash table with the working hash table |
1539 | * @HashResultPointer: pointer to an initial/result hash table. | 1601 | * @HashResultPointer: pointer to an initial/result hash table. |
1540 | * @HashWorkingPointer: pointer to an working hash table. | 1602 | * @HashWorkingPointer: pointer to an working hash table. |
1541 | * | 1603 | * |
@@ -1592,7 +1654,7 @@ lpfc_sha_iterate(uint32_t * HashResultPointer, uint32_t * HashWorkingPointer) | |||
1592 | } | 1654 | } |
1593 | 1655 | ||
1594 | /** | 1656 | /** |
1595 | * lpfc_challenge_key: Create challenge key based on WWPN of the HBA. | 1657 | * lpfc_challenge_key - Create challenge key based on WWPN of the HBA |
1596 | * @RandomChallenge: pointer to the entry of host challenge random number array. | 1658 | * @RandomChallenge: pointer to the entry of host challenge random number array. |
1597 | * @HashWorking: pointer to the entry of the working hash array. | 1659 | * @HashWorking: pointer to the entry of the working hash array. |
1598 | * | 1660 | * |
@@ -1608,7 +1670,7 @@ lpfc_challenge_key(uint32_t * RandomChallenge, uint32_t * HashWorking) | |||
1608 | } | 1670 | } |
1609 | 1671 | ||
1610 | /** | 1672 | /** |
1611 | * lpfc_hba_init: Perform special handling for LC HBA initialization. | 1673 | * lpfc_hba_init - Perform special handling for LC HBA initialization |
1612 | * @phba: pointer to lpfc hba data structure. | 1674 | * @phba: pointer to lpfc hba data structure. |
1613 | * @hbainit: pointer to an array of unsigned 32-bit integers. | 1675 | * @hbainit: pointer to an array of unsigned 32-bit integers. |
1614 | * | 1676 | * |
@@ -1637,7 +1699,7 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit) | |||
1637 | } | 1699 | } |
1638 | 1700 | ||
1639 | /** | 1701 | /** |
1640 | * lpfc_cleanup: Performs vport cleanups before deleting a vport. | 1702 | * lpfc_cleanup - Performs vport cleanups before deleting a vport |
1641 | * @vport: pointer to a virtual N_Port data structure. | 1703 | * @vport: pointer to a virtual N_Port data structure. |
1642 | * | 1704 | * |
1643 | * This routine performs the necessary cleanups before deleting the @vport. | 1705 | * This routine performs the necessary cleanups before deleting the @vport. |
@@ -1724,7 +1786,7 @@ lpfc_cleanup(struct lpfc_vport *vport) | |||
1724 | } | 1786 | } |
1725 | 1787 | ||
1726 | /** | 1788 | /** |
1727 | * lpfc_stop_vport_timers: Stop all the timers associated with a vport. | 1789 | * lpfc_stop_vport_timers - Stop all the timers associated with a vport |
1728 | * @vport: pointer to a virtual N_Port data structure. | 1790 | * @vport: pointer to a virtual N_Port data structure. |
1729 | * | 1791 | * |
1730 | * This routine stops all the timers associated with a @vport. This function | 1792 | * This routine stops all the timers associated with a @vport. This function |
@@ -1741,7 +1803,7 @@ lpfc_stop_vport_timers(struct lpfc_vport *vport) | |||
1741 | } | 1803 | } |
1742 | 1804 | ||
1743 | /** | 1805 | /** |
1744 | * lpfc_stop_phba_timers: Stop all the timers associated with an HBA. | 1806 | * lpfc_stop_phba_timers - Stop all the timers associated with an HBA |
1745 | * @phba: pointer to lpfc hba data structure. | 1807 | * @phba: pointer to lpfc hba data structure. |
1746 | * | 1808 | * |
1747 | * This routine stops all the timers associated with a HBA. This function is | 1809 | * This routine stops all the timers associated with a HBA. This function is |
@@ -1761,7 +1823,7 @@ lpfc_stop_phba_timers(struct lpfc_hba *phba) | |||
1761 | } | 1823 | } |
1762 | 1824 | ||
1763 | /** | 1825 | /** |
1764 | * lpfc_block_mgmt_io: Mark a HBA's management interface as blocked. | 1826 | * lpfc_block_mgmt_io - Mark a HBA's management interface as blocked |
1765 | * @phba: pointer to lpfc hba data structure. | 1827 | * @phba: pointer to lpfc hba data structure. |
1766 | * | 1828 | * |
1767 | * This routine marks a HBA's management interface as blocked. Once the HBA's | 1829 | * This routine marks a HBA's management interface as blocked. Once the HBA's |
@@ -1781,7 +1843,7 @@ lpfc_block_mgmt_io(struct lpfc_hba * phba) | |||
1781 | } | 1843 | } |
1782 | 1844 | ||
1783 | /** | 1845 | /** |
1784 | * lpfc_online: Initialize and bring a HBA online. | 1846 | * lpfc_online - Initialize and bring a HBA online |
1785 | * @phba: pointer to lpfc hba data structure. | 1847 | * @phba: pointer to lpfc hba data structure. |
1786 | * | 1848 | * |
1787 | * This routine initializes the HBA and brings a HBA online. During this | 1849 | * This routine initializes the HBA and brings a HBA online. During this |
@@ -1839,7 +1901,7 @@ lpfc_online(struct lpfc_hba *phba) | |||
1839 | } | 1901 | } |
1840 | 1902 | ||
1841 | /** | 1903 | /** |
1842 | * lpfc_unblock_mgmt_io: Mark a HBA's management interface to be not blocked. | 1904 | * lpfc_unblock_mgmt_io - Mark a HBA's management interface to be not blocked |
1843 | * @phba: pointer to lpfc hba data structure. | 1905 | * @phba: pointer to lpfc hba data structure. |
1844 | * | 1906 | * |
1845 | * This routine marks a HBA's management interface as not blocked. Once the | 1907 | * This routine marks a HBA's management interface as not blocked. Once the |
@@ -1860,7 +1922,7 @@ lpfc_unblock_mgmt_io(struct lpfc_hba * phba) | |||
1860 | } | 1922 | } |
1861 | 1923 | ||
1862 | /** | 1924 | /** |
1863 | * lpfc_offline_prep: Prepare a HBA to be brought offline. | 1925 | * lpfc_offline_prep - Prepare a HBA to be brought offline |
1864 | * @phba: pointer to lpfc hba data structure. | 1926 | * @phba: pointer to lpfc hba data structure. |
1865 | * | 1927 | * |
1866 | * This routine is invoked to prepare a HBA to be brought offline. It performs | 1928 | * This routine is invoked to prepare a HBA to be brought offline. It performs |
@@ -1917,7 +1979,7 @@ lpfc_offline_prep(struct lpfc_hba * phba) | |||
1917 | } | 1979 | } |
1918 | 1980 | ||
1919 | /** | 1981 | /** |
1920 | * lpfc_offline: Bring a HBA offline. | 1982 | * lpfc_offline - Bring a HBA offline |
1921 | * @phba: pointer to lpfc hba data structure. | 1983 | * @phba: pointer to lpfc hba data structure. |
1922 | * | 1984 | * |
1923 | * This routine actually brings a HBA offline. It stops all the timers | 1985 | * This routine actually brings a HBA offline. It stops all the timers |
@@ -1962,7 +2024,7 @@ lpfc_offline(struct lpfc_hba *phba) | |||
1962 | } | 2024 | } |
1963 | 2025 | ||
1964 | /** | 2026 | /** |
1965 | * lpfc_scsi_free: Free all the SCSI buffers and IOCBs from driver lists. | 2027 | * lpfc_scsi_free - Free all the SCSI buffers and IOCBs from driver lists |
1966 | * @phba: pointer to lpfc hba data structure. | 2028 | * @phba: pointer to lpfc hba data structure. |
1967 | * | 2029 | * |
1968 | * This routine is to free all the SCSI buffers and IOCBs from the driver | 2030 | * This routine is to free all the SCSI buffers and IOCBs from the driver |
@@ -2001,7 +2063,7 @@ lpfc_scsi_free(struct lpfc_hba *phba) | |||
2001 | } | 2063 | } |
2002 | 2064 | ||
2003 | /** | 2065 | /** |
2004 | * lpfc_create_port: Create an FC port. | 2066 | * lpfc_create_port - Create an FC port |
2005 | * @phba: pointer to lpfc hba data structure. | 2067 | * @phba: pointer to lpfc hba data structure. |
2006 | * @instance: a unique integer ID to this FC port. | 2068 | * @instance: a unique integer ID to this FC port. |
2007 | * @dev: pointer to the device data structure. | 2069 | * @dev: pointer to the device data structure. |
@@ -2091,7 +2153,7 @@ out: | |||
2091 | } | 2153 | } |
2092 | 2154 | ||
2093 | /** | 2155 | /** |
2094 | * destroy_port: Destroy an FC port. | 2156 | * destroy_port - destroy an FC port |
2095 | * @vport: pointer to an lpfc virtual N_Port data structure. | 2157 | * @vport: pointer to an lpfc virtual N_Port data structure. |
2096 | * | 2158 | * |
2097 | * This routine destroys a FC port from the upper layer protocol. All the | 2159 | * This routine destroys a FC port from the upper layer protocol. All the |
@@ -2116,7 +2178,7 @@ destroy_port(struct lpfc_vport *vport) | |||
2116 | } | 2178 | } |
2117 | 2179 | ||
2118 | /** | 2180 | /** |
2119 | * lpfc_get_instance: Get a unique integer ID. | 2181 | * lpfc_get_instance - Get a unique integer ID |
2120 | * | 2182 | * |
2121 | * This routine allocates a unique integer ID from lpfc_hba_index pool. It | 2183 | * This routine allocates a unique integer ID from lpfc_hba_index pool. It |
2122 | * uses the kernel idr facility to perform the task. | 2184 | * uses the kernel idr facility to perform the task. |
@@ -2139,7 +2201,7 @@ lpfc_get_instance(void) | |||
2139 | } | 2201 | } |
2140 | 2202 | ||
2141 | /** | 2203 | /** |
2142 | * lpfc_scan_finished: method for SCSI layer to detect whether scan is done. | 2204 | * lpfc_scan_finished - method for SCSI layer to detect whether scan is done |
2143 | * @shost: pointer to SCSI host data structure. | 2205 | * @shost: pointer to SCSI host data structure. |
2144 | * @time: elapsed time of the scan in jiffies. | 2206 | * @time: elapsed time of the scan in jiffies. |
2145 | * | 2207 | * |
@@ -2197,7 +2259,7 @@ finished: | |||
2197 | } | 2259 | } |
2198 | 2260 | ||
2199 | /** | 2261 | /** |
2200 | * lpfc_host_attrib_init: Initialize SCSI host attributes on a FC port. | 2262 | * lpfc_host_attrib_init - Initialize SCSI host attributes on a FC port |
2201 | * @shost: pointer to SCSI host data structure. | 2263 | * @shost: pointer to SCSI host data structure. |
2202 | * | 2264 | * |
2203 | * This routine initializes a given SCSI host attributes on a FC port. The | 2265 | * This routine initializes a given SCSI host attributes on a FC port. The |
@@ -2252,7 +2314,7 @@ void lpfc_host_attrib_init(struct Scsi_Host *shost) | |||
2252 | } | 2314 | } |
2253 | 2315 | ||
2254 | /** | 2316 | /** |
2255 | * lpfc_enable_msix: Enable MSI-X interrupt mode. | 2317 | * lpfc_enable_msix - Enable MSI-X interrupt mode |
2256 | * @phba: pointer to lpfc hba data structure. | 2318 | * @phba: pointer to lpfc hba data structure. |
2257 | * | 2319 | * |
2258 | * This routine is invoked to enable the MSI-X interrupt vectors. The kernel | 2320 | * This routine is invoked to enable the MSI-X interrupt vectors. The kernel |
@@ -2366,7 +2428,7 @@ msi_fail_out: | |||
2366 | } | 2428 | } |
2367 | 2429 | ||
2368 | /** | 2430 | /** |
2369 | * lpfc_disable_msix: Disable MSI-X interrupt mode. | 2431 | * lpfc_disable_msix - Disable MSI-X interrupt mode |
2370 | * @phba: pointer to lpfc hba data structure. | 2432 | * @phba: pointer to lpfc hba data structure. |
2371 | * | 2433 | * |
2372 | * This routine is invoked to release the MSI-X vectors and then disable the | 2434 | * This routine is invoked to release the MSI-X vectors and then disable the |
@@ -2385,7 +2447,7 @@ lpfc_disable_msix(struct lpfc_hba *phba) | |||
2385 | } | 2447 | } |
2386 | 2448 | ||
2387 | /** | 2449 | /** |
2388 | * lpfc_enable_msi: Enable MSI interrupt mode. | 2450 | * lpfc_enable_msi - Enable MSI interrupt mode |
2389 | * @phba: pointer to lpfc hba data structure. | 2451 | * @phba: pointer to lpfc hba data structure. |
2390 | * | 2452 | * |
2391 | * This routine is invoked to enable the MSI interrupt mode. The kernel | 2453 | * This routine is invoked to enable the MSI interrupt mode. The kernel |
@@ -2423,7 +2485,7 @@ lpfc_enable_msi(struct lpfc_hba *phba) | |||
2423 | } | 2485 | } |
2424 | 2486 | ||
2425 | /** | 2487 | /** |
2426 | * lpfc_disable_msi: Disable MSI interrupt mode. | 2488 | * lpfc_disable_msi - Disable MSI interrupt mode |
2427 | * @phba: pointer to lpfc hba data structure. | 2489 | * @phba: pointer to lpfc hba data structure. |
2428 | * | 2490 | * |
2429 | * This routine is invoked to disable the MSI interrupt mode. The driver | 2491 | * This routine is invoked to disable the MSI interrupt mode. The driver |
@@ -2441,7 +2503,7 @@ lpfc_disable_msi(struct lpfc_hba *phba) | |||
2441 | } | 2503 | } |
2442 | 2504 | ||
2443 | /** | 2505 | /** |
2444 | * lpfc_log_intr_mode: Log the active interrupt mode | 2506 | * lpfc_log_intr_mode - Log the active interrupt mode |
2445 | * @phba: pointer to lpfc hba data structure. | 2507 | * @phba: pointer to lpfc hba data structure. |
2446 | * @intr_mode: active interrupt mode adopted. | 2508 | * @intr_mode: active interrupt mode adopted. |
2447 | * | 2509 | * |
@@ -2490,7 +2552,7 @@ lpfc_stop_port(struct lpfc_hba *phba) | |||
2490 | } | 2552 | } |
2491 | 2553 | ||
2492 | /** | 2554 | /** |
2493 | * lpfc_enable_intr: Enable device interrupt. | 2555 | * lpfc_enable_intr - Enable device interrupt |
2494 | * @phba: pointer to lpfc hba data structure. | 2556 | * @phba: pointer to lpfc hba data structure. |
2495 | * | 2557 | * |
2496 | * This routine is invoked to enable device interrupt and associate driver's | 2558 | * This routine is invoked to enable device interrupt and associate driver's |
@@ -2547,7 +2609,7 @@ lpfc_enable_intr(struct lpfc_hba *phba, uint32_t cfg_mode) | |||
2547 | } | 2609 | } |
2548 | 2610 | ||
2549 | /** | 2611 | /** |
2550 | * lpfc_disable_intr: Disable device interrupt. | 2612 | * lpfc_disable_intr - Disable device interrupt |
2551 | * @phba: pointer to lpfc hba data structure. | 2613 | * @phba: pointer to lpfc hba data structure. |
2552 | * | 2614 | * |
2553 | * This routine is invoked to disable device interrupt and disassociate the | 2615 | * This routine is invoked to disable device interrupt and disassociate the |
@@ -2574,7 +2636,7 @@ lpfc_disable_intr(struct lpfc_hba *phba) | |||
2574 | } | 2636 | } |
2575 | 2637 | ||
2576 | /** | 2638 | /** |
2577 | * lpfc_pci_probe_one: lpfc PCI probe func to register device to PCI subsystem. | 2639 | * lpfc_pci_probe_one - lpfc PCI probe func to register device to PCI subsystem |
2578 | * @pdev: pointer to PCI device | 2640 | * @pdev: pointer to PCI device |
2579 | * @pid: pointer to PCI device identifier | 2641 | * @pid: pointer to PCI device identifier |
2580 | * | 2642 | * |
@@ -3010,7 +3072,7 @@ out: | |||
3010 | } | 3072 | } |
3011 | 3073 | ||
3012 | /** | 3074 | /** |
3013 | * lpfc_pci_remove_one: lpfc PCI func to unregister device from PCI subsystem. | 3075 | * lpfc_pci_remove_one - lpfc PCI func to unregister device from PCI subsystem |
3014 | * @pdev: pointer to PCI device | 3076 | * @pdev: pointer to PCI device |
3015 | * | 3077 | * |
3016 | * This routine is to be registered to the kernel's PCI subsystem. When an | 3078 | * This routine is to be registered to the kernel's PCI subsystem. When an |
@@ -3033,8 +3095,6 @@ lpfc_pci_remove_one(struct pci_dev *pdev) | |||
3033 | 3095 | ||
3034 | lpfc_free_sysfs_attr(vport); | 3096 | lpfc_free_sysfs_attr(vport); |
3035 | 3097 | ||
3036 | kthread_stop(phba->worker_thread); | ||
3037 | |||
3038 | /* Release all the vports against this physical port */ | 3098 | /* Release all the vports against this physical port */ |
3039 | vports = lpfc_create_vport_work_array(phba); | 3099 | vports = lpfc_create_vport_work_array(phba); |
3040 | if (vports != NULL) | 3100 | if (vports != NULL) |
@@ -3052,7 +3112,12 @@ lpfc_pci_remove_one(struct pci_dev *pdev) | |||
3052 | * clears the rings, discards all mailbox commands, and resets | 3112 | * clears the rings, discards all mailbox commands, and resets |
3053 | * the HBA. | 3113 | * the HBA. |
3054 | */ | 3114 | */ |
3115 | |||
3116 | /* HBA interrupt will be diabled after this call */ | ||
3055 | lpfc_sli_hba_down(phba); | 3117 | lpfc_sli_hba_down(phba); |
3118 | /* Stop kthread signal shall trigger work_done one more time */ | ||
3119 | kthread_stop(phba->worker_thread); | ||
3120 | /* Final cleanup of txcmplq and reset the HBA */ | ||
3056 | lpfc_sli_brdrestart(phba); | 3121 | lpfc_sli_brdrestart(phba); |
3057 | 3122 | ||
3058 | lpfc_stop_phba_timers(phba); | 3123 | lpfc_stop_phba_timers(phba); |
@@ -3095,7 +3160,7 @@ lpfc_pci_remove_one(struct pci_dev *pdev) | |||
3095 | } | 3160 | } |
3096 | 3161 | ||
3097 | /** | 3162 | /** |
3098 | * lpfc_pci_suspend_one: lpfc PCI func to suspend device for power management. | 3163 | * lpfc_pci_suspend_one - lpfc PCI func to suspend device for power management |
3099 | * @pdev: pointer to PCI device | 3164 | * @pdev: pointer to PCI device |
3100 | * @msg: power management message | 3165 | * @msg: power management message |
3101 | * | 3166 | * |
@@ -3139,7 +3204,7 @@ lpfc_pci_suspend_one(struct pci_dev *pdev, pm_message_t msg) | |||
3139 | } | 3204 | } |
3140 | 3205 | ||
3141 | /** | 3206 | /** |
3142 | * lpfc_pci_resume_one: lpfc PCI func to resume device for power management. | 3207 | * lpfc_pci_resume_one - lpfc PCI func to resume device for power management |
3143 | * @pdev: pointer to PCI device | 3208 | * @pdev: pointer to PCI device |
3144 | * | 3209 | * |
3145 | * This routine is to be registered to the kernel's PCI subsystem to support | 3210 | * This routine is to be registered to the kernel's PCI subsystem to support |
@@ -3204,7 +3269,7 @@ lpfc_pci_resume_one(struct pci_dev *pdev) | |||
3204 | } | 3269 | } |
3205 | 3270 | ||
3206 | /** | 3271 | /** |
3207 | * lpfc_io_error_detected: Driver method for handling PCI I/O error detected. | 3272 | * lpfc_io_error_detected - Driver method for handling PCI I/O error detected |
3208 | * @pdev: pointer to PCI device. | 3273 | * @pdev: pointer to PCI device. |
3209 | * @state: the current PCI connection state. | 3274 | * @state: the current PCI connection state. |
3210 | * | 3275 | * |
@@ -3254,7 +3319,7 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev, | |||
3254 | } | 3319 | } |
3255 | 3320 | ||
3256 | /** | 3321 | /** |
3257 | * lpfc_io_slot_reset: Restart a PCI device from scratch. | 3322 | * lpfc_io_slot_reset - Restart a PCI device from scratch |
3258 | * @pdev: pointer to PCI device. | 3323 | * @pdev: pointer to PCI device. |
3259 | * | 3324 | * |
3260 | * This routine is registered to the PCI subsystem for error handling. This is | 3325 | * This routine is registered to the PCI subsystem for error handling. This is |
@@ -3313,7 +3378,7 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev) | |||
3313 | } | 3378 | } |
3314 | 3379 | ||
3315 | /** | 3380 | /** |
3316 | * lpfc_io_resume: Resume PCI I/O operation. | 3381 | * lpfc_io_resume - Resume PCI I/O operation |
3317 | * @pdev: pointer to PCI device | 3382 | * @pdev: pointer to PCI device |
3318 | * | 3383 | * |
3319 | * This routine is registered to the PCI subsystem for error handling. It is | 3384 | * This routine is registered to the PCI subsystem for error handling. It is |
@@ -3426,7 +3491,7 @@ static struct pci_driver lpfc_driver = { | |||
3426 | }; | 3491 | }; |
3427 | 3492 | ||
3428 | /** | 3493 | /** |
3429 | * lpfc_init: lpfc module initialization routine. | 3494 | * lpfc_init - lpfc module initialization routine |
3430 | * | 3495 | * |
3431 | * This routine is to be invoked when the lpfc module is loaded into the | 3496 | * This routine is to be invoked when the lpfc module is loaded into the |
3432 | * kernel. The special kernel macro module_init() is used to indicate the | 3497 | * kernel. The special kernel macro module_init() is used to indicate the |
@@ -3472,7 +3537,7 @@ lpfc_init(void) | |||
3472 | } | 3537 | } |
3473 | 3538 | ||
3474 | /** | 3539 | /** |
3475 | * lpfc_exit: lpfc module removal routine. | 3540 | * lpfc_exit - lpfc module removal routine |
3476 | * | 3541 | * |
3477 | * This routine is invoked when the lpfc module is removed from the kernel. | 3542 | * This routine is invoked when the lpfc module is removed from the kernel. |
3478 | * The special kernel macro module_exit() is used to indicate the role of | 3543 | * The special kernel macro module_exit() is used to indicate the role of |
diff --git a/drivers/scsi/lpfc/lpfc_logmsg.h b/drivers/scsi/lpfc/lpfc_logmsg.h index a85b7c196bb..1aa85709b01 100644 --- a/drivers/scsi/lpfc/lpfc_logmsg.h +++ b/drivers/scsi/lpfc/lpfc_logmsg.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #define LOG_FCP 0x40 /* FCP traffic history */ | 27 | #define LOG_FCP 0x40 /* FCP traffic history */ |
28 | #define LOG_NODE 0x80 /* Node table events */ | 28 | #define LOG_NODE 0x80 /* Node table events */ |
29 | #define LOG_TEMP 0x100 /* Temperature sensor events */ | 29 | #define LOG_TEMP 0x100 /* Temperature sensor events */ |
30 | #define LOG_BG 0x200 /* BlockBuard events */ | 30 | #define LOG_BG 0x200 /* BlockGuard events */ |
31 | #define LOG_MISC 0x400 /* Miscellaneous events */ | 31 | #define LOG_MISC 0x400 /* Miscellaneous events */ |
32 | #define LOG_SLI 0x800 /* SLI events */ | 32 | #define LOG_SLI 0x800 /* SLI events */ |
33 | #define LOG_FCP_ERROR 0x1000 /* log errors, not underruns */ | 33 | #define LOG_FCP_ERROR 0x1000 /* log errors, not underruns */ |
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c index 34eeb086a66..134fc7fc212 100644 --- a/drivers/scsi/lpfc/lpfc_mbox.c +++ b/drivers/scsi/lpfc/lpfc_mbox.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "lpfc_compat.h" | 39 | #include "lpfc_compat.h" |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * lpfc_dump_mem: Prepare a mailbox command for retrieving HBA's VPD memory. | 42 | * lpfc_dump_mem - Prepare a mailbox command for retrieving HBA's VPD memory |
43 | * @phba: pointer to lpfc hba data structure. | 43 | * @phba: pointer to lpfc hba data structure. |
44 | * @pmb: pointer to the driver internal queue element for mailbox command. | 44 | * @pmb: pointer to the driver internal queue element for mailbox command. |
45 | * @offset: offset for dumping VPD memory mailbox command. | 45 | * @offset: offset for dumping VPD memory mailbox command. |
@@ -77,9 +77,10 @@ lpfc_dump_mem(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, uint16_t offset) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | /** | 79 | /** |
80 | * lpfc_dump_mem: Prepare a mailbox command for retrieving wakeup params. | 80 | * lpfc_dump_wakeup_param - Prepare mailbox command for retrieving wakeup params |
81 | * @phba: pointer to lpfc hba data structure. | 81 | * @phba: pointer to lpfc hba data structure. |
82 | * @pmb: pointer to the driver internal queue element for mailbox command. | 82 | * @pmb: pointer to the driver internal queue element for mailbox command. |
83 | * | ||
83 | * This function create a dump memory mailbox command to dump wake up | 84 | * This function create a dump memory mailbox command to dump wake up |
84 | * parameters. | 85 | * parameters. |
85 | */ | 86 | */ |
@@ -109,7 +110,7 @@ lpfc_dump_wakeup_param(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) | |||
109 | } | 110 | } |
110 | 111 | ||
111 | /** | 112 | /** |
112 | * lpfc_read_nv: Prepare a mailbox command for reading HBA's NVRAM param. | 113 | * lpfc_read_nv - Prepare a mailbox command for reading HBA's NVRAM param |
113 | * @phba: pointer to lpfc hba data structure. | 114 | * @phba: pointer to lpfc hba data structure. |
114 | * @pmb: pointer to the driver internal queue element for mailbox command. | 115 | * @pmb: pointer to the driver internal queue element for mailbox command. |
115 | * | 116 | * |
@@ -132,7 +133,7 @@ lpfc_read_nv(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
132 | } | 133 | } |
133 | 134 | ||
134 | /** | 135 | /** |
135 | * lpfc_config_async: Prepare a mailbox command for enabling HBA async event. | 136 | * lpfc_config_async - Prepare a mailbox command for enabling HBA async event |
136 | * @phba: pointer to lpfc hba data structure. | 137 | * @phba: pointer to lpfc hba data structure. |
137 | * @pmb: pointer to the driver internal queue element for mailbox command. | 138 | * @pmb: pointer to the driver internal queue element for mailbox command. |
138 | * @ring: ring number for the asynchronous event to be configured. | 139 | * @ring: ring number for the asynchronous event to be configured. |
@@ -159,7 +160,7 @@ lpfc_config_async(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, | |||
159 | } | 160 | } |
160 | 161 | ||
161 | /** | 162 | /** |
162 | * lpfc_heart_beat: Prepare a mailbox command for heart beat. | 163 | * lpfc_heart_beat - Prepare a mailbox command for heart beat |
163 | * @phba: pointer to lpfc hba data structure. | 164 | * @phba: pointer to lpfc hba data structure. |
164 | * @pmb: pointer to the driver internal queue element for mailbox command. | 165 | * @pmb: pointer to the driver internal queue element for mailbox command. |
165 | * | 166 | * |
@@ -184,7 +185,7 @@ lpfc_heart_beat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
184 | } | 185 | } |
185 | 186 | ||
186 | /** | 187 | /** |
187 | * lpfc_read_la: Prepare a mailbox command for reading HBA link attention. | 188 | * lpfc_read_la - Prepare a mailbox command for reading HBA link attention |
188 | * @phba: pointer to lpfc hba data structure. | 189 | * @phba: pointer to lpfc hba data structure. |
189 | * @pmb: pointer to the driver internal queue element for mailbox command. | 190 | * @pmb: pointer to the driver internal queue element for mailbox command. |
190 | * @mp: DMA buffer memory for reading the link attention information into. | 191 | * @mp: DMA buffer memory for reading the link attention information into. |
@@ -228,7 +229,7 @@ lpfc_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb, struct lpfc_dmabuf *mp) | |||
228 | } | 229 | } |
229 | 230 | ||
230 | /** | 231 | /** |
231 | * lpfc_clear_la: Prepare a mailbox command for clearing HBA link attention. | 232 | * lpfc_clear_la - Prepare a mailbox command for clearing HBA link attention |
232 | * @phba: pointer to lpfc hba data structure. | 233 | * @phba: pointer to lpfc hba data structure. |
233 | * @pmb: pointer to the driver internal queue element for mailbox command. | 234 | * @pmb: pointer to the driver internal queue element for mailbox command. |
234 | * | 235 | * |
@@ -257,7 +258,7 @@ lpfc_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
257 | } | 258 | } |
258 | 259 | ||
259 | /** | 260 | /** |
260 | * lpfc_config_link: Prepare a mailbox command for configuring link on a HBA. | 261 | * lpfc_config_link - Prepare a mailbox command for configuring link on a HBA |
261 | * @phba: pointer to lpfc hba data structure. | 262 | * @phba: pointer to lpfc hba data structure. |
262 | * @pmb: pointer to the driver internal queue element for mailbox command. | 263 | * @pmb: pointer to the driver internal queue element for mailbox command. |
263 | * | 264 | * |
@@ -305,7 +306,7 @@ lpfc_config_link(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
305 | } | 306 | } |
306 | 307 | ||
307 | /** | 308 | /** |
308 | * lpfc_config_msi: Prepare a mailbox command for configuring msi-x. | 309 | * lpfc_config_msi - Prepare a mailbox command for configuring msi-x |
309 | * @phba: pointer to lpfc hba data structure. | 310 | * @phba: pointer to lpfc hba data structure. |
310 | * @pmb: pointer to the driver internal queue element for mailbox command. | 311 | * @pmb: pointer to the driver internal queue element for mailbox command. |
311 | * | 312 | * |
@@ -383,7 +384,7 @@ lpfc_config_msi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) | |||
383 | } | 384 | } |
384 | 385 | ||
385 | /** | 386 | /** |
386 | * lpfc_init_link: Prepare a mailbox command for initialize link on a HBA. | 387 | * lpfc_init_link - Prepare a mailbox command for initialize link on a HBA |
387 | * @phba: pointer to lpfc hba data structure. | 388 | * @phba: pointer to lpfc hba data structure. |
388 | * @pmb: pointer to the driver internal queue element for mailbox command. | 389 | * @pmb: pointer to the driver internal queue element for mailbox command. |
389 | * @topology: the link topology for the link to be initialized to. | 390 | * @topology: the link topology for the link to be initialized to. |
@@ -463,7 +464,7 @@ lpfc_init_link(struct lpfc_hba * phba, | |||
463 | } | 464 | } |
464 | 465 | ||
465 | /** | 466 | /** |
466 | * lpfc_read_sparam: Prepare a mailbox command for reading HBA parameters. | 467 | * lpfc_read_sparam - Prepare a mailbox command for reading HBA parameters |
467 | * @phba: pointer to lpfc hba data structure. | 468 | * @phba: pointer to lpfc hba data structure. |
468 | * @pmb: pointer to the driver internal queue element for mailbox command. | 469 | * @pmb: pointer to the driver internal queue element for mailbox command. |
469 | * @vpi: virtual N_Port identifier. | 470 | * @vpi: virtual N_Port identifier. |
@@ -523,7 +524,7 @@ lpfc_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, int vpi) | |||
523 | } | 524 | } |
524 | 525 | ||
525 | /** | 526 | /** |
526 | * lpfc_unreg_did: Prepare a mailbox command for unregistering DID. | 527 | * lpfc_unreg_did - Prepare a mailbox command for unregistering DID |
527 | * @phba: pointer to lpfc hba data structure. | 528 | * @phba: pointer to lpfc hba data structure. |
528 | * @vpi: virtual N_Port identifier. | 529 | * @vpi: virtual N_Port identifier. |
529 | * @did: remote port identifier. | 530 | * @did: remote port identifier. |
@@ -555,7 +556,7 @@ lpfc_unreg_did(struct lpfc_hba * phba, uint16_t vpi, uint32_t did, | |||
555 | } | 556 | } |
556 | 557 | ||
557 | /** | 558 | /** |
558 | * lpfc_read_config: Prepare a mailbox command for reading HBA configuration. | 559 | * lpfc_read_config - Prepare a mailbox command for reading HBA configuration |
559 | * @phba: pointer to lpfc hba data structure. | 560 | * @phba: pointer to lpfc hba data structure. |
560 | * @pmb: pointer to the driver internal queue element for mailbox command. | 561 | * @pmb: pointer to the driver internal queue element for mailbox command. |
561 | * | 562 | * |
@@ -581,7 +582,7 @@ lpfc_read_config(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
581 | } | 582 | } |
582 | 583 | ||
583 | /** | 584 | /** |
584 | * lpfc_read_lnk_stat: Prepare a mailbox command for reading HBA link stats. | 585 | * lpfc_read_lnk_stat - Prepare a mailbox command for reading HBA link stats |
585 | * @phba: pointer to lpfc hba data structure. | 586 | * @phba: pointer to lpfc hba data structure. |
586 | * @pmb: pointer to the driver internal queue element for mailbox command. | 587 | * @pmb: pointer to the driver internal queue element for mailbox command. |
587 | * | 588 | * |
@@ -606,7 +607,7 @@ lpfc_read_lnk_stat(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
606 | } | 607 | } |
607 | 608 | ||
608 | /** | 609 | /** |
609 | * lpfc_reg_login: Prepare a mailbox command for registering remote login. | 610 | * lpfc_reg_login - Prepare a mailbox command for registering remote login |
610 | * @phba: pointer to lpfc hba data structure. | 611 | * @phba: pointer to lpfc hba data structure. |
611 | * @vpi: virtual N_Port identifier. | 612 | * @vpi: virtual N_Port identifier. |
612 | * @did: remote port identifier. | 613 | * @did: remote port identifier. |
@@ -677,7 +678,7 @@ lpfc_reg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t did, | |||
677 | } | 678 | } |
678 | 679 | ||
679 | /** | 680 | /** |
680 | * lpfc_unreg_login: Prepare a mailbox command for unregistering remote login. | 681 | * lpfc_unreg_login - Prepare a mailbox command for unregistering remote login |
681 | * @phba: pointer to lpfc hba data structure. | 682 | * @phba: pointer to lpfc hba data structure. |
682 | * @vpi: virtual N_Port identifier. | 683 | * @vpi: virtual N_Port identifier. |
683 | * @rpi: remote port identifier | 684 | * @rpi: remote port identifier |
@@ -709,7 +710,7 @@ lpfc_unreg_login(struct lpfc_hba *phba, uint16_t vpi, uint32_t rpi, | |||
709 | } | 710 | } |
710 | 711 | ||
711 | /** | 712 | /** |
712 | * lpfc_reg_vpi: Prepare a mailbox command for registering vport identifier. | 713 | * lpfc_reg_vpi - Prepare a mailbox command for registering vport identifier |
713 | * @phba: pointer to lpfc hba data structure. | 714 | * @phba: pointer to lpfc hba data structure. |
714 | * @vpi: virtual N_Port identifier. | 715 | * @vpi: virtual N_Port identifier. |
715 | * @sid: Fibre Channel S_ID (N_Port_ID assigned to a virtual N_Port). | 716 | * @sid: Fibre Channel S_ID (N_Port_ID assigned to a virtual N_Port). |
@@ -741,7 +742,7 @@ lpfc_reg_vpi(struct lpfc_hba *phba, uint16_t vpi, uint32_t sid, | |||
741 | } | 742 | } |
742 | 743 | ||
743 | /** | 744 | /** |
744 | * lpfc_unreg_vpi: Prepare a mailbox command for unregistering vport id. | 745 | * lpfc_unreg_vpi - Prepare a mailbox command for unregistering vport id |
745 | * @phba: pointer to lpfc hba data structure. | 746 | * @phba: pointer to lpfc hba data structure. |
746 | * @vpi: virtual N_Port identifier. | 747 | * @vpi: virtual N_Port identifier. |
747 | * @pmb: pointer to the driver internal queue element for mailbox command. | 748 | * @pmb: pointer to the driver internal queue element for mailbox command. |
@@ -771,7 +772,7 @@ lpfc_unreg_vpi(struct lpfc_hba *phba, uint16_t vpi, LPFC_MBOXQ_t *pmb) | |||
771 | } | 772 | } |
772 | 773 | ||
773 | /** | 774 | /** |
774 | * lpfc_config_pcb_setup: Set up IOCB rings in the Port Control Block (PCB) | 775 | * lpfc_config_pcb_setup - Set up IOCB rings in the Port Control Block (PCB) |
775 | * @phba: pointer to lpfc hba data structure. | 776 | * @phba: pointer to lpfc hba data structure. |
776 | * | 777 | * |
777 | * This routine sets up and initializes the IOCB rings in the Port Control | 778 | * This routine sets up and initializes the IOCB rings in the Port Control |
@@ -835,7 +836,7 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba) | |||
835 | } | 836 | } |
836 | 837 | ||
837 | /** | 838 | /** |
838 | * lpfc_read_rev: Prepare a mailbox command for reading HBA revision. | 839 | * lpfc_read_rev - Prepare a mailbox command for reading HBA revision |
839 | * @phba: pointer to lpfc hba data structure. | 840 | * @phba: pointer to lpfc hba data structure. |
840 | * @pmb: pointer to the driver internal queue element for mailbox command. | 841 | * @pmb: pointer to the driver internal queue element for mailbox command. |
841 | * | 842 | * |
@@ -861,7 +862,7 @@ lpfc_read_rev(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
861 | } | 862 | } |
862 | 863 | ||
863 | /** | 864 | /** |
864 | * lpfc_build_hbq_profile2: Set up the HBQ Selection Profile 2. | 865 | * lpfc_build_hbq_profile2 - Set up the HBQ Selection Profile 2 |
865 | * @hbqmb: pointer to the HBQ configuration data structure in mailbox command. | 866 | * @hbqmb: pointer to the HBQ configuration data structure in mailbox command. |
866 | * @hbq_desc: pointer to the HBQ selection profile descriptor. | 867 | * @hbq_desc: pointer to the HBQ selection profile descriptor. |
867 | * | 868 | * |
@@ -880,7 +881,7 @@ lpfc_build_hbq_profile2(struct config_hbq_var *hbqmb, | |||
880 | } | 881 | } |
881 | 882 | ||
882 | /** | 883 | /** |
883 | * lpfc_build_hbq_profile3: Set up the HBQ Selection Profile 3. | 884 | * lpfc_build_hbq_profile3 - Set up the HBQ Selection Profile 3 |
884 | * @hbqmb: pointer to the HBQ configuration data structure in mailbox command. | 885 | * @hbqmb: pointer to the HBQ configuration data structure in mailbox command. |
885 | * @hbq_desc: pointer to the HBQ selection profile descriptor. | 886 | * @hbq_desc: pointer to the HBQ selection profile descriptor. |
886 | * | 887 | * |
@@ -902,7 +903,7 @@ lpfc_build_hbq_profile3(struct config_hbq_var *hbqmb, | |||
902 | } | 903 | } |
903 | 904 | ||
904 | /** | 905 | /** |
905 | * lpfc_build_hbq_profile5: Set up the HBQ Selection Profile 5. | 906 | * lpfc_build_hbq_profile5 - Set up the HBQ Selection Profile 5 |
906 | * @hbqmb: pointer to the HBQ configuration data structure in mailbox command. | 907 | * @hbqmb: pointer to the HBQ configuration data structure in mailbox command. |
907 | * @hbq_desc: pointer to the HBQ selection profile descriptor. | 908 | * @hbq_desc: pointer to the HBQ selection profile descriptor. |
908 | * | 909 | * |
@@ -925,7 +926,7 @@ lpfc_build_hbq_profile5(struct config_hbq_var *hbqmb, | |||
925 | } | 926 | } |
926 | 927 | ||
927 | /** | 928 | /** |
928 | * lpfc_config_hbq: Prepare a mailbox command for configuring an HBQ. | 929 | * lpfc_config_hbq - Prepare a mailbox command for configuring an HBQ |
929 | * @phba: pointer to lpfc hba data structure. | 930 | * @phba: pointer to lpfc hba data structure. |
930 | * @id: HBQ identifier. | 931 | * @id: HBQ identifier. |
931 | * @hbq_desc: pointer to the HBA descriptor data structure. | 932 | * @hbq_desc: pointer to the HBA descriptor data structure. |
@@ -999,7 +1000,7 @@ lpfc_config_hbq(struct lpfc_hba *phba, uint32_t id, | |||
999 | } | 1000 | } |
1000 | 1001 | ||
1001 | /** | 1002 | /** |
1002 | * lpfc_config_ring: Prepare a mailbox command for configuring an IOCB ring. | 1003 | * lpfc_config_ring - Prepare a mailbox command for configuring an IOCB ring |
1003 | * @phba: pointer to lpfc hba data structure. | 1004 | * @phba: pointer to lpfc hba data structure. |
1004 | * @ring: | 1005 | * @ring: |
1005 | * @pmb: pointer to the driver internal queue element for mailbox command. | 1006 | * @pmb: pointer to the driver internal queue element for mailbox command. |
@@ -1057,7 +1058,7 @@ lpfc_config_ring(struct lpfc_hba * phba, int ring, LPFC_MBOXQ_t * pmb) | |||
1057 | } | 1058 | } |
1058 | 1059 | ||
1059 | /** | 1060 | /** |
1060 | * lpfc_config_port: Prepare a mailbox command for configuring port. | 1061 | * lpfc_config_port - Prepare a mailbox command for configuring port |
1061 | * @phba: pointer to lpfc hba data structure. | 1062 | * @phba: pointer to lpfc hba data structure. |
1062 | * @pmb: pointer to the driver internal queue element for mailbox command. | 1063 | * @pmb: pointer to the driver internal queue element for mailbox command. |
1063 | * | 1064 | * |
@@ -1227,7 +1228,7 @@ lpfc_config_port(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) | |||
1227 | } | 1228 | } |
1228 | 1229 | ||
1229 | /** | 1230 | /** |
1230 | * lpfc_kill_board: Prepare a mailbox command for killing board. | 1231 | * lpfc_kill_board - Prepare a mailbox command for killing board |
1231 | * @phba: pointer to lpfc hba data structure. | 1232 | * @phba: pointer to lpfc hba data structure. |
1232 | * @pmb: pointer to the driver internal queue element for mailbox command. | 1233 | * @pmb: pointer to the driver internal queue element for mailbox command. |
1233 | * | 1234 | * |
@@ -1253,7 +1254,7 @@ lpfc_kill_board(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) | |||
1253 | } | 1254 | } |
1254 | 1255 | ||
1255 | /** | 1256 | /** |
1256 | * lpfc_mbox_put: Put a mailbox cmd into the tail of driver's mailbox queue. | 1257 | * lpfc_mbox_put - Put a mailbox cmd into the tail of driver's mailbox queue |
1257 | * @phba: pointer to lpfc hba data structure. | 1258 | * @phba: pointer to lpfc hba data structure. |
1258 | * @mbq: pointer to the driver internal queue element for mailbox command. | 1259 | * @mbq: pointer to the driver internal queue element for mailbox command. |
1259 | * | 1260 | * |
@@ -1277,7 +1278,7 @@ lpfc_mbox_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq) | |||
1277 | } | 1278 | } |
1278 | 1279 | ||
1279 | /** | 1280 | /** |
1280 | * lpfc_mbox_get: Remove a mailbox cmd from the head of driver's mailbox queue. | 1281 | * lpfc_mbox_get - Remove a mailbox cmd from the head of driver's mailbox queue |
1281 | * @phba: pointer to lpfc hba data structure. | 1282 | * @phba: pointer to lpfc hba data structure. |
1282 | * | 1283 | * |
1283 | * Driver maintains a internal mailbox command queue implemented as a linked | 1284 | * Driver maintains a internal mailbox command queue implemented as a linked |
@@ -1304,7 +1305,7 @@ lpfc_mbox_get(struct lpfc_hba * phba) | |||
1304 | } | 1305 | } |
1305 | 1306 | ||
1306 | /** | 1307 | /** |
1307 | * lpfc_mbox_cmpl_put: Put mailbox command into mailbox command complete list. | 1308 | * lpfc_mbox_cmpl_put - Put mailbox command into mailbox command complete list |
1308 | * @phba: pointer to lpfc hba data structure. | 1309 | * @phba: pointer to lpfc hba data structure. |
1309 | * @mbq: pointer to the driver internal queue element for mailbox command. | 1310 | * @mbq: pointer to the driver internal queue element for mailbox command. |
1310 | * | 1311 | * |
@@ -1327,7 +1328,7 @@ lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq) | |||
1327 | } | 1328 | } |
1328 | 1329 | ||
1329 | /** | 1330 | /** |
1330 | * lpfc_mbox_tmo_val: Retrieve mailbox command timeout value. | 1331 | * lpfc_mbox_tmo_val - Retrieve mailbox command timeout value |
1331 | * @phba: pointer to lpfc hba data structure. | 1332 | * @phba: pointer to lpfc hba data structure. |
1332 | * @cmd: mailbox command code. | 1333 | * @cmd: mailbox command code. |
1333 | * | 1334 | * |
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index a4bba206924..35a97673339 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c | |||
@@ -41,7 +41,7 @@ | |||
41 | 41 | ||
42 | 42 | ||
43 | /** | 43 | /** |
44 | * lpfc_mem_alloc: create and allocate all PCI and memory pools | 44 | * lpfc_mem_alloc - create and allocate all PCI and memory pools |
45 | * @phba: HBA to allocate pools for | 45 | * @phba: HBA to allocate pools for |
46 | * | 46 | * |
47 | * Description: Creates and allocates PCI pools lpfc_scsi_dma_buf_pool, | 47 | * Description: Creates and allocates PCI pools lpfc_scsi_dma_buf_pool, |
@@ -136,12 +136,12 @@ lpfc_mem_alloc(struct lpfc_hba * phba) | |||
136 | } | 136 | } |
137 | 137 | ||
138 | /** | 138 | /** |
139 | * lpfc_mem_free: Frees all PCI and memory allocated by lpfc_mem_alloc | 139 | * lpfc_mem_free - Frees all PCI and memory allocated by lpfc_mem_alloc |
140 | * @phba: HBA to free memory for | 140 | * @phba: HBA to free memory for |
141 | * | 141 | * |
142 | * Description: Frees PCI pools lpfc_scsi_dma_buf_pool, lpfc_mbuf_pool, | 142 | * Description: Frees PCI pools lpfc_scsi_dma_buf_pool, lpfc_mbuf_pool, |
143 | * lpfc_hbq_pool. Frees kmalloc-backed mempools for LPFC_MBOXQ_t and | 143 | * lpfc_hbq_pool. Frees kmalloc-backed mempools for LPFC_MBOXQ_t and |
144 | * lpfc_nodelist. Also frees the VPI bitmask. | 144 | * lpfc_nodelist. Also frees the VPI bitmask |
145 | * | 145 | * |
146 | * Returns: None | 146 | * Returns: None |
147 | **/ | 147 | **/ |
@@ -212,7 +212,7 @@ lpfc_mem_free(struct lpfc_hba * phba) | |||
212 | } | 212 | } |
213 | 213 | ||
214 | /** | 214 | /** |
215 | * lpfc_mbuf_alloc: Allocate an mbuf from the lpfc_mbuf_pool PCI pool | 215 | * lpfc_mbuf_alloc - Allocate an mbuf from the lpfc_mbuf_pool PCI pool |
216 | * @phba: HBA which owns the pool to allocate from | 216 | * @phba: HBA which owns the pool to allocate from |
217 | * @mem_flags: indicates if this is a priority (MEM_PRI) allocation | 217 | * @mem_flags: indicates if this is a priority (MEM_PRI) allocation |
218 | * @handle: used to return the DMA-mapped address of the mbuf | 218 | * @handle: used to return the DMA-mapped address of the mbuf |
@@ -249,7 +249,7 @@ lpfc_mbuf_alloc(struct lpfc_hba *phba, int mem_flags, dma_addr_t *handle) | |||
249 | } | 249 | } |
250 | 250 | ||
251 | /** | 251 | /** |
252 | * __lpfc_mem_free: Free an mbuf from the lpfc_mbuf_pool PCI pool (locked) | 252 | * __lpfc_mbuf_free - Free an mbuf from the lpfc_mbuf_pool PCI pool (locked) |
253 | * @phba: HBA which owns the pool to return to | 253 | * @phba: HBA which owns the pool to return to |
254 | * @virt: mbuf to free | 254 | * @virt: mbuf to free |
255 | * @dma: the DMA-mapped address of the lpfc_mbuf_pool to be freed | 255 | * @dma: the DMA-mapped address of the lpfc_mbuf_pool to be freed |
@@ -278,7 +278,7 @@ __lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma) | |||
278 | } | 278 | } |
279 | 279 | ||
280 | /** | 280 | /** |
281 | * lpfc_mem_free: Free an mbuf from the lpfc_mbuf_pool PCI pool (unlocked) | 281 | * lpfc_mbuf_free - Free an mbuf from the lpfc_mbuf_pool PCI pool (unlocked) |
282 | * @phba: HBA which owns the pool to return to | 282 | * @phba: HBA which owns the pool to return to |
283 | * @virt: mbuf to free | 283 | * @virt: mbuf to free |
284 | * @dma: the DMA-mapped address of the lpfc_mbuf_pool to be freed | 284 | * @dma: the DMA-mapped address of the lpfc_mbuf_pool to be freed |
@@ -291,7 +291,6 @@ __lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma) | |||
291 | * Returns: None | 291 | * Returns: None |
292 | **/ | 292 | **/ |
293 | void | 293 | void |
294 | |||
295 | lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma) | 294 | lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma) |
296 | { | 295 | { |
297 | unsigned long iflags; | 296 | unsigned long iflags; |
@@ -303,7 +302,7 @@ lpfc_mbuf_free(struct lpfc_hba * phba, void *virt, dma_addr_t dma) | |||
303 | } | 302 | } |
304 | 303 | ||
305 | /** | 304 | /** |
306 | * lpfc_els_hbq_alloc: Allocate an HBQ buffer | 305 | * lpfc_els_hbq_alloc - Allocate an HBQ buffer |
307 | * @phba: HBA to allocate HBQ buffer for | 306 | * @phba: HBA to allocate HBQ buffer for |
308 | * | 307 | * |
309 | * Description: Allocates a DMA-mapped HBQ buffer from the lpfc_hbq_pool PCI | 308 | * Description: Allocates a DMA-mapped HBQ buffer from the lpfc_hbq_pool PCI |
@@ -335,7 +334,7 @@ lpfc_els_hbq_alloc(struct lpfc_hba *phba) | |||
335 | } | 334 | } |
336 | 335 | ||
337 | /** | 336 | /** |
338 | * lpfc_mem_hbq_free: Frees an HBQ buffer allocated with lpfc_els_hbq_alloc | 337 | * lpfc_mem_hbq_free - Frees an HBQ buffer allocated with lpfc_els_hbq_alloc |
339 | * @phba: HBA buffer was allocated for | 338 | * @phba: HBA buffer was allocated for |
340 | * @hbqbp: HBQ container returned by lpfc_els_hbq_alloc | 339 | * @hbqbp: HBQ container returned by lpfc_els_hbq_alloc |
341 | * | 340 | * |
@@ -355,7 +354,7 @@ lpfc_els_hbq_free(struct lpfc_hba *phba, struct hbq_dmabuf *hbqbp) | |||
355 | } | 354 | } |
356 | 355 | ||
357 | /** | 356 | /** |
358 | * lpfc_in_buf_free: Free a DMA buffer | 357 | * lpfc_in_buf_free - Free a DMA buffer |
359 | * @phba: HBA buffer is associated with | 358 | * @phba: HBA buffer is associated with |
360 | * @mp: Buffer to free | 359 | * @mp: Buffer to free |
361 | * | 360 | * |
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index 8f548adae9c..08cdc77af41 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c | |||
@@ -192,7 +192,6 @@ lpfc_els_abort(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) | |||
192 | struct lpfc_sli *psli = &phba->sli; | 192 | struct lpfc_sli *psli = &phba->sli; |
193 | struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING]; | 193 | struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING]; |
194 | struct lpfc_iocbq *iocb, *next_iocb; | 194 | struct lpfc_iocbq *iocb, *next_iocb; |
195 | IOCB_t *cmd; | ||
196 | 195 | ||
197 | /* Abort outstanding I/O on NPort <nlp_DID> */ | 196 | /* Abort outstanding I/O on NPort <nlp_DID> */ |
198 | lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_DISCOVERY, | 197 | lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_DISCOVERY, |
@@ -223,19 +222,10 @@ lpfc_els_abort(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) | |||
223 | } | 222 | } |
224 | spin_unlock_irq(&phba->hbalock); | 223 | spin_unlock_irq(&phba->hbalock); |
225 | 224 | ||
226 | while (!list_empty(&completions)) { | 225 | /* Cancel all the IOCBs from the completions list */ |
227 | iocb = list_get_first(&completions, struct lpfc_iocbq, list); | 226 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
228 | cmd = &iocb->iocb; | 227 | IOERR_SLI_ABORTED); |
229 | list_del_init(&iocb->list); | 228 | |
230 | |||
231 | if (!iocb->iocb_cmpl) | ||
232 | lpfc_sli_release_iocbq(phba, iocb); | ||
233 | else { | ||
234 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
235 | cmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
236 | (iocb->iocb_cmpl) (phba, iocb, iocb); | ||
237 | } | ||
238 | } | ||
239 | lpfc_cancel_retry_delay_tmo(phba->pport, ndlp); | 229 | lpfc_cancel_retry_delay_tmo(phba->pport, ndlp); |
240 | return 0; | 230 | return 0; |
241 | } | 231 | } |
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 36fd2e75da1..167b66dd34c 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
@@ -112,7 +112,7 @@ lpfc_debug_save_dif(struct scsi_cmnd *cmnd) | |||
112 | } | 112 | } |
113 | 113 | ||
114 | /** | 114 | /** |
115 | * lpfc_update_stats: Update statistical data for the command completion. | 115 | * lpfc_update_stats - Update statistical data for the command completion |
116 | * @phba: Pointer to HBA object. | 116 | * @phba: Pointer to HBA object. |
117 | * @lpfc_cmd: lpfc scsi command object pointer. | 117 | * @lpfc_cmd: lpfc scsi command object pointer. |
118 | * | 118 | * |
@@ -165,8 +165,7 @@ lpfc_update_stats(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd) | |||
165 | } | 165 | } |
166 | 166 | ||
167 | /** | 167 | /** |
168 | * lpfc_send_sdev_queuedepth_change_event: Posts a queuedepth change | 168 | * lpfc_send_sdev_queuedepth_change_event - Posts a queuedepth change event |
169 | * event. | ||
170 | * @phba: Pointer to HBA context object. | 169 | * @phba: Pointer to HBA context object. |
171 | * @vport: Pointer to vport object. | 170 | * @vport: Pointer to vport object. |
172 | * @ndlp: Pointer to FC node associated with the target. | 171 | * @ndlp: Pointer to FC node associated with the target. |
@@ -220,7 +219,7 @@ lpfc_send_sdev_queuedepth_change_event(struct lpfc_hba *phba, | |||
220 | } | 219 | } |
221 | 220 | ||
222 | /** | 221 | /** |
223 | * lpfc_rampdown_queue_depth: Post RAMP_DOWN_QUEUE event to worker thread. | 222 | * lpfc_rampdown_queue_depth - Post RAMP_DOWN_QUEUE event to worker thread |
224 | * @phba: The Hba for which this call is being executed. | 223 | * @phba: The Hba for which this call is being executed. |
225 | * | 224 | * |
226 | * This routine is called when there is resource error in driver or firmware. | 225 | * This routine is called when there is resource error in driver or firmware. |
@@ -261,7 +260,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba) | |||
261 | } | 260 | } |
262 | 261 | ||
263 | /** | 262 | /** |
264 | * lpfc_rampup_queue_depth: Post RAMP_UP_QUEUE event for worker thread. | 263 | * lpfc_rampup_queue_depth - Post RAMP_UP_QUEUE event for worker thread |
265 | * @phba: The Hba for which this call is being executed. | 264 | * @phba: The Hba for which this call is being executed. |
266 | * | 265 | * |
267 | * This routine post WORKER_RAMP_UP_QUEUE event for @phba vport. This routine | 266 | * This routine post WORKER_RAMP_UP_QUEUE event for @phba vport. This routine |
@@ -273,14 +272,14 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba) | |||
273 | **/ | 272 | **/ |
274 | static inline void | 273 | static inline void |
275 | lpfc_rampup_queue_depth(struct lpfc_vport *vport, | 274 | lpfc_rampup_queue_depth(struct lpfc_vport *vport, |
276 | struct scsi_device *sdev) | 275 | uint32_t queue_depth) |
277 | { | 276 | { |
278 | unsigned long flags; | 277 | unsigned long flags; |
279 | struct lpfc_hba *phba = vport->phba; | 278 | struct lpfc_hba *phba = vport->phba; |
280 | uint32_t evt_posted; | 279 | uint32_t evt_posted; |
281 | atomic_inc(&phba->num_cmd_success); | 280 | atomic_inc(&phba->num_cmd_success); |
282 | 281 | ||
283 | if (vport->cfg_lun_queue_depth <= sdev->queue_depth) | 282 | if (vport->cfg_lun_queue_depth <= queue_depth) |
284 | return; | 283 | return; |
285 | spin_lock_irqsave(&phba->hbalock, flags); | 284 | spin_lock_irqsave(&phba->hbalock, flags); |
286 | if (((phba->last_ramp_up_time + QUEUE_RAMP_UP_INTERVAL) > jiffies) || | 285 | if (((phba->last_ramp_up_time + QUEUE_RAMP_UP_INTERVAL) > jiffies) || |
@@ -303,7 +302,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport, | |||
303 | } | 302 | } |
304 | 303 | ||
305 | /** | 304 | /** |
306 | * lpfc_ramp_down_queue_handler: WORKER_RAMP_DOWN_QUEUE event handler. | 305 | * lpfc_ramp_down_queue_handler - WORKER_RAMP_DOWN_QUEUE event handler |
307 | * @phba: The Hba for which this call is being executed. | 306 | * @phba: The Hba for which this call is being executed. |
308 | * | 307 | * |
309 | * This routine is called to process WORKER_RAMP_DOWN_QUEUE event for worker | 308 | * This routine is called to process WORKER_RAMP_DOWN_QUEUE event for worker |
@@ -361,7 +360,7 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba) | |||
361 | } | 360 | } |
362 | 361 | ||
363 | /** | 362 | /** |
364 | * lpfc_ramp_up_queue_handler: WORKER_RAMP_UP_QUEUE event handler. | 363 | * lpfc_ramp_up_queue_handler - WORKER_RAMP_UP_QUEUE event handler |
365 | * @phba: The Hba for which this call is being executed. | 364 | * @phba: The Hba for which this call is being executed. |
366 | * | 365 | * |
367 | * This routine is called to process WORKER_RAMP_UP_QUEUE event for worker | 366 | * This routine is called to process WORKER_RAMP_UP_QUEUE event for worker |
@@ -410,7 +409,7 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba) | |||
410 | } | 409 | } |
411 | 410 | ||
412 | /** | 411 | /** |
413 | * lpfc_scsi_dev_block: set all scsi hosts to block state. | 412 | * lpfc_scsi_dev_block - set all scsi hosts to block state |
414 | * @phba: Pointer to HBA context object. | 413 | * @phba: Pointer to HBA context object. |
415 | * | 414 | * |
416 | * This function walks vport list and set each SCSI host to block state | 415 | * This function walks vport list and set each SCSI host to block state |
@@ -439,7 +438,7 @@ lpfc_scsi_dev_block(struct lpfc_hba *phba) | |||
439 | } | 438 | } |
440 | 439 | ||
441 | /** | 440 | /** |
442 | * lpfc_new_scsi_buf: Scsi buffer allocator. | 441 | * lpfc_new_scsi_buf - Scsi buffer allocator |
443 | * @vport: The virtual port for which this call being executed. | 442 | * @vport: The virtual port for which this call being executed. |
444 | * | 443 | * |
445 | * This routine allocates a scsi buffer, which contains all the necessary | 444 | * This routine allocates a scsi buffer, which contains all the necessary |
@@ -563,7 +562,7 @@ lpfc_new_scsi_buf(struct lpfc_vport *vport) | |||
563 | } | 562 | } |
564 | 563 | ||
565 | /** | 564 | /** |
566 | * lpfc_get_scsi_buf: Get a scsi buffer from lpfc_scsi_buf_list list of Hba. | 565 | * lpfc_get_scsi_buf - Get a scsi buffer from lpfc_scsi_buf_list list of Hba |
567 | * @phba: The Hba for which this call is being executed. | 566 | * @phba: The Hba for which this call is being executed. |
568 | * | 567 | * |
569 | * This routine removes a scsi buffer from head of @phba lpfc_scsi_buf_list list | 568 | * This routine removes a scsi buffer from head of @phba lpfc_scsi_buf_list list |
@@ -592,7 +591,7 @@ lpfc_get_scsi_buf(struct lpfc_hba * phba) | |||
592 | } | 591 | } |
593 | 592 | ||
594 | /** | 593 | /** |
595 | * lpfc_release_scsi_buf: Return a scsi buffer back to hba lpfc_scsi_buf_list list. | 594 | * lpfc_release_scsi_buf - Return a scsi buffer back to hba's lpfc_scsi_buf_list |
596 | * @phba: The Hba for which this call is being executed. | 595 | * @phba: The Hba for which this call is being executed. |
597 | * @psb: The scsi buffer which is being released. | 596 | * @psb: The scsi buffer which is being released. |
598 | * | 597 | * |
@@ -611,7 +610,7 @@ lpfc_release_scsi_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb) | |||
611 | } | 610 | } |
612 | 611 | ||
613 | /** | 612 | /** |
614 | * lpfc_scsi_prep_dma_buf: Routine to do DMA mapping for scsi buffer. | 613 | * lpfc_scsi_prep_dma_buf - Routine to do DMA mapping for scsi buffer |
615 | * @phba: The Hba for which this call is being executed. | 614 | * @phba: The Hba for which this call is being executed. |
616 | * @lpfc_cmd: The scsi buffer which is going to be mapped. | 615 | * @lpfc_cmd: The scsi buffer which is going to be mapped. |
617 | * | 616 | * |
@@ -738,7 +737,7 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd) | |||
738 | * Due to difference in data length between DIF/non-DIF paths, | 737 | * Due to difference in data length between DIF/non-DIF paths, |
739 | * we need to set word 4 of IOCB here | 738 | * we need to set word 4 of IOCB here |
740 | */ | 739 | */ |
741 | iocb_cmd->un.fcpi.fcpi_parm = le32_to_cpu(scsi_bufflen(scsi_cmnd)); | 740 | iocb_cmd->un.fcpi.fcpi_parm = scsi_bufflen(scsi_cmnd); |
742 | return 0; | 741 | return 0; |
743 | } | 742 | } |
744 | 743 | ||
@@ -823,9 +822,9 @@ lpfc_cmd_blksize(struct scsi_cmnd *sc) | |||
823 | /** | 822 | /** |
824 | * lpfc_get_cmd_dif_parms - Extract DIF parameters from SCSI command | 823 | * lpfc_get_cmd_dif_parms - Extract DIF parameters from SCSI command |
825 | * @sc: in: SCSI command | 824 | * @sc: in: SCSI command |
826 | * @apptagmask out: app tag mask | 825 | * @apptagmask: out: app tag mask |
827 | * @apptagval out: app tag value | 826 | * @apptagval: out: app tag value |
828 | * @reftag out: ref tag (reference tag) | 827 | * @reftag: out: ref tag (reference tag) |
829 | * | 828 | * |
830 | * Description: | 829 | * Description: |
831 | * Extract DIF paramters from the command if possible. Otherwise, | 830 | * Extract DIF paramters from the command if possible. Otherwise, |
@@ -1413,7 +1412,7 @@ out: | |||
1413 | } | 1412 | } |
1414 | 1413 | ||
1415 | /** | 1414 | /** |
1416 | * lpfc_send_scsi_error_event: Posts an event when there is SCSI error. | 1415 | * lpfc_send_scsi_error_event - Posts an event when there is SCSI error |
1417 | * @phba: Pointer to hba context object. | 1416 | * @phba: Pointer to hba context object. |
1418 | * @vport: Pointer to vport object. | 1417 | * @vport: Pointer to vport object. |
1419 | * @lpfc_cmd: Pointer to lpfc scsi command which reported the error. | 1418 | * @lpfc_cmd: Pointer to lpfc scsi command which reported the error. |
@@ -1505,7 +1504,7 @@ lpfc_send_scsi_error_event(struct lpfc_hba *phba, struct lpfc_vport *vport, | |||
1505 | } | 1504 | } |
1506 | 1505 | ||
1507 | /** | 1506 | /** |
1508 | * lpfc_scsi_unprep_dma_buf: Routine to un-map DMA mapping of scatter gather. | 1507 | * lpfc_scsi_unprep_dma_buf - Routine to un-map DMA mapping of scatter gather |
1509 | * @phba: The Hba for which this call is being executed. | 1508 | * @phba: The Hba for which this call is being executed. |
1510 | * @psb: The scsi buffer which is going to be un-mapped. | 1509 | * @psb: The scsi buffer which is going to be un-mapped. |
1511 | * | 1510 | * |
@@ -1530,7 +1529,7 @@ lpfc_scsi_unprep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * psb) | |||
1530 | } | 1529 | } |
1531 | 1530 | ||
1532 | /** | 1531 | /** |
1533 | * lpfc_handler_fcp_err: FCP response handler. | 1532 | * lpfc_handler_fcp_err - FCP response handler |
1534 | * @vport: The virtual port for which this call is being executed. | 1533 | * @vport: The virtual port for which this call is being executed. |
1535 | * @lpfc_cmd: Pointer to lpfc_scsi_buf data structure. | 1534 | * @lpfc_cmd: Pointer to lpfc_scsi_buf data structure. |
1536 | * @rsp_iocb: The response IOCB which contains FCP error. | 1535 | * @rsp_iocb: The response IOCB which contains FCP error. |
@@ -1674,7 +1673,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd, | |||
1674 | } | 1673 | } |
1675 | 1674 | ||
1676 | /** | 1675 | /** |
1677 | * lpfc_scsi_cmd_iocb_cmpl: Scsi cmnd IOCB completion routine. | 1676 | * lpfc_scsi_cmd_iocb_cmpl - Scsi cmnd IOCB completion routine |
1678 | * @phba: The Hba for which this call is being executed. | 1677 | * @phba: The Hba for which this call is being executed. |
1679 | * @pIocbIn: The command IOCBQ for the scsi cmnd. | 1678 | * @pIocbIn: The command IOCBQ for the scsi cmnd. |
1680 | * @pIocbOut: The response IOCBQ for the scsi cmnd . | 1679 | * @pIocbOut: The response IOCBQ for the scsi cmnd . |
@@ -1694,10 +1693,12 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, | |||
1694 | struct lpfc_nodelist *pnode = rdata->pnode; | 1693 | struct lpfc_nodelist *pnode = rdata->pnode; |
1695 | struct scsi_cmnd *cmd = lpfc_cmd->pCmd; | 1694 | struct scsi_cmnd *cmd = lpfc_cmd->pCmd; |
1696 | int result; | 1695 | int result; |
1697 | struct scsi_device *sdev, *tmp_sdev; | 1696 | struct scsi_device *tmp_sdev; |
1698 | int depth = 0; | 1697 | int depth = 0; |
1699 | unsigned long flags; | 1698 | unsigned long flags; |
1700 | struct lpfc_fast_path_event *fast_path_evt; | 1699 | struct lpfc_fast_path_event *fast_path_evt; |
1700 | struct Scsi_Host *shost = cmd->device->host; | ||
1701 | uint32_t queue_depth, scsi_id; | ||
1701 | 1702 | ||
1702 | lpfc_cmd->result = pIocbOut->iocb.un.ulpWord[4]; | 1703 | lpfc_cmd->result = pIocbOut->iocb.un.ulpWord[4]; |
1703 | lpfc_cmd->status = pIocbOut->iocb.ulpStatus; | 1704 | lpfc_cmd->status = pIocbOut->iocb.ulpStatus; |
@@ -1808,11 +1809,10 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, | |||
1808 | 1809 | ||
1809 | lpfc_update_stats(phba, lpfc_cmd); | 1810 | lpfc_update_stats(phba, lpfc_cmd); |
1810 | result = cmd->result; | 1811 | result = cmd->result; |
1811 | sdev = cmd->device; | ||
1812 | if (vport->cfg_max_scsicmpl_time && | 1812 | if (vport->cfg_max_scsicmpl_time && |
1813 | time_after(jiffies, lpfc_cmd->start_time + | 1813 | time_after(jiffies, lpfc_cmd->start_time + |
1814 | msecs_to_jiffies(vport->cfg_max_scsicmpl_time))) { | 1814 | msecs_to_jiffies(vport->cfg_max_scsicmpl_time))) { |
1815 | spin_lock_irqsave(sdev->host->host_lock, flags); | 1815 | spin_lock_irqsave(shost->host_lock, flags); |
1816 | if (pnode && NLP_CHK_NODE_ACT(pnode)) { | 1816 | if (pnode && NLP_CHK_NODE_ACT(pnode)) { |
1817 | if (pnode->cmd_qdepth > | 1817 | if (pnode->cmd_qdepth > |
1818 | atomic_read(&pnode->cmd_pending) && | 1818 | atomic_read(&pnode->cmd_pending) && |
@@ -1825,22 +1825,26 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, | |||
1825 | 1825 | ||
1826 | pnode->last_change_time = jiffies; | 1826 | pnode->last_change_time = jiffies; |
1827 | } | 1827 | } |
1828 | spin_unlock_irqrestore(sdev->host->host_lock, flags); | 1828 | spin_unlock_irqrestore(shost->host_lock, flags); |
1829 | } else if (pnode && NLP_CHK_NODE_ACT(pnode)) { | 1829 | } else if (pnode && NLP_CHK_NODE_ACT(pnode)) { |
1830 | if ((pnode->cmd_qdepth < LPFC_MAX_TGT_QDEPTH) && | 1830 | if ((pnode->cmd_qdepth < LPFC_MAX_TGT_QDEPTH) && |
1831 | time_after(jiffies, pnode->last_change_time + | 1831 | time_after(jiffies, pnode->last_change_time + |
1832 | msecs_to_jiffies(LPFC_TGTQ_INTERVAL))) { | 1832 | msecs_to_jiffies(LPFC_TGTQ_INTERVAL))) { |
1833 | spin_lock_irqsave(sdev->host->host_lock, flags); | 1833 | spin_lock_irqsave(shost->host_lock, flags); |
1834 | pnode->cmd_qdepth += pnode->cmd_qdepth * | 1834 | pnode->cmd_qdepth += pnode->cmd_qdepth * |
1835 | LPFC_TGTQ_RAMPUP_PCENT / 100; | 1835 | LPFC_TGTQ_RAMPUP_PCENT / 100; |
1836 | if (pnode->cmd_qdepth > LPFC_MAX_TGT_QDEPTH) | 1836 | if (pnode->cmd_qdepth > LPFC_MAX_TGT_QDEPTH) |
1837 | pnode->cmd_qdepth = LPFC_MAX_TGT_QDEPTH; | 1837 | pnode->cmd_qdepth = LPFC_MAX_TGT_QDEPTH; |
1838 | pnode->last_change_time = jiffies; | 1838 | pnode->last_change_time = jiffies; |
1839 | spin_unlock_irqrestore(sdev->host->host_lock, flags); | 1839 | spin_unlock_irqrestore(shost->host_lock, flags); |
1840 | } | 1840 | } |
1841 | } | 1841 | } |
1842 | 1842 | ||
1843 | lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd); | 1843 | lpfc_scsi_unprep_dma_buf(phba, lpfc_cmd); |
1844 | |||
1845 | /* The sdev is not guaranteed to be valid post scsi_done upcall. */ | ||
1846 | queue_depth = cmd->device->queue_depth; | ||
1847 | scsi_id = cmd->device->id; | ||
1844 | cmd->scsi_done(cmd); | 1848 | cmd->scsi_done(cmd); |
1845 | 1849 | ||
1846 | if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) { | 1850 | if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) { |
@@ -1848,28 +1852,28 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, | |||
1848 | * If there is a thread waiting for command completion | 1852 | * If there is a thread waiting for command completion |
1849 | * wake up the thread. | 1853 | * wake up the thread. |
1850 | */ | 1854 | */ |
1851 | spin_lock_irqsave(sdev->host->host_lock, flags); | 1855 | spin_lock_irqsave(shost->host_lock, flags); |
1852 | lpfc_cmd->pCmd = NULL; | 1856 | lpfc_cmd->pCmd = NULL; |
1853 | if (lpfc_cmd->waitq) | 1857 | if (lpfc_cmd->waitq) |
1854 | wake_up(lpfc_cmd->waitq); | 1858 | wake_up(lpfc_cmd->waitq); |
1855 | spin_unlock_irqrestore(sdev->host->host_lock, flags); | 1859 | spin_unlock_irqrestore(shost->host_lock, flags); |
1856 | lpfc_release_scsi_buf(phba, lpfc_cmd); | 1860 | lpfc_release_scsi_buf(phba, lpfc_cmd); |
1857 | return; | 1861 | return; |
1858 | } | 1862 | } |
1859 | 1863 | ||
1860 | 1864 | ||
1861 | if (!result) | 1865 | if (!result) |
1862 | lpfc_rampup_queue_depth(vport, sdev); | 1866 | lpfc_rampup_queue_depth(vport, queue_depth); |
1863 | 1867 | ||
1864 | if (!result && pnode && NLP_CHK_NODE_ACT(pnode) && | 1868 | if (!result && pnode && NLP_CHK_NODE_ACT(pnode) && |
1865 | ((jiffies - pnode->last_ramp_up_time) > | 1869 | ((jiffies - pnode->last_ramp_up_time) > |
1866 | LPFC_Q_RAMP_UP_INTERVAL * HZ) && | 1870 | LPFC_Q_RAMP_UP_INTERVAL * HZ) && |
1867 | ((jiffies - pnode->last_q_full_time) > | 1871 | ((jiffies - pnode->last_q_full_time) > |
1868 | LPFC_Q_RAMP_UP_INTERVAL * HZ) && | 1872 | LPFC_Q_RAMP_UP_INTERVAL * HZ) && |
1869 | (vport->cfg_lun_queue_depth > sdev->queue_depth)) { | 1873 | (vport->cfg_lun_queue_depth > queue_depth)) { |
1870 | shost_for_each_device(tmp_sdev, sdev->host) { | 1874 | shost_for_each_device(tmp_sdev, shost) { |
1871 | if (vport->cfg_lun_queue_depth > tmp_sdev->queue_depth){ | 1875 | if (vport->cfg_lun_queue_depth > tmp_sdev->queue_depth){ |
1872 | if (tmp_sdev->id != sdev->id) | 1876 | if (tmp_sdev->id != scsi_id) |
1873 | continue; | 1877 | continue; |
1874 | if (tmp_sdev->ordered_tags) | 1878 | if (tmp_sdev->ordered_tags) |
1875 | scsi_adjust_queue_depth(tmp_sdev, | 1879 | scsi_adjust_queue_depth(tmp_sdev, |
@@ -1885,7 +1889,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, | |||
1885 | } | 1889 | } |
1886 | lpfc_send_sdev_queuedepth_change_event(phba, vport, pnode, | 1890 | lpfc_send_sdev_queuedepth_change_event(phba, vport, pnode, |
1887 | 0xFFFFFFFF, | 1891 | 0xFFFFFFFF, |
1888 | sdev->queue_depth - 1, sdev->queue_depth); | 1892 | queue_depth , queue_depth + 1); |
1889 | } | 1893 | } |
1890 | 1894 | ||
1891 | /* | 1895 | /* |
@@ -1896,8 +1900,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, | |||
1896 | NLP_CHK_NODE_ACT(pnode)) { | 1900 | NLP_CHK_NODE_ACT(pnode)) { |
1897 | pnode->last_q_full_time = jiffies; | 1901 | pnode->last_q_full_time = jiffies; |
1898 | 1902 | ||
1899 | shost_for_each_device(tmp_sdev, sdev->host) { | 1903 | shost_for_each_device(tmp_sdev, shost) { |
1900 | if (tmp_sdev->id != sdev->id) | 1904 | if (tmp_sdev->id != scsi_id) |
1901 | continue; | 1905 | continue; |
1902 | depth = scsi_track_queue_full(tmp_sdev, | 1906 | depth = scsi_track_queue_full(tmp_sdev, |
1903 | tmp_sdev->queue_depth - 1); | 1907 | tmp_sdev->queue_depth - 1); |
@@ -1909,7 +1913,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, | |||
1909 | * scsi_track_queue_full. | 1913 | * scsi_track_queue_full. |
1910 | */ | 1914 | */ |
1911 | if (depth == -1) | 1915 | if (depth == -1) |
1912 | depth = sdev->host->cmd_per_lun; | 1916 | depth = shost->cmd_per_lun; |
1913 | 1917 | ||
1914 | if (depth) { | 1918 | if (depth) { |
1915 | lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, | 1919 | lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, |
@@ -1925,17 +1929,17 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, | |||
1925 | * If there is a thread waiting for command completion | 1929 | * If there is a thread waiting for command completion |
1926 | * wake up the thread. | 1930 | * wake up the thread. |
1927 | */ | 1931 | */ |
1928 | spin_lock_irqsave(sdev->host->host_lock, flags); | 1932 | spin_lock_irqsave(shost->host_lock, flags); |
1929 | lpfc_cmd->pCmd = NULL; | 1933 | lpfc_cmd->pCmd = NULL; |
1930 | if (lpfc_cmd->waitq) | 1934 | if (lpfc_cmd->waitq) |
1931 | wake_up(lpfc_cmd->waitq); | 1935 | wake_up(lpfc_cmd->waitq); |
1932 | spin_unlock_irqrestore(sdev->host->host_lock, flags); | 1936 | spin_unlock_irqrestore(shost->host_lock, flags); |
1933 | 1937 | ||
1934 | lpfc_release_scsi_buf(phba, lpfc_cmd); | 1938 | lpfc_release_scsi_buf(phba, lpfc_cmd); |
1935 | } | 1939 | } |
1936 | 1940 | ||
1937 | /** | 1941 | /** |
1938 | * lpfc_fcpcmd_to_iocb - copy the fcp_cmd data into the IOCB. | 1942 | * lpfc_fcpcmd_to_iocb - copy the fcp_cmd data into the IOCB |
1939 | * @data: A pointer to the immediate command data portion of the IOCB. | 1943 | * @data: A pointer to the immediate command data portion of the IOCB. |
1940 | * @fcp_cmnd: The FCP Command that is provided by the SCSI layer. | 1944 | * @fcp_cmnd: The FCP Command that is provided by the SCSI layer. |
1941 | * | 1945 | * |
@@ -1953,7 +1957,7 @@ lpfc_fcpcmd_to_iocb(uint8_t *data, struct fcp_cmnd *fcp_cmnd) | |||
1953 | } | 1957 | } |
1954 | 1958 | ||
1955 | /** | 1959 | /** |
1956 | * lpfc_scsi_prep_cmnd: Routine to convert scsi cmnd to FCP information unit. | 1960 | * lpfc_scsi_prep_cmnd - Routine to convert scsi cmnd to FCP information unit |
1957 | * @vport: The virtual port for which this call is being executed. | 1961 | * @vport: The virtual port for which this call is being executed. |
1958 | * @lpfc_cmd: The scsi command which needs to send. | 1962 | * @lpfc_cmd: The scsi command which needs to send. |
1959 | * @pnode: Pointer to lpfc_nodelist. | 1963 | * @pnode: Pointer to lpfc_nodelist. |
@@ -2047,7 +2051,7 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd, | |||
2047 | } | 2051 | } |
2048 | 2052 | ||
2049 | /** | 2053 | /** |
2050 | * lpfc_scsi_prep_task_mgmt_cmnd: Convert scsi TM cmnd to FCP information unit. | 2054 | * lpfc_scsi_prep_task_mgmt_cmnd - Convert scsi TM cmnd to FCP information unit |
2051 | * @vport: The virtual port for which this call is being executed. | 2055 | * @vport: The virtual port for which this call is being executed. |
2052 | * @lpfc_cmd: Pointer to lpfc_scsi_buf data structure. | 2056 | * @lpfc_cmd: Pointer to lpfc_scsi_buf data structure. |
2053 | * @lun: Logical unit number. | 2057 | * @lun: Logical unit number. |
@@ -2110,7 +2114,7 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_vport *vport, | |||
2110 | } | 2114 | } |
2111 | 2115 | ||
2112 | /** | 2116 | /** |
2113 | * lpc_taskmgmt_def_cmpl: IOCB completion routine for task management command. | 2117 | * lpfc_taskmgmt_def_cmpl - IOCB completion routine for task management command |
2114 | * @phba: The Hba for which this call is being executed. | 2118 | * @phba: The Hba for which this call is being executed. |
2115 | * @cmdiocbq: Pointer to lpfc_iocbq data structure. | 2119 | * @cmdiocbq: Pointer to lpfc_iocbq data structure. |
2116 | * @rspiocbq: Pointer to lpfc_iocbq data structure. | 2120 | * @rspiocbq: Pointer to lpfc_iocbq data structure. |
@@ -2131,7 +2135,7 @@ lpfc_tskmgmt_def_cmpl(struct lpfc_hba *phba, | |||
2131 | } | 2135 | } |
2132 | 2136 | ||
2133 | /** | 2137 | /** |
2134 | * lpfc_scsi_tgt_reset: Target reset handler. | 2138 | * lpfc_scsi_tgt_reset - Target reset handler |
2135 | * @lpfc_cmd: Pointer to lpfc_scsi_buf data structure | 2139 | * @lpfc_cmd: Pointer to lpfc_scsi_buf data structure |
2136 | * @vport: The virtual port for which this call is being executed. | 2140 | * @vport: The virtual port for which this call is being executed. |
2137 | * @tgt_id: Target ID. | 2141 | * @tgt_id: Target ID. |
@@ -2198,7 +2202,7 @@ lpfc_scsi_tgt_reset(struct lpfc_scsi_buf *lpfc_cmd, struct lpfc_vport *vport, | |||
2198 | } | 2202 | } |
2199 | 2203 | ||
2200 | /** | 2204 | /** |
2201 | * lpfc_info: Info entry point of scsi_host_template data structure. | 2205 | * lpfc_info - Info entry point of scsi_host_template data structure |
2202 | * @host: The scsi host for which this call is being executed. | 2206 | * @host: The scsi host for which this call is being executed. |
2203 | * | 2207 | * |
2204 | * This routine provides module information about hba. | 2208 | * This routine provides module information about hba. |
@@ -2236,7 +2240,7 @@ lpfc_info(struct Scsi_Host *host) | |||
2236 | } | 2240 | } |
2237 | 2241 | ||
2238 | /** | 2242 | /** |
2239 | * lpfc_poll_rearm_time: Routine to modify fcp_poll timer of hba. | 2243 | * lpfc_poll_rearm_time - Routine to modify fcp_poll timer of hba |
2240 | * @phba: The Hba for which this call is being executed. | 2244 | * @phba: The Hba for which this call is being executed. |
2241 | * | 2245 | * |
2242 | * This routine modifies fcp_poll_timer field of @phba by cfg_poll_tmo. | 2246 | * This routine modifies fcp_poll_timer field of @phba by cfg_poll_tmo. |
@@ -2253,7 +2257,7 @@ static __inline__ void lpfc_poll_rearm_timer(struct lpfc_hba * phba) | |||
2253 | } | 2257 | } |
2254 | 2258 | ||
2255 | /** | 2259 | /** |
2256 | * lpfc_poll_start_timer: Routine to start fcp_poll_timer of HBA. | 2260 | * lpfc_poll_start_timer - Routine to start fcp_poll_timer of HBA |
2257 | * @phba: The Hba for which this call is being executed. | 2261 | * @phba: The Hba for which this call is being executed. |
2258 | * | 2262 | * |
2259 | * This routine starts the fcp_poll_timer of @phba. | 2263 | * This routine starts the fcp_poll_timer of @phba. |
@@ -2264,7 +2268,7 @@ void lpfc_poll_start_timer(struct lpfc_hba * phba) | |||
2264 | } | 2268 | } |
2265 | 2269 | ||
2266 | /** | 2270 | /** |
2267 | * lpfc_poll_timeout: Restart polling timer. | 2271 | * lpfc_poll_timeout - Restart polling timer |
2268 | * @ptr: Map to lpfc_hba data structure pointer. | 2272 | * @ptr: Map to lpfc_hba data structure pointer. |
2269 | * | 2273 | * |
2270 | * This routine restarts fcp_poll timer, when FCP ring polling is enable | 2274 | * This routine restarts fcp_poll timer, when FCP ring polling is enable |
@@ -2283,8 +2287,7 @@ void lpfc_poll_timeout(unsigned long ptr) | |||
2283 | } | 2287 | } |
2284 | 2288 | ||
2285 | /** | 2289 | /** |
2286 | * lpfc_queuecommand: Queuecommand entry point of Scsi Host Templater data | 2290 | * lpfc_queuecommand - scsi_host_template queuecommand entry point |
2287 | * structure. | ||
2288 | * @cmnd: Pointer to scsi_cmnd data structure. | 2291 | * @cmnd: Pointer to scsi_cmnd data structure. |
2289 | * @done: Pointer to done routine. | 2292 | * @done: Pointer to done routine. |
2290 | * | 2293 | * |
@@ -2450,7 +2453,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) | |||
2450 | } | 2453 | } |
2451 | 2454 | ||
2452 | /** | 2455 | /** |
2453 | * lpfc_block_error_handler: Routine to block error handler. | 2456 | * lpfc_block_error_handler - Routine to block error handler |
2454 | * @cmnd: Pointer to scsi_cmnd data structure. | 2457 | * @cmnd: Pointer to scsi_cmnd data structure. |
2455 | * | 2458 | * |
2456 | * This routine blocks execution till fc_rport state is not FC_PORSTAT_BLCOEKD. | 2459 | * This routine blocks execution till fc_rport state is not FC_PORSTAT_BLCOEKD. |
@@ -2472,8 +2475,7 @@ lpfc_block_error_handler(struct scsi_cmnd *cmnd) | |||
2472 | } | 2475 | } |
2473 | 2476 | ||
2474 | /** | 2477 | /** |
2475 | * lpfc_abort_handler: Eh_abort_handler entry point of Scsi Host Template data | 2478 | * lpfc_abort_handler - scsi_host_template eh_abort_handler entry point |
2476 | *structure. | ||
2477 | * @cmnd: Pointer to scsi_cmnd data structure. | 2479 | * @cmnd: Pointer to scsi_cmnd data structure. |
2478 | * | 2480 | * |
2479 | * This routine aborts @cmnd pending in base driver. | 2481 | * This routine aborts @cmnd pending in base driver. |
@@ -2578,8 +2580,7 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd) | |||
2578 | } | 2580 | } |
2579 | 2581 | ||
2580 | /** | 2582 | /** |
2581 | * lpfc_device_reset_handler: eh_device_reset entry point of Scsi Host Template | 2583 | * lpfc_device_reset_handler - scsi_host_template eh_device_reset entry point |
2582 | *data structure. | ||
2583 | * @cmnd: Pointer to scsi_cmnd data structure. | 2584 | * @cmnd: Pointer to scsi_cmnd data structure. |
2584 | * | 2585 | * |
2585 | * This routine does a device reset by sending a TARGET_RESET task management | 2586 | * This routine does a device reset by sending a TARGET_RESET task management |
@@ -2587,7 +2588,7 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd) | |||
2587 | * | 2588 | * |
2588 | * Return code : | 2589 | * Return code : |
2589 | * 0x2003 - Error | 2590 | * 0x2003 - Error |
2590 | * 0ex2002 - Success | 2591 | * 0x2002 - Success |
2591 | **/ | 2592 | **/ |
2592 | static int | 2593 | static int |
2593 | lpfc_device_reset_handler(struct scsi_cmnd *cmnd) | 2594 | lpfc_device_reset_handler(struct scsi_cmnd *cmnd) |
@@ -2707,8 +2708,7 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd) | |||
2707 | } | 2708 | } |
2708 | 2709 | ||
2709 | /** | 2710 | /** |
2710 | * lpfc_bus_reset_handler: eh_bus_reset_handler entry point of Scsi Host | 2711 | * lpfc_bus_reset_handler - scsi_host_template eh_bus_reset_handler entry point |
2711 | * Template data structure. | ||
2712 | * @cmnd: Pointer to scsi_cmnd data structure. | 2712 | * @cmnd: Pointer to scsi_cmnd data structure. |
2713 | * | 2713 | * |
2714 | * This routine does target reset to all target on @cmnd->device->host. | 2714 | * This routine does target reset to all target on @cmnd->device->host. |
@@ -2808,8 +2808,7 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd) | |||
2808 | } | 2808 | } |
2809 | 2809 | ||
2810 | /** | 2810 | /** |
2811 | * lpfc_slave_alloc: slave_alloc entry point of Scsi Host Template data | 2811 | * lpfc_slave_alloc - scsi_host_template slave_alloc entry point |
2812 | * structure. | ||
2813 | * @sdev: Pointer to scsi_device. | 2812 | * @sdev: Pointer to scsi_device. |
2814 | * | 2813 | * |
2815 | * This routine populates the cmds_per_lun count + 2 scsi_bufs into this host's | 2814 | * This routine populates the cmds_per_lun count + 2 scsi_bufs into this host's |
@@ -2883,8 +2882,7 @@ lpfc_slave_alloc(struct scsi_device *sdev) | |||
2883 | } | 2882 | } |
2884 | 2883 | ||
2885 | /** | 2884 | /** |
2886 | * lpfc_slave_configure: slave_configure entry point of Scsi Host Templater data | 2885 | * lpfc_slave_configure - scsi_host_template slave_configure entry point |
2887 | * structure. | ||
2888 | * @sdev: Pointer to scsi_device. | 2886 | * @sdev: Pointer to scsi_device. |
2889 | * | 2887 | * |
2890 | * This routine configures following items | 2888 | * This routine configures following items |
@@ -2925,7 +2923,7 @@ lpfc_slave_configure(struct scsi_device *sdev) | |||
2925 | } | 2923 | } |
2926 | 2924 | ||
2927 | /** | 2925 | /** |
2928 | * lpfc_slave_destroy: slave_destroy entry point of SHT data structure. | 2926 | * lpfc_slave_destroy - slave_destroy entry point of SHT data structure |
2929 | * @sdev: Pointer to scsi_device. | 2927 | * @sdev: Pointer to scsi_device. |
2930 | * | 2928 | * |
2931 | * This routine sets @sdev hostatdata filed to null. | 2929 | * This routine sets @sdev hostatdata filed to null. |
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index a36a120561e..eb5c75c45ba 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -68,7 +68,7 @@ typedef enum _lpfc_iocb_type { | |||
68 | } lpfc_iocb_type; | 68 | } lpfc_iocb_type; |
69 | 69 | ||
70 | /** | 70 | /** |
71 | * lpfc_cmd_iocb: Get next command iocb entry in the ring. | 71 | * lpfc_cmd_iocb - Get next command iocb entry in the ring |
72 | * @phba: Pointer to HBA context object. | 72 | * @phba: Pointer to HBA context object. |
73 | * @pring: Pointer to driver SLI ring object. | 73 | * @pring: Pointer to driver SLI ring object. |
74 | * | 74 | * |
@@ -85,7 +85,7 @@ lpfc_cmd_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
85 | } | 85 | } |
86 | 86 | ||
87 | /** | 87 | /** |
88 | * lpfc_resp_iocb: Get next response iocb entry in the ring. | 88 | * lpfc_resp_iocb - Get next response iocb entry in the ring |
89 | * @phba: Pointer to HBA context object. | 89 | * @phba: Pointer to HBA context object. |
90 | * @pring: Pointer to driver SLI ring object. | 90 | * @pring: Pointer to driver SLI ring object. |
91 | * | 91 | * |
@@ -102,7 +102,7 @@ lpfc_resp_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
102 | } | 102 | } |
103 | 103 | ||
104 | /** | 104 | /** |
105 | * __lpfc_sli_get_iocbq: Allocates an iocb object from iocb pool. | 105 | * __lpfc_sli_get_iocbq - Allocates an iocb object from iocb pool |
106 | * @phba: Pointer to HBA context object. | 106 | * @phba: Pointer to HBA context object. |
107 | * | 107 | * |
108 | * This function is called with hbalock held. This function | 108 | * This function is called with hbalock held. This function |
@@ -121,7 +121,7 @@ __lpfc_sli_get_iocbq(struct lpfc_hba *phba) | |||
121 | } | 121 | } |
122 | 122 | ||
123 | /** | 123 | /** |
124 | * lpfc_sli_get_iocbq: Allocates an iocb object from iocb pool. | 124 | * lpfc_sli_get_iocbq - Allocates an iocb object from iocb pool |
125 | * @phba: Pointer to HBA context object. | 125 | * @phba: Pointer to HBA context object. |
126 | * | 126 | * |
127 | * This function is called with no lock held. This function | 127 | * This function is called with no lock held. This function |
@@ -142,7 +142,7 @@ lpfc_sli_get_iocbq(struct lpfc_hba *phba) | |||
142 | } | 142 | } |
143 | 143 | ||
144 | /** | 144 | /** |
145 | * __lpfc_sli_release_iocbq: Release iocb to the iocb pool. | 145 | * __lpfc_sli_release_iocbq - Release iocb to the iocb pool |
146 | * @phba: Pointer to HBA context object. | 146 | * @phba: Pointer to HBA context object. |
147 | * @iocbq: Pointer to driver iocb object. | 147 | * @iocbq: Pointer to driver iocb object. |
148 | * | 148 | * |
@@ -164,7 +164,7 @@ __lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq) | |||
164 | } | 164 | } |
165 | 165 | ||
166 | /** | 166 | /** |
167 | * lpfc_sli_release_iocbq: Release iocb to the iocb pool. | 167 | * lpfc_sli_release_iocbq - Release iocb to the iocb pool |
168 | * @phba: Pointer to HBA context object. | 168 | * @phba: Pointer to HBA context object. |
169 | * @iocbq: Pointer to driver iocb object. | 169 | * @iocbq: Pointer to driver iocb object. |
170 | * | 170 | * |
@@ -185,8 +185,40 @@ lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq) | |||
185 | } | 185 | } |
186 | 186 | ||
187 | /** | 187 | /** |
188 | * lpfc_sli_iocb_cmd_type: Get the iocb type. | 188 | * lpfc_sli_cancel_iocbs - Cancel all iocbs from a list. |
189 | * @iocb_cmnd : iocb command code. | 189 | * @phba: Pointer to HBA context object. |
190 | * @iocblist: List of IOCBs. | ||
191 | * @ulpstatus: ULP status in IOCB command field. | ||
192 | * @ulpWord4: ULP word-4 in IOCB command field. | ||
193 | * | ||
194 | * This function is called with a list of IOCBs to cancel. It cancels the IOCB | ||
195 | * on the list by invoking the complete callback function associated with the | ||
196 | * IOCB with the provided @ulpstatus and @ulpword4 set to the IOCB commond | ||
197 | * fields. | ||
198 | **/ | ||
199 | void | ||
200 | lpfc_sli_cancel_iocbs(struct lpfc_hba *phba, struct list_head *iocblist, | ||
201 | uint32_t ulpstatus, uint32_t ulpWord4) | ||
202 | { | ||
203 | struct lpfc_iocbq *piocb; | ||
204 | |||
205 | while (!list_empty(iocblist)) { | ||
206 | list_remove_head(iocblist, piocb, struct lpfc_iocbq, list); | ||
207 | |||
208 | if (!piocb->iocb_cmpl) | ||
209 | lpfc_sli_release_iocbq(phba, piocb); | ||
210 | else { | ||
211 | piocb->iocb.ulpStatus = ulpstatus; | ||
212 | piocb->iocb.un.ulpWord[4] = ulpWord4; | ||
213 | (piocb->iocb_cmpl) (phba, piocb, piocb); | ||
214 | } | ||
215 | } | ||
216 | return; | ||
217 | } | ||
218 | |||
219 | /** | ||
220 | * lpfc_sli_iocb_cmd_type - Get the iocb type | ||
221 | * @iocb_cmnd: iocb command code. | ||
190 | * | 222 | * |
191 | * This function is called by ring event handler function to get the iocb type. | 223 | * This function is called by ring event handler function to get the iocb type. |
192 | * This function translates the iocb command to an iocb command type used to | 224 | * This function translates the iocb command to an iocb command type used to |
@@ -295,7 +327,7 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd) | |||
295 | } | 327 | } |
296 | 328 | ||
297 | /** | 329 | /** |
298 | * lpfc_sli_ring_map: Issue config_ring mbox for all rings. | 330 | * lpfc_sli_ring_map - Issue config_ring mbox for all rings |
299 | * @phba: Pointer to HBA context object. | 331 | * @phba: Pointer to HBA context object. |
300 | * | 332 | * |
301 | * This function is called from SLI initialization code | 333 | * This function is called from SLI initialization code |
@@ -338,7 +370,7 @@ lpfc_sli_ring_map(struct lpfc_hba *phba) | |||
338 | } | 370 | } |
339 | 371 | ||
340 | /** | 372 | /** |
341 | * lpfc_sli_ringtxcmpl_put: Adds new iocb to the txcmplq. | 373 | * lpfc_sli_ringtxcmpl_put - Adds new iocb to the txcmplq |
342 | * @phba: Pointer to HBA context object. | 374 | * @phba: Pointer to HBA context object. |
343 | * @pring: Pointer to driver SLI ring object. | 375 | * @pring: Pointer to driver SLI ring object. |
344 | * @piocb: Pointer to the driver iocb object. | 376 | * @piocb: Pointer to the driver iocb object. |
@@ -370,7 +402,7 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
370 | } | 402 | } |
371 | 403 | ||
372 | /** | 404 | /** |
373 | * lpfc_sli_ringtx_get: Get first element of the txq. | 405 | * lpfc_sli_ringtx_get - Get first element of the txq |
374 | * @phba: Pointer to HBA context object. | 406 | * @phba: Pointer to HBA context object. |
375 | * @pring: Pointer to driver SLI ring object. | 407 | * @pring: Pointer to driver SLI ring object. |
376 | * | 408 | * |
@@ -391,7 +423,7 @@ lpfc_sli_ringtx_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
391 | } | 423 | } |
392 | 424 | ||
393 | /** | 425 | /** |
394 | * lpfc_sli_next_iocb_slot: Get next iocb slot in the ring. | 426 | * lpfc_sli_next_iocb_slot - Get next iocb slot in the ring |
395 | * @phba: Pointer to HBA context object. | 427 | * @phba: Pointer to HBA context object. |
396 | * @pring: Pointer to driver SLI ring object. | 428 | * @pring: Pointer to driver SLI ring object. |
397 | * | 429 | * |
@@ -445,7 +477,7 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
445 | } | 477 | } |
446 | 478 | ||
447 | /** | 479 | /** |
448 | * lpfc_sli_next_iotag: Get an iotag for the iocb. | 480 | * lpfc_sli_next_iotag - Get an iotag for the iocb |
449 | * @phba: Pointer to HBA context object. | 481 | * @phba: Pointer to HBA context object. |
450 | * @iocbq: Pointer to driver iocb object. | 482 | * @iocbq: Pointer to driver iocb object. |
451 | * | 483 | * |
@@ -520,7 +552,7 @@ lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq) | |||
520 | } | 552 | } |
521 | 553 | ||
522 | /** | 554 | /** |
523 | * lpfc_sli_submit_iocb: Submit an iocb to the firmware. | 555 | * lpfc_sli_submit_iocb - Submit an iocb to the firmware |
524 | * @phba: Pointer to HBA context object. | 556 | * @phba: Pointer to HBA context object. |
525 | * @pring: Pointer to driver SLI ring object. | 557 | * @pring: Pointer to driver SLI ring object. |
526 | * @iocb: Pointer to iocb slot in the ring. | 558 | * @iocb: Pointer to iocb slot in the ring. |
@@ -577,7 +609,7 @@ lpfc_sli_submit_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
577 | } | 609 | } |
578 | 610 | ||
579 | /** | 611 | /** |
580 | * lpfc_sli_update_full_ring: Update the chip attention register. | 612 | * lpfc_sli_update_full_ring - Update the chip attention register |
581 | * @phba: Pointer to HBA context object. | 613 | * @phba: Pointer to HBA context object. |
582 | * @pring: Pointer to driver SLI ring object. | 614 | * @pring: Pointer to driver SLI ring object. |
583 | * | 615 | * |
@@ -608,7 +640,7 @@ lpfc_sli_update_full_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
608 | } | 640 | } |
609 | 641 | ||
610 | /** | 642 | /** |
611 | * lpfc_sli_update_ring: Update chip attention register. | 643 | * lpfc_sli_update_ring - Update chip attention register |
612 | * @phba: Pointer to HBA context object. | 644 | * @phba: Pointer to HBA context object. |
613 | * @pring: Pointer to driver SLI ring object. | 645 | * @pring: Pointer to driver SLI ring object. |
614 | * | 646 | * |
@@ -632,7 +664,7 @@ lpfc_sli_update_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
632 | } | 664 | } |
633 | 665 | ||
634 | /** | 666 | /** |
635 | * lpfc_sli_resume_iocb: Process iocbs in the txq. | 667 | * lpfc_sli_resume_iocb - Process iocbs in the txq |
636 | * @phba: Pointer to HBA context object. | 668 | * @phba: Pointer to HBA context object. |
637 | * @pring: Pointer to driver SLI ring object. | 669 | * @pring: Pointer to driver SLI ring object. |
638 | * | 670 | * |
@@ -672,7 +704,7 @@ lpfc_sli_resume_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
672 | } | 704 | } |
673 | 705 | ||
674 | /** | 706 | /** |
675 | * lpfc_sli_next_hbq_slot: Get next hbq entry for the HBQ. | 707 | * lpfc_sli_next_hbq_slot - Get next hbq entry for the HBQ |
676 | * @phba: Pointer to HBA context object. | 708 | * @phba: Pointer to HBA context object. |
677 | * @hbqno: HBQ number. | 709 | * @hbqno: HBQ number. |
678 | * | 710 | * |
@@ -717,7 +749,7 @@ lpfc_sli_next_hbq_slot(struct lpfc_hba *phba, uint32_t hbqno) | |||
717 | } | 749 | } |
718 | 750 | ||
719 | /** | 751 | /** |
720 | * lpfc_sli_hbqbuf_free_all: Free all the hbq buffers. | 752 | * lpfc_sli_hbqbuf_free_all - Free all the hbq buffers |
721 | * @phba: Pointer to HBA context object. | 753 | * @phba: Pointer to HBA context object. |
722 | * | 754 | * |
723 | * This function is called with no lock held to free all the | 755 | * This function is called with no lock held to free all the |
@@ -771,7 +803,7 @@ lpfc_sli_hbqbuf_free_all(struct lpfc_hba *phba) | |||
771 | } | 803 | } |
772 | 804 | ||
773 | /** | 805 | /** |
774 | * lpfc_sli_hbq_to_firmware: Post the hbq buffer to firmware. | 806 | * lpfc_sli_hbq_to_firmware - Post the hbq buffer to firmware |
775 | * @phba: Pointer to HBA context object. | 807 | * @phba: Pointer to HBA context object. |
776 | * @hbqno: HBQ number. | 808 | * @hbqno: HBQ number. |
777 | * @hbq_buf: Pointer to HBQ buffer. | 809 | * @hbq_buf: Pointer to HBQ buffer. |
@@ -818,8 +850,8 @@ static struct lpfc_hbq_init lpfc_els_hbq = { | |||
818 | .profile = 0, | 850 | .profile = 0, |
819 | .ring_mask = (1 << LPFC_ELS_RING), | 851 | .ring_mask = (1 << LPFC_ELS_RING), |
820 | .buffer_count = 0, | 852 | .buffer_count = 0, |
821 | .init_count = 20, | 853 | .init_count = 40, |
822 | .add_count = 5, | 854 | .add_count = 40, |
823 | }; | 855 | }; |
824 | 856 | ||
825 | /* HBQ for the extra ring if needed */ | 857 | /* HBQ for the extra ring if needed */ |
@@ -841,7 +873,7 @@ struct lpfc_hbq_init *lpfc_hbq_defs[] = { | |||
841 | }; | 873 | }; |
842 | 874 | ||
843 | /** | 875 | /** |
844 | * lpfc_sli_hbqbuf_fill_hbqs: Post more hbq buffers to HBQ. | 876 | * lpfc_sli_hbqbuf_fill_hbqs - Post more hbq buffers to HBQ |
845 | * @phba: Pointer to HBA context object. | 877 | * @phba: Pointer to HBA context object. |
846 | * @hbqno: HBQ number. | 878 | * @hbqno: HBQ number. |
847 | * @count: Number of HBQ buffers to be posted. | 879 | * @count: Number of HBQ buffers to be posted. |
@@ -901,7 +933,7 @@ err: | |||
901 | } | 933 | } |
902 | 934 | ||
903 | /** | 935 | /** |
904 | * lpfc_sli_hbqbuf_add_hbqs: Post more HBQ buffers to firmware. | 936 | * lpfc_sli_hbqbuf_add_hbqs - Post more HBQ buffers to firmware |
905 | * @phba: Pointer to HBA context object. | 937 | * @phba: Pointer to HBA context object. |
906 | * @qno: HBQ number. | 938 | * @qno: HBQ number. |
907 | * | 939 | * |
@@ -917,7 +949,7 @@ lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno) | |||
917 | } | 949 | } |
918 | 950 | ||
919 | /** | 951 | /** |
920 | * lpfc_sli_hbqbuf_init_hbqs: Post initial buffers to the HBQ. | 952 | * lpfc_sli_hbqbuf_init_hbqs - Post initial buffers to the HBQ |
921 | * @phba: Pointer to HBA context object. | 953 | * @phba: Pointer to HBA context object. |
922 | * @qno: HBQ queue number. | 954 | * @qno: HBQ queue number. |
923 | * | 955 | * |
@@ -933,7 +965,7 @@ lpfc_sli_hbqbuf_init_hbqs(struct lpfc_hba *phba, uint32_t qno) | |||
933 | } | 965 | } |
934 | 966 | ||
935 | /** | 967 | /** |
936 | * lpfc_sli_hbqbuf_find: Find the hbq buffer associated with a tag. | 968 | * lpfc_sli_hbqbuf_find - Find the hbq buffer associated with a tag |
937 | * @phba: Pointer to HBA context object. | 969 | * @phba: Pointer to HBA context object. |
938 | * @tag: Tag of the hbq buffer. | 970 | * @tag: Tag of the hbq buffer. |
939 | * | 971 | * |
@@ -966,7 +998,7 @@ lpfc_sli_hbqbuf_find(struct lpfc_hba *phba, uint32_t tag) | |||
966 | } | 998 | } |
967 | 999 | ||
968 | /** | 1000 | /** |
969 | * lpfc_sli_free_hbq: Give back the hbq buffer to firmware. | 1001 | * lpfc_sli_free_hbq - Give back the hbq buffer to firmware |
970 | * @phba: Pointer to HBA context object. | 1002 | * @phba: Pointer to HBA context object. |
971 | * @hbq_buffer: Pointer to HBQ buffer. | 1003 | * @hbq_buffer: Pointer to HBQ buffer. |
972 | * | 1004 | * |
@@ -988,7 +1020,7 @@ lpfc_sli_free_hbq(struct lpfc_hba *phba, struct hbq_dmabuf *hbq_buffer) | |||
988 | } | 1020 | } |
989 | 1021 | ||
990 | /** | 1022 | /** |
991 | * lpfc_sli_chk_mbx_command: Check if the mailbox is a legitimate mailbox. | 1023 | * lpfc_sli_chk_mbx_command - Check if the mailbox is a legitimate mailbox |
992 | * @mbxCommand: mailbox command code. | 1024 | * @mbxCommand: mailbox command code. |
993 | * | 1025 | * |
994 | * This function is called by the mailbox event handler function to verify | 1026 | * This function is called by the mailbox event handler function to verify |
@@ -1064,8 +1096,7 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand) | |||
1064 | } | 1096 | } |
1065 | 1097 | ||
1066 | /** | 1098 | /** |
1067 | * lpfc_sli_wake_mbox_wait: Completion handler for mbox issued from | 1099 | * lpfc_sli_wake_mbox_wait - lpfc_sli_issue_mbox_wait mbox completion handler |
1068 | * lpfc_sli_issue_mbox_wait. | ||
1069 | * @phba: Pointer to HBA context object. | 1100 | * @phba: Pointer to HBA context object. |
1070 | * @pmboxq: Pointer to mailbox command. | 1101 | * @pmboxq: Pointer to mailbox command. |
1071 | * | 1102 | * |
@@ -1096,7 +1127,7 @@ lpfc_sli_wake_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq) | |||
1096 | 1127 | ||
1097 | 1128 | ||
1098 | /** | 1129 | /** |
1099 | * lpfc_sli_def_mbox_cmpl: Default mailbox completion handler. | 1130 | * lpfc_sli_def_mbox_cmpl - Default mailbox completion handler |
1100 | * @phba: Pointer to HBA context object. | 1131 | * @phba: Pointer to HBA context object. |
1101 | * @pmb: Pointer to mailbox object. | 1132 | * @pmb: Pointer to mailbox object. |
1102 | * | 1133 | * |
@@ -1140,7 +1171,7 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) | |||
1140 | } | 1171 | } |
1141 | 1172 | ||
1142 | /** | 1173 | /** |
1143 | * lpfc_sli_handle_mb_event: Handle mailbox completions from firmware. | 1174 | * lpfc_sli_handle_mb_event - Handle mailbox completions from firmware |
1144 | * @phba: Pointer to HBA context object. | 1175 | * @phba: Pointer to HBA context object. |
1145 | * | 1176 | * |
1146 | * This function is called with no lock held. This function processes all | 1177 | * This function is called with no lock held. This function processes all |
@@ -1260,7 +1291,7 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba) | |||
1260 | } | 1291 | } |
1261 | 1292 | ||
1262 | /** | 1293 | /** |
1263 | * lpfc_sli_get_buff: Get the buffer associated with the buffer tag. | 1294 | * lpfc_sli_get_buff - Get the buffer associated with the buffer tag |
1264 | * @phba: Pointer to HBA context object. | 1295 | * @phba: Pointer to HBA context object. |
1265 | * @pring: Pointer to driver SLI ring object. | 1296 | * @pring: Pointer to driver SLI ring object. |
1266 | * @tag: buffer tag. | 1297 | * @tag: buffer tag. |
@@ -1288,7 +1319,7 @@ lpfc_sli_get_buff(struct lpfc_hba *phba, | |||
1288 | 1319 | ||
1289 | 1320 | ||
1290 | /** | 1321 | /** |
1291 | * lpfc_sli_process_unsol_iocb: Unsolicited iocb handler. | 1322 | * lpfc_sli_process_unsol_iocb - Unsolicited iocb handler |
1292 | * @phba: Pointer to HBA context object. | 1323 | * @phba: Pointer to HBA context object. |
1293 | * @pring: Pointer to driver SLI ring object. | 1324 | * @pring: Pointer to driver SLI ring object. |
1294 | * @saveq: Pointer to the unsolicited iocb. | 1325 | * @saveq: Pointer to the unsolicited iocb. |
@@ -1484,7 +1515,7 @@ lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
1484 | } | 1515 | } |
1485 | 1516 | ||
1486 | /** | 1517 | /** |
1487 | * lpfc_sli_iocbq_lookup: Find command iocb for the given response iocb. | 1518 | * lpfc_sli_iocbq_lookup - Find command iocb for the given response iocb |
1488 | * @phba: Pointer to HBA context object. | 1519 | * @phba: Pointer to HBA context object. |
1489 | * @pring: Pointer to driver SLI ring object. | 1520 | * @pring: Pointer to driver SLI ring object. |
1490 | * @prspiocb: Pointer to response iocb object. | 1521 | * @prspiocb: Pointer to response iocb object. |
@@ -1521,7 +1552,7 @@ lpfc_sli_iocbq_lookup(struct lpfc_hba *phba, | |||
1521 | } | 1552 | } |
1522 | 1553 | ||
1523 | /** | 1554 | /** |
1524 | * lpfc_sli_process_sol_iocb: process solicited iocb completion. | 1555 | * lpfc_sli_process_sol_iocb - process solicited iocb completion |
1525 | * @phba: Pointer to HBA context object. | 1556 | * @phba: Pointer to HBA context object. |
1526 | * @pring: Pointer to driver SLI ring object. | 1557 | * @pring: Pointer to driver SLI ring object. |
1527 | * @saveq: Pointer to the response iocb to be processed. | 1558 | * @saveq: Pointer to the response iocb to be processed. |
@@ -1597,7 +1628,7 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
1597 | * Ring <ringno> handler: unexpected completion IoTag | 1628 | * Ring <ringno> handler: unexpected completion IoTag |
1598 | * <IoTag> | 1629 | * <IoTag> |
1599 | */ | 1630 | */ |
1600 | lpfc_printf_vlog(cmdiocbp->vport, KERN_WARNING, LOG_SLI, | 1631 | lpfc_printf_log(phba, KERN_WARNING, LOG_SLI, |
1601 | "0322 Ring %d handler: " | 1632 | "0322 Ring %d handler: " |
1602 | "unexpected completion IoTag x%x " | 1633 | "unexpected completion IoTag x%x " |
1603 | "Data: x%x x%x x%x x%x\n", | 1634 | "Data: x%x x%x x%x x%x\n", |
@@ -1614,7 +1645,7 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
1614 | } | 1645 | } |
1615 | 1646 | ||
1616 | /** | 1647 | /** |
1617 | * lpfc_sli_rsp_pointers_error: Response ring pointer error handler. | 1648 | * lpfc_sli_rsp_pointers_error - Response ring pointer error handler |
1618 | * @phba: Pointer to HBA context object. | 1649 | * @phba: Pointer to HBA context object. |
1619 | * @pring: Pointer to driver SLI ring object. | 1650 | * @pring: Pointer to driver SLI ring object. |
1620 | * | 1651 | * |
@@ -1652,7 +1683,7 @@ lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
1652 | } | 1683 | } |
1653 | 1684 | ||
1654 | /** | 1685 | /** |
1655 | * lpfc_poll_eratt: Error attention polling timer timeout handler. | 1686 | * lpfc_poll_eratt - Error attention polling timer timeout handler |
1656 | * @ptr: Pointer to address of HBA context object. | 1687 | * @ptr: Pointer to address of HBA context object. |
1657 | * | 1688 | * |
1658 | * This function is invoked by the Error Attention polling timer when the | 1689 | * This function is invoked by the Error Attention polling timer when the |
@@ -1682,7 +1713,7 @@ void lpfc_poll_eratt(unsigned long ptr) | |||
1682 | } | 1713 | } |
1683 | 1714 | ||
1684 | /** | 1715 | /** |
1685 | * lpfc_sli_poll_fcp_ring: Handle FCP ring completion in polling mode. | 1716 | * lpfc_sli_poll_fcp_ring - Handle FCP ring completion in polling mode |
1686 | * @phba: Pointer to HBA context object. | 1717 | * @phba: Pointer to HBA context object. |
1687 | * | 1718 | * |
1688 | * This function is called from lpfc_queuecommand, lpfc_poll_timeout, | 1719 | * This function is called from lpfc_queuecommand, lpfc_poll_timeout, |
@@ -1845,7 +1876,7 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba) | |||
1845 | } | 1876 | } |
1846 | 1877 | ||
1847 | /** | 1878 | /** |
1848 | * lpfc_sli_handle_fast_ring_event: Handle ring events on FCP ring. | 1879 | * lpfc_sli_handle_fast_ring_event - Handle ring events on FCP ring |
1849 | * @phba: Pointer to HBA context object. | 1880 | * @phba: Pointer to HBA context object. |
1850 | * @pring: Pointer to driver SLI ring object. | 1881 | * @pring: Pointer to driver SLI ring object. |
1851 | * @mask: Host attention register mask for this ring. | 1882 | * @mask: Host attention register mask for this ring. |
@@ -2037,7 +2068,7 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba, | |||
2037 | } | 2068 | } |
2038 | 2069 | ||
2039 | /** | 2070 | /** |
2040 | * lpfc_sli_handle_slow_ring_event: Handle ring events for non-FCP rings. | 2071 | * lpfc_sli_handle_slow_ring_event - Handle ring events for non-FCP rings |
2041 | * @phba: Pointer to HBA context object. | 2072 | * @phba: Pointer to HBA context object. |
2042 | * @pring: Pointer to driver SLI ring object. | 2073 | * @pring: Pointer to driver SLI ring object. |
2043 | * @mask: Host attention register mask for this ring. | 2074 | * @mask: Host attention register mask for this ring. |
@@ -2311,7 +2342,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba, | |||
2311 | } | 2342 | } |
2312 | 2343 | ||
2313 | /** | 2344 | /** |
2314 | * lpfc_sli_abort_iocb_ring: Abort all iocbs in the ring. | 2345 | * lpfc_sli_abort_iocb_ring - Abort all iocbs in the ring |
2315 | * @phba: Pointer to HBA context object. | 2346 | * @phba: Pointer to HBA context object. |
2316 | * @pring: Pointer to driver SLI ring object. | 2347 | * @pring: Pointer to driver SLI ring object. |
2317 | * | 2348 | * |
@@ -2325,7 +2356,6 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
2325 | { | 2356 | { |
2326 | LIST_HEAD(completions); | 2357 | LIST_HEAD(completions); |
2327 | struct lpfc_iocbq *iocb, *next_iocb; | 2358 | struct lpfc_iocbq *iocb, *next_iocb; |
2328 | IOCB_t *cmd = NULL; | ||
2329 | 2359 | ||
2330 | if (pring->ringno == LPFC_ELS_RING) { | 2360 | if (pring->ringno == LPFC_ELS_RING) { |
2331 | lpfc_fabric_abort_hba(phba); | 2361 | lpfc_fabric_abort_hba(phba); |
@@ -2344,23 +2374,13 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring) | |||
2344 | 2374 | ||
2345 | spin_unlock_irq(&phba->hbalock); | 2375 | spin_unlock_irq(&phba->hbalock); |
2346 | 2376 | ||
2347 | while (!list_empty(&completions)) { | 2377 | /* Cancel all the IOCBs from the completions list */ |
2348 | iocb = list_get_first(&completions, struct lpfc_iocbq, list); | 2378 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
2349 | cmd = &iocb->iocb; | 2379 | IOERR_SLI_ABORTED); |
2350 | list_del_init(&iocb->list); | ||
2351 | |||
2352 | if (!iocb->iocb_cmpl) | ||
2353 | lpfc_sli_release_iocbq(phba, iocb); | ||
2354 | else { | ||
2355 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
2356 | cmd->un.ulpWord[4] = IOERR_SLI_ABORTED; | ||
2357 | (iocb->iocb_cmpl) (phba, iocb, iocb); | ||
2358 | } | ||
2359 | } | ||
2360 | } | 2380 | } |
2361 | 2381 | ||
2362 | /** | 2382 | /** |
2363 | * lpfc_sli_flush_fcp_rings: flush all iocbs in the fcp ring. | 2383 | * lpfc_sli_flush_fcp_rings - flush all iocbs in the fcp ring |
2364 | * @phba: Pointer to HBA context object. | 2384 | * @phba: Pointer to HBA context object. |
2365 | * | 2385 | * |
2366 | * This function flushes all iocbs in the fcp ring and frees all the iocb | 2386 | * This function flushes all iocbs in the fcp ring and frees all the iocb |
@@ -2374,8 +2394,6 @@ lpfc_sli_flush_fcp_rings(struct lpfc_hba *phba) | |||
2374 | { | 2394 | { |
2375 | LIST_HEAD(txq); | 2395 | LIST_HEAD(txq); |
2376 | LIST_HEAD(txcmplq); | 2396 | LIST_HEAD(txcmplq); |
2377 | struct lpfc_iocbq *iocb; | ||
2378 | IOCB_t *cmd = NULL; | ||
2379 | struct lpfc_sli *psli = &phba->sli; | 2397 | struct lpfc_sli *psli = &phba->sli; |
2380 | struct lpfc_sli_ring *pring; | 2398 | struct lpfc_sli_ring *pring; |
2381 | 2399 | ||
@@ -2393,38 +2411,16 @@ lpfc_sli_flush_fcp_rings(struct lpfc_hba *phba) | |||
2393 | spin_unlock_irq(&phba->hbalock); | 2411 | spin_unlock_irq(&phba->hbalock); |
2394 | 2412 | ||
2395 | /* Flush the txq */ | 2413 | /* Flush the txq */ |
2396 | while (!list_empty(&txq)) { | 2414 | lpfc_sli_cancel_iocbs(phba, &txq, IOSTAT_LOCAL_REJECT, |
2397 | iocb = list_get_first(&txq, struct lpfc_iocbq, list); | 2415 | IOERR_SLI_DOWN); |
2398 | cmd = &iocb->iocb; | ||
2399 | list_del_init(&iocb->list); | ||
2400 | |||
2401 | if (!iocb->iocb_cmpl) | ||
2402 | lpfc_sli_release_iocbq(phba, iocb); | ||
2403 | else { | ||
2404 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
2405 | cmd->un.ulpWord[4] = IOERR_SLI_DOWN; | ||
2406 | (iocb->iocb_cmpl) (phba, iocb, iocb); | ||
2407 | } | ||
2408 | } | ||
2409 | 2416 | ||
2410 | /* Flush the txcmpq */ | 2417 | /* Flush the txcmpq */ |
2411 | while (!list_empty(&txcmplq)) { | 2418 | lpfc_sli_cancel_iocbs(phba, &txcmplq, IOSTAT_LOCAL_REJECT, |
2412 | iocb = list_get_first(&txcmplq, struct lpfc_iocbq, list); | 2419 | IOERR_SLI_DOWN); |
2413 | cmd = &iocb->iocb; | ||
2414 | list_del_init(&iocb->list); | ||
2415 | |||
2416 | if (!iocb->iocb_cmpl) | ||
2417 | lpfc_sli_release_iocbq(phba, iocb); | ||
2418 | else { | ||
2419 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
2420 | cmd->un.ulpWord[4] = IOERR_SLI_DOWN; | ||
2421 | (iocb->iocb_cmpl) (phba, iocb, iocb); | ||
2422 | } | ||
2423 | } | ||
2424 | } | 2420 | } |
2425 | 2421 | ||
2426 | /** | 2422 | /** |
2427 | * lpfc_sli_brdready: Check for host status bits. | 2423 | * lpfc_sli_brdready - Check for host status bits |
2428 | * @phba: Pointer to HBA context object. | 2424 | * @phba: Pointer to HBA context object. |
2429 | * @mask: Bit mask to be checked. | 2425 | * @mask: Bit mask to be checked. |
2430 | * | 2426 | * |
@@ -2484,7 +2480,7 @@ lpfc_sli_brdready(struct lpfc_hba *phba, uint32_t mask) | |||
2484 | #define BARRIER_TEST_PATTERN (0xdeadbeef) | 2480 | #define BARRIER_TEST_PATTERN (0xdeadbeef) |
2485 | 2481 | ||
2486 | /** | 2482 | /** |
2487 | * lpfc_reset_barrier: Make HBA ready for HBA reset. | 2483 | * lpfc_reset_barrier - Make HBA ready for HBA reset |
2488 | * @phba: Pointer to HBA context object. | 2484 | * @phba: Pointer to HBA context object. |
2489 | * | 2485 | * |
2490 | * This function is called before resetting an HBA. This | 2486 | * This function is called before resetting an HBA. This |
@@ -2564,7 +2560,7 @@ restore_hc: | |||
2564 | } | 2560 | } |
2565 | 2561 | ||
2566 | /** | 2562 | /** |
2567 | * lpfc_sli_brdkill: Issue a kill_board mailbox command. | 2563 | * lpfc_sli_brdkill - Issue a kill_board mailbox command |
2568 | * @phba: Pointer to HBA context object. | 2564 | * @phba: Pointer to HBA context object. |
2569 | * | 2565 | * |
2570 | * This function issues a kill_board mailbox command and waits for | 2566 | * This function issues a kill_board mailbox command and waits for |
@@ -2651,7 +2647,7 @@ lpfc_sli_brdkill(struct lpfc_hba *phba) | |||
2651 | } | 2647 | } |
2652 | 2648 | ||
2653 | /** | 2649 | /** |
2654 | * lpfc_sli_brdreset: Reset the HBA. | 2650 | * lpfc_sli_brdreset - Reset the HBA |
2655 | * @phba: Pointer to HBA context object. | 2651 | * @phba: Pointer to HBA context object. |
2656 | * | 2652 | * |
2657 | * This function resets the HBA by writing HC_INITFF to the control | 2653 | * This function resets the HBA by writing HC_INITFF to the control |
@@ -2714,7 +2710,7 @@ lpfc_sli_brdreset(struct lpfc_hba *phba) | |||
2714 | } | 2710 | } |
2715 | 2711 | ||
2716 | /** | 2712 | /** |
2717 | * lpfc_sli_brdrestart: Restart the HBA. | 2713 | * lpfc_sli_brdrestart - Restart the HBA |
2718 | * @phba: Pointer to HBA context object. | 2714 | * @phba: Pointer to HBA context object. |
2719 | * | 2715 | * |
2720 | * This function is called in the SLI initialization code path to | 2716 | * This function is called in the SLI initialization code path to |
@@ -2781,7 +2777,7 @@ lpfc_sli_brdrestart(struct lpfc_hba *phba) | |||
2781 | } | 2777 | } |
2782 | 2778 | ||
2783 | /** | 2779 | /** |
2784 | * lpfc_sli_chipset_init: Wait for the restart of the HBA after a restart. | 2780 | * lpfc_sli_chipset_init - Wait for the restart of the HBA after a restart |
2785 | * @phba: Pointer to HBA context object. | 2781 | * @phba: Pointer to HBA context object. |
2786 | * | 2782 | * |
2787 | * This function is called after a HBA restart to wait for successful | 2783 | * This function is called after a HBA restart to wait for successful |
@@ -2876,7 +2872,7 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba) | |||
2876 | } | 2872 | } |
2877 | 2873 | ||
2878 | /** | 2874 | /** |
2879 | * lpfc_sli_hbq_count: Get the number of HBQs to be configured. | 2875 | * lpfc_sli_hbq_count - Get the number of HBQs to be configured |
2880 | * | 2876 | * |
2881 | * This function calculates and returns the number of HBQs required to be | 2877 | * This function calculates and returns the number of HBQs required to be |
2882 | * configured. | 2878 | * configured. |
@@ -2888,7 +2884,7 @@ lpfc_sli_hbq_count(void) | |||
2888 | } | 2884 | } |
2889 | 2885 | ||
2890 | /** | 2886 | /** |
2891 | * lpfc_sli_hbq_entry_count: Calculate total number of hbq entries. | 2887 | * lpfc_sli_hbq_entry_count - Calculate total number of hbq entries |
2892 | * | 2888 | * |
2893 | * This function adds the number of hbq entries in every HBQ to get | 2889 | * This function adds the number of hbq entries in every HBQ to get |
2894 | * the total number of hbq entries required for the HBA and returns | 2890 | * the total number of hbq entries required for the HBA and returns |
@@ -2907,7 +2903,7 @@ lpfc_sli_hbq_entry_count(void) | |||
2907 | } | 2903 | } |
2908 | 2904 | ||
2909 | /** | 2905 | /** |
2910 | * lpfc_sli_hbq_size: Calculate memory required for all hbq entries. | 2906 | * lpfc_sli_hbq_size - Calculate memory required for all hbq entries |
2911 | * | 2907 | * |
2912 | * This function calculates amount of memory required for all hbq entries | 2908 | * This function calculates amount of memory required for all hbq entries |
2913 | * to be configured and returns the total memory required. | 2909 | * to be configured and returns the total memory required. |
@@ -2919,7 +2915,7 @@ lpfc_sli_hbq_size(void) | |||
2919 | } | 2915 | } |
2920 | 2916 | ||
2921 | /** | 2917 | /** |
2922 | * lpfc_sli_hbq_setup: configure and initialize HBQs. | 2918 | * lpfc_sli_hbq_setup - configure and initialize HBQs |
2923 | * @phba: Pointer to HBA context object. | 2919 | * @phba: Pointer to HBA context object. |
2924 | * | 2920 | * |
2925 | * This function is called during the SLI initialization to configure | 2921 | * This function is called during the SLI initialization to configure |
@@ -2988,7 +2984,7 @@ lpfc_sli_hbq_setup(struct lpfc_hba *phba) | |||
2988 | } | 2984 | } |
2989 | 2985 | ||
2990 | /** | 2986 | /** |
2991 | * lpfc_sli_config_port: Issue config port mailbox command. | 2987 | * lpfc_sli_config_port - Issue config port mailbox command |
2992 | * @phba: Pointer to HBA context object. | 2988 | * @phba: Pointer to HBA context object. |
2993 | * @sli_mode: sli mode - 2/3 | 2989 | * @sli_mode: sli mode - 2/3 |
2994 | * | 2990 | * |
@@ -3114,7 +3110,7 @@ do_prep_failed: | |||
3114 | 3110 | ||
3115 | 3111 | ||
3116 | /** | 3112 | /** |
3117 | * lpfc_sli_hba_setup: SLI intialization function. | 3113 | * lpfc_sli_hba_setup - SLI intialization function |
3118 | * @phba: Pointer to HBA context object. | 3114 | * @phba: Pointer to HBA context object. |
3119 | * | 3115 | * |
3120 | * This function is the main SLI intialization function. This function | 3116 | * This function is the main SLI intialization function. This function |
@@ -3206,7 +3202,7 @@ lpfc_sli_hba_setup_error: | |||
3206 | 3202 | ||
3207 | 3203 | ||
3208 | /** | 3204 | /** |
3209 | * lpfc_mbox_timeout: Timeout call back function for mbox timer. | 3205 | * lpfc_mbox_timeout - Timeout call back function for mbox timer |
3210 | * @ptr: context object - pointer to hba structure. | 3206 | * @ptr: context object - pointer to hba structure. |
3211 | * | 3207 | * |
3212 | * This is the callback function for mailbox timer. The mailbox | 3208 | * This is the callback function for mailbox timer. The mailbox |
@@ -3237,7 +3233,7 @@ lpfc_mbox_timeout(unsigned long ptr) | |||
3237 | 3233 | ||
3238 | 3234 | ||
3239 | /** | 3235 | /** |
3240 | * lpfc_mbox_timeout_handler: Worker thread function to handle mailbox timeout. | 3236 | * lpfc_mbox_timeout_handler - Worker thread function to handle mailbox timeout |
3241 | * @phba: Pointer to HBA context object. | 3237 | * @phba: Pointer to HBA context object. |
3242 | * | 3238 | * |
3243 | * This function is called from worker thread when a mailbox command times out. | 3239 | * This function is called from worker thread when a mailbox command times out. |
@@ -3252,6 +3248,21 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba) | |||
3252 | struct lpfc_sli *psli = &phba->sli; | 3248 | struct lpfc_sli *psli = &phba->sli; |
3253 | struct lpfc_sli_ring *pring; | 3249 | struct lpfc_sli_ring *pring; |
3254 | 3250 | ||
3251 | /* Check the pmbox pointer first. There is a race condition | ||
3252 | * between the mbox timeout handler getting executed in the | ||
3253 | * worklist and the mailbox actually completing. When this | ||
3254 | * race condition occurs, the mbox_active will be NULL. | ||
3255 | */ | ||
3256 | spin_lock_irq(&phba->hbalock); | ||
3257 | if (pmbox == NULL) { | ||
3258 | lpfc_printf_log(phba, KERN_WARNING, | ||
3259 | LOG_MBOX | LOG_SLI, | ||
3260 | "0353 Active Mailbox cleared - mailbox timeout " | ||
3261 | "exiting\n"); | ||
3262 | spin_unlock_irq(&phba->hbalock); | ||
3263 | return; | ||
3264 | } | ||
3265 | |||
3255 | /* Mbox cmd <mbxCommand> timeout */ | 3266 | /* Mbox cmd <mbxCommand> timeout */ |
3256 | lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI, | 3267 | lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI, |
3257 | "0310 Mailbox command x%x timeout Data: x%x x%x x%p\n", | 3268 | "0310 Mailbox command x%x timeout Data: x%x x%x x%p\n", |
@@ -3259,6 +3270,7 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba) | |||
3259 | phba->pport->port_state, | 3270 | phba->pport->port_state, |
3260 | phba->sli.sli_flag, | 3271 | phba->sli.sli_flag, |
3261 | phba->sli.mbox_active); | 3272 | phba->sli.mbox_active); |
3273 | spin_unlock_irq(&phba->hbalock); | ||
3262 | 3274 | ||
3263 | /* Setting state unknown so lpfc_sli_abort_iocb_ring | 3275 | /* Setting state unknown so lpfc_sli_abort_iocb_ring |
3264 | * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing | 3276 | * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing |
@@ -3295,7 +3307,7 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba) | |||
3295 | } | 3307 | } |
3296 | 3308 | ||
3297 | /** | 3309 | /** |
3298 | * lpfc_sli_issue_mbox: Issue a mailbox command to firmware. | 3310 | * lpfc_sli_issue_mbox - Issue a mailbox command to firmware |
3299 | * @phba: Pointer to HBA context object. | 3311 | * @phba: Pointer to HBA context object. |
3300 | * @pmbox: Pointer to mailbox object. | 3312 | * @pmbox: Pointer to mailbox object. |
3301 | * @flag: Flag indicating how the mailbox need to be processed. | 3313 | * @flag: Flag indicating how the mailbox need to be processed. |
@@ -3365,6 +3377,12 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag) | |||
3365 | goto out_not_finished; | 3377 | goto out_not_finished; |
3366 | } | 3378 | } |
3367 | 3379 | ||
3380 | /* If HBA has a deferred error attention, fail the iocb. */ | ||
3381 | if (unlikely(phba->hba_flag & DEFER_ERATT)) { | ||
3382 | spin_unlock_irqrestore(&phba->hbalock, drvr_flag); | ||
3383 | goto out_not_finished; | ||
3384 | } | ||
3385 | |||
3368 | psli = &phba->sli; | 3386 | psli = &phba->sli; |
3369 | 3387 | ||
3370 | mb = &pmbox->mb; | 3388 | mb = &pmbox->mb; |
@@ -3632,7 +3650,7 @@ out_not_finished: | |||
3632 | } | 3650 | } |
3633 | 3651 | ||
3634 | /** | 3652 | /** |
3635 | * __lpfc_sli_ringtx_put: Add an iocb to the txq. | 3653 | * __lpfc_sli_ringtx_put - Add an iocb to the txq |
3636 | * @phba: Pointer to HBA context object. | 3654 | * @phba: Pointer to HBA context object. |
3637 | * @pring: Pointer to driver SLI ring object. | 3655 | * @pring: Pointer to driver SLI ring object. |
3638 | * @piocb: Pointer to address of newly added command iocb. | 3656 | * @piocb: Pointer to address of newly added command iocb. |
@@ -3651,7 +3669,7 @@ __lpfc_sli_ringtx_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
3651 | } | 3669 | } |
3652 | 3670 | ||
3653 | /** | 3671 | /** |
3654 | * lpfc_sli_next_iocb: Get the next iocb in the txq. | 3672 | * lpfc_sli_next_iocb - Get the next iocb in the txq |
3655 | * @phba: Pointer to HBA context object. | 3673 | * @phba: Pointer to HBA context object. |
3656 | * @pring: Pointer to driver SLI ring object. | 3674 | * @pring: Pointer to driver SLI ring object. |
3657 | * @piocb: Pointer to address of newly added command iocb. | 3675 | * @piocb: Pointer to address of newly added command iocb. |
@@ -3683,7 +3701,7 @@ lpfc_sli_next_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
3683 | } | 3701 | } |
3684 | 3702 | ||
3685 | /** | 3703 | /** |
3686 | * __lpfc_sli_issue_iocb: Lockless version of lpfc_sli_issue_iocb. | 3704 | * __lpfc_sli_issue_iocb - Lockless version of lpfc_sli_issue_iocb |
3687 | * @phba: Pointer to HBA context object. | 3705 | * @phba: Pointer to HBA context object. |
3688 | * @pring: Pointer to driver SLI ring object. | 3706 | * @pring: Pointer to driver SLI ring object. |
3689 | * @piocb: Pointer to command iocb. | 3707 | * @piocb: Pointer to command iocb. |
@@ -3729,6 +3747,10 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
3729 | if (unlikely(pci_channel_offline(phba->pcidev))) | 3747 | if (unlikely(pci_channel_offline(phba->pcidev))) |
3730 | return IOCB_ERROR; | 3748 | return IOCB_ERROR; |
3731 | 3749 | ||
3750 | /* If HBA has a deferred error attention, fail the iocb. */ | ||
3751 | if (unlikely(phba->hba_flag & DEFER_ERATT)) | ||
3752 | return IOCB_ERROR; | ||
3753 | |||
3732 | /* | 3754 | /* |
3733 | * We should never get an IOCB if we are in a < LINK_DOWN state | 3755 | * We should never get an IOCB if we are in a < LINK_DOWN state |
3734 | */ | 3756 | */ |
@@ -3813,7 +3835,7 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
3813 | 3835 | ||
3814 | 3836 | ||
3815 | /** | 3837 | /** |
3816 | * lpfc_sli_issue_iocb: Wrapper function for __lpfc_sli_issue_iocb. | 3838 | * lpfc_sli_issue_iocb - Wrapper function for __lpfc_sli_issue_iocb |
3817 | * @phba: Pointer to HBA context object. | 3839 | * @phba: Pointer to HBA context object. |
3818 | * @pring: Pointer to driver SLI ring object. | 3840 | * @pring: Pointer to driver SLI ring object. |
3819 | * @piocb: Pointer to command iocb. | 3841 | * @piocb: Pointer to command iocb. |
@@ -3840,7 +3862,7 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
3840 | } | 3862 | } |
3841 | 3863 | ||
3842 | /** | 3864 | /** |
3843 | * lpfc_extra_ring_setup: Extra ring setup function. | 3865 | * lpfc_extra_ring_setup - Extra ring setup function |
3844 | * @phba: Pointer to HBA context object. | 3866 | * @phba: Pointer to HBA context object. |
3845 | * | 3867 | * |
3846 | * This function is called while driver attaches with the | 3868 | * This function is called while driver attaches with the |
@@ -3886,7 +3908,7 @@ lpfc_extra_ring_setup( struct lpfc_hba *phba) | |||
3886 | } | 3908 | } |
3887 | 3909 | ||
3888 | /** | 3910 | /** |
3889 | * lpfc_sli_async_event_handler: ASYNC iocb handler function. | 3911 | * lpfc_sli_async_event_handler - ASYNC iocb handler function |
3890 | * @phba: Pointer to HBA context object. | 3912 | * @phba: Pointer to HBA context object. |
3891 | * @pring: Pointer to driver SLI ring object. | 3913 | * @pring: Pointer to driver SLI ring object. |
3892 | * @iocbq: Pointer to iocb object. | 3914 | * @iocbq: Pointer to iocb object. |
@@ -3907,6 +3929,7 @@ lpfc_sli_async_event_handler(struct lpfc_hba * phba, | |||
3907 | uint16_t temp; | 3929 | uint16_t temp; |
3908 | struct temp_event temp_event_data; | 3930 | struct temp_event temp_event_data; |
3909 | struct Scsi_Host *shost; | 3931 | struct Scsi_Host *shost; |
3932 | uint32_t *iocb_w; | ||
3910 | 3933 | ||
3911 | icmd = &iocbq->iocb; | 3934 | icmd = &iocbq->iocb; |
3912 | evt_code = icmd->un.asyncstat.evt_code; | 3935 | evt_code = icmd->un.asyncstat.evt_code; |
@@ -3914,13 +3937,23 @@ lpfc_sli_async_event_handler(struct lpfc_hba * phba, | |||
3914 | 3937 | ||
3915 | if ((evt_code != ASYNC_TEMP_WARN) && | 3938 | if ((evt_code != ASYNC_TEMP_WARN) && |
3916 | (evt_code != ASYNC_TEMP_SAFE)) { | 3939 | (evt_code != ASYNC_TEMP_SAFE)) { |
3940 | iocb_w = (uint32_t *) icmd; | ||
3917 | lpfc_printf_log(phba, | 3941 | lpfc_printf_log(phba, |
3918 | KERN_ERR, | 3942 | KERN_ERR, |
3919 | LOG_SLI, | 3943 | LOG_SLI, |
3920 | "0346 Ring %d handler: unexpected ASYNC_STATUS" | 3944 | "0346 Ring %d handler: unexpected ASYNC_STATUS" |
3921 | " evt_code 0x%x\n", | 3945 | " evt_code 0x%x \n" |
3946 | "W0 0x%08x W1 0x%08x W2 0x%08x W3 0x%08x\n" | ||
3947 | "W4 0x%08x W5 0x%08x W6 0x%08x W7 0x%08x\n" | ||
3948 | "W8 0x%08x W9 0x%08x W10 0x%08x W11 0x%08x\n" | ||
3949 | "W12 0x%08x W13 0x%08x W14 0x%08x W15 0x%08x\n", | ||
3922 | pring->ringno, | 3950 | pring->ringno, |
3923 | icmd->un.asyncstat.evt_code); | 3951 | icmd->un.asyncstat.evt_code, |
3952 | iocb_w[0], iocb_w[1], iocb_w[2], iocb_w[3], | ||
3953 | iocb_w[4], iocb_w[5], iocb_w[6], iocb_w[7], | ||
3954 | iocb_w[8], iocb_w[9], iocb_w[10], iocb_w[11], | ||
3955 | iocb_w[12], iocb_w[13], iocb_w[14], iocb_w[15]); | ||
3956 | |||
3924 | return; | 3957 | return; |
3925 | } | 3958 | } |
3926 | temp_event_data.data = (uint32_t)temp; | 3959 | temp_event_data.data = (uint32_t)temp; |
@@ -3954,7 +3987,7 @@ lpfc_sli_async_event_handler(struct lpfc_hba * phba, | |||
3954 | 3987 | ||
3955 | 3988 | ||
3956 | /** | 3989 | /** |
3957 | * lpfc_sli_setup: SLI ring setup function. | 3990 | * lpfc_sli_setup - SLI ring setup function |
3958 | * @phba: Pointer to HBA context object. | 3991 | * @phba: Pointer to HBA context object. |
3959 | * | 3992 | * |
3960 | * lpfc_sli_setup sets up rings of the SLI interface with | 3993 | * lpfc_sli_setup sets up rings of the SLI interface with |
@@ -4076,7 +4109,7 @@ lpfc_sli_setup(struct lpfc_hba *phba) | |||
4076 | } | 4109 | } |
4077 | 4110 | ||
4078 | /** | 4111 | /** |
4079 | * lpfc_sli_queue_setup: Queue initialization function. | 4112 | * lpfc_sli_queue_setup - Queue initialization function |
4080 | * @phba: Pointer to HBA context object. | 4113 | * @phba: Pointer to HBA context object. |
4081 | * | 4114 | * |
4082 | * lpfc_sli_queue_setup sets up mailbox queues and iocb queues for each | 4115 | * lpfc_sli_queue_setup sets up mailbox queues and iocb queues for each |
@@ -4115,7 +4148,7 @@ lpfc_sli_queue_setup(struct lpfc_hba *phba) | |||
4115 | } | 4148 | } |
4116 | 4149 | ||
4117 | /** | 4150 | /** |
4118 | * lpfc_sli_host_down: Vport cleanup function. | 4151 | * lpfc_sli_host_down - Vport cleanup function |
4119 | * @vport: Pointer to virtual port object. | 4152 | * @vport: Pointer to virtual port object. |
4120 | * | 4153 | * |
4121 | * lpfc_sli_host_down is called to clean up the resources | 4154 | * lpfc_sli_host_down is called to clean up the resources |
@@ -4179,22 +4212,14 @@ lpfc_sli_host_down(struct lpfc_vport *vport) | |||
4179 | 4212 | ||
4180 | spin_unlock_irqrestore(&phba->hbalock, flags); | 4213 | spin_unlock_irqrestore(&phba->hbalock, flags); |
4181 | 4214 | ||
4182 | while (!list_empty(&completions)) { | 4215 | /* Cancel all the IOCBs from the completions list */ |
4183 | list_remove_head(&completions, iocb, struct lpfc_iocbq, list); | 4216 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
4184 | 4217 | IOERR_SLI_DOWN); | |
4185 | if (!iocb->iocb_cmpl) | ||
4186 | lpfc_sli_release_iocbq(phba, iocb); | ||
4187 | else { | ||
4188 | iocb->iocb.ulpStatus = IOSTAT_LOCAL_REJECT; | ||
4189 | iocb->iocb.un.ulpWord[4] = IOERR_SLI_DOWN; | ||
4190 | (iocb->iocb_cmpl) (phba, iocb, iocb); | ||
4191 | } | ||
4192 | } | ||
4193 | return 1; | 4218 | return 1; |
4194 | } | 4219 | } |
4195 | 4220 | ||
4196 | /** | 4221 | /** |
4197 | * lpfc_sli_hba_down: Resource cleanup function for the HBA. | 4222 | * lpfc_sli_hba_down - Resource cleanup function for the HBA |
4198 | * @phba: Pointer to HBA context object. | 4223 | * @phba: Pointer to HBA context object. |
4199 | * | 4224 | * |
4200 | * This function cleans up all iocb, buffers, mailbox commands | 4225 | * This function cleans up all iocb, buffers, mailbox commands |
@@ -4216,8 +4241,6 @@ lpfc_sli_hba_down(struct lpfc_hba *phba) | |||
4216 | struct lpfc_sli_ring *pring; | 4241 | struct lpfc_sli_ring *pring; |
4217 | struct lpfc_dmabuf *buf_ptr; | 4242 | struct lpfc_dmabuf *buf_ptr; |
4218 | LPFC_MBOXQ_t *pmb; | 4243 | LPFC_MBOXQ_t *pmb; |
4219 | struct lpfc_iocbq *iocb; | ||
4220 | IOCB_t *cmd = NULL; | ||
4221 | int i; | 4244 | int i; |
4222 | unsigned long flags = 0; | 4245 | unsigned long flags = 0; |
4223 | 4246 | ||
@@ -4245,18 +4268,9 @@ lpfc_sli_hba_down(struct lpfc_hba *phba) | |||
4245 | } | 4268 | } |
4246 | spin_unlock_irqrestore(&phba->hbalock, flags); | 4269 | spin_unlock_irqrestore(&phba->hbalock, flags); |
4247 | 4270 | ||
4248 | while (!list_empty(&completions)) { | 4271 | /* Cancel all the IOCBs from the completions list */ |
4249 | list_remove_head(&completions, iocb, struct lpfc_iocbq, list); | 4272 | lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT, |
4250 | cmd = &iocb->iocb; | 4273 | IOERR_SLI_DOWN); |
4251 | |||
4252 | if (!iocb->iocb_cmpl) | ||
4253 | lpfc_sli_release_iocbq(phba, iocb); | ||
4254 | else { | ||
4255 | cmd->ulpStatus = IOSTAT_LOCAL_REJECT; | ||
4256 | cmd->un.ulpWord[4] = IOERR_SLI_DOWN; | ||
4257 | (iocb->iocb_cmpl) (phba, iocb, iocb); | ||
4258 | } | ||
4259 | } | ||
4260 | 4274 | ||
4261 | spin_lock_irqsave(&phba->hbalock, flags); | 4275 | spin_lock_irqsave(&phba->hbalock, flags); |
4262 | list_splice_init(&phba->elsbuf, &completions); | 4276 | list_splice_init(&phba->elsbuf, &completions); |
@@ -4299,7 +4313,7 @@ lpfc_sli_hba_down(struct lpfc_hba *phba) | |||
4299 | } | 4313 | } |
4300 | 4314 | ||
4301 | /** | 4315 | /** |
4302 | * lpfc_sli_pcimem_bcopy: SLI memory copy function. | 4316 | * lpfc_sli_pcimem_bcopy - SLI memory copy function |
4303 | * @srcp: Source memory pointer. | 4317 | * @srcp: Source memory pointer. |
4304 | * @destp: Destination memory pointer. | 4318 | * @destp: Destination memory pointer. |
4305 | * @cnt: Number of words required to be copied. | 4319 | * @cnt: Number of words required to be copied. |
@@ -4329,7 +4343,7 @@ lpfc_sli_pcimem_bcopy(void *srcp, void *destp, uint32_t cnt) | |||
4329 | 4343 | ||
4330 | 4344 | ||
4331 | /** | 4345 | /** |
4332 | * lpfc_sli_ringpostbuf_put: Function to add a buffer to postbufq. | 4346 | * lpfc_sli_ringpostbuf_put - Function to add a buffer to postbufq |
4333 | * @phba: Pointer to HBA context object. | 4347 | * @phba: Pointer to HBA context object. |
4334 | * @pring: Pointer to driver SLI ring object. | 4348 | * @pring: Pointer to driver SLI ring object. |
4335 | * @mp: Pointer to driver buffer object. | 4349 | * @mp: Pointer to driver buffer object. |
@@ -4352,8 +4366,7 @@ lpfc_sli_ringpostbuf_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
4352 | } | 4366 | } |
4353 | 4367 | ||
4354 | /** | 4368 | /** |
4355 | * lpfc_sli_get_buffer_tag: Tag allocation function for a buffer posted | 4369 | * lpfc_sli_get_buffer_tag - allocates a tag for a CMD_QUE_XRI64_CX buffer |
4356 | * using CMD_QUE_XRI64_CX iocb. | ||
4357 | * @phba: Pointer to HBA context object. | 4370 | * @phba: Pointer to HBA context object. |
4358 | * | 4371 | * |
4359 | * When HBQ is enabled, buffers are searched based on tags. This function | 4372 | * When HBQ is enabled, buffers are searched based on tags. This function |
@@ -4378,8 +4391,7 @@ lpfc_sli_get_buffer_tag(struct lpfc_hba *phba) | |||
4378 | } | 4391 | } |
4379 | 4392 | ||
4380 | /** | 4393 | /** |
4381 | * lpfc_sli_ring_taggedbuf_get: Search HBQ buffer associated with | 4394 | * lpfc_sli_ring_taggedbuf_get - find HBQ buffer associated with given tag |
4382 | * posted using CMD_QUE_XRI64_CX iocb. | ||
4383 | * @phba: Pointer to HBA context object. | 4395 | * @phba: Pointer to HBA context object. |
4384 | * @pring: Pointer to driver SLI ring object. | 4396 | * @pring: Pointer to driver SLI ring object. |
4385 | * @tag: Buffer tag. | 4397 | * @tag: Buffer tag. |
@@ -4422,8 +4434,7 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
4422 | } | 4434 | } |
4423 | 4435 | ||
4424 | /** | 4436 | /** |
4425 | * lpfc_sli_ringpostbuf_get: SLI2 buffer search function for | 4437 | * lpfc_sli_ringpostbuf_get - search buffers for unsolicited CT and ELS events |
4426 | * unsolicited ct and els events. | ||
4427 | * @phba: Pointer to HBA context object. | 4438 | * @phba: Pointer to HBA context object. |
4428 | * @pring: Pointer to driver SLI ring object. | 4439 | * @pring: Pointer to driver SLI ring object. |
4429 | * @phys: DMA address of the buffer. | 4440 | * @phys: DMA address of the buffer. |
@@ -4466,7 +4477,7 @@ lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, | |||
4466 | } | 4477 | } |
4467 | 4478 | ||
4468 | /** | 4479 | /** |
4469 | * lpfc_sli_abort_els_cmpl: Completion handler for the els abort iocbs. | 4480 | * lpfc_sli_abort_els_cmpl - Completion handler for the els abort iocbs |
4470 | * @phba: Pointer to HBA context object. | 4481 | * @phba: Pointer to HBA context object. |
4471 | * @cmdiocb: Pointer to driver command iocb object. | 4482 | * @cmdiocb: Pointer to driver command iocb object. |
4472 | * @rspiocb: Pointer to driver response iocb object. | 4483 | * @rspiocb: Pointer to driver response iocb object. |
@@ -4542,7 +4553,7 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
4542 | } | 4553 | } |
4543 | 4554 | ||
4544 | /** | 4555 | /** |
4545 | * lpfc_ignore_els_cmpl: Completion handler for aborted ELS command. | 4556 | * lpfc_ignore_els_cmpl - Completion handler for aborted ELS command |
4546 | * @phba: Pointer to HBA context object. | 4557 | * @phba: Pointer to HBA context object. |
4547 | * @cmdiocb: Pointer to driver command iocb object. | 4558 | * @cmdiocb: Pointer to driver command iocb object. |
4548 | * @rspiocb: Pointer to driver response iocb object. | 4559 | * @rspiocb: Pointer to driver response iocb object. |
@@ -4572,7 +4583,7 @@ lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
4572 | } | 4583 | } |
4573 | 4584 | ||
4574 | /** | 4585 | /** |
4575 | * lpfc_sli_issue_abort_iotag: Abort function for a command iocb. | 4586 | * lpfc_sli_issue_abort_iotag - Abort function for a command iocb |
4576 | * @phba: Pointer to HBA context object. | 4587 | * @phba: Pointer to HBA context object. |
4577 | * @pring: Pointer to driver SLI ring object. | 4588 | * @pring: Pointer to driver SLI ring object. |
4578 | * @cmdiocb: Pointer to driver command iocb object. | 4589 | * @cmdiocb: Pointer to driver command iocb object. |
@@ -4658,15 +4669,14 @@ abort_iotag_exit: | |||
4658 | } | 4669 | } |
4659 | 4670 | ||
4660 | /** | 4671 | /** |
4661 | * lpfc_sli_validate_fcp_iocb: Filtering function, used to find commands | 4672 | * lpfc_sli_validate_fcp_iocb - find commands associated with a vport or LUN |
4662 | * associated with a vport/SCSI target/lun. | ||
4663 | * @iocbq: Pointer to driver iocb object. | 4673 | * @iocbq: Pointer to driver iocb object. |
4664 | * @vport: Pointer to driver virtual port object. | 4674 | * @vport: Pointer to driver virtual port object. |
4665 | * @tgt_id: SCSI ID of the target. | 4675 | * @tgt_id: SCSI ID of the target. |
4666 | * @lun_id: LUN ID of the scsi device. | 4676 | * @lun_id: LUN ID of the scsi device. |
4667 | * @ctx_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST | 4677 | * @ctx_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST |
4668 | * | 4678 | * |
4669 | * This function acts as iocb filter for functions which abort or count | 4679 | * This function acts as an iocb filter for functions which abort or count |
4670 | * all FCP iocbs pending on a lun/SCSI target/SCSI host. It will return | 4680 | * all FCP iocbs pending on a lun/SCSI target/SCSI host. It will return |
4671 | * 0 if the filtering criteria is met for the given iocb and will return | 4681 | * 0 if the filtering criteria is met for the given iocb and will return |
4672 | * 1 if the filtering criteria is not met. | 4682 | * 1 if the filtering criteria is not met. |
@@ -4724,7 +4734,7 @@ lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport, | |||
4724 | } | 4734 | } |
4725 | 4735 | ||
4726 | /** | 4736 | /** |
4727 | * lpfc_sli_sum_iocb: Function to count the number of FCP iocbs pending. | 4737 | * lpfc_sli_sum_iocb - Function to count the number of FCP iocbs pending |
4728 | * @vport: Pointer to virtual port. | 4738 | * @vport: Pointer to virtual port. |
4729 | * @tgt_id: SCSI ID of the target. | 4739 | * @tgt_id: SCSI ID of the target. |
4730 | * @lun_id: LUN ID of the scsi device. | 4740 | * @lun_id: LUN ID of the scsi device. |
@@ -4762,8 +4772,7 @@ lpfc_sli_sum_iocb(struct lpfc_vport *vport, uint16_t tgt_id, uint64_t lun_id, | |||
4762 | } | 4772 | } |
4763 | 4773 | ||
4764 | /** | 4774 | /** |
4765 | * lpfc_sli_abort_fcp_cmpl: Completion handler function for an aborted | 4775 | * lpfc_sli_abort_fcp_cmpl - Completion handler function for aborted FCP IOCBs |
4766 | * FCP iocb. | ||
4767 | * @phba: Pointer to HBA context object | 4776 | * @phba: Pointer to HBA context object |
4768 | * @cmdiocb: Pointer to command iocb object. | 4777 | * @cmdiocb: Pointer to command iocb object. |
4769 | * @rspiocb: Pointer to response iocb object. | 4778 | * @rspiocb: Pointer to response iocb object. |
@@ -4781,8 +4790,7 @@ lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
4781 | } | 4790 | } |
4782 | 4791 | ||
4783 | /** | 4792 | /** |
4784 | * lpfc_sli_abort_iocb: This function issue abort for all SCSI commands | 4793 | * lpfc_sli_abort_iocb - issue abort for all commands on a host/target/LUN |
4785 | * pending on a SCSI host(vport)/target/lun. | ||
4786 | * @vport: Pointer to virtual port. | 4794 | * @vport: Pointer to virtual port. |
4787 | * @pring: Pointer to driver SLI ring object. | 4795 | * @pring: Pointer to driver SLI ring object. |
4788 | * @tgt_id: SCSI ID of the target. | 4796 | * @tgt_id: SCSI ID of the target. |
@@ -4854,8 +4862,7 @@ lpfc_sli_abort_iocb(struct lpfc_vport *vport, struct lpfc_sli_ring *pring, | |||
4854 | } | 4862 | } |
4855 | 4863 | ||
4856 | /** | 4864 | /** |
4857 | * lpfc_sli_wake_iocb_wait: iocb completion handler for iocb issued using | 4865 | * lpfc_sli_wake_iocb_wait - lpfc_sli_issue_iocb_wait's completion handler |
4858 | * lpfc_sli_issue_iocb_wait. | ||
4859 | * @phba: Pointer to HBA context object. | 4866 | * @phba: Pointer to HBA context object. |
4860 | * @cmdiocbq: Pointer to command iocb. | 4867 | * @cmdiocbq: Pointer to command iocb. |
4861 | * @rspiocbq: Pointer to response iocb. | 4868 | * @rspiocbq: Pointer to response iocb. |
@@ -4893,7 +4900,7 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba, | |||
4893 | } | 4900 | } |
4894 | 4901 | ||
4895 | /** | 4902 | /** |
4896 | * lpfc_sli_issue_iocb_wait: Synchronous function to issue iocb commands. | 4903 | * lpfc_sli_issue_iocb_wait - Synchronous function to issue iocb commands |
4897 | * @phba: Pointer to HBA context object.. | 4904 | * @phba: Pointer to HBA context object.. |
4898 | * @pring: Pointer to sli ring. | 4905 | * @pring: Pointer to sli ring. |
4899 | * @piocb: Pointer to command iocb. | 4906 | * @piocb: Pointer to command iocb. |
@@ -5000,7 +5007,7 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba, | |||
5000 | } | 5007 | } |
5001 | 5008 | ||
5002 | /** | 5009 | /** |
5003 | * lpfc_sli_issue_mbox_wait: Synchronous function to issue mailbox. | 5010 | * lpfc_sli_issue_mbox_wait - Synchronous function to issue mailbox |
5004 | * @phba: Pointer to HBA context object. | 5011 | * @phba: Pointer to HBA context object. |
5005 | * @pmboxq: Pointer to driver mailbox object. | 5012 | * @pmboxq: Pointer to driver mailbox object. |
5006 | * @timeout: Timeout in number of seconds. | 5013 | * @timeout: Timeout in number of seconds. |
@@ -5070,7 +5077,7 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq, | |||
5070 | } | 5077 | } |
5071 | 5078 | ||
5072 | /** | 5079 | /** |
5073 | * lpfc_sli_flush_mbox_queue: mailbox queue cleanup function. | 5080 | * lpfc_sli_flush_mbox_queue - mailbox queue cleanup function |
5074 | * @phba: Pointer to HBA context. | 5081 | * @phba: Pointer to HBA context. |
5075 | * | 5082 | * |
5076 | * This function is called to cleanup any pending mailbox | 5083 | * This function is called to cleanup any pending mailbox |
@@ -5113,7 +5120,7 @@ lpfc_sli_flush_mbox_queue(struct lpfc_hba * phba) | |||
5113 | } | 5120 | } |
5114 | 5121 | ||
5115 | /** | 5122 | /** |
5116 | * lpfc_sli_check_eratt: check error attention events | 5123 | * lpfc_sli_check_eratt - check error attention events |
5117 | * @phba: Pointer to HBA context. | 5124 | * @phba: Pointer to HBA context. |
5118 | * | 5125 | * |
5119 | * This function is called form timer soft interrupt context to check HBA's | 5126 | * This function is called form timer soft interrupt context to check HBA's |
@@ -5145,11 +5152,31 @@ lpfc_sli_check_eratt(struct lpfc_hba *phba) | |||
5145 | return 0; | 5152 | return 0; |
5146 | } | 5153 | } |
5147 | 5154 | ||
5155 | /* | ||
5156 | * If there is deferred error attention, do not check for error | ||
5157 | * attention | ||
5158 | */ | ||
5159 | if (unlikely(phba->hba_flag & DEFER_ERATT)) { | ||
5160 | spin_unlock_irq(&phba->hbalock); | ||
5161 | return 0; | ||
5162 | } | ||
5163 | |||
5148 | /* Read chip Host Attention (HA) register */ | 5164 | /* Read chip Host Attention (HA) register */ |
5149 | ha_copy = readl(phba->HAregaddr); | 5165 | ha_copy = readl(phba->HAregaddr); |
5150 | if (ha_copy & HA_ERATT) { | 5166 | if (ha_copy & HA_ERATT) { |
5151 | /* Read host status register to retrieve error event */ | 5167 | /* Read host status register to retrieve error event */ |
5152 | lpfc_sli_read_hs(phba); | 5168 | lpfc_sli_read_hs(phba); |
5169 | |||
5170 | /* Check if there is a deferred error condition is active */ | ||
5171 | if ((HS_FFER1 & phba->work_hs) && | ||
5172 | ((HS_FFER2 | HS_FFER3 | HS_FFER4 | HS_FFER5 | | ||
5173 | HS_FFER6 | HS_FFER7) & phba->work_hs)) { | ||
5174 | phba->hba_flag |= DEFER_ERATT; | ||
5175 | /* Clear all interrupt enable conditions */ | ||
5176 | writel(0, phba->HCregaddr); | ||
5177 | readl(phba->HCregaddr); | ||
5178 | } | ||
5179 | |||
5153 | /* Set the driver HA work bitmap */ | 5180 | /* Set the driver HA work bitmap */ |
5154 | phba->work_ha |= HA_ERATT; | 5181 | phba->work_ha |= HA_ERATT; |
5155 | /* Indicate polling handles this ERATT */ | 5182 | /* Indicate polling handles this ERATT */ |
@@ -5162,7 +5189,7 @@ lpfc_sli_check_eratt(struct lpfc_hba *phba) | |||
5162 | } | 5189 | } |
5163 | 5190 | ||
5164 | /** | 5191 | /** |
5165 | * lpfc_sp_intr_handler: The slow-path interrupt handler of lpfc driver. | 5192 | * lpfc_sp_intr_handler - The slow-path interrupt handler of lpfc driver |
5166 | * @irq: Interrupt number. | 5193 | * @irq: Interrupt number. |
5167 | * @dev_id: The device context pointer. | 5194 | * @dev_id: The device context pointer. |
5168 | * | 5195 | * |
@@ -5238,6 +5265,16 @@ lpfc_sp_intr_handler(int irq, void *dev_id) | |||
5238 | /* Indicate interrupt handler handles ERATT */ | 5265 | /* Indicate interrupt handler handles ERATT */ |
5239 | phba->hba_flag |= HBA_ERATT_HANDLED; | 5266 | phba->hba_flag |= HBA_ERATT_HANDLED; |
5240 | } | 5267 | } |
5268 | |||
5269 | /* | ||
5270 | * If there is deferred error attention, do not check for any | ||
5271 | * interrupt. | ||
5272 | */ | ||
5273 | if (unlikely(phba->hba_flag & DEFER_ERATT)) { | ||
5274 | spin_unlock_irq(&phba->hbalock); | ||
5275 | return IRQ_NONE; | ||
5276 | } | ||
5277 | |||
5241 | /* Clear up only attention source related to slow-path */ | 5278 | /* Clear up only attention source related to slow-path */ |
5242 | writel((ha_copy & (HA_MBATT | HA_R2_CLR_MSK)), | 5279 | writel((ha_copy & (HA_MBATT | HA_R2_CLR_MSK)), |
5243 | phba->HAregaddr); | 5280 | phba->HAregaddr); |
@@ -5309,8 +5346,22 @@ lpfc_sp_intr_handler(int irq, void *dev_id) | |||
5309 | } | 5346 | } |
5310 | } | 5347 | } |
5311 | spin_lock_irqsave(&phba->hbalock, iflag); | 5348 | spin_lock_irqsave(&phba->hbalock, iflag); |
5312 | if (work_ha_copy & HA_ERATT) | 5349 | if (work_ha_copy & HA_ERATT) { |
5313 | lpfc_sli_read_hs(phba); | 5350 | lpfc_sli_read_hs(phba); |
5351 | /* | ||
5352 | * Check if there is a deferred error condition | ||
5353 | * is active | ||
5354 | */ | ||
5355 | if ((HS_FFER1 & phba->work_hs) && | ||
5356 | ((HS_FFER2 | HS_FFER3 | HS_FFER4 | HS_FFER5 | | ||
5357 | HS_FFER6 | HS_FFER7) & phba->work_hs)) { | ||
5358 | phba->hba_flag |= DEFER_ERATT; | ||
5359 | /* Clear all interrupt enable conditions */ | ||
5360 | writel(0, phba->HCregaddr); | ||
5361 | readl(phba->HCregaddr); | ||
5362 | } | ||
5363 | } | ||
5364 | |||
5314 | if ((work_ha_copy & HA_MBATT) && (phba->sli.mbox_active)) { | 5365 | if ((work_ha_copy & HA_MBATT) && (phba->sli.mbox_active)) { |
5315 | pmb = phba->sli.mbox_active; | 5366 | pmb = phba->sli.mbox_active; |
5316 | pmbox = &pmb->mb; | 5367 | pmbox = &pmb->mb; |
@@ -5423,7 +5474,7 @@ send_current_mbox: | |||
5423 | } /* lpfc_sp_intr_handler */ | 5474 | } /* lpfc_sp_intr_handler */ |
5424 | 5475 | ||
5425 | /** | 5476 | /** |
5426 | * lpfc_fp_intr_handler: The fast-path interrupt handler of lpfc driver. | 5477 | * lpfc_fp_intr_handler - The fast-path interrupt handler of lpfc driver |
5427 | * @irq: Interrupt number. | 5478 | * @irq: Interrupt number. |
5428 | * @dev_id: The device context pointer. | 5479 | * @dev_id: The device context pointer. |
5429 | * | 5480 | * |
@@ -5474,6 +5525,14 @@ lpfc_fp_intr_handler(int irq, void *dev_id) | |||
5474 | ha_copy = readl(phba->HAregaddr); | 5525 | ha_copy = readl(phba->HAregaddr); |
5475 | /* Clear up only attention source related to fast-path */ | 5526 | /* Clear up only attention source related to fast-path */ |
5476 | spin_lock_irqsave(&phba->hbalock, iflag); | 5527 | spin_lock_irqsave(&phba->hbalock, iflag); |
5528 | /* | ||
5529 | * If there is deferred error attention, do not check for | ||
5530 | * any interrupt. | ||
5531 | */ | ||
5532 | if (unlikely(phba->hba_flag & DEFER_ERATT)) { | ||
5533 | spin_unlock_irq(&phba->hbalock); | ||
5534 | return IRQ_NONE; | ||
5535 | } | ||
5477 | writel((ha_copy & (HA_R0_CLR_MSK | HA_R1_CLR_MSK)), | 5536 | writel((ha_copy & (HA_R0_CLR_MSK | HA_R1_CLR_MSK)), |
5478 | phba->HAregaddr); | 5537 | phba->HAregaddr); |
5479 | readl(phba->HAregaddr); /* flush */ | 5538 | readl(phba->HAregaddr); /* flush */ |
@@ -5510,7 +5569,7 @@ lpfc_fp_intr_handler(int irq, void *dev_id) | |||
5510 | } /* lpfc_fp_intr_handler */ | 5569 | } /* lpfc_fp_intr_handler */ |
5511 | 5570 | ||
5512 | /** | 5571 | /** |
5513 | * lpfc_intr_handler: The device-level interrupt handler of lpfc driver. | 5572 | * lpfc_intr_handler - The device-level interrupt handler of lpfc driver |
5514 | * @irq: Interrupt number. | 5573 | * @irq: Interrupt number. |
5515 | * @dev_id: The device context pointer. | 5574 | * @dev_id: The device context pointer. |
5516 | * | 5575 | * |
@@ -5566,6 +5625,14 @@ lpfc_intr_handler(int irq, void *dev_id) | |||
5566 | phba->hba_flag |= HBA_ERATT_HANDLED; | 5625 | phba->hba_flag |= HBA_ERATT_HANDLED; |
5567 | } | 5626 | } |
5568 | 5627 | ||
5628 | /* | ||
5629 | * If there is deferred error attention, do not check for any interrupt. | ||
5630 | */ | ||
5631 | if (unlikely(phba->hba_flag & DEFER_ERATT)) { | ||
5632 | spin_unlock_irq(&phba->hbalock); | ||
5633 | return IRQ_NONE; | ||
5634 | } | ||
5635 | |||
5569 | /* Clear attention sources except link and error attentions */ | 5636 | /* Clear attention sources except link and error attentions */ |
5570 | writel((phba->ha_copy & ~(HA_LATT | HA_ERATT)), phba->HAregaddr); | 5637 | writel((phba->ha_copy & ~(HA_LATT | HA_ERATT)), phba->HAregaddr); |
5571 | readl(phba->HAregaddr); /* flush */ | 5638 | readl(phba->HAregaddr); /* flush */ |
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h index 7e32e95c539..e599519e307 100644 --- a/drivers/scsi/lpfc/lpfc_version.h +++ b/drivers/scsi/lpfc/lpfc_version.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************* | 1 | /******************************************************************* |
2 | * This file is part of the Emulex Linux Device Driver for * | 2 | * This file is part of the Emulex Linux Device Driver for * |
3 | * Fibre Channel Host Bus Adapters. * | 3 | * Fibre Channel Host Bus Adapters. * |
4 | * Copyright (C) 2004-2008 Emulex. All rights reserved. * | 4 | * Copyright (C) 2004-2009 Emulex. All rights reserved. * |
5 | * EMULEX and SLI are trademarks of Emulex. * | 5 | * EMULEX and SLI are trademarks of Emulex. * |
6 | * www.emulex.com * | 6 | * www.emulex.com * |
7 | * * | 7 | * * |
@@ -18,7 +18,7 @@ | |||
18 | * included with this package. * | 18 | * included with this package. * |
19 | *******************************************************************/ | 19 | *******************************************************************/ |
20 | 20 | ||
21 | #define LPFC_DRIVER_VERSION "8.3.0" | 21 | #define LPFC_DRIVER_VERSION "8.3.1" |
22 | 22 | ||
23 | #define LPFC_DRIVER_NAME "lpfc" | 23 | #define LPFC_DRIVER_NAME "lpfc" |
24 | #define LPFC_SP_DRIVER_HANDLER_NAME "lpfc:sp" | 24 | #define LPFC_SP_DRIVER_HANDLER_NAME "lpfc:sp" |
@@ -26,4 +26,4 @@ | |||
26 | 26 | ||
27 | #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \ | 27 | #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \ |
28 | LPFC_DRIVER_VERSION | 28 | LPFC_DRIVER_VERSION |
29 | #define LPFC_COPYRIGHT "Copyright(c) 2004-2008 Emulex. All rights reserved." | 29 | #define LPFC_COPYRIGHT "Copyright(c) 2004-2009 Emulex. All rights reserved." |
diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c index 63b54c66756..917ad56b0af 100644 --- a/drivers/scsi/lpfc/lpfc_vport.c +++ b/drivers/scsi/lpfc/lpfc_vport.c | |||
@@ -206,7 +206,7 @@ lpfc_unique_wwpn(struct lpfc_hba *phba, struct lpfc_vport *new_vport) | |||
206 | } | 206 | } |
207 | 207 | ||
208 | /** | 208 | /** |
209 | * lpfc_discovery_wait: Wait for driver discovery to quiesce. | 209 | * lpfc_discovery_wait - Wait for driver discovery to quiesce |
210 | * @vport: The virtual port for which this call is being executed. | 210 | * @vport: The virtual port for which this call is being executed. |
211 | * | 211 | * |
212 | * This driver calls this routine specifically from lpfc_vport_delete | 212 | * This driver calls this routine specifically from lpfc_vport_delete |
@@ -741,7 +741,7 @@ lpfc_destroy_vport_work_array(struct lpfc_hba *phba, struct lpfc_vport **vports) | |||
741 | 741 | ||
742 | 742 | ||
743 | /** | 743 | /** |
744 | * lpfc_vport_reset_stat_data: Reset the statistical data for the vport. | 744 | * lpfc_vport_reset_stat_data - Reset the statistical data for the vport |
745 | * @vport: Pointer to vport object. | 745 | * @vport: Pointer to vport object. |
746 | * | 746 | * |
747 | * This function resets the statistical data for the vport. This function | 747 | * This function resets the statistical data for the vport. This function |
@@ -763,8 +763,7 @@ lpfc_vport_reset_stat_data(struct lpfc_vport *vport) | |||
763 | 763 | ||
764 | 764 | ||
765 | /** | 765 | /** |
766 | * lpfc_alloc_bucket: Allocate data buffer required for collecting | 766 | * lpfc_alloc_bucket - Allocate data buffer required for statistical data |
767 | * statistical data. | ||
768 | * @vport: Pointer to vport object. | 767 | * @vport: Pointer to vport object. |
769 | * | 768 | * |
770 | * This function allocates data buffer required for all the FC | 769 | * This function allocates data buffer required for all the FC |
@@ -797,8 +796,7 @@ lpfc_alloc_bucket(struct lpfc_vport *vport) | |||
797 | } | 796 | } |
798 | 797 | ||
799 | /** | 798 | /** |
800 | * lpfc_free_bucket: Free data buffer required for collecting | 799 | * lpfc_free_bucket - Free data buffer required for statistical data |
801 | * statistical data. | ||
802 | * @vport: Pointer to vport object. | 800 | * @vport: Pointer to vport object. |
803 | * | 801 | * |
804 | * Th function frees statistical data buffer of all the FC | 802 | * Th function frees statistical data buffer of all the FC |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index a91f5143cea..f3da592f7bc 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -636,6 +636,14 @@ _base_unmask_interrupts(struct MPT2SAS_ADAPTER *ioc) | |||
636 | static irqreturn_t | 636 | static irqreturn_t |
637 | _base_interrupt(int irq, void *bus_id) | 637 | _base_interrupt(int irq, void *bus_id) |
638 | { | 638 | { |
639 | union reply_descriptor { | ||
640 | u64 word; | ||
641 | struct { | ||
642 | u32 low; | ||
643 | u32 high; | ||
644 | } u; | ||
645 | }; | ||
646 | union reply_descriptor rd; | ||
639 | u32 post_index, post_index_next, completed_cmds; | 647 | u32 post_index, post_index_next, completed_cmds; |
640 | u8 request_desript_type; | 648 | u8 request_desript_type; |
641 | u16 smid; | 649 | u16 smid; |
@@ -656,7 +664,8 @@ _base_interrupt(int irq, void *bus_id) | |||
656 | 664 | ||
657 | completed_cmds = 0; | 665 | completed_cmds = 0; |
658 | do { | 666 | do { |
659 | if (ioc->reply_post_free[post_index].Words == ~0ULL) | 667 | rd.word = ioc->reply_post_free[post_index].Words; |
668 | if (rd.u.low == UINT_MAX || rd.u.high == UINT_MAX) | ||
660 | goto out; | 669 | goto out; |
661 | reply = 0; | 670 | reply = 0; |
662 | cb_idx = 0xFF; | 671 | cb_idx = 0xFF; |
@@ -721,7 +730,7 @@ _base_interrupt(int irq, void *bus_id) | |||
721 | for (i = 0 ; i < completed_cmds; i++) { | 730 | for (i = 0 ; i < completed_cmds; i++) { |
722 | post_index = post_index_next; | 731 | post_index = post_index_next; |
723 | /* poison the reply post descriptor */ | 732 | /* poison the reply post descriptor */ |
724 | ioc->reply_post_free[post_index_next].Words = ~0ULL; | 733 | ioc->reply_post_free[post_index_next].Words = ULLONG_MAX; |
725 | post_index_next = (post_index == | 734 | post_index_next = (post_index == |
726 | (ioc->reply_post_queue_depth - 1)) | 735 | (ioc->reply_post_queue_depth - 1)) |
727 | ? 0 : post_index + 1; | 736 | ? 0 : post_index + 1; |
@@ -1387,6 +1396,64 @@ mpt2sas_base_put_smid_target_assist(struct MPT2SAS_ADAPTER *ioc, u16 smid, | |||
1387 | } | 1396 | } |
1388 | 1397 | ||
1389 | /** | 1398 | /** |
1399 | * _base_display_dell_branding - Disply branding string | ||
1400 | * @ioc: per adapter object | ||
1401 | * | ||
1402 | * Return nothing. | ||
1403 | */ | ||
1404 | static void | ||
1405 | _base_display_dell_branding(struct MPT2SAS_ADAPTER *ioc) | ||
1406 | { | ||
1407 | char dell_branding[MPT2SAS_DELL_BRANDING_SIZE]; | ||
1408 | |||
1409 | if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_DELL) | ||
1410 | return; | ||
1411 | |||
1412 | memset(dell_branding, 0, MPT2SAS_DELL_BRANDING_SIZE); | ||
1413 | switch (ioc->pdev->subsystem_device) { | ||
1414 | case MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID: | ||
1415 | strncpy(dell_branding, MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING, | ||
1416 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1417 | break; | ||
1418 | case MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID: | ||
1419 | strncpy(dell_branding, MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING, | ||
1420 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1421 | break; | ||
1422 | case MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID: | ||
1423 | strncpy(dell_branding, | ||
1424 | MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING, | ||
1425 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1426 | break; | ||
1427 | case MPT2SAS_DELL_PERC_H200_MODULAR_SSDID: | ||
1428 | strncpy(dell_branding, | ||
1429 | MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING, | ||
1430 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1431 | break; | ||
1432 | case MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID: | ||
1433 | strncpy(dell_branding, | ||
1434 | MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING, | ||
1435 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1436 | break; | ||
1437 | case MPT2SAS_DELL_PERC_H200_SSDID: | ||
1438 | strncpy(dell_branding, MPT2SAS_DELL_PERC_H200_BRANDING, | ||
1439 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1440 | break; | ||
1441 | case MPT2SAS_DELL_6GBPS_SAS_SSDID: | ||
1442 | strncpy(dell_branding, MPT2SAS_DELL_6GBPS_SAS_BRANDING, | ||
1443 | MPT2SAS_DELL_BRANDING_SIZE - 1); | ||
1444 | break; | ||
1445 | default: | ||
1446 | sprintf(dell_branding, "0x%4X", ioc->pdev->subsystem_device); | ||
1447 | break; | ||
1448 | } | ||
1449 | |||
1450 | printk(MPT2SAS_INFO_FMT "%s: Vendor(0x%04X), Device(0x%04X)," | ||
1451 | " SSVID(0x%04X), SSDID(0x%04X)\n", ioc->name, dell_branding, | ||
1452 | ioc->pdev->vendor, ioc->pdev->device, ioc->pdev->subsystem_vendor, | ||
1453 | ioc->pdev->subsystem_device); | ||
1454 | } | ||
1455 | |||
1456 | /** | ||
1390 | * _base_display_ioc_capabilities - Disply IOC's capabilities. | 1457 | * _base_display_ioc_capabilities - Disply IOC's capabilities. |
1391 | * @ioc: per adapter object | 1458 | * @ioc: per adapter object |
1392 | * | 1459 | * |
@@ -1427,6 +1494,8 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc) | |||
1427 | i++; | 1494 | i++; |
1428 | } | 1495 | } |
1429 | 1496 | ||
1497 | _base_display_dell_branding(ioc); | ||
1498 | |||
1430 | i = 0; | 1499 | i = 0; |
1431 | printk("), "); | 1500 | printk("), "); |
1432 | printk("Capabilities=("); | 1501 | printk("Capabilities=("); |
@@ -3068,7 +3137,7 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, | |||
3068 | 3137 | ||
3069 | /* initialize Reply Post Free Queue */ | 3138 | /* initialize Reply Post Free Queue */ |
3070 | for (i = 0; i < ioc->reply_post_queue_depth; i++) | 3139 | for (i = 0; i < ioc->reply_post_queue_depth; i++) |
3071 | ioc->reply_post_free[i].Words = ~0ULL; | 3140 | ioc->reply_post_free[i].Words = ULLONG_MAX; |
3072 | 3141 | ||
3073 | r = _base_send_ioc_init(ioc, VF_ID, sleep_flag); | 3142 | r = _base_send_ioc_init(ioc, VF_ID, sleep_flag); |
3074 | if (r) | 3143 | if (r) |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h index 6945ff4d382..babd4cc0cb2 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.h +++ b/drivers/scsi/mpt2sas/mpt2sas_base.h | |||
@@ -68,11 +68,11 @@ | |||
68 | #define MPT2SAS_DRIVER_NAME "mpt2sas" | 68 | #define MPT2SAS_DRIVER_NAME "mpt2sas" |
69 | #define MPT2SAS_AUTHOR "LSI Corporation <DL-MPTFusionLinux@lsi.com>" | 69 | #define MPT2SAS_AUTHOR "LSI Corporation <DL-MPTFusionLinux@lsi.com>" |
70 | #define MPT2SAS_DESCRIPTION "LSI MPT Fusion SAS 2.0 Device Driver" | 70 | #define MPT2SAS_DESCRIPTION "LSI MPT Fusion SAS 2.0 Device Driver" |
71 | #define MPT2SAS_DRIVER_VERSION "00.100.11.16" | 71 | #define MPT2SAS_DRIVER_VERSION "01.100.02.00" |
72 | #define MPT2SAS_MAJOR_VERSION 00 | 72 | #define MPT2SAS_MAJOR_VERSION 00 |
73 | #define MPT2SAS_MINOR_VERSION 100 | 73 | #define MPT2SAS_MINOR_VERSION 100 |
74 | #define MPT2SAS_BUILD_VERSION 11 | 74 | #define MPT2SAS_BUILD_VERSION 02 |
75 | #define MPT2SAS_RELEASE_VERSION 16 | 75 | #define MPT2SAS_RELEASE_VERSION 00 |
76 | 76 | ||
77 | /* | 77 | /* |
78 | * Set MPT2SAS_SG_DEPTH value based on user input. | 78 | * Set MPT2SAS_SG_DEPTH value based on user input. |
@@ -130,6 +130,30 @@ | |||
130 | #define MPT2SAS_ERR_FMT KERN_ERR MPT2SAS_FMT | 130 | #define MPT2SAS_ERR_FMT KERN_ERR MPT2SAS_FMT |
131 | 131 | ||
132 | /* | 132 | /* |
133 | * Dell HBA branding | ||
134 | */ | ||
135 | #define MPT2SAS_DELL_BRANDING_SIZE 32 | ||
136 | |||
137 | #define MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING "Dell 6Gbps SAS HBA" | ||
138 | #define MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING "Dell PERC H200 Adapter" | ||
139 | #define MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING "Dell PERC H200 Integrated" | ||
140 | #define MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING "Dell PERC H200 Modular" | ||
141 | #define MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING "Dell PERC H200 Embedded" | ||
142 | #define MPT2SAS_DELL_PERC_H200_BRANDING "Dell PERC H200" | ||
143 | #define MPT2SAS_DELL_6GBPS_SAS_BRANDING "Dell 6Gbps SAS" | ||
144 | |||
145 | /* | ||
146 | * Dell HBA SSDIDs | ||
147 | */ | ||
148 | #define MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID 0x1F1C | ||
149 | #define MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID 0x1F1D | ||
150 | #define MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID 0x1F1E | ||
151 | #define MPT2SAS_DELL_PERC_H200_MODULAR_SSDID 0x1F1F | ||
152 | #define MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID 0x1F20 | ||
153 | #define MPT2SAS_DELL_PERC_H200_SSDID 0x1F21 | ||
154 | #define MPT2SAS_DELL_6GBPS_SAS_SSDID 0x1F22 | ||
155 | |||
156 | /* | ||
133 | * per target private data | 157 | * per target private data |
134 | */ | 158 | */ |
135 | #define MPT_TARGET_FLAGS_RAID_COMPONENT 0x01 | 159 | #define MPT_TARGET_FLAGS_RAID_COMPONENT 0x01 |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c index 2d4f85c9d7a..ba6ab170bdf 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c | |||
@@ -64,6 +64,9 @@ | |||
64 | static struct fasync_struct *async_queue; | 64 | static struct fasync_struct *async_queue; |
65 | static DECLARE_WAIT_QUEUE_HEAD(ctl_poll_wait); | 65 | static DECLARE_WAIT_QUEUE_HEAD(ctl_poll_wait); |
66 | 66 | ||
67 | static int _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, | ||
68 | u8 *issue_reset); | ||
69 | |||
67 | /** | 70 | /** |
68 | * enum block_state - blocking state | 71 | * enum block_state - blocking state |
69 | * @NON_BLOCKING: non blocking | 72 | * @NON_BLOCKING: non blocking |
@@ -378,10 +381,22 @@ _ctl_verify_adapter(int ioc_number, struct MPT2SAS_ADAPTER **iocpp) | |||
378 | void | 381 | void |
379 | mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) | 382 | mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) |
380 | { | 383 | { |
384 | int i; | ||
385 | u8 issue_reset; | ||
386 | |||
381 | switch (reset_phase) { | 387 | switch (reset_phase) { |
382 | case MPT2_IOC_PRE_RESET: | 388 | case MPT2_IOC_PRE_RESET: |
383 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 389 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " |
384 | "MPT2_IOC_PRE_RESET\n", ioc->name, __func__)); | 390 | "MPT2_IOC_PRE_RESET\n", ioc->name, __func__)); |
391 | for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { | ||
392 | if (!(ioc->diag_buffer_status[i] & | ||
393 | MPT2_DIAG_BUFFER_IS_REGISTERED)) | ||
394 | continue; | ||
395 | if ((ioc->diag_buffer_status[i] & | ||
396 | MPT2_DIAG_BUFFER_IS_RELEASED)) | ||
397 | continue; | ||
398 | _ctl_send_release(ioc, i, &issue_reset); | ||
399 | } | ||
385 | break; | 400 | break; |
386 | case MPT2_IOC_AFTER_RESET: | 401 | case MPT2_IOC_AFTER_RESET: |
387 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 402 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " |
@@ -395,6 +410,17 @@ mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) | |||
395 | case MPT2_IOC_DONE_RESET: | 410 | case MPT2_IOC_DONE_RESET: |
396 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 411 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " |
397 | "MPT2_IOC_DONE_RESET\n", ioc->name, __func__)); | 412 | "MPT2_IOC_DONE_RESET\n", ioc->name, __func__)); |
413 | |||
414 | for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { | ||
415 | if (!(ioc->diag_buffer_status[i] & | ||
416 | MPT2_DIAG_BUFFER_IS_REGISTERED)) | ||
417 | continue; | ||
418 | if ((ioc->diag_buffer_status[i] & | ||
419 | MPT2_DIAG_BUFFER_IS_RELEASED)) | ||
420 | continue; | ||
421 | ioc->diag_buffer_status[i] |= | ||
422 | MPT2_DIAG_BUFFER_IS_DIAG_RESET; | ||
423 | } | ||
398 | break; | 424 | break; |
399 | } | 425 | } |
400 | } | 426 | } |
@@ -714,8 +740,10 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc, | |||
714 | 740 | ||
715 | if (tm_request->TaskType == | 741 | if (tm_request->TaskType == |
716 | MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK) { | 742 | MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK) { |
717 | if (_ctl_do_task_abort(ioc, &karg, tm_request)) | 743 | if (_ctl_do_task_abort(ioc, &karg, tm_request)) { |
744 | mpt2sas_base_free_smid(ioc, smid); | ||
718 | goto out; | 745 | goto out; |
746 | } | ||
719 | } | 747 | } |
720 | 748 | ||
721 | mutex_lock(&ioc->tm_cmds.mutex); | 749 | mutex_lock(&ioc->tm_cmds.mutex); |
@@ -915,9 +943,9 @@ _ctl_getiocinfo(void __user *arg) | |||
915 | karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn); | 943 | karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn); |
916 | karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus); | 944 | karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus); |
917 | karg.firmware_version = ioc->facts.FWVersion.Word; | 945 | karg.firmware_version = ioc->facts.FWVersion.Word; |
918 | strncpy(karg.driver_version, MPT2SAS_DRIVER_VERSION, | 946 | strcpy(karg.driver_version, MPT2SAS_DRIVER_NAME); |
919 | MPT2_IOCTL_VERSION_LENGTH); | 947 | strcat(karg.driver_version, "-"); |
920 | karg.driver_version[MPT2_IOCTL_VERSION_LENGTH - 1] = '\0'; | 948 | strcat(karg.driver_version, MPT2SAS_DRIVER_VERSION); |
921 | karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); | 949 | karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); |
922 | 950 | ||
923 | if (copy_to_user(arg, &karg, sizeof(karg))) { | 951 | if (copy_to_user(arg, &karg, sizeof(karg))) { |
@@ -1551,81 +1579,38 @@ _ctl_diag_query(void __user *arg) | |||
1551 | } | 1579 | } |
1552 | 1580 | ||
1553 | /** | 1581 | /** |
1554 | * _ctl_diag_release - request to send Diag Release Message to firmware | 1582 | * _ctl_send_release - Diag Release Message |
1555 | * @arg - user space buffer containing ioctl content | 1583 | * @ioc: per adapter object |
1556 | * @state - NON_BLOCKING or BLOCKING | 1584 | * @buffer_type - specifies either TRACE or SNAPSHOT |
1585 | * @issue_reset - specifies whether host reset is required. | ||
1557 | * | 1586 | * |
1558 | * This allows ownership of the specified buffer to returned to the driver, | ||
1559 | * allowing an application to read the buffer without fear that firmware is | ||
1560 | * overwritting information in the buffer. | ||
1561 | */ | 1587 | */ |
1562 | static long | 1588 | static int |
1563 | _ctl_diag_release(void __user *arg, enum block_state state) | 1589 | _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, u8 *issue_reset) |
1564 | { | 1590 | { |
1565 | struct mpt2_diag_release karg; | ||
1566 | struct MPT2SAS_ADAPTER *ioc; | ||
1567 | void *request_data; | ||
1568 | int rc; | ||
1569 | Mpi2DiagReleaseRequest_t *mpi_request; | 1591 | Mpi2DiagReleaseRequest_t *mpi_request; |
1570 | Mpi2DiagReleaseReply_t *mpi_reply; | 1592 | Mpi2DiagReleaseReply_t *mpi_reply; |
1571 | u8 buffer_type; | ||
1572 | unsigned long timeleft; | ||
1573 | u16 smid; | 1593 | u16 smid; |
1574 | u16 ioc_status; | 1594 | u16 ioc_status; |
1575 | u8 issue_reset = 0; | 1595 | u32 ioc_state; |
1576 | 1596 | int rc; | |
1577 | if (copy_from_user(&karg, arg, sizeof(karg))) { | 1597 | unsigned long timeleft; |
1578 | printk(KERN_ERR "failure at %s:%d/%s()!\n", | ||
1579 | __FILE__, __LINE__, __func__); | ||
1580 | return -EFAULT; | ||
1581 | } | ||
1582 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | ||
1583 | return -ENODEV; | ||
1584 | 1598 | ||
1585 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1599 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, |
1586 | __func__)); | 1600 | __func__)); |
1587 | 1601 | ||
1588 | buffer_type = karg.unique_id & 0x000000ff; | 1602 | rc = 0; |
1589 | if (!_ctl_diag_capability(ioc, buffer_type)) { | 1603 | *issue_reset = 0; |
1590 | printk(MPT2SAS_ERR_FMT "%s: doesn't have capability for " | ||
1591 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type); | ||
1592 | return -EPERM; | ||
1593 | } | ||
1594 | |||
1595 | if ((ioc->diag_buffer_status[buffer_type] & | ||
1596 | MPT2_DIAG_BUFFER_IS_REGISTERED) == 0) { | ||
1597 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) is not " | ||
1598 | "registered\n", ioc->name, __func__, buffer_type); | ||
1599 | return -EINVAL; | ||
1600 | } | ||
1601 | |||
1602 | if (karg.unique_id != ioc->unique_id[buffer_type]) { | ||
1603 | printk(MPT2SAS_ERR_FMT "%s: unique_id(0x%08x) is not " | ||
1604 | "registered\n", ioc->name, __func__, karg.unique_id); | ||
1605 | return -EINVAL; | ||
1606 | } | ||
1607 | |||
1608 | if (ioc->diag_buffer_status[buffer_type] & | ||
1609 | MPT2_DIAG_BUFFER_IS_RELEASED) { | ||
1610 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) " | ||
1611 | "is already released\n", ioc->name, __func__, | ||
1612 | buffer_type); | ||
1613 | return 0; | ||
1614 | } | ||
1615 | |||
1616 | request_data = ioc->diag_buffer[buffer_type]; | ||
1617 | 1604 | ||
1618 | if (!request_data) { | 1605 | ioc_state = mpt2sas_base_get_iocstate(ioc, 1); |
1619 | printk(MPT2SAS_ERR_FMT "%s: doesn't have memory allocated for " | 1606 | if (ioc_state != MPI2_IOC_STATE_OPERATIONAL) { |
1620 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type); | 1607 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " |
1621 | return -ENOMEM; | 1608 | "skipping due to FAULT state\n", ioc->name, |
1609 | __func__)); | ||
1610 | rc = -EAGAIN; | ||
1611 | goto out; | ||
1622 | } | 1612 | } |
1623 | 1613 | ||
1624 | if (state == NON_BLOCKING && !mutex_trylock(&ioc->ctl_cmds.mutex)) | ||
1625 | return -EAGAIN; | ||
1626 | else if (mutex_lock_interruptible(&ioc->ctl_cmds.mutex)) | ||
1627 | return -ERESTARTSYS; | ||
1628 | |||
1629 | if (ioc->ctl_cmds.status != MPT2_CMD_NOT_USED) { | 1614 | if (ioc->ctl_cmds.status != MPT2_CMD_NOT_USED) { |
1630 | printk(MPT2SAS_ERR_FMT "%s: ctl_cmd in use\n", | 1615 | printk(MPT2SAS_ERR_FMT "%s: ctl_cmd in use\n", |
1631 | ioc->name, __func__); | 1616 | ioc->name, __func__); |
@@ -1641,7 +1626,6 @@ _ctl_diag_release(void __user *arg, enum block_state state) | |||
1641 | goto out; | 1626 | goto out; |
1642 | } | 1627 | } |
1643 | 1628 | ||
1644 | rc = 0; | ||
1645 | ioc->ctl_cmds.status = MPT2_CMD_PENDING; | 1629 | ioc->ctl_cmds.status = MPT2_CMD_PENDING; |
1646 | memset(ioc->ctl_cmds.reply, 0, ioc->reply_sz); | 1630 | memset(ioc->ctl_cmds.reply, 0, ioc->reply_sz); |
1647 | mpi_request = mpt2sas_base_get_msg_frame(ioc, smid); | 1631 | mpi_request = mpt2sas_base_get_msg_frame(ioc, smid); |
@@ -1660,8 +1644,9 @@ _ctl_diag_release(void __user *arg, enum block_state state) | |||
1660 | _debug_dump_mf(mpi_request, | 1644 | _debug_dump_mf(mpi_request, |
1661 | sizeof(Mpi2DiagReleaseRequest_t)/4); | 1645 | sizeof(Mpi2DiagReleaseRequest_t)/4); |
1662 | if (!(ioc->ctl_cmds.status & MPT2_CMD_RESET)) | 1646 | if (!(ioc->ctl_cmds.status & MPT2_CMD_RESET)) |
1663 | issue_reset = 1; | 1647 | *issue_reset = 1; |
1664 | goto issue_host_reset; | 1648 | rc = -EFAULT; |
1649 | goto out; | ||
1665 | } | 1650 | } |
1666 | 1651 | ||
1667 | /* process the completed Reply Message Frame */ | 1652 | /* process the completed Reply Message Frame */ |
@@ -1687,14 +1672,101 @@ _ctl_diag_release(void __user *arg, enum block_state state) | |||
1687 | rc = -EFAULT; | 1672 | rc = -EFAULT; |
1688 | } | 1673 | } |
1689 | 1674 | ||
1690 | issue_host_reset: | 1675 | out: |
1676 | ioc->ctl_cmds.status = MPT2_CMD_NOT_USED; | ||
1677 | return rc; | ||
1678 | } | ||
1679 | |||
1680 | /** | ||
1681 | * _ctl_diag_release - request to send Diag Release Message to firmware | ||
1682 | * @arg - user space buffer containing ioctl content | ||
1683 | * @state - NON_BLOCKING or BLOCKING | ||
1684 | * | ||
1685 | * This allows ownership of the specified buffer to returned to the driver, | ||
1686 | * allowing an application to read the buffer without fear that firmware is | ||
1687 | * overwritting information in the buffer. | ||
1688 | */ | ||
1689 | static long | ||
1690 | _ctl_diag_release(void __user *arg, enum block_state state) | ||
1691 | { | ||
1692 | struct mpt2_diag_release karg; | ||
1693 | struct MPT2SAS_ADAPTER *ioc; | ||
1694 | void *request_data; | ||
1695 | int rc; | ||
1696 | u8 buffer_type; | ||
1697 | u8 issue_reset = 0; | ||
1698 | |||
1699 | if (copy_from_user(&karg, arg, sizeof(karg))) { | ||
1700 | printk(KERN_ERR "failure at %s:%d/%s()!\n", | ||
1701 | __FILE__, __LINE__, __func__); | ||
1702 | return -EFAULT; | ||
1703 | } | ||
1704 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | ||
1705 | return -ENODEV; | ||
1706 | |||
1707 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | ||
1708 | __func__)); | ||
1709 | |||
1710 | buffer_type = karg.unique_id & 0x000000ff; | ||
1711 | if (!_ctl_diag_capability(ioc, buffer_type)) { | ||
1712 | printk(MPT2SAS_ERR_FMT "%s: doesn't have capability for " | ||
1713 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type); | ||
1714 | return -EPERM; | ||
1715 | } | ||
1716 | |||
1717 | if ((ioc->diag_buffer_status[buffer_type] & | ||
1718 | MPT2_DIAG_BUFFER_IS_REGISTERED) == 0) { | ||
1719 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) is not " | ||
1720 | "registered\n", ioc->name, __func__, buffer_type); | ||
1721 | return -EINVAL; | ||
1722 | } | ||
1723 | |||
1724 | if (karg.unique_id != ioc->unique_id[buffer_type]) { | ||
1725 | printk(MPT2SAS_ERR_FMT "%s: unique_id(0x%08x) is not " | ||
1726 | "registered\n", ioc->name, __func__, karg.unique_id); | ||
1727 | return -EINVAL; | ||
1728 | } | ||
1729 | |||
1730 | if (ioc->diag_buffer_status[buffer_type] & | ||
1731 | MPT2_DIAG_BUFFER_IS_RELEASED) { | ||
1732 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) " | ||
1733 | "is already released\n", ioc->name, __func__, | ||
1734 | buffer_type); | ||
1735 | return 0; | ||
1736 | } | ||
1737 | |||
1738 | request_data = ioc->diag_buffer[buffer_type]; | ||
1739 | |||
1740 | if (!request_data) { | ||
1741 | printk(MPT2SAS_ERR_FMT "%s: doesn't have memory allocated for " | ||
1742 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type); | ||
1743 | return -ENOMEM; | ||
1744 | } | ||
1745 | |||
1746 | /* buffers were released by due to host reset */ | ||
1747 | if ((ioc->diag_buffer_status[buffer_type] & | ||
1748 | MPT2_DIAG_BUFFER_IS_DIAG_RESET)) { | ||
1749 | ioc->diag_buffer_status[buffer_type] |= | ||
1750 | MPT2_DIAG_BUFFER_IS_RELEASED; | ||
1751 | ioc->diag_buffer_status[buffer_type] &= | ||
1752 | ~MPT2_DIAG_BUFFER_IS_DIAG_RESET; | ||
1753 | printk(MPT2SAS_ERR_FMT "%s: buffer_type(0x%02x) " | ||
1754 | "was released due to host reset\n", ioc->name, __func__, | ||
1755 | buffer_type); | ||
1756 | return 0; | ||
1757 | } | ||
1758 | |||
1759 | if (state == NON_BLOCKING && !mutex_trylock(&ioc->ctl_cmds.mutex)) | ||
1760 | return -EAGAIN; | ||
1761 | else if (mutex_lock_interruptible(&ioc->ctl_cmds.mutex)) | ||
1762 | return -ERESTARTSYS; | ||
1763 | |||
1764 | rc = _ctl_send_release(ioc, buffer_type, &issue_reset); | ||
1765 | |||
1691 | if (issue_reset) | 1766 | if (issue_reset) |
1692 | mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP, | 1767 | mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP, |
1693 | FORCE_BIG_HAMMER); | 1768 | FORCE_BIG_HAMMER); |
1694 | 1769 | ||
1695 | out: | ||
1696 | |||
1697 | ioc->ctl_cmds.status = MPT2_CMD_NOT_USED; | ||
1698 | mutex_unlock(&ioc->ctl_cmds.mutex); | 1770 | mutex_unlock(&ioc->ctl_cmds.mutex); |
1699 | return rc; | 1771 | return rc; |
1700 | } | 1772 | } |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.h b/drivers/scsi/mpt2sas/mpt2sas_ctl.h index dbb6c0cf888..4da11435533 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.h +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.h | |||
@@ -50,7 +50,7 @@ | |||
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | #define MPT2SAS_DEV_NAME "mpt2ctl" | 52 | #define MPT2SAS_DEV_NAME "mpt2ctl" |
53 | #define MPT2_MAGIC_NUMBER 'm' | 53 | #define MPT2_MAGIC_NUMBER 'L' |
54 | #define MPT2_IOCTL_DEFAULT_TIMEOUT (10) /* in seconds */ | 54 | #define MPT2_IOCTL_DEFAULT_TIMEOUT (10) /* in seconds */ |
55 | 55 | ||
56 | /** | 56 | /** |
@@ -295,8 +295,9 @@ struct mpt2_ioctl_btdh_mapping { | |||
295 | 295 | ||
296 | 296 | ||
297 | /* status bits for ioc->diag_buffer_status */ | 297 | /* status bits for ioc->diag_buffer_status */ |
298 | #define MPT2_DIAG_BUFFER_IS_REGISTERED (0x01) | 298 | #define MPT2_DIAG_BUFFER_IS_REGISTERED (0x01) |
299 | #define MPT2_DIAG_BUFFER_IS_RELEASED (0x02) | 299 | #define MPT2_DIAG_BUFFER_IS_RELEASED (0x02) |
300 | #define MPT2_DIAG_BUFFER_IS_DIAG_RESET (0x04) | ||
300 | 301 | ||
301 | /* application flags for mpt2_diag_register, mpt2_diag_query */ | 302 | /* application flags for mpt2_diag_register, mpt2_diag_query */ |
302 | #define MPT2_APP_FLAGS_APP_OWNED (0x0001) | 303 | #define MPT2_APP_FLAGS_APP_OWNED (0x0001) |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 0c463c483c0..e3a7967259e 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
@@ -119,7 +119,7 @@ struct sense_info { | |||
119 | */ | 119 | */ |
120 | struct fw_event_work { | 120 | struct fw_event_work { |
121 | struct list_head list; | 121 | struct list_head list; |
122 | struct delayed_work work; | 122 | struct work_struct work; |
123 | struct MPT2SAS_ADAPTER *ioc; | 123 | struct MPT2SAS_ADAPTER *ioc; |
124 | u8 VF_ID; | 124 | u8 VF_ID; |
125 | u8 host_reset_handling; | 125 | u8 host_reset_handling; |
@@ -516,12 +516,8 @@ _scsih_sas_device_add(struct MPT2SAS_ADAPTER *ioc, | |||
516 | handle = sas_device->handle; | 516 | handle = sas_device->handle; |
517 | parent_handle = sas_device->parent_handle; | 517 | parent_handle = sas_device->parent_handle; |
518 | sas_address = sas_device->sas_address; | 518 | sas_address = sas_device->sas_address; |
519 | if (!mpt2sas_transport_port_add(ioc, handle, parent_handle)) { | 519 | if (!mpt2sas_transport_port_add(ioc, handle, parent_handle)) |
520 | _scsih_sas_device_remove(ioc, sas_device); | 520 | _scsih_sas_device_remove(ioc, sas_device); |
521 | } else if (!sas_device->starget) { | ||
522 | mpt2sas_transport_port_remove(ioc, sas_address, parent_handle); | ||
523 | _scsih_sas_device_remove(ioc, sas_device); | ||
524 | } | ||
525 | } | 521 | } |
526 | 522 | ||
527 | /** | 523 | /** |
@@ -1203,7 +1199,9 @@ scsih_target_destroy(struct scsi_target *starget) | |||
1203 | rphy = dev_to_rphy(starget->dev.parent); | 1199 | rphy = dev_to_rphy(starget->dev.parent); |
1204 | sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc, | 1200 | sas_device = mpt2sas_scsih_sas_device_find_by_sas_address(ioc, |
1205 | rphy->identify.sas_address); | 1201 | rphy->identify.sas_address); |
1206 | if (sas_device) | 1202 | if (sas_device && (sas_device->starget == starget) && |
1203 | (sas_device->id == starget->id) && | ||
1204 | (sas_device->channel == starget->channel)) | ||
1207 | sas_device->starget = NULL; | 1205 | sas_device->starget = NULL; |
1208 | 1206 | ||
1209 | spin_unlock_irqrestore(&ioc->sas_device_lock, flags); | 1207 | spin_unlock_irqrestore(&ioc->sas_device_lock, flags); |
@@ -2009,8 +2007,8 @@ _scsih_fw_event_add(struct MPT2SAS_ADAPTER *ioc, struct fw_event_work *fw_event) | |||
2009 | 2007 | ||
2010 | spin_lock_irqsave(&ioc->fw_event_lock, flags); | 2008 | spin_lock_irqsave(&ioc->fw_event_lock, flags); |
2011 | list_add_tail(&fw_event->list, &ioc->fw_event_list); | 2009 | list_add_tail(&fw_event->list, &ioc->fw_event_list); |
2012 | INIT_DELAYED_WORK(&fw_event->work, _firmware_event_work); | 2010 | INIT_WORK(&fw_event->work, _firmware_event_work); |
2013 | queue_delayed_work(ioc->firmware_event_thread, &fw_event->work, 1); | 2011 | queue_work(ioc->firmware_event_thread, &fw_event->work); |
2014 | spin_unlock_irqrestore(&ioc->fw_event_lock, flags); | 2012 | spin_unlock_irqrestore(&ioc->fw_event_lock, flags); |
2015 | } | 2013 | } |
2016 | 2014 | ||
@@ -2054,7 +2052,7 @@ _scsih_fw_event_requeue(struct MPT2SAS_ADAPTER *ioc, struct fw_event_work | |||
2054 | return; | 2052 | return; |
2055 | 2053 | ||
2056 | spin_lock_irqsave(&ioc->fw_event_lock, flags); | 2054 | spin_lock_irqsave(&ioc->fw_event_lock, flags); |
2057 | queue_delayed_work(ioc->firmware_event_thread, &fw_event->work, delay); | 2055 | queue_work(ioc->firmware_event_thread, &fw_event->work); |
2058 | spin_unlock_irqrestore(&ioc->fw_event_lock, flags); | 2056 | spin_unlock_irqrestore(&ioc->fw_event_lock, flags); |
2059 | } | 2057 | } |
2060 | 2058 | ||
@@ -2863,8 +2861,9 @@ scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 VF_ID, u32 reply) | |||
2863 | struct sense_info data; | 2861 | struct sense_info data; |
2864 | const void *sense_data = mpt2sas_base_get_sense_buffer(ioc, | 2862 | const void *sense_data = mpt2sas_base_get_sense_buffer(ioc, |
2865 | smid); | 2863 | smid); |
2866 | memcpy(scmd->sense_buffer, sense_data, | 2864 | u32 sz = min_t(u32, SCSI_SENSE_BUFFERSIZE, |
2867 | le32_to_cpu(mpi_reply->SenseCount)); | 2865 | le32_to_cpu(mpi_reply->SenseCount)); |
2866 | memcpy(scmd->sense_buffer, sense_data, sz); | ||
2868 | _scsih_normalize_sense(scmd->sense_buffer, &data); | 2867 | _scsih_normalize_sense(scmd->sense_buffer, &data); |
2869 | /* failure prediction threshold exceeded */ | 2868 | /* failure prediction threshold exceeded */ |
2870 | if (data.asc == 0x5D) | 2869 | if (data.asc == 0x5D) |
@@ -3923,7 +3922,7 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, | |||
3923 | 3922 | ||
3924 | mpt2sas_scsih_issue_tm(ioc, handle, lun, | 3923 | mpt2sas_scsih_issue_tm(ioc, handle, lun, |
3925 | MPI2_SCSITASKMGMT_TASKTYPE_QUERY_TASK, smid, 30); | 3924 | MPI2_SCSITASKMGMT_TASKTYPE_QUERY_TASK, smid, 30); |
3926 | termination_count += le32_to_cpu(mpi_reply->TerminationCount); | 3925 | ioc->tm_cmds.status = MPT2_CMD_NOT_USED; |
3927 | 3926 | ||
3928 | if ((mpi_reply->IOCStatus == MPI2_IOCSTATUS_SUCCESS) && | 3927 | if ((mpi_reply->IOCStatus == MPI2_IOCSTATUS_SUCCESS) && |
3929 | (mpi_reply->ResponseCode == | 3928 | (mpi_reply->ResponseCode == |
@@ -3933,10 +3932,10 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID, | |||
3933 | continue; | 3932 | continue; |
3934 | 3933 | ||
3935 | mpt2sas_scsih_issue_tm(ioc, handle, lun, | 3934 | mpt2sas_scsih_issue_tm(ioc, handle, lun, |
3936 | MPI2_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET, smid, 30); | 3935 | MPI2_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET, 0, 30); |
3936 | ioc->tm_cmds.status = MPT2_CMD_NOT_USED; | ||
3937 | termination_count += le32_to_cpu(mpi_reply->TerminationCount); | 3937 | termination_count += le32_to_cpu(mpi_reply->TerminationCount); |
3938 | } | 3938 | } |
3939 | ioc->tm_cmds.status = MPT2_CMD_NOT_USED; | ||
3940 | ioc->broadcast_aen_busy = 0; | 3939 | ioc->broadcast_aen_busy = 0; |
3941 | mutex_unlock(&ioc->tm_cmds.mutex); | 3940 | mutex_unlock(&ioc->tm_cmds.mutex); |
3942 | 3941 | ||
@@ -4962,7 +4961,7 @@ static void | |||
4962 | _firmware_event_work(struct work_struct *work) | 4961 | _firmware_event_work(struct work_struct *work) |
4963 | { | 4962 | { |
4964 | struct fw_event_work *fw_event = container_of(work, | 4963 | struct fw_event_work *fw_event = container_of(work, |
4965 | struct fw_event_work, work.work); | 4964 | struct fw_event_work, work); |
4966 | unsigned long flags; | 4965 | unsigned long flags; |
4967 | struct MPT2SAS_ADAPTER *ioc = fw_event->ioc; | 4966 | struct MPT2SAS_ADAPTER *ioc = fw_event->ioc; |
4968 | 4967 | ||
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index 2a5f0777148..1ce6b24abab 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c | |||
@@ -205,6 +205,74 @@ static unsigned _osd_req_alist_elem_size(struct osd_request *or, unsigned len) | |||
205 | osdv2_attr_list_elem_size(len); | 205 | osdv2_attr_list_elem_size(len); |
206 | } | 206 | } |
207 | 207 | ||
208 | static void _osd_req_alist_elem_encode(struct osd_request *or, | ||
209 | void *attr_last, const struct osd_attr *oa) | ||
210 | { | ||
211 | if (osd_req_is_ver1(or)) { | ||
212 | struct osdv1_attributes_list_element *attr = attr_last; | ||
213 | |||
214 | attr->attr_page = cpu_to_be32(oa->attr_page); | ||
215 | attr->attr_id = cpu_to_be32(oa->attr_id); | ||
216 | attr->attr_bytes = cpu_to_be16(oa->len); | ||
217 | memcpy(attr->attr_val, oa->val_ptr, oa->len); | ||
218 | } else { | ||
219 | struct osdv2_attributes_list_element *attr = attr_last; | ||
220 | |||
221 | attr->attr_page = cpu_to_be32(oa->attr_page); | ||
222 | attr->attr_id = cpu_to_be32(oa->attr_id); | ||
223 | attr->attr_bytes = cpu_to_be16(oa->len); | ||
224 | memcpy(attr->attr_val, oa->val_ptr, oa->len); | ||
225 | } | ||
226 | } | ||
227 | |||
228 | static int _osd_req_alist_elem_decode(struct osd_request *or, | ||
229 | void *cur_p, struct osd_attr *oa, unsigned max_bytes) | ||
230 | { | ||
231 | unsigned inc; | ||
232 | if (osd_req_is_ver1(or)) { | ||
233 | struct osdv1_attributes_list_element *attr = cur_p; | ||
234 | |||
235 | if (max_bytes < sizeof(*attr)) | ||
236 | return -1; | ||
237 | |||
238 | oa->len = be16_to_cpu(attr->attr_bytes); | ||
239 | inc = _osd_req_alist_elem_size(or, oa->len); | ||
240 | if (inc > max_bytes) | ||
241 | return -1; | ||
242 | |||
243 | oa->attr_page = be32_to_cpu(attr->attr_page); | ||
244 | oa->attr_id = be32_to_cpu(attr->attr_id); | ||
245 | |||
246 | /* OSD1: On empty attributes we return a pointer to 2 bytes | ||
247 | * of zeros. This keeps similar behaviour with OSD2. | ||
248 | * (See below) | ||
249 | */ | ||
250 | oa->val_ptr = likely(oa->len) ? attr->attr_val : | ||
251 | (u8 *)&attr->attr_bytes; | ||
252 | } else { | ||
253 | struct osdv2_attributes_list_element *attr = cur_p; | ||
254 | |||
255 | if (max_bytes < sizeof(*attr)) | ||
256 | return -1; | ||
257 | |||
258 | oa->len = be16_to_cpu(attr->attr_bytes); | ||
259 | inc = _osd_req_alist_elem_size(or, oa->len); | ||
260 | if (inc > max_bytes) | ||
261 | return -1; | ||
262 | |||
263 | oa->attr_page = be32_to_cpu(attr->attr_page); | ||
264 | oa->attr_id = be32_to_cpu(attr->attr_id); | ||
265 | |||
266 | /* OSD2: For convenience, on empty attributes, we return 8 bytes | ||
267 | * of zeros here. This keeps the same behaviour with OSD2r04, | ||
268 | * and is nice with null terminating ASCII fields. | ||
269 | * oa->val_ptr == NULL marks the end-of-list, or error. | ||
270 | */ | ||
271 | oa->val_ptr = likely(oa->len) ? attr->attr_val : attr->reserved; | ||
272 | } | ||
273 | return inc; | ||
274 | } | ||
275 | |||
208 | static unsigned _osd_req_alist_size(struct osd_request *or, void *list_head) | 276 | static unsigned _osd_req_alist_size(struct osd_request *or, void *list_head) |
209 | { | 277 | { |
210 | return osd_req_is_ver1(or) ? | 278 | return osd_req_is_ver1(or) ? |
@@ -282,9 +350,9 @@ _osd_req_sec_params(struct osd_request *or) | |||
282 | struct osd_cdb *ocdb = &or->cdb; | 350 | struct osd_cdb *ocdb = &or->cdb; |
283 | 351 | ||
284 | if (osd_req_is_ver1(or)) | 352 | if (osd_req_is_ver1(or)) |
285 | return &ocdb->v1.sec_params; | 353 | return (struct osd_security_parameters *)&ocdb->v1.sec_params; |
286 | else | 354 | else |
287 | return &ocdb->v2.sec_params; | 355 | return (struct osd_security_parameters *)&ocdb->v2.sec_params; |
288 | } | 356 | } |
289 | 357 | ||
290 | void osd_dev_init(struct osd_dev *osdd, struct scsi_device *scsi_device) | 358 | void osd_dev_init(struct osd_dev *osdd, struct scsi_device *scsi_device) |
@@ -612,9 +680,9 @@ static int _osd_req_list_objects(struct osd_request *or, | |||
612 | 680 | ||
613 | WARN_ON(or->in.bio); | 681 | WARN_ON(or->in.bio); |
614 | bio = bio_map_kern(q, list, len, or->alloc_flags); | 682 | bio = bio_map_kern(q, list, len, or->alloc_flags); |
615 | if (!bio) { | 683 | if (IS_ERR(bio)) { |
616 | OSD_ERR("!!! Failed to allocate list_objects BIO\n"); | 684 | OSD_ERR("!!! Failed to allocate list_objects BIO\n"); |
617 | return -ENOMEM; | 685 | return PTR_ERR(bio); |
618 | } | 686 | } |
619 | 687 | ||
620 | bio->bi_rw &= ~(1 << BIO_RW); | 688 | bio->bi_rw &= ~(1 << BIO_RW); |
@@ -798,7 +866,6 @@ int osd_req_add_set_attr_list(struct osd_request *or, | |||
798 | attr_last = or->set_attr.buff + total_bytes; | 866 | attr_last = or->set_attr.buff + total_bytes; |
799 | 867 | ||
800 | for (; nelem; --nelem) { | 868 | for (; nelem; --nelem) { |
801 | struct osd_attributes_list_element *attr; | ||
802 | unsigned elem_size = _osd_req_alist_elem_size(or, oa->len); | 869 | unsigned elem_size = _osd_req_alist_elem_size(or, oa->len); |
803 | 870 | ||
804 | total_bytes += elem_size; | 871 | total_bytes += elem_size; |
@@ -811,11 +878,7 @@ int osd_req_add_set_attr_list(struct osd_request *or, | |||
811 | or->set_attr.buff + or->set_attr.total_bytes; | 878 | or->set_attr.buff + or->set_attr.total_bytes; |
812 | } | 879 | } |
813 | 880 | ||
814 | attr = attr_last; | 881 | _osd_req_alist_elem_encode(or, attr_last, oa); |
815 | attr->attr_page = cpu_to_be32(oa->attr_page); | ||
816 | attr->attr_id = cpu_to_be32(oa->attr_id); | ||
817 | attr->attr_bytes = cpu_to_be16(oa->len); | ||
818 | memcpy(attr->attr_val, oa->val_ptr, oa->len); | ||
819 | 882 | ||
820 | attr_last += elem_size; | 883 | attr_last += elem_size; |
821 | ++oa; | 884 | ++oa; |
@@ -1070,15 +1133,10 @@ int osd_req_decode_get_attr_list(struct osd_request *or, | |||
1070 | } | 1133 | } |
1071 | 1134 | ||
1072 | for (n = 0; (n < *nelem) && (cur_bytes < returned_bytes); ++n) { | 1135 | for (n = 0; (n < *nelem) && (cur_bytes < returned_bytes); ++n) { |
1073 | struct osd_attributes_list_element *attr = cur_p; | 1136 | int inc = _osd_req_alist_elem_decode(or, cur_p, oa, |
1074 | unsigned inc; | 1137 | returned_bytes - cur_bytes); |
1075 | 1138 | ||
1076 | oa->len = be16_to_cpu(attr->attr_bytes); | 1139 | if (inc < 0) { |
1077 | inc = _osd_req_alist_elem_size(or, oa->len); | ||
1078 | OSD_DEBUG("oa->len=%d inc=%d cur_bytes=%d\n", | ||
1079 | oa->len, inc, cur_bytes); | ||
1080 | cur_bytes += inc; | ||
1081 | if (cur_bytes > returned_bytes) { | ||
1082 | OSD_ERR("BAD FOOD from target. list not valid!" | 1140 | OSD_ERR("BAD FOOD from target. list not valid!" |
1083 | "c=%d r=%d n=%d\n", | 1141 | "c=%d r=%d n=%d\n", |
1084 | cur_bytes, returned_bytes, n); | 1142 | cur_bytes, returned_bytes, n); |
@@ -1086,10 +1144,7 @@ int osd_req_decode_get_attr_list(struct osd_request *or, | |||
1086 | break; | 1144 | break; |
1087 | } | 1145 | } |
1088 | 1146 | ||
1089 | oa->attr_page = be32_to_cpu(attr->attr_page); | 1147 | cur_bytes += inc; |
1090 | oa->attr_id = be32_to_cpu(attr->attr_id); | ||
1091 | oa->val_ptr = attr->attr_val; | ||
1092 | |||
1093 | cur_p += inc; | 1148 | cur_p += inc; |
1094 | ++oa; | 1149 | ++oa; |
1095 | } | 1150 | } |
@@ -1159,6 +1214,24 @@ static int _osd_req_finalize_attr_page(struct osd_request *or) | |||
1159 | return ret; | 1214 | return ret; |
1160 | } | 1215 | } |
1161 | 1216 | ||
1217 | static inline void osd_sec_parms_set_out_offset(bool is_v1, | ||
1218 | struct osd_security_parameters *sec_parms, osd_cdb_offset offset) | ||
1219 | { | ||
1220 | if (is_v1) | ||
1221 | sec_parms->v1.data_out_integrity_check_offset = offset; | ||
1222 | else | ||
1223 | sec_parms->v2.data_out_integrity_check_offset = offset; | ||
1224 | } | ||
1225 | |||
1226 | static inline void osd_sec_parms_set_in_offset(bool is_v1, | ||
1227 | struct osd_security_parameters *sec_parms, osd_cdb_offset offset) | ||
1228 | { | ||
1229 | if (is_v1) | ||
1230 | sec_parms->v1.data_in_integrity_check_offset = offset; | ||
1231 | else | ||
1232 | sec_parms->v2.data_in_integrity_check_offset = offset; | ||
1233 | } | ||
1234 | |||
1162 | static int _osd_req_finalize_data_integrity(struct osd_request *or, | 1235 | static int _osd_req_finalize_data_integrity(struct osd_request *or, |
1163 | bool has_in, bool has_out, const u8 *cap_key) | 1236 | bool has_in, bool has_out, const u8 *cap_key) |
1164 | { | 1237 | { |
@@ -1182,8 +1255,8 @@ static int _osd_req_finalize_data_integrity(struct osd_request *or, | |||
1182 | or->out_data_integ.get_attributes_bytes = cpu_to_be64( | 1255 | or->out_data_integ.get_attributes_bytes = cpu_to_be64( |
1183 | or->enc_get_attr.total_bytes); | 1256 | or->enc_get_attr.total_bytes); |
1184 | 1257 | ||
1185 | sec_parms->data_out_integrity_check_offset = | 1258 | osd_sec_parms_set_out_offset(osd_req_is_ver1(or), sec_parms, |
1186 | osd_req_encode_offset(or, or->out.total_bytes, &pad); | 1259 | osd_req_encode_offset(or, or->out.total_bytes, &pad)); |
1187 | 1260 | ||
1188 | ret = _req_append_segment(or, pad, &seg, or->out.last_seg, | 1261 | ret = _req_append_segment(or, pad, &seg, or->out.last_seg, |
1189 | &or->out); | 1262 | &or->out); |
@@ -1203,8 +1276,8 @@ static int _osd_req_finalize_data_integrity(struct osd_request *or, | |||
1203 | }; | 1276 | }; |
1204 | unsigned pad; | 1277 | unsigned pad; |
1205 | 1278 | ||
1206 | sec_parms->data_in_integrity_check_offset = | 1279 | osd_sec_parms_set_in_offset(osd_req_is_ver1(or), sec_parms, |
1207 | osd_req_encode_offset(or, or->in.total_bytes, &pad); | 1280 | osd_req_encode_offset(or, or->in.total_bytes, &pad)); |
1208 | 1281 | ||
1209 | ret = _req_append_segment(or, pad, &seg, or->in.last_seg, | 1282 | ret = _req_append_segment(or, pad, &seg, or->in.last_seg, |
1210 | &or->in); | 1283 | &or->in); |
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index f644c9571ea..22b59e13ba8 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c | |||
@@ -173,26 +173,26 @@ static const struct file_operations osd_fops = { | |||
173 | .unlocked_ioctl = osd_uld_ioctl, | 173 | .unlocked_ioctl = osd_uld_ioctl, |
174 | }; | 174 | }; |
175 | 175 | ||
176 | struct osd_dev *osduld_path_lookup(const char *path) | 176 | struct osd_dev *osduld_path_lookup(const char *name) |
177 | { | 177 | { |
178 | struct nameidata nd; | 178 | struct path path; |
179 | struct inode *inode; | 179 | struct inode *inode; |
180 | struct cdev *cdev; | 180 | struct cdev *cdev; |
181 | struct osd_uld_device *uninitialized_var(oud); | 181 | struct osd_uld_device *uninitialized_var(oud); |
182 | int error; | 182 | int error; |
183 | 183 | ||
184 | if (!path || !*path) { | 184 | if (!name || !*name) { |
185 | OSD_ERR("Mount with !path || !*path\n"); | 185 | OSD_ERR("Mount with !path || !*path\n"); |
186 | return ERR_PTR(-EINVAL); | 186 | return ERR_PTR(-EINVAL); |
187 | } | 187 | } |
188 | 188 | ||
189 | error = path_lookup(path, LOOKUP_FOLLOW, &nd); | 189 | error = kern_path(name, LOOKUP_FOLLOW, &path); |
190 | if (error) { | 190 | if (error) { |
191 | OSD_ERR("path_lookup of %s faild=>%d\n", path, error); | 191 | OSD_ERR("path_lookup of %s failed=>%d\n", name, error); |
192 | return ERR_PTR(error); | 192 | return ERR_PTR(error); |
193 | } | 193 | } |
194 | 194 | ||
195 | inode = nd.path.dentry->d_inode; | 195 | inode = path.dentry->d_inode; |
196 | error = -EINVAL; /* Not the right device e.g osd_uld_device */ | 196 | error = -EINVAL; /* Not the right device e.g osd_uld_device */ |
197 | if (!S_ISCHR(inode->i_mode)) { | 197 | if (!S_ISCHR(inode->i_mode)) { |
198 | OSD_DEBUG("!S_ISCHR()\n"); | 198 | OSD_DEBUG("!S_ISCHR()\n"); |
@@ -202,15 +202,15 @@ struct osd_dev *osduld_path_lookup(const char *path) | |||
202 | cdev = inode->i_cdev; | 202 | cdev = inode->i_cdev; |
203 | if (!cdev) { | 203 | if (!cdev) { |
204 | OSD_ERR("Before mounting an OSD Based filesystem\n"); | 204 | OSD_ERR("Before mounting an OSD Based filesystem\n"); |
205 | OSD_ERR(" user-mode must open+close the %s device\n", path); | 205 | OSD_ERR(" user-mode must open+close the %s device\n", name); |
206 | OSD_ERR(" Example: bash: echo < %s\n", path); | 206 | OSD_ERR(" Example: bash: echo < %s\n", name); |
207 | goto out; | 207 | goto out; |
208 | } | 208 | } |
209 | 209 | ||
210 | /* The Magic wand. Is it our char-dev */ | 210 | /* The Magic wand. Is it our char-dev */ |
211 | /* TODO: Support sg devices */ | 211 | /* TODO: Support sg devices */ |
212 | if (cdev->owner != THIS_MODULE) { | 212 | if (cdev->owner != THIS_MODULE) { |
213 | OSD_ERR("Error mounting %s - is not an OSD device\n", path); | 213 | OSD_ERR("Error mounting %s - is not an OSD device\n", name); |
214 | goto out; | 214 | goto out; |
215 | } | 215 | } |
216 | 216 | ||
@@ -220,7 +220,7 @@ struct osd_dev *osduld_path_lookup(const char *path) | |||
220 | error = 0; | 220 | error = 0; |
221 | 221 | ||
222 | out: | 222 | out: |
223 | path_put(&nd.path); | 223 | path_put(&path); |
224 | return error ? ERR_PTR(error) : &oud->od; | 224 | return error ? ERR_PTR(error) : &oud->od; |
225 | } | 225 | } |
226 | EXPORT_SYMBOL(osduld_path_lookup); | 226 | EXPORT_SYMBOL(osduld_path_lookup); |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index d1cb64ad1a3..bb218c8b6e9 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -1291,10 +1291,8 @@ static inline int scsi_target_queue_ready(struct Scsi_Host *shost, | |||
1291 | if (--starget->target_blocked == 0) { | 1291 | if (--starget->target_blocked == 0) { |
1292 | SCSI_LOG_MLQUEUE(3, starget_printk(KERN_INFO, starget, | 1292 | SCSI_LOG_MLQUEUE(3, starget_printk(KERN_INFO, starget, |
1293 | "unblocking target at zero depth\n")); | 1293 | "unblocking target at zero depth\n")); |
1294 | } else { | 1294 | } else |
1295 | blk_plug_device(sdev->request_queue); | ||
1296 | return 0; | 1295 | return 0; |
1297 | } | ||
1298 | } | 1296 | } |
1299 | 1297 | ||
1300 | if (scsi_target_is_busy(starget)) { | 1298 | if (scsi_target_is_busy(starget)) { |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 3fcb64b91c4..84044233b63 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <linux/string_helpers.h> | 50 | #include <linux/string_helpers.h> |
51 | #include <linux/async.h> | 51 | #include <linux/async.h> |
52 | #include <asm/uaccess.h> | 52 | #include <asm/uaccess.h> |
53 | #include <asm/unaligned.h> | ||
53 | 54 | ||
54 | #include <scsi/scsi.h> | 55 | #include <scsi/scsi.h> |
55 | #include <scsi/scsi_cmnd.h> | 56 | #include <scsi/scsi_cmnd.h> |
@@ -1344,12 +1345,8 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, | |||
1344 | return -EINVAL; | 1345 | return -EINVAL; |
1345 | } | 1346 | } |
1346 | 1347 | ||
1347 | sector_size = (buffer[8] << 24) | (buffer[9] << 16) | | 1348 | sector_size = get_unaligned_be32(&buffer[8]); |
1348 | (buffer[10] << 8) | buffer[11]; | 1349 | lba = get_unaligned_be64(&buffer[0]); |
1349 | lba = (((u64)buffer[0] << 56) | ((u64)buffer[1] << 48) | | ||
1350 | ((u64)buffer[2] << 40) | ((u64)buffer[3] << 32) | | ||
1351 | ((u64)buffer[4] << 24) | ((u64)buffer[5] << 16) | | ||
1352 | ((u64)buffer[6] << 8) | (u64)buffer[7]); | ||
1353 | 1350 | ||
1354 | sd_read_protection_type(sdkp, buffer); | 1351 | sd_read_protection_type(sdkp, buffer); |
1355 | 1352 | ||
@@ -1400,10 +1397,8 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, | |||
1400 | return -EINVAL; | 1397 | return -EINVAL; |
1401 | } | 1398 | } |
1402 | 1399 | ||
1403 | sector_size = (buffer[4] << 24) | (buffer[5] << 16) | | 1400 | sector_size = get_unaligned_be32(&buffer[4]); |
1404 | (buffer[6] << 8) | buffer[7]; | 1401 | lba = get_unaligned_be32(&buffer[0]); |
1405 | lba = (buffer[0] << 24) | (buffer[1] << 16) | | ||
1406 | (buffer[2] << 8) | buffer[3]; | ||
1407 | 1402 | ||
1408 | if ((sizeof(sdkp->capacity) == 4) && (lba == 0xffffffff)) { | 1403 | if ((sizeof(sdkp->capacity) == 4) && (lba == 0xffffffff)) { |
1409 | sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a " | 1404 | sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a " |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 82312df9b0b..e1716f14cd4 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -179,7 +179,7 @@ typedef struct sg_device { /* holds the state of each scsi generic device */ | |||
179 | /* tasklet or soft irq callback */ | 179 | /* tasklet or soft irq callback */ |
180 | static void sg_rq_end_io(struct request *rq, int uptodate); | 180 | static void sg_rq_end_io(struct request *rq, int uptodate); |
181 | static int sg_start_req(Sg_request *srp, unsigned char *cmd); | 181 | static int sg_start_req(Sg_request *srp, unsigned char *cmd); |
182 | static void sg_finish_rem_req(Sg_request * srp); | 182 | static int sg_finish_rem_req(Sg_request * srp); |
183 | static int sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size); | 183 | static int sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size); |
184 | static ssize_t sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, | 184 | static ssize_t sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, |
185 | Sg_request * srp); | 185 | Sg_request * srp); |
@@ -518,7 +518,7 @@ sg_new_read(Sg_fd * sfp, char __user *buf, size_t count, Sg_request * srp) | |||
518 | goto err_out; | 518 | goto err_out; |
519 | } | 519 | } |
520 | err_out: | 520 | err_out: |
521 | sg_finish_rem_req(srp); | 521 | err = sg_finish_rem_req(srp); |
522 | return (0 == err) ? count : err; | 522 | return (0 == err) ? count : err; |
523 | } | 523 | } |
524 | 524 | ||
@@ -1696,9 +1696,10 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd) | |||
1696 | return res; | 1696 | return res; |
1697 | } | 1697 | } |
1698 | 1698 | ||
1699 | static void | 1699 | static int sg_finish_rem_req(Sg_request * srp) |
1700 | sg_finish_rem_req(Sg_request * srp) | ||
1701 | { | 1700 | { |
1701 | int ret = 0; | ||
1702 | |||
1702 | Sg_fd *sfp = srp->parentfp; | 1703 | Sg_fd *sfp = srp->parentfp; |
1703 | Sg_scatter_hold *req_schp = &srp->data; | 1704 | Sg_scatter_hold *req_schp = &srp->data; |
1704 | 1705 | ||
@@ -1710,12 +1711,14 @@ sg_finish_rem_req(Sg_request * srp) | |||
1710 | 1711 | ||
1711 | if (srp->rq) { | 1712 | if (srp->rq) { |
1712 | if (srp->bio) | 1713 | if (srp->bio) |
1713 | blk_rq_unmap_user(srp->bio); | 1714 | ret = blk_rq_unmap_user(srp->bio); |
1714 | 1715 | ||
1715 | blk_put_request(srp->rq); | 1716 | blk_put_request(srp->rq); |
1716 | } | 1717 | } |
1717 | 1718 | ||
1718 | sg_remove_request(sfp, srp); | 1719 | sg_remove_request(sfp, srp); |
1720 | |||
1721 | return ret; | ||
1719 | } | 1722 | } |
1720 | 1723 | ||
1721 | static int | 1724 | static int |
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c index d92ff512d21..291236e6e43 100644 --- a/drivers/scsi/sr_ioctl.c +++ b/drivers/scsi/sr_ioctl.c | |||
@@ -309,6 +309,11 @@ int sr_drive_status(struct cdrom_device_info *cdi, int slot) | |||
309 | if (0 == sr_test_unit_ready(cd->device, &sshdr)) | 309 | if (0 == sr_test_unit_ready(cd->device, &sshdr)) |
310 | return CDS_DISC_OK; | 310 | return CDS_DISC_OK; |
311 | 311 | ||
312 | /* SK/ASC/ASCQ of 2/4/1 means "unit is becoming ready" */ | ||
313 | if (scsi_sense_valid(&sshdr) && sshdr.sense_key == NOT_READY | ||
314 | && sshdr.asc == 0x04 && sshdr.ascq == 0x01) | ||
315 | return CDS_DRIVE_NOT_READY; | ||
316 | |||
312 | if (!cdrom_get_media_event(cdi, &med)) { | 317 | if (!cdrom_get_media_event(cdi, &med)) { |
313 | if (med.media_present) | 318 | if (med.media_present) |
314 | return CDS_DISC_OK; | 319 | return CDS_DISC_OK; |
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 7ba7d70f04d..7be52fe288e 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
@@ -23,16 +23,18 @@ static char *serial_version = "$Revision: 1.25 $"; | |||
23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <asm/uaccess.h> | ||
27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
28 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
29 | #include <linux/bitops.h> | 28 | #include <linux/bitops.h> |
29 | #include <linux/seq_file.h> | ||
30 | #include <linux/delay.h> | ||
31 | #include <linux/module.h> | ||
32 | #include <linux/uaccess.h> | ||
33 | #include <linux/io.h> | ||
30 | 34 | ||
31 | #include <asm/io.h> | ||
32 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
33 | #include <asm/dma.h> | 36 | #include <asm/dma.h> |
34 | #include <asm/system.h> | 37 | #include <asm/system.h> |
35 | #include <linux/delay.h> | ||
36 | 38 | ||
37 | #include <arch/svinto.h> | 39 | #include <arch/svinto.h> |
38 | 40 | ||
@@ -456,7 +458,6 @@ static struct e100_serial rs_table[] = { | |||
456 | 458 | ||
457 | #define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial)) | 459 | #define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial)) |
458 | 460 | ||
459 | static struct ktermios *serial_termios[NR_PORTS]; | ||
460 | #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER | 461 | #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER |
461 | static struct fast_timer fast_timers[NR_PORTS]; | 462 | static struct fast_timer fast_timers[NR_PORTS]; |
462 | #endif | 463 | #endif |
@@ -4257,151 +4258,132 @@ rs_open(struct tty_struct *tty, struct file * filp) | |||
4257 | return 0; | 4258 | return 0; |
4258 | } | 4259 | } |
4259 | 4260 | ||
4261 | #ifdef CONFIG_PROC_FS | ||
4260 | /* | 4262 | /* |
4261 | * /proc fs routines.... | 4263 | * /proc fs routines.... |
4262 | */ | 4264 | */ |
4263 | 4265 | ||
4264 | static int line_info(char *buf, struct e100_serial *info) | 4266 | static void seq_line_info(struct seq_file *m, struct e100_serial *info) |
4265 | { | 4267 | { |
4266 | char stat_buf[30]; | ||
4267 | int ret; | ||
4268 | unsigned long tmp; | 4268 | unsigned long tmp; |
4269 | 4269 | ||
4270 | ret = sprintf(buf, "%d: uart:E100 port:%lX irq:%d", | 4270 | seq_printf(m, "%d: uart:E100 port:%lX irq:%d", |
4271 | info->line, (unsigned long)info->ioport, info->irq); | 4271 | info->line, (unsigned long)info->ioport, info->irq); |
4272 | 4272 | ||
4273 | if (!info->ioport || (info->type == PORT_UNKNOWN)) { | 4273 | if (!info->ioport || (info->type == PORT_UNKNOWN)) { |
4274 | ret += sprintf(buf+ret, "\n"); | 4274 | seq_printf(m, "\n"); |
4275 | return ret; | 4275 | return; |
4276 | } | 4276 | } |
4277 | 4277 | ||
4278 | stat_buf[0] = 0; | 4278 | seq_printf(m, " baud:%d", info->baud); |
4279 | stat_buf[1] = 0; | 4279 | seq_printf(m, " tx:%lu rx:%lu", |
4280 | if (!E100_RTS_GET(info)) | ||
4281 | strcat(stat_buf, "|RTS"); | ||
4282 | if (!E100_CTS_GET(info)) | ||
4283 | strcat(stat_buf, "|CTS"); | ||
4284 | if (!E100_DTR_GET(info)) | ||
4285 | strcat(stat_buf, "|DTR"); | ||
4286 | if (!E100_DSR_GET(info)) | ||
4287 | strcat(stat_buf, "|DSR"); | ||
4288 | if (!E100_CD_GET(info)) | ||
4289 | strcat(stat_buf, "|CD"); | ||
4290 | if (!E100_RI_GET(info)) | ||
4291 | strcat(stat_buf, "|RI"); | ||
4292 | |||
4293 | ret += sprintf(buf+ret, " baud:%d", info->baud); | ||
4294 | |||
4295 | ret += sprintf(buf+ret, " tx:%lu rx:%lu", | ||
4296 | (unsigned long)info->icount.tx, | 4280 | (unsigned long)info->icount.tx, |
4297 | (unsigned long)info->icount.rx); | 4281 | (unsigned long)info->icount.rx); |
4298 | tmp = CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE); | 4282 | tmp = CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE); |
4299 | if (tmp) { | 4283 | if (tmp) |
4300 | ret += sprintf(buf+ret, " tx_pend:%lu/%lu", | 4284 | seq_printf(m, " tx_pend:%lu/%lu", |
4301 | (unsigned long)tmp, | 4285 | (unsigned long)tmp, |
4302 | (unsigned long)SERIAL_XMIT_SIZE); | 4286 | (unsigned long)SERIAL_XMIT_SIZE); |
4303 | } | ||
4304 | 4287 | ||
4305 | ret += sprintf(buf+ret, " rx_pend:%lu/%lu", | 4288 | seq_printf(m, " rx_pend:%lu/%lu", |
4306 | (unsigned long)info->recv_cnt, | 4289 | (unsigned long)info->recv_cnt, |
4307 | (unsigned long)info->max_recv_cnt); | 4290 | (unsigned long)info->max_recv_cnt); |
4308 | 4291 | ||
4309 | #if 1 | 4292 | #if 1 |
4310 | if (info->port.tty) { | 4293 | if (info->port.tty) { |
4311 | |||
4312 | if (info->port.tty->stopped) | 4294 | if (info->port.tty->stopped) |
4313 | ret += sprintf(buf+ret, " stopped:%i", | 4295 | seq_printf(m, " stopped:%i", |
4314 | (int)info->port.tty->stopped); | 4296 | (int)info->port.tty->stopped); |
4315 | if (info->port.tty->hw_stopped) | 4297 | if (info->port.tty->hw_stopped) |
4316 | ret += sprintf(buf+ret, " hw_stopped:%i", | 4298 | seq_printf(m, " hw_stopped:%i", |
4317 | (int)info->port.tty->hw_stopped); | 4299 | (int)info->port.tty->hw_stopped); |
4318 | } | 4300 | } |
4319 | 4301 | ||
4320 | { | 4302 | { |
4321 | unsigned char rstat = info->ioport[REG_STATUS]; | 4303 | unsigned char rstat = info->ioport[REG_STATUS]; |
4322 | if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) ) | 4304 | if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect)) |
4323 | ret += sprintf(buf+ret, " xoff_detect:1"); | 4305 | seq_printf(m, " xoff_detect:1"); |
4324 | } | 4306 | } |
4325 | 4307 | ||
4326 | #endif | 4308 | #endif |
4327 | 4309 | ||
4328 | |||
4329 | |||
4330 | |||
4331 | if (info->icount.frame) | 4310 | if (info->icount.frame) |
4332 | ret += sprintf(buf+ret, " fe:%lu", | 4311 | seq_printf(m, " fe:%lu", (unsigned long)info->icount.frame); |
4333 | (unsigned long)info->icount.frame); | ||
4334 | 4312 | ||
4335 | if (info->icount.parity) | 4313 | if (info->icount.parity) |
4336 | ret += sprintf(buf+ret, " pe:%lu", | 4314 | seq_printf(m, " pe:%lu", (unsigned long)info->icount.parity); |
4337 | (unsigned long)info->icount.parity); | ||
4338 | 4315 | ||
4339 | if (info->icount.brk) | 4316 | if (info->icount.brk) |
4340 | ret += sprintf(buf+ret, " brk:%lu", | 4317 | seq_printf(m, " brk:%lu", (unsigned long)info->icount.brk); |
4341 | (unsigned long)info->icount.brk); | ||
4342 | 4318 | ||
4343 | if (info->icount.overrun) | 4319 | if (info->icount.overrun) |
4344 | ret += sprintf(buf+ret, " oe:%lu", | 4320 | seq_printf(m, " oe:%lu", (unsigned long)info->icount.overrun); |
4345 | (unsigned long)info->icount.overrun); | ||
4346 | 4321 | ||
4347 | /* | 4322 | /* |
4348 | * Last thing is the RS-232 status lines | 4323 | * Last thing is the RS-232 status lines |
4349 | */ | 4324 | */ |
4350 | ret += sprintf(buf+ret, " %s\n", stat_buf+1); | 4325 | if (!E100_RTS_GET(info)) |
4351 | return ret; | 4326 | seq_puts(m, "|RTS"); |
4327 | if (!E100_CTS_GET(info)) | ||
4328 | seq_puts(m, "|CTS"); | ||
4329 | if (!E100_DTR_GET(info)) | ||
4330 | seq_puts(m, "|DTR"); | ||
4331 | if (!E100_DSR_GET(info)) | ||
4332 | seq_puts(m, "|DSR"); | ||
4333 | if (!E100_CD_GET(info)) | ||
4334 | seq_puts(m, "|CD"); | ||
4335 | if (!E100_RI_GET(info)) | ||
4336 | seq_puts(m, "|RI"); | ||
4337 | seq_puts(m, "\n"); | ||
4352 | } | 4338 | } |
4353 | 4339 | ||
4354 | int rs_read_proc(char *page, char **start, off_t off, int count, | 4340 | |
4355 | int *eof, void *data) | 4341 | static int crisv10_proc_show(struct seq_file *m, void *v) |
4356 | { | 4342 | { |
4357 | int i, len = 0, l; | 4343 | int i; |
4358 | off_t begin = 0; | ||
4359 | 4344 | ||
4360 | len += sprintf(page, "serinfo:1.0 driver:%s\n", | 4345 | seq_printf(m, "serinfo:1.0 driver:%s\n", serial_version); |
4361 | serial_version); | 4346 | |
4362 | for (i = 0; i < NR_PORTS && len < 4000; i++) { | 4347 | for (i = 0; i < NR_PORTS; i++) { |
4363 | if (!rs_table[i].enabled) | 4348 | if (!rs_table[i].enabled) |
4364 | continue; | 4349 | continue; |
4365 | l = line_info(page + len, &rs_table[i]); | 4350 | seq_line_info(m, &rs_table[i]); |
4366 | len += l; | ||
4367 | if (len+begin > off+count) | ||
4368 | goto done; | ||
4369 | if (len+begin < off) { | ||
4370 | begin += len; | ||
4371 | len = 0; | ||
4372 | } | ||
4373 | } | 4351 | } |
4374 | #ifdef DEBUG_LOG_INCLUDED | 4352 | #ifdef DEBUG_LOG_INCLUDED |
4375 | for (i = 0; i < debug_log_pos; i++) { | 4353 | for (i = 0; i < debug_log_pos; i++) { |
4376 | len += sprintf(page + len, "%-4i %lu.%lu ", i, debug_log[i].time, timer_data_to_ns(debug_log[i].timer_data)); | 4354 | seq_printf(m, "%-4i %lu.%lu ", |
4377 | len += sprintf(page + len, debug_log[i].string, debug_log[i].value); | 4355 | i, debug_log[i].time, |
4378 | if (len+begin > off+count) | 4356 | timer_data_to_ns(debug_log[i].timer_data)); |
4379 | goto done; | 4357 | seq_printf(m, debug_log[i].string, debug_log[i].value); |
4380 | if (len+begin < off) { | ||
4381 | begin += len; | ||
4382 | len = 0; | ||
4383 | } | ||
4384 | } | 4358 | } |
4385 | len += sprintf(page + len, "debug_log %i/%i %li bytes\n", | 4359 | seq_printf(m, "debug_log %i/%i\n", i, DEBUG_LOG_SIZE); |
4386 | i, DEBUG_LOG_SIZE, begin+len); | ||
4387 | debug_log_pos = 0; | 4360 | debug_log_pos = 0; |
4388 | #endif | 4361 | #endif |
4362 | return 0; | ||
4363 | } | ||
4389 | 4364 | ||
4390 | *eof = 1; | 4365 | static int crisv10_proc_open(struct inode *inode, struct file *file) |
4391 | done: | 4366 | { |
4392 | if (off >= len+begin) | 4367 | return single_open(file, crisv10_proc_show, NULL); |
4393 | return 0; | ||
4394 | *start = page + (off-begin); | ||
4395 | return ((count < begin+len-off) ? count : begin+len-off); | ||
4396 | } | 4368 | } |
4397 | 4369 | ||
4370 | static const struct file_operations crisv10_proc_fops = { | ||
4371 | .owner = THIS_MODULE, | ||
4372 | .open = crisv10_proc_open, | ||
4373 | .read = seq_read, | ||
4374 | .llseek = seq_lseek, | ||
4375 | .release = single_release, | ||
4376 | }; | ||
4377 | #endif | ||
4378 | |||
4379 | |||
4398 | /* Finally, routines used to initialize the serial driver. */ | 4380 | /* Finally, routines used to initialize the serial driver. */ |
4399 | 4381 | ||
4400 | static void | 4382 | static void show_serial_version(void) |
4401 | show_serial_version(void) | ||
4402 | { | 4383 | { |
4403 | printk(KERN_INFO | 4384 | printk(KERN_INFO |
4404 | "ETRAX 100LX serial-driver %s, (c) 2000-2004 Axis Communications AB\r\n", | 4385 | "ETRAX 100LX serial-driver %s, " |
4386 | "(c) 2000-2004 Axis Communications AB\r\n", | ||
4405 | &serial_version[11]); /* "$Revision: x.yy" */ | 4387 | &serial_version[11]); /* "$Revision: x.yy" */ |
4406 | } | 4388 | } |
4407 | 4389 | ||
@@ -4425,13 +4407,14 @@ static const struct tty_operations rs_ops = { | |||
4425 | .break_ctl = rs_break, | 4407 | .break_ctl = rs_break, |
4426 | .send_xchar = rs_send_xchar, | 4408 | .send_xchar = rs_send_xchar, |
4427 | .wait_until_sent = rs_wait_until_sent, | 4409 | .wait_until_sent = rs_wait_until_sent, |
4428 | .read_proc = rs_read_proc, | ||
4429 | .tiocmget = rs_tiocmget, | 4410 | .tiocmget = rs_tiocmget, |
4430 | .tiocmset = rs_tiocmset | 4411 | .tiocmset = rs_tiocmset, |
4412 | #ifdef CONFIG_PROC_FS | ||
4413 | .proc_fops = &crisv10_proc_fops, | ||
4414 | #endif | ||
4431 | }; | 4415 | }; |
4432 | 4416 | ||
4433 | static int __init | 4417 | static int __init rs_init(void) |
4434 | rs_init(void) | ||
4435 | { | 4418 | { |
4436 | int i; | 4419 | int i; |
4437 | struct e100_serial *info; | 4420 | struct e100_serial *info; |
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h index 8871aaa3dba..c0a3e2734e2 100644 --- a/drivers/serial/jsm/jsm.h +++ b/drivers/serial/jsm/jsm.h | |||
@@ -130,8 +130,6 @@ struct jsm_board | |||
130 | struct pci_dev *pci_dev; | 130 | struct pci_dev *pci_dev; |
131 | u32 maxports; /* MAX ports this board can handle */ | 131 | u32 maxports; /* MAX ports this board can handle */ |
132 | 132 | ||
133 | spinlock_t bd_lock; /* Used to protect board */ | ||
134 | |||
135 | spinlock_t bd_intr_lock; /* Used to protect the poller tasklet and | 133 | spinlock_t bd_intr_lock; /* Used to protect the poller tasklet and |
136 | * the interrupt routine from each other. | 134 | * the interrupt routine from each other. |
137 | */ | 135 | */ |
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c index d2d32a19862..b3604aa322a 100644 --- a/drivers/serial/jsm/jsm_driver.c +++ b/drivers/serial/jsm/jsm_driver.c | |||
@@ -88,7 +88,6 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device | |||
88 | else | 88 | else |
89 | brd->maxports = 2; | 89 | brd->maxports = 2; |
90 | 90 | ||
91 | spin_lock_init(&brd->bd_lock); | ||
92 | spin_lock_init(&brd->bd_intr_lock); | 91 | spin_lock_init(&brd->bd_intr_lock); |
93 | 92 | ||
94 | /* store which revision we have */ | 93 | /* store which revision we have */ |
diff --git a/drivers/serial/s3c6400.c b/drivers/serial/s3c6400.c index 06936d13393..3e378523368 100644 --- a/drivers/serial/s3c6400.c +++ b/drivers/serial/s3c6400.c | |||
@@ -102,6 +102,7 @@ static struct s3c24xx_uart_info s3c6400_uart_inf = { | |||
102 | .name = "Samsung S3C6400 UART", | 102 | .name = "Samsung S3C6400 UART", |
103 | .type = PORT_S3C6400, | 103 | .type = PORT_S3C6400, |
104 | .fifosize = 64, | 104 | .fifosize = 64, |
105 | .has_divslot = 1, | ||
105 | .rx_fifomask = S3C2440_UFSTAT_RXMASK, | 106 | .rx_fifomask = S3C2440_UFSTAT_RXMASK, |
106 | .rx_fifoshift = S3C2440_UFSTAT_RXSHIFT, | 107 | .rx_fifoshift = S3C2440_UFSTAT_RXSHIFT, |
107 | .rx_fifofull = S3C2440_UFSTAT_RXFULL, | 108 | .rx_fifofull = S3C2440_UFSTAT_RXFULL, |
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index e06686ae858..93b5d75db12 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c | |||
@@ -508,6 +508,7 @@ s3c24xx_serial_setsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c) | |||
508 | struct baud_calc { | 508 | struct baud_calc { |
509 | struct s3c24xx_uart_clksrc *clksrc; | 509 | struct s3c24xx_uart_clksrc *clksrc; |
510 | unsigned int calc; | 510 | unsigned int calc; |
511 | unsigned int divslot; | ||
511 | unsigned int quot; | 512 | unsigned int quot; |
512 | struct clk *src; | 513 | struct clk *src; |
513 | }; | 514 | }; |
@@ -517,6 +518,7 @@ static int s3c24xx_serial_calcbaud(struct baud_calc *calc, | |||
517 | struct s3c24xx_uart_clksrc *clksrc, | 518 | struct s3c24xx_uart_clksrc *clksrc, |
518 | unsigned int baud) | 519 | unsigned int baud) |
519 | { | 520 | { |
521 | struct s3c24xx_uart_port *ourport = to_ourport(port); | ||
520 | unsigned long rate; | 522 | unsigned long rate; |
521 | 523 | ||
522 | calc->src = clk_get(port->dev, clksrc->name); | 524 | calc->src = clk_get(port->dev, clksrc->name); |
@@ -527,8 +529,24 @@ static int s3c24xx_serial_calcbaud(struct baud_calc *calc, | |||
527 | rate /= clksrc->divisor; | 529 | rate /= clksrc->divisor; |
528 | 530 | ||
529 | calc->clksrc = clksrc; | 531 | calc->clksrc = clksrc; |
530 | calc->quot = (rate + (8 * baud)) / (16 * baud); | 532 | |
531 | calc->calc = (rate / (calc->quot * 16)); | 533 | if (ourport->info->has_divslot) { |
534 | unsigned long div = rate / baud; | ||
535 | |||
536 | /* The UDIVSLOT register on the newer UARTs allows us to | ||
537 | * get a divisor adjustment of 1/16th on the baud clock. | ||
538 | * | ||
539 | * We don't keep the UDIVSLOT value (the 16ths we calculated | ||
540 | * by not multiplying the baud by 16) as it is easy enough | ||
541 | * to recalculate. | ||
542 | */ | ||
543 | |||
544 | calc->quot = div / 16; | ||
545 | calc->calc = rate / div; | ||
546 | } else { | ||
547 | calc->quot = (rate + (8 * baud)) / (16 * baud); | ||
548 | calc->calc = (rate / (calc->quot * 16)); | ||
549 | } | ||
532 | 550 | ||
533 | calc->quot--; | 551 | calc->quot--; |
534 | return 1; | 552 | return 1; |
@@ -611,6 +629,30 @@ static unsigned int s3c24xx_serial_getclk(struct uart_port *port, | |||
611 | return best->quot; | 629 | return best->quot; |
612 | } | 630 | } |
613 | 631 | ||
632 | /* udivslot_table[] | ||
633 | * | ||
634 | * This table takes the fractional value of the baud divisor and gives | ||
635 | * the recommended setting for the UDIVSLOT register. | ||
636 | */ | ||
637 | static u16 udivslot_table[16] = { | ||
638 | [0] = 0x0000, | ||
639 | [1] = 0x0080, | ||
640 | [2] = 0x0808, | ||
641 | [3] = 0x0888, | ||
642 | [4] = 0x2222, | ||
643 | [5] = 0x4924, | ||
644 | [6] = 0x4A52, | ||
645 | [7] = 0x54AA, | ||
646 | [8] = 0x5555, | ||
647 | [9] = 0xD555, | ||
648 | [10] = 0xD5D5, | ||
649 | [11] = 0xDDD5, | ||
650 | [12] = 0xDDDD, | ||
651 | [13] = 0xDFDD, | ||
652 | [14] = 0xDFDF, | ||
653 | [15] = 0xFFDF, | ||
654 | }; | ||
655 | |||
614 | static void s3c24xx_serial_set_termios(struct uart_port *port, | 656 | static void s3c24xx_serial_set_termios(struct uart_port *port, |
615 | struct ktermios *termios, | 657 | struct ktermios *termios, |
616 | struct ktermios *old) | 658 | struct ktermios *old) |
@@ -623,6 +665,7 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
623 | unsigned int baud, quot; | 665 | unsigned int baud, quot; |
624 | unsigned int ulcon; | 666 | unsigned int ulcon; |
625 | unsigned int umcon; | 667 | unsigned int umcon; |
668 | unsigned int udivslot = 0; | ||
626 | 669 | ||
627 | /* | 670 | /* |
628 | * We don't support modem control lines. | 671 | * We don't support modem control lines. |
@@ -644,6 +687,7 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
644 | /* check to see if we need to change clock source */ | 687 | /* check to see if we need to change clock source */ |
645 | 688 | ||
646 | if (ourport->clksrc != clksrc || ourport->baudclk != clk) { | 689 | if (ourport->clksrc != clksrc || ourport->baudclk != clk) { |
690 | dbg("selecting clock %p\n", clk); | ||
647 | s3c24xx_serial_setsource(port, clksrc); | 691 | s3c24xx_serial_setsource(port, clksrc); |
648 | 692 | ||
649 | if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) { | 693 | if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) { |
@@ -658,6 +702,13 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
658 | ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; | 702 | ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; |
659 | } | 703 | } |
660 | 704 | ||
705 | if (ourport->info->has_divslot) { | ||
706 | unsigned int div = ourport->baudclk_rate / baud; | ||
707 | |||
708 | udivslot = udivslot_table[div & 15]; | ||
709 | dbg("udivslot = %04x (div %d)\n", udivslot, div & 15); | ||
710 | } | ||
711 | |||
661 | switch (termios->c_cflag & CSIZE) { | 712 | switch (termios->c_cflag & CSIZE) { |
662 | case CS5: | 713 | case CS5: |
663 | dbg("config: 5bits/char\n"); | 714 | dbg("config: 5bits/char\n"); |
@@ -697,12 +748,16 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
697 | 748 | ||
698 | spin_lock_irqsave(&port->lock, flags); | 749 | spin_lock_irqsave(&port->lock, flags); |
699 | 750 | ||
700 | dbg("setting ulcon to %08x, brddiv to %d\n", ulcon, quot); | 751 | dbg("setting ulcon to %08x, brddiv to %d, udivslot %08x\n", |
752 | ulcon, quot, udivslot); | ||
701 | 753 | ||
702 | wr_regl(port, S3C2410_ULCON, ulcon); | 754 | wr_regl(port, S3C2410_ULCON, ulcon); |
703 | wr_regl(port, S3C2410_UBRDIV, quot); | 755 | wr_regl(port, S3C2410_UBRDIV, quot); |
704 | wr_regl(port, S3C2410_UMCON, umcon); | 756 | wr_regl(port, S3C2410_UMCON, umcon); |
705 | 757 | ||
758 | if (ourport->info->has_divslot) | ||
759 | wr_regl(port, S3C2443_DIVSLOT, udivslot); | ||
760 | |||
706 | dbg("uart: ulcon = 0x%08x, ucon = 0x%08x, ufcon = 0x%08x\n", | 761 | dbg("uart: ulcon = 0x%08x, ucon = 0x%08x, ufcon = 0x%08x\n", |
707 | rd_regl(port, S3C2410_ULCON), | 762 | rd_regl(port, S3C2410_ULCON), |
708 | rd_regl(port, S3C2410_UCON), | 763 | rd_regl(port, S3C2410_UCON), |
diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h index 571d6b90d20..7afb94843a0 100644 --- a/drivers/serial/samsung.h +++ b/drivers/serial/samsung.h | |||
@@ -21,6 +21,10 @@ struct s3c24xx_uart_info { | |||
21 | unsigned long tx_fifoshift; | 21 | unsigned long tx_fifoshift; |
22 | unsigned long tx_fifofull; | 22 | unsigned long tx_fifofull; |
23 | 23 | ||
24 | /* uart port features */ | ||
25 | |||
26 | unsigned int has_divslot:1; | ||
27 | |||
24 | /* clock source control */ | 28 | /* clock source control */ |
25 | 29 | ||
26 | int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk); | 30 | int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk); |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 885194a0741..3f3c08c6ba4 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -1373,6 +1373,9 @@ static void cleanup(struct spi_device *spi) | |||
1373 | { | 1373 | { |
1374 | struct chip_data *chip = spi_get_ctldata(spi); | 1374 | struct chip_data *chip = spi_get_ctldata(spi); |
1375 | 1375 | ||
1376 | if (!chip) | ||
1377 | return; | ||
1378 | |||
1376 | if (gpio_is_valid(chip->gpio_cs)) | 1379 | if (gpio_is_valid(chip->gpio_cs)) |
1377 | gpio_free(chip->gpio_cs); | 1380 | gpio_free(chip->gpio_cs); |
1378 | 1381 | ||
diff --git a/drivers/staging/comedi/TODO b/drivers/staging/comedi/TODO index 55781295846..15c9348fb93 100644 --- a/drivers/staging/comedi/TODO +++ b/drivers/staging/comedi/TODO | |||
@@ -11,4 +11,3 @@ Please send patches to Greg Kroah-Hartman <greg@kroah.com> and | |||
11 | copy: | 11 | copy: |
12 | Ian Abbott <abbotti@mev.co.uk> | 12 | Ian Abbott <abbotti@mev.co.uk> |
13 | Frank Mori Hess <fmhess@users.sourceforge.net> | 13 | Frank Mori Hess <fmhess@users.sourceforge.net> |
14 | David Schleef <ds@schleef.org> | ||
diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h index a42caa37080..a69cf338e49 100644 --- a/drivers/staging/rt2870/rt2870.h +++ b/drivers/staging/rt2870/rt2870.h | |||
@@ -145,6 +145,7 @@ | |||
145 | {USB_DEVICE(0x0789,0x0162)}, /* Logitec */ \ | 145 | {USB_DEVICE(0x0789,0x0162)}, /* Logitec */ \ |
146 | {USB_DEVICE(0x0789,0x0163)}, /* Logitec */ \ | 146 | {USB_DEVICE(0x0789,0x0163)}, /* Logitec */ \ |
147 | {USB_DEVICE(0x0789,0x0164)}, /* Logitec */ \ | 147 | {USB_DEVICE(0x0789,0x0164)}, /* Logitec */ \ |
148 | {USB_DEVICE(0x7392,0x7717)}, /* Edimax */ \ | ||
148 | { }/* Terminating entry */ \ | 149 | { }/* Terminating entry */ \ |
149 | } | 150 | } |
150 | 151 | ||
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h index 12215fc61dd..db446b7e2e0 100644 --- a/drivers/staging/rtl8187se/r8180.h +++ b/drivers/staging/rtl8187se/r8180.h | |||
@@ -19,7 +19,7 @@ | |||
19 | #define R8180H | 19 | #define R8180H |
20 | 20 | ||
21 | 21 | ||
22 | #define RTL8180_MODULE_NAME "rtl8180" | 22 | #define RTL8180_MODULE_NAME "r8180" |
23 | #define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a) | 23 | #define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a) |
24 | #define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a) | 24 | #define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a) |
25 | #define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a) | 25 | #define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a) |
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 6ecd12de429..e10413cee0d 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c | |||
@@ -640,11 +640,9 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
640 | { | 640 | { |
641 | struct proc_dir_entry *e; | 641 | struct proc_dir_entry *e; |
642 | struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); | 642 | struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); |
643 | priv->dir_dev = create_proc_entry(dev->name, | 643 | priv->dir_dev = rtl8180_proc; |
644 | S_IFDIR | S_IRUGO | S_IXUGO, | ||
645 | rtl8180_proc); | ||
646 | if (!priv->dir_dev) { | 644 | if (!priv->dir_dev) { |
647 | DMESGE("Unable to initialize /proc/net/rtl8180/%s\n", | 645 | DMESGE("Unable to initialize /proc/net/r8180/%s\n", |
648 | dev->name); | 646 | dev->name); |
649 | return; | 647 | return; |
650 | } | 648 | } |
@@ -654,7 +652,7 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
654 | 652 | ||
655 | if (!e) { | 653 | if (!e) { |
656 | DMESGE("Unable to initialize " | 654 | DMESGE("Unable to initialize " |
657 | "/proc/net/rtl8180/%s/stats-hw\n", | 655 | "/proc/net/r8180/%s/stats-hw\n", |
658 | dev->name); | 656 | dev->name); |
659 | } | 657 | } |
660 | 658 | ||
@@ -663,7 +661,7 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
663 | 661 | ||
664 | if (!e) { | 662 | if (!e) { |
665 | DMESGE("Unable to initialize " | 663 | DMESGE("Unable to initialize " |
666 | "/proc/net/rtl8180/%s/stats-rx\n", | 664 | "/proc/net/r8180/%s/stats-rx\n", |
667 | dev->name); | 665 | dev->name); |
668 | } | 666 | } |
669 | 667 | ||
@@ -673,7 +671,7 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
673 | 671 | ||
674 | if (!e) { | 672 | if (!e) { |
675 | DMESGE("Unable to initialize " | 673 | DMESGE("Unable to initialize " |
676 | "/proc/net/rtl8180/%s/stats-tx\n", | 674 | "/proc/net/r8180/%s/stats-tx\n", |
677 | dev->name); | 675 | dev->name); |
678 | } | 676 | } |
679 | #if 0 | 677 | #if 0 |
@@ -702,7 +700,7 @@ void rtl8180_proc_init_one(struct net_device *dev) | |||
702 | 700 | ||
703 | if (!e) { | 701 | if (!e) { |
704 | DMESGE("Unable to initialize " | 702 | DMESGE("Unable to initialize " |
705 | "/proc/net/rtl8180/%s/registers\n", | 703 | "/proc/net/r8180/%s/registers\n", |
706 | dev->name); | 704 | dev->name); |
707 | } | 705 | } |
708 | } | 706 | } |
@@ -977,13 +975,6 @@ void check_tx_ring(struct net_device *dev, int pri) | |||
977 | *tmp & (1<<15)? "ok": "err", *(tmp+4)); | 975 | *tmp & (1<<15)? "ok": "err", *(tmp+4)); |
978 | } | 976 | } |
979 | 977 | ||
980 | DMESG("nic at %d", | ||
981 | (nic-nicbegin) / 8 /4); | ||
982 | DMESG("tail at %d", ((int)tail - (int)begin) /8 /4); | ||
983 | DMESG("head at %d", ((int)head - (int)begin) /8 /4); | ||
984 | DMESG("check free desc returns %d", check_nic_enought_desc(dev,pri)); | ||
985 | DMESG("free desc is %d\n", get_curr_tx_free_desc(dev,pri)); | ||
986 | //rtl8180_reset(dev); | ||
987 | return; | 978 | return; |
988 | } | 979 | } |
989 | 980 | ||
@@ -1736,17 +1727,7 @@ short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count, | |||
1736 | * descriptor's buffer must be 256 byte aligned | 1727 | * descriptor's buffer must be 256 byte aligned |
1737 | * we shouldn't be here, since we set DMA mask ! | 1728 | * we shouldn't be here, since we set DMA mask ! |
1738 | */ | 1729 | */ |
1739 | DMESGW("Fixing TX alignment"); | 1730 | WARN(1, "DMA buffer is not aligned\n"); |
1740 | desc = (u32*)((u8*)desc + 256); | ||
1741 | #if (defined(CONFIG_HIGHMEM64G) || defined(CONFIG_64BIT_PHYS_ADDR)) | ||
1742 | desc = (u32*)((u64)desc &~ 0xff); | ||
1743 | dma_desc = (dma_addr_t)((u8*)dma_desc + 256); | ||
1744 | dma_desc = (dma_addr_t)((u64)dma_desc &~ 0xff); | ||
1745 | #else | ||
1746 | desc = (u32*)((u32)desc &~ 0xff); | ||
1747 | dma_desc = (dma_addr_t)((u8*)dma_desc + 256); | ||
1748 | dma_desc = (dma_addr_t)((u32)dma_desc &~ 0xff); | ||
1749 | #endif | ||
1750 | } | 1731 | } |
1751 | tmp=desc; | 1732 | tmp=desc; |
1752 | for (i=0;i<count;i++) | 1733 | for (i=0;i<count;i++) |
@@ -1984,18 +1965,7 @@ short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count) | |||
1984 | * descriptor's buffer must be 256 byte aligned | 1965 | * descriptor's buffer must be 256 byte aligned |
1985 | * should never happen since we specify the DMA mask | 1966 | * should never happen since we specify the DMA mask |
1986 | */ | 1967 | */ |
1987 | 1968 | WARN(1, "DMA buffer is not aligned\n"); | |
1988 | DMESGW("Fixing RX alignment"); | ||
1989 | desc = (u32*)((u8*)desc + 256); | ||
1990 | #if (defined(CONFIG_HIGHMEM64G) || defined(CONFIG_64BIT_PHYS_ADDR)) | ||
1991 | desc = (u32*)((u64)desc &~ 0xff); | ||
1992 | dma_desc = (dma_addr_t)((u8*)dma_desc + 256); | ||
1993 | dma_desc = (dma_addr_t)((u64)dma_desc &~ 0xff); | ||
1994 | #else | ||
1995 | desc = (u32*)((u32)desc &~ 0xff); | ||
1996 | dma_desc = (dma_addr_t)((u8*)dma_desc + 256); | ||
1997 | dma_desc = (dma_addr_t)((u32)dma_desc &~ 0xff); | ||
1998 | #endif | ||
1999 | } | 1969 | } |
2000 | 1970 | ||
2001 | priv->rxring=desc; | 1971 | priv->rxring=desc; |
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c index 9c3f9439f35..3b2d52819b4 100644 --- a/drivers/staging/winbond/wbusb.c +++ b/drivers/staging/winbond/wbusb.c | |||
@@ -386,7 +386,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id | |||
386 | if (err) | 386 | if (err) |
387 | goto error_free_hw; | 387 | goto error_free_hw; |
388 | 388 | ||
389 | usb_set_intfdata(intf, priv); | 389 | usb_set_intfdata(intf, dev); |
390 | 390 | ||
391 | return 0; | 391 | return 0; |
392 | 392 | ||
@@ -415,10 +415,15 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter) | |||
415 | 415 | ||
416 | static void wb35_disconnect(struct usb_interface *intf) | 416 | static void wb35_disconnect(struct usb_interface *intf) |
417 | { | 417 | { |
418 | struct wbsoft_priv *priv = usb_get_intfdata(intf); | 418 | struct ieee80211_hw *hw = usb_get_intfdata(intf); |
419 | struct wbsoft_priv *priv = hw->priv; | ||
419 | 420 | ||
420 | wb35_hw_halt(priv); | 421 | wb35_hw_halt(priv); |
421 | 422 | ||
423 | ieee80211_stop_queues(hw); | ||
424 | ieee80211_unregister_hw(hw); | ||
425 | ieee80211_free_hw(hw); | ||
426 | |||
422 | usb_set_intfdata(intf, NULL); | 427 | usb_set_intfdata(intf, NULL); |
423 | usb_put_dev(interface_to_usbdev(intf)); | 428 | usb_put_dev(interface_to_usbdev(intf)); |
424 | } | 429 | } |
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 89299a5ce16..0716cdb44cd 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
@@ -27,6 +27,8 @@ obj-$(CONFIG_USB_WUSB) += wusbcore/ | |||
27 | 27 | ||
28 | obj-$(CONFIG_USB_ACM) += class/ | 28 | obj-$(CONFIG_USB_ACM) += class/ |
29 | obj-$(CONFIG_USB_PRINTER) += class/ | 29 | obj-$(CONFIG_USB_PRINTER) += class/ |
30 | obj-$(CONFIG_USB_WDM) += class/ | ||
31 | obj-$(CONFIG_USB_TMC) += class/ | ||
30 | 32 | ||
31 | obj-$(CONFIG_USB_STORAGE) += storage/ | 33 | obj-$(CONFIG_USB_STORAGE) += storage/ |
32 | obj-$(CONFIG_USB) += storage/ | 34 | obj-$(CONFIG_USB) += storage/ |
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 6789089e246..56802d2e994 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
@@ -227,8 +227,14 @@ static ssize_t cxacru_sysfs_showattr_s8(s8 value, char *buf) | |||
227 | 227 | ||
228 | static ssize_t cxacru_sysfs_showattr_dB(s16 value, char *buf) | 228 | static ssize_t cxacru_sysfs_showattr_dB(s16 value, char *buf) |
229 | { | 229 | { |
230 | return snprintf(buf, PAGE_SIZE, "%d.%02u\n", | 230 | if (likely(value >= 0)) { |
231 | value / 100, abs(value) % 100); | 231 | return snprintf(buf, PAGE_SIZE, "%u.%02u\n", |
232 | value / 100, value % 100); | ||
233 | } else { | ||
234 | value = -value; | ||
235 | return snprintf(buf, PAGE_SIZE, "-%u.%02u\n", | ||
236 | value / 100, value % 100); | ||
237 | } | ||
232 | } | 238 | } |
233 | 239 | ||
234 | static ssize_t cxacru_sysfs_showattr_bool(u32 value, char *buf) | 240 | static ssize_t cxacru_sysfs_showattr_bool(u32 value, char *buf) |
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c index 4154be375c7..58c4d37d312 100644 --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c | |||
@@ -38,7 +38,7 @@ static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len) | |||
38 | uchar = (c & 0x1f) << 6; | 38 | uchar = (c & 0x1f) << 6; |
39 | 39 | ||
40 | c = (u8) *s++; | 40 | c = (u8) *s++; |
41 | if ((c & 0xc0) != 0xc0) | 41 | if ((c & 0xc0) != 0x80) |
42 | goto fail; | 42 | goto fail; |
43 | c &= 0x3f; | 43 | c &= 0x3f; |
44 | uchar |= c; | 44 | uchar |= c; |
@@ -49,13 +49,13 @@ static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len) | |||
49 | uchar = (c & 0x0f) << 12; | 49 | uchar = (c & 0x0f) << 12; |
50 | 50 | ||
51 | c = (u8) *s++; | 51 | c = (u8) *s++; |
52 | if ((c & 0xc0) != 0xc0) | 52 | if ((c & 0xc0) != 0x80) |
53 | goto fail; | 53 | goto fail; |
54 | c &= 0x3f; | 54 | c &= 0x3f; |
55 | uchar |= c << 6; | 55 | uchar |= c << 6; |
56 | 56 | ||
57 | c = (u8) *s++; | 57 | c = (u8) *s++; |
58 | if ((c & 0xc0) != 0xc0) | 58 | if ((c & 0xc0) != 0x80) |
59 | goto fail; | 59 | goto fail; |
60 | c &= 0x3f; | 60 | c &= 0x3f; |
61 | uchar |= c; | 61 | uchar |= c; |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 8100f1d2590..0ab8474b00c 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -56,6 +56,7 @@ static __u16 vendor = FTDI_VID; | |||
56 | static __u16 product; | 56 | static __u16 product; |
57 | 57 | ||
58 | struct ftdi_private { | 58 | struct ftdi_private { |
59 | struct kref kref; | ||
59 | ftdi_chip_type_t chip_type; | 60 | ftdi_chip_type_t chip_type; |
60 | /* type of device, either SIO or FT8U232AM */ | 61 | /* type of device, either SIO or FT8U232AM */ |
61 | int baud_base; /* baud base clock for divisor setting */ | 62 | int baud_base; /* baud base clock for divisor setting */ |
@@ -669,6 +670,8 @@ static struct usb_device_id id_table_combined [] = { | |||
669 | { USB_DEVICE(ADI_VID, ADI_GNICE_PID), | 670 | { USB_DEVICE(ADI_VID, ADI_GNICE_PID), |
670 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 671 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
671 | { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, | 672 | { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, |
673 | { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), | ||
674 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
672 | { }, /* Optional parameter entry */ | 675 | { }, /* Optional parameter entry */ |
673 | { } /* Terminating entry */ | 676 | { } /* Terminating entry */ |
674 | }; | 677 | }; |
@@ -1352,6 +1355,7 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port) | |||
1352 | return -ENOMEM; | 1355 | return -ENOMEM; |
1353 | } | 1356 | } |
1354 | 1357 | ||
1358 | kref_init(&priv->kref); | ||
1355 | spin_lock_init(&priv->rx_lock); | 1359 | spin_lock_init(&priv->rx_lock); |
1356 | spin_lock_init(&priv->tx_lock); | 1360 | spin_lock_init(&priv->tx_lock); |
1357 | init_waitqueue_head(&priv->delta_msr_wait); | 1361 | init_waitqueue_head(&priv->delta_msr_wait); |
@@ -1468,6 +1472,13 @@ static void ftdi_shutdown(struct usb_serial *serial) | |||
1468 | dbg("%s", __func__); | 1472 | dbg("%s", __func__); |
1469 | } | 1473 | } |
1470 | 1474 | ||
1475 | static void ftdi_sio_priv_release(struct kref *k) | ||
1476 | { | ||
1477 | struct ftdi_private *priv = container_of(k, struct ftdi_private, kref); | ||
1478 | |||
1479 | kfree(priv); | ||
1480 | } | ||
1481 | |||
1471 | static int ftdi_sio_port_remove(struct usb_serial_port *port) | 1482 | static int ftdi_sio_port_remove(struct usb_serial_port *port) |
1472 | { | 1483 | { |
1473 | struct ftdi_private *priv = usb_get_serial_port_data(port); | 1484 | struct ftdi_private *priv = usb_get_serial_port_data(port); |
@@ -1482,7 +1493,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port) | |||
1482 | 1493 | ||
1483 | if (priv) { | 1494 | if (priv) { |
1484 | usb_set_serial_port_data(port, NULL); | 1495 | usb_set_serial_port_data(port, NULL); |
1485 | kfree(priv); | 1496 | kref_put(&priv->kref, ftdi_sio_priv_release); |
1486 | } | 1497 | } |
1487 | 1498 | ||
1488 | return 0; | 1499 | return 0; |
@@ -1547,7 +1558,8 @@ static int ftdi_open(struct tty_struct *tty, | |||
1547 | dev_err(&port->dev, | 1558 | dev_err(&port->dev, |
1548 | "%s - failed submitting read urb, error %d\n", | 1559 | "%s - failed submitting read urb, error %d\n", |
1549 | __func__, result); | 1560 | __func__, result); |
1550 | 1561 | else | |
1562 | kref_get(&priv->kref); | ||
1551 | 1563 | ||
1552 | return result; | 1564 | return result; |
1553 | } /* ftdi_open */ | 1565 | } /* ftdi_open */ |
@@ -1589,11 +1601,11 @@ static void ftdi_close(struct tty_struct *tty, | |||
1589 | mutex_unlock(&port->serial->disc_mutex); | 1601 | mutex_unlock(&port->serial->disc_mutex); |
1590 | 1602 | ||
1591 | /* cancel any scheduled reading */ | 1603 | /* cancel any scheduled reading */ |
1592 | cancel_delayed_work(&priv->rx_work); | 1604 | cancel_delayed_work_sync(&priv->rx_work); |
1593 | flush_scheduled_work(); | ||
1594 | 1605 | ||
1595 | /* shutdown our bulk read */ | 1606 | /* shutdown our bulk read */ |
1596 | usb_kill_urb(port->read_urb); | 1607 | usb_kill_urb(port->read_urb); |
1608 | kref_put(&priv->kref, ftdi_sio_priv_release); | ||
1597 | } /* ftdi_close */ | 1609 | } /* ftdi_close */ |
1598 | 1610 | ||
1599 | 1611 | ||
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index c09f658a448..12330fa1c09 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -920,6 +920,12 @@ | |||
920 | #define JETI_SPC1201_PID 0x04b2 | 920 | #define JETI_SPC1201_PID 0x04b2 |
921 | 921 | ||
922 | /* | 922 | /* |
923 | * Marvell SheevaPlug | ||
924 | */ | ||
925 | #define MARVELL_VID 0x9e88 | ||
926 | #define MARVELL_SHEEVAPLUG_PID 0x9e8f | ||
927 | |||
928 | /* | ||
923 | * BmRequestType: 1100 0000b | 929 | * BmRequestType: 1100 0000b |
924 | * bRequest: FTDI_E2_READ | 930 | * bRequest: FTDI_E2_READ |
925 | * wValue: 0 | 931 | * wValue: 0 |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index fa65a3b0860..4b8b69045fe 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
@@ -160,8 +160,9 @@ UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x0100, | |||
160 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 160 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
161 | US_FL_IGNORE_RESIDUE ), | 161 | US_FL_IGNORE_RESIDUE ), |
162 | 162 | ||
163 | /* Reported by Andrew Nayenko <relan@bk.ru> */ | 163 | /* Reported by Andrew Nayenko <relan@bk.ru> |
164 | UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x0592, | 164 | * Updated for new firmware by Phillip Potter <phillipinda@hotmail.com> */ |
165 | UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x0610, | ||
165 | "Nokia", | 166 | "Nokia", |
166 | "Nokia 6288", | 167 | "Nokia 6288", |
167 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 168 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 7826bdce4bb..0048f1185a6 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -1128,13 +1128,6 @@ config FB_INTEL | |||
1128 | 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets. | 1128 | 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets. |
1129 | Say Y if you have and plan to use such a board. | 1129 | Say Y if you have and plan to use such a board. |
1130 | 1130 | ||
1131 | If you say Y here and want DDC/I2C support you must first say Y to | ||
1132 | "I2C support" and "I2C bit-banging support" in the character devices | ||
1133 | section. | ||
1134 | |||
1135 | If you say M here then "I2C support" and "I2C bit-banging support" | ||
1136 | can be build either as modules or built-in. | ||
1137 | |||
1138 | To compile this driver as a module, choose M here: the | 1131 | To compile this driver as a module, choose M here: the |
1139 | module will be called intelfb. | 1132 | module will be called intelfb. |
1140 | 1133 | ||
@@ -1207,11 +1200,10 @@ config FB_MATROX_G | |||
1207 | pixel and 32 bpp packed pixel. You can also use font widths | 1200 | pixel and 32 bpp packed pixel. You can also use font widths |
1208 | different from 8. | 1201 | different from 8. |
1209 | 1202 | ||
1210 | If you need support for G400 secondary head, you must first say Y to | 1203 | If you need support for G400 secondary head, you must say Y to |
1211 | "I2C support" in the character devices section, and then to | 1204 | "Matrox I2C support" and "G400 second head support" right below. |
1212 | "Matrox I2C support" and "G400 second head support" here in the | 1205 | G450/G550 secondary head and digital output are supported without |
1213 | framebuffer section. G450/G550 secondary head and digital output | 1206 | additional modules. |
1214 | are supported without additional modules. | ||
1215 | 1207 | ||
1216 | The driver starts in monitor mode. You must use the matroxset tool | 1208 | The driver starts in monitor mode. You must use the matroxset tool |
1217 | (available at <ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/>) to | 1209 | (available at <ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/>) to |
@@ -1310,13 +1302,6 @@ config FB_RADEON | |||
1310 | a framebuffer device. There are both PCI and AGP versions. You | 1302 | a framebuffer device. There are both PCI and AGP versions. You |
1311 | don't need to choose this to run the Radeon in plain VGA mode. | 1303 | don't need to choose this to run the Radeon in plain VGA mode. |
1312 | 1304 | ||
1313 | If you say Y here and want DDC/I2C support you must first say Y to | ||
1314 | "I2C support" and "I2C bit-banging support" in the character devices | ||
1315 | section. | ||
1316 | |||
1317 | If you say M here then "I2C support" and "I2C bit-banging support" | ||
1318 | can be build either as modules or built-in. | ||
1319 | |||
1320 | There is a product page at | 1305 | There is a product page at |
1321 | http://apps.ati.com/ATIcompare/ | 1306 | http://apps.ati.com/ATIcompare/ |
1322 | 1307 | ||
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 0dbd6c68d76..d8d0be5151e 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
@@ -56,7 +56,6 @@ obj-$(CONFIG_FB_CT65550) += chipsfb.o | |||
56 | obj-$(CONFIG_FB_IMSTT) += imsttfb.o | 56 | obj-$(CONFIG_FB_IMSTT) += imsttfb.o |
57 | obj-$(CONFIG_FB_FM2) += fm2fb.o | 57 | obj-$(CONFIG_FB_FM2) += fm2fb.o |
58 | obj-$(CONFIG_FB_VT8623) += vt8623fb.o | 58 | obj-$(CONFIG_FB_VT8623) += vt8623fb.o |
59 | obj-$(CONFIG_FB_CYBLA) += cyblafb.o | ||
60 | obj-$(CONFIG_FB_TRIDENT) += tridentfb.o | 59 | obj-$(CONFIG_FB_TRIDENT) += tridentfb.o |
61 | obj-$(CONFIG_FB_LE80578) += vermilion/ | 60 | obj-$(CONFIG_FB_LE80578) += vermilion/ |
62 | obj-$(CONFIG_FB_S3) += s3fb.o | 61 | obj-$(CONFIG_FB_S3) += s3fb.o |
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c index 64b35766b2a..ba9f58b2a5e 100644 --- a/drivers/video/cfbfillrect.c +++ b/drivers/video/cfbfillrect.c | |||
@@ -9,10 +9,6 @@ | |||
9 | * | 9 | * |
10 | * NOTES: | 10 | * NOTES: |
11 | * | 11 | * |
12 | * The code for depths like 24 that don't have integer number of pixels per | ||
13 | * long is broken and needs to be fixed. For now I turned these types of | ||
14 | * mode off. | ||
15 | * | ||
16 | * Also need to add code to deal with cards endians that are different than | 12 | * Also need to add code to deal with cards endians that are different than |
17 | * the native cpu endians. I also need to deal with MSB position in the word. | 13 | * the native cpu endians. I also need to deal with MSB position in the word. |
18 | * | 14 | * |
@@ -139,7 +135,7 @@ bitfill_unaligned(struct fb_info *p, unsigned long __iomem *dst, int dst_idx, | |||
139 | 135 | ||
140 | // Trailing bits | 136 | // Trailing bits |
141 | if (last) | 137 | if (last) |
142 | FB_WRITEL(comp(pat, FB_READL(dst), first), dst); | 138 | FB_WRITEL(comp(pat, FB_READL(dst), last), dst); |
143 | } | 139 | } |
144 | } | 140 | } |
145 | 141 | ||
@@ -281,7 +277,7 @@ bitfill_unaligned_rev(struct fb_info *p, unsigned long __iomem *dst, | |||
281 | 277 | ||
282 | void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | 278 | void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) |
283 | { | 279 | { |
284 | unsigned long pat, fg; | 280 | unsigned long pat, pat2, fg; |
285 | unsigned long width = rect->width, height = rect->height; | 281 | unsigned long width = rect->width, height = rect->height; |
286 | int bits = BITS_PER_LONG, bytes = bits >> 3; | 282 | int bits = BITS_PER_LONG, bytes = bits >> 3; |
287 | u32 bpp = p->var.bits_per_pixel; | 283 | u32 bpp = p->var.bits_per_pixel; |
@@ -297,7 +293,7 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
297 | else | 293 | else |
298 | fg = rect->color; | 294 | fg = rect->color; |
299 | 295 | ||
300 | pat = pixel_to_pat( bpp, fg); | 296 | pat = pixel_to_pat(bpp, fg); |
301 | 297 | ||
302 | dst = (unsigned long __iomem *)((unsigned long)p->screen_base & ~(bytes-1)); | 298 | dst = (unsigned long __iomem *)((unsigned long)p->screen_base & ~(bytes-1)); |
303 | dst_idx = ((unsigned long)p->screen_base & (bytes - 1))*8; | 299 | dst_idx = ((unsigned long)p->screen_base & (bytes - 1))*8; |
@@ -333,17 +329,16 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
333 | dst_idx += p->fix.line_length*8; | 329 | dst_idx += p->fix.line_length*8; |
334 | } | 330 | } |
335 | } else { | 331 | } else { |
336 | int right; | 332 | int right, r; |
337 | int r; | ||
338 | int rot = (left-dst_idx) % bpp; | ||
339 | void (*fill_op)(struct fb_info *p, unsigned long __iomem *dst, | 333 | void (*fill_op)(struct fb_info *p, unsigned long __iomem *dst, |
340 | int dst_idx, unsigned long pat, int left, | 334 | int dst_idx, unsigned long pat, int left, |
341 | int right, unsigned n, int bits) = NULL; | 335 | int right, unsigned n, int bits) = NULL; |
342 | 336 | #ifdef __LITTLE_ENDIAN | |
343 | /* rotate pattern to correct start position */ | 337 | right = left; |
344 | pat = pat << rot | pat >> (bpp-rot); | 338 | left = bpp - right; |
345 | 339 | #else | |
346 | right = bpp-left; | 340 | right = bpp - left; |
341 | #endif | ||
347 | switch (rect->rop) { | 342 | switch (rect->rop) { |
348 | case ROP_XOR: | 343 | case ROP_XOR: |
349 | fill_op = bitfill_unaligned_rev; | 344 | fill_op = bitfill_unaligned_rev; |
@@ -352,17 +347,18 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
352 | fill_op = bitfill_unaligned; | 347 | fill_op = bitfill_unaligned; |
353 | break; | 348 | break; |
354 | default: | 349 | default: |
355 | printk( KERN_ERR "cfb_fillrect(): unknown rop, defaulting to ROP_COPY\n"); | 350 | printk(KERN_ERR "cfb_fillrect(): unknown rop, defaulting to ROP_COPY\n"); |
356 | fill_op = bitfill_unaligned; | 351 | fill_op = bitfill_unaligned; |
357 | break; | 352 | break; |
358 | } | 353 | } |
359 | while (height--) { | 354 | while (height--) { |
360 | dst += dst_idx >> (ffs(bits) - 1); | 355 | dst += dst_idx / bits; |
361 | dst_idx &= (bits - 1); | 356 | dst_idx &= (bits - 1); |
362 | fill_op(p, dst, dst_idx, pat, left, right, | 357 | r = dst_idx % bpp; |
358 | /* rotate pattern to the correct start position */ | ||
359 | pat2 = le_long_to_cpu(rolx(cpu_to_le_long(pat), r, bpp)); | ||
360 | fill_op(p, dst, dst_idx, pat2, left, right, | ||
363 | width*bpp, bits); | 361 | width*bpp, bits); |
364 | r = (p->fix.line_length*8) % bpp; | ||
365 | pat = pat << (bpp-r) | pat >> r; | ||
366 | dst_idx += p->fix.line_length*8; | 362 | dst_idx += p->fix.line_length*8; |
367 | } | 363 | } |
368 | } | 364 | } |
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index d012edda6d1..38e86b84dce 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
@@ -1282,7 +1282,7 @@ static int vgacon_font_get(struct vc_data *c, struct console_font *font) | |||
1282 | font->charcount = vga_512_chars ? 512 : 256; | 1282 | font->charcount = vga_512_chars ? 512 : 256; |
1283 | if (!font->data) | 1283 | if (!font->data) |
1284 | return 0; | 1284 | return 0; |
1285 | return vgacon_do_font_op(&state, font->data, 0, 0); | 1285 | return vgacon_do_font_op(&state, font->data, 0, vga_512_chars); |
1286 | } | 1286 | } |
1287 | 1287 | ||
1288 | #else | 1288 | #else |
diff --git a/drivers/video/fb_draw.h b/drivers/video/fb_draw.h index 1db622192bd..04c01faaf77 100644 --- a/drivers/video/fb_draw.h +++ b/drivers/video/fb_draw.h | |||
@@ -33,11 +33,11 @@ pixel_to_pat( u32 bpp, u32 pixel) | |||
33 | case 8: | 33 | case 8: |
34 | return 0x0101010101010101ul*pixel; | 34 | return 0x0101010101010101ul*pixel; |
35 | case 12: | 35 | case 12: |
36 | return 0x0001001001001001ul*pixel; | 36 | return 0x1001001001001001ul*pixel; |
37 | case 16: | 37 | case 16: |
38 | return 0x0001000100010001ul*pixel; | 38 | return 0x0001000100010001ul*pixel; |
39 | case 24: | 39 | case 24: |
40 | return 0x0000000001000001ul*pixel; | 40 | return 0x0001000001000001ul*pixel; |
41 | case 32: | 41 | case 32: |
42 | return 0x0000000100000001ul*pixel; | 42 | return 0x0000000100000001ul*pixel; |
43 | default: | 43 | default: |
@@ -58,11 +58,11 @@ pixel_to_pat( u32 bpp, u32 pixel) | |||
58 | case 8: | 58 | case 8: |
59 | return 0x01010101ul*pixel; | 59 | return 0x01010101ul*pixel; |
60 | case 12: | 60 | case 12: |
61 | return 0x00001001ul*pixel; | 61 | return 0x01001001ul*pixel; |
62 | case 16: | 62 | case 16: |
63 | return 0x00010001ul*pixel; | 63 | return 0x00010001ul*pixel; |
64 | case 24: | 64 | case 24: |
65 | return 0x00000001ul*pixel; | 65 | return 0x01000001ul*pixel; |
66 | case 32: | 66 | case 32: |
67 | return 0x00000001ul*pixel; | 67 | return 0x00000001ul*pixel; |
68 | default: | 68 | default: |
@@ -167,4 +167,17 @@ static inline unsigned long fb_rev_pixels_in_long(unsigned long val, | |||
167 | 167 | ||
168 | #endif /* CONFIG_FB_CFB_REV_PIXELS_IN_BYTE */ | 168 | #endif /* CONFIG_FB_CFB_REV_PIXELS_IN_BYTE */ |
169 | 169 | ||
170 | #define cpu_to_le_long _cpu_to_le_long(BITS_PER_LONG) | ||
171 | #define _cpu_to_le_long(x) __cpu_to_le_long(x) | ||
172 | #define __cpu_to_le_long(x) cpu_to_le##x | ||
173 | |||
174 | #define le_long_to_cpu _le_long_to_cpu(BITS_PER_LONG) | ||
175 | #define _le_long_to_cpu(x) __le_long_to_cpu(x) | ||
176 | #define __le_long_to_cpu(x) le##x##_to_cpu | ||
177 | |||
178 | static inline unsigned long rolx(unsigned long word, unsigned int shift, unsigned int x) | ||
179 | { | ||
180 | return (word << shift) | (word >> (x - shift)); | ||
181 | } | ||
182 | |||
170 | #endif /* FB_DRAW_H */ | 183 | #endif /* FB_DRAW_H */ |
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 21b3692092f..9894de1c9b9 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c | |||
@@ -1152,11 +1152,11 @@ static struct fb_ops mx3fb_ops = { | |||
1152 | */ | 1152 | */ |
1153 | static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) | 1153 | static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) |
1154 | { | 1154 | { |
1155 | struct mx3fb_data *drv_data = platform_get_drvdata(pdev); | 1155 | struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); |
1156 | struct mx3fb_info *mx3_fbi = drv_data->fbi->par; | 1156 | struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; |
1157 | 1157 | ||
1158 | acquire_console_sem(); | 1158 | acquire_console_sem(); |
1159 | fb_set_suspend(drv_data->fbi, 1); | 1159 | fb_set_suspend(mx3fb->fbi, 1); |
1160 | release_console_sem(); | 1160 | release_console_sem(); |
1161 | 1161 | ||
1162 | if (mx3_fbi->blank == FB_BLANK_UNBLANK) { | 1162 | if (mx3_fbi->blank == FB_BLANK_UNBLANK) { |
@@ -1172,16 +1172,16 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) | |||
1172 | */ | 1172 | */ |
1173 | static int mx3fb_resume(struct platform_device *pdev) | 1173 | static int mx3fb_resume(struct platform_device *pdev) |
1174 | { | 1174 | { |
1175 | struct mx3fb_data *drv_data = platform_get_drvdata(pdev); | 1175 | struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); |
1176 | struct mx3fb_info *mx3_fbi = drv_data->fbi->par; | 1176 | struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; |
1177 | 1177 | ||
1178 | if (mx3_fbi->blank == FB_BLANK_UNBLANK) { | 1178 | if (mx3_fbi->blank == FB_BLANK_UNBLANK) { |
1179 | sdc_enable_channel(mx3_fbi); | 1179 | sdc_enable_channel(mx3_fbi); |
1180 | sdc_set_brightness(mx3fb, drv_data->backlight_level); | 1180 | sdc_set_brightness(mx3fb, mx3fb->backlight_level); |
1181 | } | 1181 | } |
1182 | 1182 | ||
1183 | acquire_console_sem(); | 1183 | acquire_console_sem(); |
1184 | fb_set_suspend(drv_data->fbi, 0); | 1184 | fb_set_suspend(mx3fb->fbi, 0); |
1185 | release_console_sem(); | 1185 | release_console_sem(); |
1186 | 1186 | ||
1187 | return 0; | 1187 | return 0; |
diff --git a/drivers/video/sysfillrect.c b/drivers/video/sysfillrect.c index f94d6b6e29e..33ee3d34f9d 100644 --- a/drivers/video/sysfillrect.c +++ b/drivers/video/sysfillrect.c | |||
@@ -124,7 +124,7 @@ bitfill_unaligned(struct fb_info *p, unsigned long *dst, int dst_idx, | |||
124 | 124 | ||
125 | /* Trailing bits */ | 125 | /* Trailing bits */ |
126 | if (last) | 126 | if (last) |
127 | *dst = comp(pat, *dst, first); | 127 | *dst = comp(pat, *dst, last); |
128 | } | 128 | } |
129 | } | 129 | } |
130 | 130 | ||
@@ -242,7 +242,7 @@ bitfill_unaligned_rev(struct fb_info *p, unsigned long *dst, int dst_idx, | |||
242 | 242 | ||
243 | void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | 243 | void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect) |
244 | { | 244 | { |
245 | unsigned long pat, fg; | 245 | unsigned long pat, pat2, fg; |
246 | unsigned long width = rect->width, height = rect->height; | 246 | unsigned long width = rect->width, height = rect->height; |
247 | int bits = BITS_PER_LONG, bytes = bits >> 3; | 247 | int bits = BITS_PER_LONG, bytes = bits >> 3; |
248 | u32 bpp = p->var.bits_per_pixel; | 248 | u32 bpp = p->var.bits_per_pixel; |
@@ -292,17 +292,16 @@ void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
292 | dst_idx += p->fix.line_length*8; | 292 | dst_idx += p->fix.line_length*8; |
293 | } | 293 | } |
294 | } else { | 294 | } else { |
295 | int right; | 295 | int right, r; |
296 | int r; | ||
297 | int rot = (left-dst_idx) % bpp; | ||
298 | void (*fill_op)(struct fb_info *p, unsigned long *dst, | 296 | void (*fill_op)(struct fb_info *p, unsigned long *dst, |
299 | int dst_idx, unsigned long pat, int left, | 297 | int dst_idx, unsigned long pat, int left, |
300 | int right, unsigned n, int bits) = NULL; | 298 | int right, unsigned n, int bits) = NULL; |
301 | 299 | #ifdef __LITTLE_ENDIAN | |
302 | /* rotate pattern to correct start position */ | 300 | right = left; |
303 | pat = pat << rot | pat >> (bpp-rot); | 301 | left = bpp - right; |
304 | 302 | #else | |
305 | right = bpp-left; | 303 | right = bpp - left; |
304 | #endif | ||
306 | switch (rect->rop) { | 305 | switch (rect->rop) { |
307 | case ROP_XOR: | 306 | case ROP_XOR: |
308 | fill_op = bitfill_unaligned_rev; | 307 | fill_op = bitfill_unaligned_rev; |
@@ -311,18 +310,19 @@ void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect) | |||
311 | fill_op = bitfill_unaligned; | 310 | fill_op = bitfill_unaligned; |
312 | break; | 311 | break; |
313 | default: | 312 | default: |
314 | printk(KERN_ERR "cfb_fillrect(): unknown rop, " | 313 | printk(KERN_ERR "sys_fillrect(): unknown rop, " |
315 | "defaulting to ROP_COPY\n"); | 314 | "defaulting to ROP_COPY\n"); |
316 | fill_op = bitfill_unaligned; | 315 | fill_op = bitfill_unaligned; |
317 | break; | 316 | break; |
318 | } | 317 | } |
319 | while (height--) { | 318 | while (height--) { |
320 | dst += dst_idx >> (ffs(bits) - 1); | 319 | dst += dst_idx / bits; |
321 | dst_idx &= (bits - 1); | 320 | dst_idx &= (bits - 1); |
322 | fill_op(p, dst, dst_idx, pat, left, right, | 321 | r = dst_idx % bpp; |
322 | /* rotate pattern to the correct start position */ | ||
323 | pat2 = le_long_to_cpu(rolx(cpu_to_le_long(pat), r, bpp)); | ||
324 | fill_op(p, dst, dst_idx, pat2, left, right, | ||
323 | width*bpp, bits); | 325 | width*bpp, bits); |
324 | r = (p->fix.line_length*8) % bpp; | ||
325 | pat = pat << (bpp-r) | pat >> r; | ||
326 | dst_idx += p->fix.line_length*8; | 326 | dst_idx += p->fix.line_length*8; |
327 | } | 327 | } |
328 | } | 328 | } |
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index e327b84820d..a0fec298216 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c | |||
@@ -2103,7 +2103,7 @@ static void viafb_remove_proc(struct proc_dir_entry *viafb_entry) | |||
2103 | 2103 | ||
2104 | static int __devinit via_pci_probe(void) | 2104 | static int __devinit via_pci_probe(void) |
2105 | { | 2105 | { |
2106 | unsigned int default_xres, default_yres; | 2106 | unsigned long default_xres, default_yres; |
2107 | char *tmpc, *tmpm; | 2107 | char *tmpc, *tmpm; |
2108 | char *tmpc_sec, *tmpm_sec; | 2108 | char *tmpc_sec, *tmpm_sec; |
2109 | int vmode_index; | 2109 | int vmode_index; |
@@ -2196,8 +2196,8 @@ static int __devinit via_pci_probe(void) | |||
2196 | viafb_FB_MM = viaparinfo->fbmem_virt; | 2196 | viafb_FB_MM = viaparinfo->fbmem_virt; |
2197 | tmpm = viafb_mode; | 2197 | tmpm = viafb_mode; |
2198 | tmpc = strsep(&tmpm, "x"); | 2198 | tmpc = strsep(&tmpm, "x"); |
2199 | strict_strtoul(tmpc, 0, (unsigned long *)&default_xres); | 2199 | strict_strtoul(tmpc, 0, &default_xres); |
2200 | strict_strtoul(tmpm, 0, (unsigned long *)&default_yres); | 2200 | strict_strtoul(tmpm, 0, &default_yres); |
2201 | 2201 | ||
2202 | vmode_index = viafb_get_mode_index(default_xres, default_yres, 0); | 2202 | vmode_index = viafb_get_mode_index(default_xres, default_yres, 0); |
2203 | DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index); | 2203 | DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index); |
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index efa4b363ce7..f5bbd9e8341 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
@@ -513,7 +513,8 @@ static ssize_t show_target(struct sys_device *dev, struct sysdev_attribute *attr | |||
513 | char *buf) | 513 | char *buf) |
514 | { | 514 | { |
515 | return sprintf(buf, "%llu\n", | 515 | return sprintf(buf, "%llu\n", |
516 | (u64)balloon_stats.target_pages << PAGE_SHIFT); | 516 | (unsigned long long)balloon_stats.target_pages |
517 | << PAGE_SHIFT); | ||
517 | } | 518 | } |
518 | 519 | ||
519 | static ssize_t store_target(struct sys_device *dev, | 520 | static ssize_t store_target(struct sys_device *dev, |