diff options
Diffstat (limited to 'drivers')
149 files changed, 3782 insertions, 3087 deletions
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c index 7d6481d9fbec..4038dbfa63a0 100644 --- a/drivers/acpi/resources/rscalc.c +++ b/drivers/acpi/resources/rscalc.c | |||
@@ -391,8 +391,7 @@ acpi_rs_get_list_length(u8 * aml_buffer, | |||
391 | * Ensure a 32-bit boundary for the structure | 391 | * Ensure a 32-bit boundary for the structure |
392 | */ | 392 | */ |
393 | extra_struct_bytes = | 393 | extra_struct_bytes = |
394 | ACPI_ROUND_UP_to_32_bITS(resource_length) - | 394 | ACPI_ROUND_UP_to_32_bITS(resource_length); |
395 | resource_length; | ||
396 | break; | 395 | break; |
397 | 396 | ||
398 | case ACPI_RESOURCE_NAME_END_TAG: | 397 | case ACPI_RESOURCE_NAME_END_TAG: |
@@ -408,8 +407,7 @@ acpi_rs_get_list_length(u8 * aml_buffer, | |||
408 | * Add vendor data and ensure a 32-bit boundary for the structure | 407 | * Add vendor data and ensure a 32-bit boundary for the structure |
409 | */ | 408 | */ |
410 | extra_struct_bytes = | 409 | extra_struct_bytes = |
411 | ACPI_ROUND_UP_to_32_bITS(resource_length) - | 410 | ACPI_ROUND_UP_to_32_bITS(resource_length); |
412 | resource_length; | ||
413 | break; | 411 | break; |
414 | 412 | ||
415 | case ACPI_RESOURCE_NAME_ADDRESS32: | 413 | case ACPI_RESOURCE_NAME_ADDRESS32: |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 4e7dbcc425ff..bc9b2bcd7dba 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -58,6 +58,7 @@ | |||
58 | #include <linux/suspend.h> | 58 | #include <linux/suspend.h> |
59 | #include <scsi/scsi_cmnd.h> | 59 | #include <scsi/scsi_cmnd.h> |
60 | #include <scsi/scsi_ioctl.h> | 60 | #include <scsi/scsi_ioctl.h> |
61 | #include <scsi/scsi.h> | ||
61 | 62 | ||
62 | #include <asm/uaccess.h> | 63 | #include <asm/uaccess.h> |
63 | 64 | ||
@@ -380,6 +381,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * | |||
380 | memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE); | 381 | memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE); |
381 | if (sizeof(rq->cmd) > CDROM_PACKET_SIZE) | 382 | if (sizeof(rq->cmd) > CDROM_PACKET_SIZE) |
382 | memset(rq->cmd + CDROM_PACKET_SIZE, 0, sizeof(rq->cmd) - CDROM_PACKET_SIZE); | 383 | memset(rq->cmd + CDROM_PACKET_SIZE, 0, sizeof(rq->cmd) - CDROM_PACKET_SIZE); |
384 | rq->cmd_len = COMMAND_SIZE(rq->cmd[0]); | ||
383 | 385 | ||
384 | rq->ref_count++; | 386 | rq->ref_count++; |
385 | rq->flags |= REQ_NOMERGE; | 387 | rq->flags |= REQ_NOMERGE; |
@@ -645,7 +647,7 @@ static void pkt_copy_bio_data(struct bio *src_bio, int seg, int offs, struct pag | |||
645 | * b) The data can be used as cache to avoid read requests if we receive a | 647 | * b) The data can be used as cache to avoid read requests if we receive a |
646 | * new write request for the same zone. | 648 | * new write request for the same zone. |
647 | */ | 649 | */ |
648 | static void pkt_make_local_copy(struct packet_data *pkt, struct page **pages, int *offsets) | 650 | static void pkt_make_local_copy(struct packet_data *pkt, struct bio_vec *bvec) |
649 | { | 651 | { |
650 | int f, p, offs; | 652 | int f, p, offs; |
651 | 653 | ||
@@ -653,15 +655,15 @@ static void pkt_make_local_copy(struct packet_data *pkt, struct page **pages, in | |||
653 | p = 0; | 655 | p = 0; |
654 | offs = 0; | 656 | offs = 0; |
655 | for (f = 0; f < pkt->frames; f++) { | 657 | for (f = 0; f < pkt->frames; f++) { |
656 | if (pages[f] != pkt->pages[p]) { | 658 | if (bvec[f].bv_page != pkt->pages[p]) { |
657 | void *vfrom = kmap_atomic(pages[f], KM_USER0) + offsets[f]; | 659 | void *vfrom = kmap_atomic(bvec[f].bv_page, KM_USER0) + bvec[f].bv_offset; |
658 | void *vto = page_address(pkt->pages[p]) + offs; | 660 | void *vto = page_address(pkt->pages[p]) + offs; |
659 | memcpy(vto, vfrom, CD_FRAMESIZE); | 661 | memcpy(vto, vfrom, CD_FRAMESIZE); |
660 | kunmap_atomic(vfrom, KM_USER0); | 662 | kunmap_atomic(vfrom, KM_USER0); |
661 | pages[f] = pkt->pages[p]; | 663 | bvec[f].bv_page = pkt->pages[p]; |
662 | offsets[f] = offs; | 664 | bvec[f].bv_offset = offs; |
663 | } else { | 665 | } else { |
664 | BUG_ON(offsets[f] != offs); | 666 | BUG_ON(bvec[f].bv_offset != offs); |
665 | } | 667 | } |
666 | offs += CD_FRAMESIZE; | 668 | offs += CD_FRAMESIZE; |
667 | if (offs >= PAGE_SIZE) { | 669 | if (offs >= PAGE_SIZE) { |
@@ -991,18 +993,17 @@ try_next_bio: | |||
991 | static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) | 993 | static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) |
992 | { | 994 | { |
993 | struct bio *bio; | 995 | struct bio *bio; |
994 | struct page *pages[PACKET_MAX_SIZE]; | ||
995 | int offsets[PACKET_MAX_SIZE]; | ||
996 | int f; | 996 | int f; |
997 | int frames_write; | 997 | int frames_write; |
998 | struct bio_vec *bvec = pkt->w_bio->bi_io_vec; | ||
998 | 999 | ||
999 | for (f = 0; f < pkt->frames; f++) { | 1000 | for (f = 0; f < pkt->frames; f++) { |
1000 | pages[f] = pkt->pages[(f * CD_FRAMESIZE) / PAGE_SIZE]; | 1001 | bvec[f].bv_page = pkt->pages[(f * CD_FRAMESIZE) / PAGE_SIZE]; |
1001 | offsets[f] = (f * CD_FRAMESIZE) % PAGE_SIZE; | 1002 | bvec[f].bv_offset = (f * CD_FRAMESIZE) % PAGE_SIZE; |
1002 | } | 1003 | } |
1003 | 1004 | ||
1004 | /* | 1005 | /* |
1005 | * Fill-in pages[] and offsets[] with data from orig_bios. | 1006 | * Fill-in bvec with data from orig_bios. |
1006 | */ | 1007 | */ |
1007 | frames_write = 0; | 1008 | frames_write = 0; |
1008 | spin_lock(&pkt->lock); | 1009 | spin_lock(&pkt->lock); |
@@ -1024,11 +1025,11 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) | |||
1024 | } | 1025 | } |
1025 | 1026 | ||
1026 | if (src_bvl->bv_len - src_offs >= CD_FRAMESIZE) { | 1027 | if (src_bvl->bv_len - src_offs >= CD_FRAMESIZE) { |
1027 | pages[f] = src_bvl->bv_page; | 1028 | bvec[f].bv_page = src_bvl->bv_page; |
1028 | offsets[f] = src_bvl->bv_offset + src_offs; | 1029 | bvec[f].bv_offset = src_bvl->bv_offset + src_offs; |
1029 | } else { | 1030 | } else { |
1030 | pkt_copy_bio_data(bio, segment, src_offs, | 1031 | pkt_copy_bio_data(bio, segment, src_offs, |
1031 | pages[f], offsets[f]); | 1032 | bvec[f].bv_page, bvec[f].bv_offset); |
1032 | } | 1033 | } |
1033 | src_offs += CD_FRAMESIZE; | 1034 | src_offs += CD_FRAMESIZE; |
1034 | frames_write++; | 1035 | frames_write++; |
@@ -1042,7 +1043,7 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) | |||
1042 | BUG_ON(frames_write != pkt->write_size); | 1043 | BUG_ON(frames_write != pkt->write_size); |
1043 | 1044 | ||
1044 | if (test_bit(PACKET_MERGE_SEGS, &pd->flags) || (pkt->write_size < pkt->frames)) { | 1045 | if (test_bit(PACKET_MERGE_SEGS, &pd->flags) || (pkt->write_size < pkt->frames)) { |
1045 | pkt_make_local_copy(pkt, pages, offsets); | 1046 | pkt_make_local_copy(pkt, bvec); |
1046 | pkt->cache_valid = 1; | 1047 | pkt->cache_valid = 1; |
1047 | } else { | 1048 | } else { |
1048 | pkt->cache_valid = 0; | 1049 | pkt->cache_valid = 0; |
@@ -1055,17 +1056,9 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) | |||
1055 | pkt->w_bio->bi_bdev = pd->bdev; | 1056 | pkt->w_bio->bi_bdev = pd->bdev; |
1056 | pkt->w_bio->bi_end_io = pkt_end_io_packet_write; | 1057 | pkt->w_bio->bi_end_io = pkt_end_io_packet_write; |
1057 | pkt->w_bio->bi_private = pkt; | 1058 | pkt->w_bio->bi_private = pkt; |
1058 | for (f = 0; f < pkt->frames; f++) { | 1059 | for (f = 0; f < pkt->frames; f++) |
1059 | if ((f + 1 < pkt->frames) && (pages[f + 1] == pages[f]) && | 1060 | if (!bio_add_page(pkt->w_bio, bvec[f].bv_page, CD_FRAMESIZE, bvec[f].bv_offset)) |
1060 | (offsets[f + 1] = offsets[f] + CD_FRAMESIZE)) { | 1061 | BUG(); |
1061 | if (!bio_add_page(pkt->w_bio, pages[f], CD_FRAMESIZE * 2, offsets[f])) | ||
1062 | BUG(); | ||
1063 | f++; | ||
1064 | } else { | ||
1065 | if (!bio_add_page(pkt->w_bio, pages[f], CD_FRAMESIZE, offsets[f])) | ||
1066 | BUG(); | ||
1067 | } | ||
1068 | } | ||
1069 | VPRINTK("pktcdvd: vcnt=%d\n", pkt->w_bio->bi_vcnt); | 1062 | VPRINTK("pktcdvd: vcnt=%d\n", pkt->w_bio->bi_vcnt); |
1070 | 1063 | ||
1071 | atomic_set(&pkt->io_wait, 1); | 1064 | atomic_set(&pkt->io_wait, 1); |
@@ -1504,40 +1497,42 @@ static int pkt_set_write_settings(struct pktcdvd_device *pd) | |||
1504 | } | 1497 | } |
1505 | 1498 | ||
1506 | /* | 1499 | /* |
1507 | * 0 -- we can write to this track, 1 -- we can't | 1500 | * 1 -- we can write to this track, 0 -- we can't |
1508 | */ | 1501 | */ |
1509 | static int pkt_good_track(track_information *ti) | 1502 | static int pkt_writable_track(struct pktcdvd_device *pd, track_information *ti) |
1510 | { | 1503 | { |
1511 | /* | 1504 | switch (pd->mmc3_profile) { |
1512 | * only good for CD-RW at the moment, not DVD-RW | 1505 | case 0x1a: /* DVD+RW */ |
1513 | */ | 1506 | case 0x12: /* DVD-RAM */ |
1507 | /* The track is always writable on DVD+RW/DVD-RAM */ | ||
1508 | return 1; | ||
1509 | default: | ||
1510 | break; | ||
1511 | } | ||
1514 | 1512 | ||
1515 | /* | 1513 | if (!ti->packet || !ti->fp) |
1516 | * FIXME: only for FP | ||
1517 | */ | ||
1518 | if (ti->fp == 0) | ||
1519 | return 0; | 1514 | return 0; |
1520 | 1515 | ||
1521 | /* | 1516 | /* |
1522 | * "good" settings as per Mt Fuji. | 1517 | * "good" settings as per Mt Fuji. |
1523 | */ | 1518 | */ |
1524 | if (ti->rt == 0 && ti->blank == 0 && ti->packet == 1) | 1519 | if (ti->rt == 0 && ti->blank == 0) |
1525 | return 0; | 1520 | return 1; |
1526 | 1521 | ||
1527 | if (ti->rt == 0 && ti->blank == 1 && ti->packet == 1) | 1522 | if (ti->rt == 0 && ti->blank == 1) |
1528 | return 0; | 1523 | return 1; |
1529 | 1524 | ||
1530 | if (ti->rt == 1 && ti->blank == 0 && ti->packet == 1) | 1525 | if (ti->rt == 1 && ti->blank == 0) |
1531 | return 0; | 1526 | return 1; |
1532 | 1527 | ||
1533 | printk("pktcdvd: bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet); | 1528 | printk("pktcdvd: bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet); |
1534 | return 1; | 1529 | return 0; |
1535 | } | 1530 | } |
1536 | 1531 | ||
1537 | /* | 1532 | /* |
1538 | * 0 -- we can write to this disc, 1 -- we can't | 1533 | * 1 -- we can write to this disc, 0 -- we can't |
1539 | */ | 1534 | */ |
1540 | static int pkt_good_disc(struct pktcdvd_device *pd, disc_information *di) | 1535 | static int pkt_writable_disc(struct pktcdvd_device *pd, disc_information *di) |
1541 | { | 1536 | { |
1542 | switch (pd->mmc3_profile) { | 1537 | switch (pd->mmc3_profile) { |
1543 | case 0x0a: /* CD-RW */ | 1538 | case 0x0a: /* CD-RW */ |
@@ -1546,10 +1541,10 @@ static int pkt_good_disc(struct pktcdvd_device *pd, disc_information *di) | |||
1546 | case 0x1a: /* DVD+RW */ | 1541 | case 0x1a: /* DVD+RW */ |
1547 | case 0x13: /* DVD-RW */ | 1542 | case 0x13: /* DVD-RW */ |
1548 | case 0x12: /* DVD-RAM */ | 1543 | case 0x12: /* DVD-RAM */ |
1549 | return 0; | ||
1550 | default: | ||
1551 | printk("pktcdvd: Wrong disc profile (%x)\n", pd->mmc3_profile); | ||
1552 | return 1; | 1544 | return 1; |
1545 | default: | ||
1546 | VPRINTK("pktcdvd: Wrong disc profile (%x)\n", pd->mmc3_profile); | ||
1547 | return 0; | ||
1553 | } | 1548 | } |
1554 | 1549 | ||
1555 | /* | 1550 | /* |
@@ -1558,25 +1553,25 @@ static int pkt_good_disc(struct pktcdvd_device *pd, disc_information *di) | |||
1558 | */ | 1553 | */ |
1559 | if (di->disc_type == 0xff) { | 1554 | if (di->disc_type == 0xff) { |
1560 | printk("pktcdvd: Unknown disc. No track?\n"); | 1555 | printk("pktcdvd: Unknown disc. No track?\n"); |
1561 | return 1; | 1556 | return 0; |
1562 | } | 1557 | } |
1563 | 1558 | ||
1564 | if (di->disc_type != 0x20 && di->disc_type != 0) { | 1559 | if (di->disc_type != 0x20 && di->disc_type != 0) { |
1565 | printk("pktcdvd: Wrong disc type (%x)\n", di->disc_type); | 1560 | printk("pktcdvd: Wrong disc type (%x)\n", di->disc_type); |
1566 | return 1; | 1561 | return 0; |
1567 | } | 1562 | } |
1568 | 1563 | ||
1569 | if (di->erasable == 0) { | 1564 | if (di->erasable == 0) { |
1570 | printk("pktcdvd: Disc not erasable\n"); | 1565 | printk("pktcdvd: Disc not erasable\n"); |
1571 | return 1; | 1566 | return 0; |
1572 | } | 1567 | } |
1573 | 1568 | ||
1574 | if (di->border_status == PACKET_SESSION_RESERVED) { | 1569 | if (di->border_status == PACKET_SESSION_RESERVED) { |
1575 | printk("pktcdvd: Can't write to last track (reserved)\n"); | 1570 | printk("pktcdvd: Can't write to last track (reserved)\n"); |
1576 | return 1; | 1571 | return 0; |
1577 | } | 1572 | } |
1578 | 1573 | ||
1579 | return 0; | 1574 | return 1; |
1580 | } | 1575 | } |
1581 | 1576 | ||
1582 | static int pkt_probe_settings(struct pktcdvd_device *pd) | 1577 | static int pkt_probe_settings(struct pktcdvd_device *pd) |
@@ -1601,23 +1596,9 @@ static int pkt_probe_settings(struct pktcdvd_device *pd) | |||
1601 | return ret; | 1596 | return ret; |
1602 | } | 1597 | } |
1603 | 1598 | ||
1604 | if (pkt_good_disc(pd, &di)) | 1599 | if (!pkt_writable_disc(pd, &di)) |
1605 | return -ENXIO; | 1600 | return -EROFS; |
1606 | 1601 | ||
1607 | switch (pd->mmc3_profile) { | ||
1608 | case 0x1a: /* DVD+RW */ | ||
1609 | printk("pktcdvd: inserted media is DVD+RW\n"); | ||
1610 | break; | ||
1611 | case 0x13: /* DVD-RW */ | ||
1612 | printk("pktcdvd: inserted media is DVD-RW\n"); | ||
1613 | break; | ||
1614 | case 0x12: /* DVD-RAM */ | ||
1615 | printk("pktcdvd: inserted media is DVD-RAM\n"); | ||
1616 | break; | ||
1617 | default: | ||
1618 | printk("pktcdvd: inserted media is CD-R%s\n", di.erasable ? "W" : ""); | ||
1619 | break; | ||
1620 | } | ||
1621 | pd->type = di.erasable ? PACKET_CDRW : PACKET_CDR; | 1602 | pd->type = di.erasable ? PACKET_CDRW : PACKET_CDR; |
1622 | 1603 | ||
1623 | track = 1; /* (di.last_track_msb << 8) | di.last_track_lsb; */ | 1604 | track = 1; /* (di.last_track_msb << 8) | di.last_track_lsb; */ |
@@ -1626,9 +1607,9 @@ static int pkt_probe_settings(struct pktcdvd_device *pd) | |||
1626 | return ret; | 1607 | return ret; |
1627 | } | 1608 | } |
1628 | 1609 | ||
1629 | if (pkt_good_track(&ti)) { | 1610 | if (!pkt_writable_track(pd, &ti)) { |
1630 | printk("pktcdvd: can't write to this track\n"); | 1611 | printk("pktcdvd: can't write to this track\n"); |
1631 | return -ENXIO; | 1612 | return -EROFS; |
1632 | } | 1613 | } |
1633 | 1614 | ||
1634 | /* | 1615 | /* |
@@ -1642,7 +1623,7 @@ static int pkt_probe_settings(struct pktcdvd_device *pd) | |||
1642 | } | 1623 | } |
1643 | if (pd->settings.size > PACKET_MAX_SECTORS) { | 1624 | if (pd->settings.size > PACKET_MAX_SECTORS) { |
1644 | printk("pktcdvd: packet size is too big\n"); | 1625 | printk("pktcdvd: packet size is too big\n"); |
1645 | return -ENXIO; | 1626 | return -EROFS; |
1646 | } | 1627 | } |
1647 | pd->settings.fp = ti.fp; | 1628 | pd->settings.fp = ti.fp; |
1648 | pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1); | 1629 | pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1); |
@@ -1684,7 +1665,7 @@ static int pkt_probe_settings(struct pktcdvd_device *pd) | |||
1684 | break; | 1665 | break; |
1685 | default: | 1666 | default: |
1686 | printk("pktcdvd: unknown data mode\n"); | 1667 | printk("pktcdvd: unknown data mode\n"); |
1687 | return 1; | 1668 | return -EROFS; |
1688 | } | 1669 | } |
1689 | return 0; | 1670 | return 0; |
1690 | } | 1671 | } |
@@ -1894,8 +1875,8 @@ static int pkt_open_write(struct pktcdvd_device *pd) | |||
1894 | unsigned int write_speed, media_write_speed, read_speed; | 1875 | unsigned int write_speed, media_write_speed, read_speed; |
1895 | 1876 | ||
1896 | if ((ret = pkt_probe_settings(pd))) { | 1877 | if ((ret = pkt_probe_settings(pd))) { |
1897 | DPRINTK("pktcdvd: %s failed probe\n", pd->name); | 1878 | VPRINTK("pktcdvd: %s failed probe\n", pd->name); |
1898 | return -EIO; | 1879 | return ret; |
1899 | } | 1880 | } |
1900 | 1881 | ||
1901 | if ((ret = pkt_set_write_settings(pd))) { | 1882 | if ((ret = pkt_set_write_settings(pd))) { |
@@ -2053,10 +2034,9 @@ static int pkt_open(struct inode *inode, struct file *file) | |||
2053 | goto out_dec; | 2034 | goto out_dec; |
2054 | } | 2035 | } |
2055 | } else { | 2036 | } else { |
2056 | if (pkt_open_dev(pd, file->f_mode & FMODE_WRITE)) { | 2037 | ret = pkt_open_dev(pd, file->f_mode & FMODE_WRITE); |
2057 | ret = -EIO; | 2038 | if (ret) |
2058 | goto out_dec; | 2039 | goto out_dec; |
2059 | } | ||
2060 | /* | 2040 | /* |
2061 | * needed here as well, since ext2 (among others) may change | 2041 | * needed here as well, since ext2 (among others) may change |
2062 | * the blocksize at mount time | 2042 | * the blocksize at mount time |
@@ -2436,11 +2416,12 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u | |||
2436 | * The door gets locked when the device is opened, so we | 2416 | * The door gets locked when the device is opened, so we |
2437 | * have to unlock it or else the eject command fails. | 2417 | * have to unlock it or else the eject command fails. |
2438 | */ | 2418 | */ |
2439 | pkt_lock_door(pd, 0); | 2419 | if (pd->refcnt == 1) |
2420 | pkt_lock_door(pd, 0); | ||
2440 | return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); | 2421 | return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); |
2441 | 2422 | ||
2442 | default: | 2423 | default: |
2443 | printk("pktcdvd: Unknown ioctl for %s (%x)\n", pd->name, cmd); | 2424 | VPRINTK("pktcdvd: Unknown ioctl for %s (%x)\n", pd->name, cmd); |
2444 | return -ENOTTY; | 2425 | return -ENOTTY; |
2445 | } | 2426 | } |
2446 | 2427 | ||
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index e522d19ad886..7e21b1ff27c4 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -474,18 +474,6 @@ static int bt3c_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long | |||
474 | /* ======================== Card services HCI interaction ======================== */ | 474 | /* ======================== Card services HCI interaction ======================== */ |
475 | 475 | ||
476 | 476 | ||
477 | static struct device *bt3c_device(void) | ||
478 | { | ||
479 | static struct device dev = { | ||
480 | .bus_id = "pcmcia", | ||
481 | }; | ||
482 | kobject_set_name(&dev.kobj, "bt3c"); | ||
483 | kobject_init(&dev.kobj); | ||
484 | |||
485 | return &dev; | ||
486 | } | ||
487 | |||
488 | |||
489 | static int bt3c_load_firmware(bt3c_info_t *info, unsigned char *firmware, int count) | 477 | static int bt3c_load_firmware(bt3c_info_t *info, unsigned char *firmware, int count) |
490 | { | 478 | { |
491 | char *ptr = (char *) firmware; | 479 | char *ptr = (char *) firmware; |
@@ -574,6 +562,7 @@ static int bt3c_open(bt3c_info_t *info) | |||
574 | { | 562 | { |
575 | const struct firmware *firmware; | 563 | const struct firmware *firmware; |
576 | struct hci_dev *hdev; | 564 | struct hci_dev *hdev; |
565 | client_handle_t handle; | ||
577 | int err; | 566 | int err; |
578 | 567 | ||
579 | spin_lock_init(&(info->lock)); | 568 | spin_lock_init(&(info->lock)); |
@@ -605,8 +594,10 @@ static int bt3c_open(bt3c_info_t *info) | |||
605 | 594 | ||
606 | hdev->owner = THIS_MODULE; | 595 | hdev->owner = THIS_MODULE; |
607 | 596 | ||
597 | handle = info->link.handle; | ||
598 | |||
608 | /* Load firmware */ | 599 | /* Load firmware */ |
609 | err = request_firmware(&firmware, "BT3CPCC.bin", bt3c_device()); | 600 | err = request_firmware(&firmware, "BT3CPCC.bin", &handle_to_dev(handle)); |
610 | if (err < 0) { | 601 | if (err < 0) { |
611 | BT_ERR("Firmware request failed"); | 602 | BT_ERR("Firmware request failed"); |
612 | goto error; | 603 | goto error; |
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig index 486ed8a11b59..a4d425d2dce2 100644 --- a/drivers/char/agp/Kconfig +++ b/drivers/char/agp/Kconfig | |||
@@ -15,22 +15,23 @@ config AGP | |||
15 | due to kernel allocation issues), you could use PCI accesses | 15 | due to kernel allocation issues), you could use PCI accesses |
16 | and have up to a couple gigs of texture space. | 16 | and have up to a couple gigs of texture space. |
17 | 17 | ||
18 | Note that this is the only means to have XFree4/GLX use | 18 | Note that this is the only means to have X/GLX use |
19 | write-combining with MTRR support on the AGP bus. Without it, OpenGL | 19 | write-combining with MTRR support on the AGP bus. Without it, OpenGL |
20 | direct rendering will be a lot slower but still faster than PIO. | 20 | direct rendering will be a lot slower but still faster than PIO. |
21 | 21 | ||
22 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
23 | use GLX or DRI. If unsure, say N. | ||
24 | |||
25 | To compile this driver as a module, choose M here: the | 22 | To compile this driver as a module, choose M here: the |
26 | module will be called agpgart. | 23 | module will be called agpgart. |
27 | 24 | ||
25 | You should say Y here if you want to use GLX or DRI. | ||
26 | |||
27 | If unsure, say N. | ||
28 | |||
28 | config AGP_ALI | 29 | config AGP_ALI |
29 | tristate "ALI chipset support" | 30 | tristate "ALI chipset support" |
30 | depends on AGP && X86_32 | 31 | depends on AGP && X86_32 |
31 | ---help--- | 32 | ---help--- |
32 | This option gives you AGP support for the GLX component of | 33 | This option gives you AGP support for the GLX component of |
33 | XFree86 4.x on the following ALi chipsets. The supported chipsets | 34 | X on the following ALi chipsets. The supported chipsets |
34 | include M1541, M1621, M1631, M1632, M1641,M1647,and M1651. | 35 | include M1541, M1621, M1631, M1632, M1641,M1647,and M1651. |
35 | For the ALi-chipset question, ALi suggests you refer to | 36 | For the ALi-chipset question, ALi suggests you refer to |
36 | <http://www.ali.com.tw/eng/support/index.shtml>. | 37 | <http://www.ali.com.tw/eng/support/index.shtml>. |
@@ -40,28 +41,19 @@ config AGP_ALI | |||
40 | timing issues, this chipset cannot do AGP 2x with the G200. | 41 | timing issues, this chipset cannot do AGP 2x with the G200. |
41 | This is a hardware limitation. AGP 1x seems to be fine, though. | 42 | This is a hardware limitation. AGP 1x seems to be fine, though. |
42 | 43 | ||
43 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
44 | use GLX or DRI. If unsure, say N. | ||
45 | |||
46 | config AGP_ATI | 44 | config AGP_ATI |
47 | tristate "ATI chipset support" | 45 | tristate "ATI chipset support" |
48 | depends on AGP && X86_32 | 46 | depends on AGP && X86_32 |
49 | ---help--- | 47 | ---help--- |
50 | This option gives you AGP support for the GLX component of | 48 | This option gives you AGP support for the GLX component of |
51 | XFree86 4.x on the ATI RadeonIGP family of chipsets. | 49 | X on the ATI RadeonIGP family of chipsets. |
52 | |||
53 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
54 | use GLX or DRI. If unsure, say N. | ||
55 | 50 | ||
56 | config AGP_AMD | 51 | config AGP_AMD |
57 | tristate "AMD Irongate, 761, and 762 chipset support" | 52 | tristate "AMD Irongate, 761, and 762 chipset support" |
58 | depends on AGP && X86_32 | 53 | depends on AGP && X86_32 |
59 | help | 54 | help |
60 | This option gives you AGP support for the GLX component of | 55 | This option gives you AGP support for the GLX component of |
61 | XFree86 4.x on AMD Irongate, 761, and 762 chipsets. | 56 | X on AMD Irongate, 761, and 762 chipsets. |
62 | |||
63 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
64 | use GLX or DRI. If unsure, say N. | ||
65 | 57 | ||
66 | config AGP_AMD64 | 58 | config AGP_AMD64 |
67 | tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU | 59 | tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU |
@@ -69,45 +61,38 @@ config AGP_AMD64 | |||
69 | default y if GART_IOMMU | 61 | default y if GART_IOMMU |
70 | help | 62 | help |
71 | This option gives you AGP support for the GLX component of | 63 | This option gives you AGP support for the GLX component of |
72 | XFree86 4.x using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs. | 64 | X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs. |
73 | You still need an external AGP bridge like the AMD 8151, VIA | 65 | You still need an external AGP bridge like the AMD 8151, VIA |
74 | K8T400M, SiS755. It may also support other AGP bridges when loaded | 66 | K8T400M, SiS755. It may also support other AGP bridges when loaded |
75 | with agp_try_unsupported=1. | 67 | with agp_try_unsupported=1. |
76 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
77 | use GLX or DRI. If unsure, say Y | ||
78 | 68 | ||
79 | config AGP_INTEL | 69 | config AGP_INTEL |
80 | tristate "Intel 440LX/BX/GX, I8xx and E7x05 chipset support" | 70 | tristate "Intel 440LX/BX/GX, I8xx and E7x05 chipset support" |
81 | depends on AGP && X86 | 71 | depends on AGP && X86 |
82 | help | 72 | help |
83 | This option gives you AGP support for the GLX component of XFree86 4.x | 73 | This option gives you AGP support for the GLX component of X |
84 | on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860, 875, | 74 | on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860, 875, |
85 | E7205 and E7505 chipsets and full support for the 810, 815, 830M, 845G, | 75 | E7205 and E7505 chipsets and full support for the 810, 815, 830M, |
86 | 852GM, 855GM, 865G and I915 integrated graphics chipsets. | 76 | 845G, 852GM, 855GM, 865G and I915 integrated graphics chipsets. |
77 | |||
87 | 78 | ||
88 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
89 | use GLX or DRI, or if you have any Intel integrated graphics | ||
90 | chipsets. If unsure, say Y. | ||
91 | 79 | ||
92 | config AGP_NVIDIA | 80 | config AGP_NVIDIA |
93 | tristate "NVIDIA nForce/nForce2 chipset support" | 81 | tristate "NVIDIA nForce/nForce2 chipset support" |
94 | depends on AGP && X86_32 | 82 | depends on AGP && X86_32 |
95 | help | 83 | help |
96 | This option gives you AGP support for the GLX component of | 84 | This option gives you AGP support for the GLX component of |
97 | XFree86 4.x on the following NVIDIA chipsets. The supported chipsets | 85 | X on NVIDIA chipsets including nForce and nForce2 |
98 | include nForce and nForce2 | ||
99 | 86 | ||
100 | config AGP_SIS | 87 | config AGP_SIS |
101 | tristate "SiS chipset support" | 88 | tristate "SiS chipset support" |
102 | depends on AGP && X86_32 | 89 | depends on AGP && X86_32 |
103 | help | 90 | help |
104 | This option gives you AGP support for the GLX component of | 91 | This option gives you AGP support for the GLX component of |
105 | XFree86 4.x on Silicon Integrated Systems [SiS] chipsets. | 92 | X on Silicon Integrated Systems [SiS] chipsets. |
106 | 93 | ||
107 | Note that 5591/5592 AGP chipsets are NOT supported. | 94 | Note that 5591/5592 AGP chipsets are NOT supported. |
108 | 95 | ||
109 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
110 | use GLX or DRI. If unsure, say N. | ||
111 | 96 | ||
112 | config AGP_SWORKS | 97 | config AGP_SWORKS |
113 | tristate "Serverworks LE/HE chipset support" | 98 | tristate "Serverworks LE/HE chipset support" |
@@ -121,10 +106,7 @@ config AGP_VIA | |||
121 | depends on AGP && X86_32 | 106 | depends on AGP && X86_32 |
122 | help | 107 | help |
123 | This option gives you AGP support for the GLX component of | 108 | This option gives you AGP support for the GLX component of |
124 | XFree86 4.x on VIA MVP3/Apollo Pro chipsets. | 109 | X on VIA MVP3/Apollo Pro chipsets. |
125 | |||
126 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
127 | use GLX or DRI. If unsure, say N. | ||
128 | 110 | ||
129 | config AGP_I460 | 111 | config AGP_I460 |
130 | tristate "Intel 460GX chipset support" | 112 | tristate "Intel 460GX chipset support" |
@@ -159,9 +141,6 @@ config AGP_EFFICEON | |||
159 | This option gives you AGP support for the Transmeta Efficeon | 141 | This option gives you AGP support for the Transmeta Efficeon |
160 | series processors with integrated northbridges. | 142 | series processors with integrated northbridges. |
161 | 143 | ||
162 | You should say Y here if you use XFree86 3.3.6 or 4.x and want to | ||
163 | use GLX or DRI. If unsure, say Y. | ||
164 | |||
165 | config AGP_SGI_TIOCA | 144 | config AGP_SGI_TIOCA |
166 | tristate "SGI TIO chipset AGP support" | 145 | tristate "SGI TIO chipset AGP support" |
167 | depends on AGP && (IA64_SGI_SN2 || IA64_GENERIC) | 146 | depends on AGP && (IA64_SGI_SN2 || IA64_GENERIC) |
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 9964c508c111..1251b2515bbe 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -516,8 +516,10 @@ static int __devinit nforce3_agp_init(struct pci_dev *pdev) | |||
516 | pci_read_config_dword (hammers[0], AMD64_GARTAPERTUREBASE, &apbase); | 516 | pci_read_config_dword (hammers[0], AMD64_GARTAPERTUREBASE, &apbase); |
517 | 517 | ||
518 | /* if x86-64 aperture base is beyond 4G, exit here */ | 518 | /* if x86-64 aperture base is beyond 4G, exit here */ |
519 | if ( (apbase & 0x7fff) >> (32 - 25) ) | 519 | if ( (apbase & 0x7fff) >> (32 - 25) ) { |
520 | return -ENODEV; | 520 | printk(KERN_INFO PFX "aperture base > 4G\n"); |
521 | return -ENODEV; | ||
522 | } | ||
521 | 523 | ||
522 | apbase = (apbase & 0x7fff) << 25; | 524 | apbase = (apbase & 0x7fff) << 25; |
523 | 525 | ||
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c index 268f78d926d3..efef9999f1cf 100644 --- a/drivers/char/agp/sworks-agp.c +++ b/drivers/char/agp/sworks-agp.c | |||
@@ -468,9 +468,7 @@ static int __devinit agp_serverworks_probe(struct pci_dev *pdev, | |||
468 | 468 | ||
469 | switch (pdev->device) { | 469 | switch (pdev->device) { |
470 | case 0x0006: | 470 | case 0x0006: |
471 | /* ServerWorks CNB20HE | 471 | printk (KERN_ERR PFX "ServerWorks CNB20HE is unsupported due to lack of documentation.\n"); |
472 | Fail silently.*/ | ||
473 | printk (KERN_ERR PFX "Detected ServerWorks CNB20HE chipset: No AGP present.\n"); | ||
474 | return -ENODEV; | 472 | return -ENODEV; |
475 | 473 | ||
476 | case PCI_DEVICE_ID_SERVERWORKS_HE: | 474 | case PCI_DEVICE_ID_SERVERWORKS_HE: |
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h index 8fd6357a48da..2c17e88a8847 100644 --- a/drivers/char/drm/drm_pciids.h +++ b/drivers/char/drm/drm_pciids.h | |||
@@ -85,7 +85,6 @@ | |||
85 | {0x1002, 0x5969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \ | 85 | {0x1002, 0x5969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \ |
86 | {0x1002, 0x596A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ | 86 | {0x1002, 0x596A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ |
87 | {0x1002, 0x596B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ | 87 | {0x1002, 0x596B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ |
88 | {0x1002, 0x5b60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ | ||
89 | {0x1002, 0x5c61, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \ | 88 | {0x1002, 0x5c61, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \ |
90 | {0x1002, 0x5c62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ | 89 | {0x1002, 0x5c62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ |
91 | {0x1002, 0x5c63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \ | 90 | {0x1002, 0x5c63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \ |
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index a1381c61aa63..d3879ac9970f 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c | |||
@@ -202,10 +202,15 @@ void i915_driver_irq_postinstall(drm_device_t * dev) | |||
202 | void i915_driver_irq_uninstall(drm_device_t * dev) | 202 | void i915_driver_irq_uninstall(drm_device_t * dev) |
203 | { | 203 | { |
204 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 204 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
205 | u16 temp; | ||
206 | |||
205 | if (!dev_priv) | 207 | if (!dev_priv) |
206 | return; | 208 | return; |
207 | 209 | ||
208 | I915_WRITE16(I915REG_HWSTAM, 0xffff); | 210 | I915_WRITE16(I915REG_HWSTAM, 0xffff); |
209 | I915_WRITE16(I915REG_INT_MASK_R, 0xffff); | 211 | I915_WRITE16(I915REG_INT_MASK_R, 0xffff); |
210 | I915_WRITE16(I915REG_INT_ENABLE_R, 0x0); | 212 | I915_WRITE16(I915REG_INT_ENABLE_R, 0x0); |
213 | |||
214 | temp = I915_READ16(I915REG_INT_IDENTITY_R); | ||
215 | I915_WRITE16(I915REG_INT_IDENTITY_R, temp); | ||
211 | } | 216 | } |
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c index 291dbf4c8186..c08fa5076f05 100644 --- a/drivers/char/drm/r300_cmdbuf.c +++ b/drivers/char/drm/r300_cmdbuf.c | |||
@@ -161,6 +161,7 @@ void r300_init_reg_flags(void) | |||
161 | ADD_RANGE(R300_VAP_PVS_CNTL_1, 3); | 161 | ADD_RANGE(R300_VAP_PVS_CNTL_1, 3); |
162 | ADD_RANGE(R300_GB_ENABLE, 1); | 162 | ADD_RANGE(R300_GB_ENABLE, 1); |
163 | ADD_RANGE(R300_GB_MSPOS0, 5); | 163 | ADD_RANGE(R300_GB_MSPOS0, 5); |
164 | ADD_RANGE(R300_TX_CNTL, 1); | ||
164 | ADD_RANGE(R300_TX_ENABLE, 1); | 165 | ADD_RANGE(R300_TX_ENABLE, 1); |
165 | ADD_RANGE(0x4200, 4); | 166 | ADD_RANGE(0x4200, 4); |
166 | ADD_RANGE(0x4214, 1); | 167 | ADD_RANGE(0x4214, 1); |
@@ -489,6 +490,50 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv, | |||
489 | 490 | ||
490 | return 0; | 491 | return 0; |
491 | } | 492 | } |
493 | static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv, | ||
494 | drm_radeon_kcmd_buffer_t *cmdbuf) | ||
495 | { | ||
496 | u32 *cmd = (u32 *) cmdbuf->buf; | ||
497 | int count, ret; | ||
498 | RING_LOCALS; | ||
499 | |||
500 | count=(cmd[0]>>16) & 0x3fff; | ||
501 | |||
502 | if (cmd[0] & 0x8000) { | ||
503 | u32 offset; | ||
504 | |||
505 | if (cmd[1] & (RADEON_GMC_SRC_PITCH_OFFSET_CNTL | ||
506 | | RADEON_GMC_DST_PITCH_OFFSET_CNTL)) { | ||
507 | offset = cmd[2] << 10; | ||
508 | ret = r300_check_offset(dev_priv, offset); | ||
509 | if (ret) { | ||
510 | DRM_ERROR("Invalid bitblt first offset is %08X\n", offset); | ||
511 | return DRM_ERR(EINVAL); | ||
512 | } | ||
513 | } | ||
514 | |||
515 | if ((cmd[1] & RADEON_GMC_SRC_PITCH_OFFSET_CNTL) && | ||
516 | (cmd[1] & RADEON_GMC_DST_PITCH_OFFSET_CNTL)) { | ||
517 | offset = cmd[3] << 10; | ||
518 | ret = r300_check_offset(dev_priv, offset); | ||
519 | if (ret) { | ||
520 | DRM_ERROR("Invalid bitblt second offset is %08X\n", offset); | ||
521 | return DRM_ERR(EINVAL); | ||
522 | } | ||
523 | |||
524 | } | ||
525 | } | ||
526 | |||
527 | BEGIN_RING(count+2); | ||
528 | OUT_RING(cmd[0]); | ||
529 | OUT_RING_TABLE((int *)(cmdbuf->buf + 4), count + 1); | ||
530 | ADVANCE_RING(); | ||
531 | |||
532 | cmdbuf->buf += (count+2)*4; | ||
533 | cmdbuf->bufsz -= (count+2)*4; | ||
534 | |||
535 | return 0; | ||
536 | } | ||
492 | 537 | ||
493 | static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv, | 538 | static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv, |
494 | drm_radeon_kcmd_buffer_t *cmdbuf) | 539 | drm_radeon_kcmd_buffer_t *cmdbuf) |
@@ -527,6 +572,9 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv, | |||
527 | case RADEON_3D_LOAD_VBPNTR: /* load vertex array pointers */ | 572 | case RADEON_3D_LOAD_VBPNTR: /* load vertex array pointers */ |
528 | return r300_emit_3d_load_vbpntr(dev_priv, cmdbuf, header); | 573 | return r300_emit_3d_load_vbpntr(dev_priv, cmdbuf, header); |
529 | 574 | ||
575 | case RADEON_CNTL_BITBLT_MULTI: | ||
576 | return r300_emit_bitblt_multi(dev_priv, cmdbuf); | ||
577 | |||
530 | case RADEON_CP_3D_DRAW_IMMD_2: /* triggers drawing using in-packet vertex data */ | 578 | case RADEON_CP_3D_DRAW_IMMD_2: /* triggers drawing using in-packet vertex data */ |
531 | case RADEON_CP_3D_DRAW_VBUF_2: /* triggers drawing of vertex buffers setup elsewhere */ | 579 | case RADEON_CP_3D_DRAW_VBUF_2: /* triggers drawing of vertex buffers setup elsewhere */ |
532 | case RADEON_CP_3D_DRAW_INDX_2: /* triggers drawing using indices to vertex buffer */ | 580 | case RADEON_CP_3D_DRAW_INDX_2: /* triggers drawing using indices to vertex buffer */ |
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h index a0ed20e25221..d1e19954406b 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/char/drm/r300_reg.h | |||
@@ -451,6 +451,9 @@ I am fairly certain that they are correct unless stated otherwise in comments. | |||
451 | /* END */ | 451 | /* END */ |
452 | 452 | ||
453 | /* gap */ | 453 | /* gap */ |
454 | /* Zero to flush caches. */ | ||
455 | #define R300_TX_CNTL 0x4100 | ||
456 | |||
454 | /* The upper enable bits are guessed, based on fglrx reported limits. */ | 457 | /* The upper enable bits are guessed, based on fglrx reported limits. */ |
455 | #define R300_TX_ENABLE 0x4104 | 458 | #define R300_TX_ENABLE 0x4104 |
456 | # define R300_TX_ENABLE_0 (1 << 0) | 459 | # define R300_TX_ENABLE_0 (1 << 0) |
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 498b19b1d641..1f7d2ab8c4fc 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h | |||
@@ -90,9 +90,10 @@ | |||
90 | * 1.19- Add support for gart table in FB memory and PCIE r300 | 90 | * 1.19- Add support for gart table in FB memory and PCIE r300 |
91 | * 1.20- Add support for r300 texrect | 91 | * 1.20- Add support for r300 texrect |
92 | * 1.21- Add support for card type getparam | 92 | * 1.21- Add support for card type getparam |
93 | * 1.22- Add support for texture cache flushes (R300_TX_CNTL) | ||
93 | */ | 94 | */ |
94 | #define DRIVER_MAJOR 1 | 95 | #define DRIVER_MAJOR 1 |
95 | #define DRIVER_MINOR 21 | 96 | #define DRIVER_MINOR 22 |
96 | #define DRIVER_PATCHLEVEL 0 | 97 | #define DRIVER_PATCHLEVEL 0 |
97 | 98 | ||
98 | /* | 99 | /* |
diff --git a/drivers/char/esp.c b/drivers/char/esp.c index 57539d8f9f7c..09dc4b01232c 100644 --- a/drivers/char/esp.c +++ b/drivers/char/esp.c | |||
@@ -150,17 +150,6 @@ static void rs_wait_until_sent(struct tty_struct *, int); | |||
150 | /* Standard COM flags (except for COM4, because of the 8514 problem) */ | 150 | /* Standard COM flags (except for COM4, because of the 8514 problem) */ |
151 | #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) | 151 | #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) |
152 | 152 | ||
153 | /* | ||
154 | * tmp_buf is used as a temporary buffer by serial_write. We need to | ||
155 | * lock it in case the memcpy_fromfs blocks while swapping in a page, | ||
156 | * and some other program tries to do a serial write at the same time. | ||
157 | * Since the lock will only come under contention when the system is | ||
158 | * swapping and available memory is low, it makes sense to share one | ||
159 | * buffer across all the serial ports, since it significantly saves | ||
160 | * memory if large numbers of serial ports are open. | ||
161 | */ | ||
162 | static unsigned char *tmp_buf; | ||
163 | |||
164 | static inline int serial_paranoia_check(struct esp_struct *info, | 153 | static inline int serial_paranoia_check(struct esp_struct *info, |
165 | char *name, const char *routine) | 154 | char *name, const char *routine) |
166 | { | 155 | { |
@@ -1267,7 +1256,7 @@ static int rs_write(struct tty_struct * tty, | |||
1267 | if (serial_paranoia_check(info, tty->name, "rs_write")) | 1256 | if (serial_paranoia_check(info, tty->name, "rs_write")) |
1268 | return 0; | 1257 | return 0; |
1269 | 1258 | ||
1270 | if (!tty || !info->xmit_buf || !tmp_buf) | 1259 | if (!tty || !info->xmit_buf) |
1271 | return 0; | 1260 | return 0; |
1272 | 1261 | ||
1273 | while (1) { | 1262 | while (1) { |
@@ -2291,11 +2280,7 @@ static int esp_open(struct tty_struct *tty, struct file * filp) | |||
2291 | tty->driver_data = info; | 2280 | tty->driver_data = info; |
2292 | info->tty = tty; | 2281 | info->tty = tty; |
2293 | 2282 | ||
2294 | if (!tmp_buf) { | 2283 | spin_unlock_irqrestore(&info->lock, flags); |
2295 | tmp_buf = (unsigned char *) get_zeroed_page(GFP_KERNEL); | ||
2296 | if (!tmp_buf) | ||
2297 | return -ENOMEM; | ||
2298 | } | ||
2299 | 2284 | ||
2300 | /* | 2285 | /* |
2301 | * Start up serial port | 2286 | * Start up serial port |
@@ -2602,9 +2587,6 @@ static void __exit espserial_exit(void) | |||
2602 | free_pages((unsigned long)dma_buffer, | 2587 | free_pages((unsigned long)dma_buffer, |
2603 | get_order(DMA_BUFFER_SZ)); | 2588 | get_order(DMA_BUFFER_SZ)); |
2604 | 2589 | ||
2605 | if (tmp_buf) | ||
2606 | free_page((unsigned long)tmp_buf); | ||
2607 | |||
2608 | while (free_pio_buf) { | 2590 | while (free_pio_buf) { |
2609 | pio_buf = free_pio_buf->next; | 2591 | pio_buf = free_pio_buf->next; |
2610 | kfree(free_pio_buf); | 2592 | kfree(free_pio_buf); |
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 66a2fee06eb9..ef140ebde117 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -956,22 +956,18 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) | |||
956 | } | 956 | } |
957 | } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { | 957 | } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { |
958 | struct acpi_resource_extended_irq *irqp; | 958 | struct acpi_resource_extended_irq *irqp; |
959 | int i; | 959 | int i, irq; |
960 | 960 | ||
961 | irqp = &res->data.extended_irq; | 961 | irqp = &res->data.extended_irq; |
962 | 962 | ||
963 | if (irqp->interrupt_count > 0) { | 963 | for (i = 0; i < irqp->interrupt_count; i++) { |
964 | hdp->hd_nirqs = irqp->interrupt_count; | 964 | irq = acpi_register_gsi(irqp->interrupts[i], |
965 | 965 | irqp->triggering, irqp->polarity); | |
966 | for (i = 0; i < hdp->hd_nirqs; i++) { | 966 | if (irq < 0) |
967 | int rc = | 967 | return AE_ERROR; |
968 | acpi_register_gsi(irqp->interrupts[i], | 968 | |
969 | irqp->triggering, | 969 | hdp->hd_irq[hdp->hd_nirqs] = irq; |
970 | irqp->polarity); | 970 | hdp->hd_nirqs++; |
971 | if (rc < 0) | ||
972 | return AE_ERROR; | ||
973 | hdp->hd_irq[i] = rc; | ||
974 | } | ||
975 | } | 971 | } |
976 | } | 972 | } |
977 | 973 | ||
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 1994a92d4733..f65b2e14a485 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
@@ -335,6 +335,8 @@ static int hvc_open(struct tty_struct *tty, struct file * filp) | |||
335 | } /* else count == 0 */ | 335 | } /* else count == 0 */ |
336 | 336 | ||
337 | tty->driver_data = hp; | 337 | tty->driver_data = hp; |
338 | tty->low_latency = 1; /* Makes flushes to ldisc synchronous. */ | ||
339 | |||
338 | hp->tty = tty; | 340 | hp->tty = tty; |
339 | /* Save for request_irq outside of spin_lock. */ | 341 | /* Save for request_irq outside of spin_lock. */ |
340 | irq = hp->irq; | 342 | irq = hp->irq; |
@@ -633,9 +635,6 @@ static int hvc_poll(struct hvc_struct *hp) | |||
633 | tty_insert_flip_char(tty, buf[i], 0); | 635 | tty_insert_flip_char(tty, buf[i], 0); |
634 | } | 636 | } |
635 | 637 | ||
636 | if (count) | ||
637 | tty_schedule_flip(tty); | ||
638 | |||
639 | /* | 638 | /* |
640 | * Account for the total amount read in one loop, and if above | 639 | * Account for the total amount read in one loop, and if above |
641 | * 64 bytes, we do a quick schedule loop to let the tty grok | 640 | * 64 bytes, we do a quick schedule loop to let the tty grok |
@@ -656,6 +655,9 @@ static int hvc_poll(struct hvc_struct *hp) | |||
656 | bail: | 655 | bail: |
657 | spin_unlock_irqrestore(&hp->lock, flags); | 656 | spin_unlock_irqrestore(&hp->lock, flags); |
658 | 657 | ||
658 | if (read_total) | ||
659 | tty_flip_buffer_push(tty); | ||
660 | |||
659 | return poll_mask; | 661 | return poll_mask; |
660 | } | 662 | } |
661 | 663 | ||
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 5765f672e853..d58f82318853 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
@@ -243,7 +243,7 @@ static struct sysrq_key_op sysrq_term_op = { | |||
243 | 243 | ||
244 | static void moom_callback(void *ignored) | 244 | static void moom_callback(void *ignored) |
245 | { | 245 | { |
246 | out_of_memory(GFP_KERNEL, 0); | 246 | out_of_memory(&NODE_DATA(0)->node_zonelists[ZONE_NORMAL], GFP_KERNEL, 0); |
247 | } | 247 | } |
248 | 248 | ||
249 | static DECLARE_WORK(moom_work, moom_callback, NULL); | 249 | static DECLARE_WORK(moom_work, moom_callback, NULL); |
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c index 41a94bc79f67..eb2eb3e12d6a 100644 --- a/drivers/char/tipar.c +++ b/drivers/char/tipar.c | |||
@@ -250,12 +250,17 @@ tipar_open(struct inode *inode, struct file *file) | |||
250 | { | 250 | { |
251 | unsigned int minor = iminor(inode) - TIPAR_MINOR; | 251 | unsigned int minor = iminor(inode) - TIPAR_MINOR; |
252 | 252 | ||
253 | if (minor > tp_count - 1) | 253 | if (tp_count == 0 || minor > tp_count - 1) |
254 | return -ENXIO; | 254 | return -ENXIO; |
255 | 255 | ||
256 | if (test_and_set_bit(minor, &opened)) | 256 | if (test_and_set_bit(minor, &opened)) |
257 | return -EBUSY; | 257 | return -EBUSY; |
258 | 258 | ||
259 | if (!table[minor].dev) { | ||
260 | printk(KERN_ERR "%s: NULL device for minor %u\n", | ||
261 | __FUNCTION__, minor); | ||
262 | return -ENXIO; | ||
263 | } | ||
259 | parport_claim_or_block(table[minor].dev); | 264 | parport_claim_or_block(table[minor].dev); |
260 | init_ti_parallel(minor); | 265 | init_ti_parallel(minor); |
261 | parport_release(table[minor].dev); | 266 | parport_release(table[minor].dev); |
@@ -510,16 +515,20 @@ tipar_init_module(void) | |||
510 | err = PTR_ERR(tipar_class); | 515 | err = PTR_ERR(tipar_class); |
511 | goto out_chrdev; | 516 | goto out_chrdev; |
512 | } | 517 | } |
513 | if (parport_register_driver(&tipar_driver)) { | 518 | if (parport_register_driver(&tipar_driver) || tp_count == 0) { |
514 | printk(KERN_ERR "tipar: unable to register with parport\n"); | 519 | printk(KERN_ERR "tipar: unable to register with parport\n"); |
515 | err = -EIO; | 520 | err = -EIO; |
516 | goto out; | 521 | goto out_class; |
517 | } | 522 | } |
518 | 523 | ||
519 | err = 0; | 524 | err = 0; |
520 | goto out; | 525 | goto out; |
521 | 526 | ||
527 | out_class: | ||
528 | class_destroy(tipar_class); | ||
529 | |||
522 | out_chrdev: | 530 | out_chrdev: |
531 | devfs_remove("ticables/par"); | ||
523 | unregister_chrdev(TIPAR_MAJOR, "tipar"); | 532 | unregister_chrdev(TIPAR_MAJOR, "tipar"); |
524 | out: | 533 | out: |
525 | return err; | 534 | return err; |
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c index ec7590951af5..24095f6ee6da 100644 --- a/drivers/char/tpm/tpm_infineon.c +++ b/drivers/char/tpm/tpm_infineon.c | |||
@@ -33,6 +33,7 @@ | |||
33 | static int TPM_INF_DATA; | 33 | static int TPM_INF_DATA; |
34 | static int TPM_INF_ADDR; | 34 | static int TPM_INF_ADDR; |
35 | static int TPM_INF_BASE; | 35 | static int TPM_INF_BASE; |
36 | static int TPM_INF_ADDR_LEN; | ||
36 | static int TPM_INF_PORT_LEN; | 37 | static int TPM_INF_PORT_LEN; |
37 | 38 | ||
38 | /* TPM header definitions */ | 39 | /* TPM header definitions */ |
@@ -195,6 +196,7 @@ static int tpm_inf_recv(struct tpm_chip *chip, u8 * buf, size_t count) | |||
195 | int i; | 196 | int i; |
196 | int ret; | 197 | int ret; |
197 | u32 size = 0; | 198 | u32 size = 0; |
199 | number_of_wtx = 0; | ||
198 | 200 | ||
199 | recv_begin: | 201 | recv_begin: |
200 | /* start receiving header */ | 202 | /* start receiving header */ |
@@ -378,24 +380,35 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
378 | if (pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) && | 380 | if (pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) && |
379 | !(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) { | 381 | !(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) { |
380 | TPM_INF_ADDR = pnp_port_start(dev, 0); | 382 | TPM_INF_ADDR = pnp_port_start(dev, 0); |
383 | TPM_INF_ADDR_LEN = pnp_port_len(dev, 0); | ||
381 | TPM_INF_DATA = (TPM_INF_ADDR + 1); | 384 | TPM_INF_DATA = (TPM_INF_ADDR + 1); |
382 | TPM_INF_BASE = pnp_port_start(dev, 1); | 385 | TPM_INF_BASE = pnp_port_start(dev, 1); |
383 | TPM_INF_PORT_LEN = pnp_port_len(dev, 1); | 386 | TPM_INF_PORT_LEN = pnp_port_len(dev, 1); |
384 | if (!TPM_INF_PORT_LEN) | 387 | if ((TPM_INF_PORT_LEN < 4) || (TPM_INF_ADDR_LEN < 2)) { |
385 | return -EINVAL; | 388 | rc = -EINVAL; |
389 | goto err_last; | ||
390 | } | ||
386 | dev_info(&dev->dev, "Found %s with ID %s\n", | 391 | dev_info(&dev->dev, "Found %s with ID %s\n", |
387 | dev->name, dev_id->id); | 392 | dev->name, dev_id->id); |
388 | if (!((TPM_INF_BASE >> 8) & 0xff)) | 393 | if (!((TPM_INF_BASE >> 8) & 0xff)) { |
389 | return -EINVAL; | 394 | rc = -EINVAL; |
395 | goto err_last; | ||
396 | } | ||
390 | /* publish my base address and request region */ | 397 | /* publish my base address and request region */ |
391 | tpm_inf.base = TPM_INF_BASE; | 398 | tpm_inf.base = TPM_INF_BASE; |
392 | if (request_region | 399 | if (request_region |
393 | (tpm_inf.base, TPM_INF_PORT_LEN, "tpm_infineon0") == NULL) { | 400 | (tpm_inf.base, TPM_INF_PORT_LEN, "tpm_infineon0") == NULL) { |
394 | release_region(tpm_inf.base, TPM_INF_PORT_LEN); | 401 | rc = -EINVAL; |
395 | return -EINVAL; | 402 | goto err_last; |
403 | } | ||
404 | if (request_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN, | ||
405 | "tpm_infineon0") == NULL) { | ||
406 | rc = -EINVAL; | ||
407 | goto err_last; | ||
396 | } | 408 | } |
397 | } else { | 409 | } else { |
398 | return -EINVAL; | 410 | rc = -EINVAL; |
411 | goto err_last; | ||
399 | } | 412 | } |
400 | 413 | ||
401 | /* query chip for its vendor, its version number a.s.o. */ | 414 | /* query chip for its vendor, its version number a.s.o. */ |
@@ -443,8 +456,8 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
443 | dev_err(&dev->dev, | 456 | dev_err(&dev->dev, |
444 | "Could not set IO-ports to 0x%lx\n", | 457 | "Could not set IO-ports to 0x%lx\n", |
445 | tpm_inf.base); | 458 | tpm_inf.base); |
446 | release_region(tpm_inf.base, TPM_INF_PORT_LEN); | 459 | rc = -EIO; |
447 | return -EIO; | 460 | goto err_release_region; |
448 | } | 461 | } |
449 | 462 | ||
450 | /* activate register */ | 463 | /* activate register */ |
@@ -471,14 +484,21 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, | |||
471 | 484 | ||
472 | rc = tpm_register_hardware(&dev->dev, &tpm_inf); | 485 | rc = tpm_register_hardware(&dev->dev, &tpm_inf); |
473 | if (rc < 0) { | 486 | if (rc < 0) { |
474 | release_region(tpm_inf.base, TPM_INF_PORT_LEN); | 487 | rc = -ENODEV; |
475 | return -ENODEV; | 488 | goto err_release_region; |
476 | } | 489 | } |
477 | return 0; | 490 | return 0; |
478 | } else { | 491 | } else { |
479 | dev_info(&dev->dev, "No Infineon TPM found!\n"); | 492 | rc = -ENODEV; |
480 | return -ENODEV; | 493 | goto err_release_region; |
481 | } | 494 | } |
495 | |||
496 | err_release_region: | ||
497 | release_region(tpm_inf.base, TPM_INF_PORT_LEN); | ||
498 | release_region(TPM_INF_ADDR, TPM_INF_ADDR_LEN); | ||
499 | |||
500 | err_last: | ||
501 | return rc; | ||
482 | } | 502 | } |
483 | 503 | ||
484 | static __devexit void tpm_inf_pnp_remove(struct pnp_dev *dev) | 504 | static __devexit void tpm_inf_pnp_remove(struct pnp_dev *dev) |
@@ -518,5 +538,5 @@ module_exit(cleanup_inf); | |||
518 | 538 | ||
519 | MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>"); | 539 | MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>"); |
520 | MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); | 540 | MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2"); |
521 | MODULE_VERSION("1.6"); | 541 | MODULE_VERSION("1.7"); |
522 | MODULE_LICENSE("GPL"); | 542 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 076e07c1da38..e9bba94fc898 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -268,6 +268,8 @@ static struct tty_buffer *tty_buffer_alloc(size_t size) | |||
268 | p->size = size; | 268 | p->size = size; |
269 | p->next = NULL; | 269 | p->next = NULL; |
270 | p->active = 0; | 270 | p->active = 0; |
271 | p->commit = 0; | ||
272 | p->read = 0; | ||
271 | p->char_buf_ptr = (char *)(p->data); | 273 | p->char_buf_ptr = (char *)(p->data); |
272 | p->flag_buf_ptr = (unsigned char *)p->char_buf_ptr + size; | 274 | p->flag_buf_ptr = (unsigned char *)p->char_buf_ptr + size; |
273 | /* printk("Flip create %p\n", p); */ | 275 | /* printk("Flip create %p\n", p); */ |
@@ -298,6 +300,8 @@ static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size) | |||
298 | *tbh = t->next; | 300 | *tbh = t->next; |
299 | t->next = NULL; | 301 | t->next = NULL; |
300 | t->used = 0; | 302 | t->used = 0; |
303 | t->commit = 0; | ||
304 | t->read = 0; | ||
301 | /* DEBUG ONLY */ | 305 | /* DEBUG ONLY */ |
302 | memset(t->data, '*', size); | 306 | memset(t->data, '*', size); |
303 | /* printk("Flip recycle %p\n", t); */ | 307 | /* printk("Flip recycle %p\n", t); */ |
@@ -335,6 +339,7 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size) | |||
335 | if (b != NULL) { | 339 | if (b != NULL) { |
336 | b->next = n; | 340 | b->next = n; |
337 | b->active = 0; | 341 | b->active = 0; |
342 | b->commit = b->used; | ||
338 | } else | 343 | } else |
339 | tty->buf.head = n; | 344 | tty->buf.head = n; |
340 | tty->buf.tail = n; | 345 | tty->buf.tail = n; |
@@ -1836,7 +1841,6 @@ static void release_dev(struct file * filp) | |||
1836 | tty_closing = tty->count <= 1; | 1841 | tty_closing = tty->count <= 1; |
1837 | o_tty_closing = o_tty && | 1842 | o_tty_closing = o_tty && |
1838 | (o_tty->count <= (pty_master ? 1 : 0)); | 1843 | (o_tty->count <= (pty_master ? 1 : 0)); |
1839 | up(&tty_sem); | ||
1840 | do_sleep = 0; | 1844 | do_sleep = 0; |
1841 | 1845 | ||
1842 | if (tty_closing) { | 1846 | if (tty_closing) { |
@@ -1864,6 +1868,7 @@ static void release_dev(struct file * filp) | |||
1864 | 1868 | ||
1865 | printk(KERN_WARNING "release_dev: %s: read/write wait queue " | 1869 | printk(KERN_WARNING "release_dev: %s: read/write wait queue " |
1866 | "active!\n", tty_name(tty, buf)); | 1870 | "active!\n", tty_name(tty, buf)); |
1871 | up(&tty_sem); | ||
1867 | schedule(); | 1872 | schedule(); |
1868 | } | 1873 | } |
1869 | 1874 | ||
@@ -1872,8 +1877,6 @@ static void release_dev(struct file * filp) | |||
1872 | * both sides, and we've completed the last operation that could | 1877 | * both sides, and we've completed the last operation that could |
1873 | * block, so it's safe to proceed with closing. | 1878 | * block, so it's safe to proceed with closing. |
1874 | */ | 1879 | */ |
1875 | |||
1876 | down(&tty_sem); | ||
1877 | if (pty_master) { | 1880 | if (pty_master) { |
1878 | if (--o_tty->count < 0) { | 1881 | if (--o_tty->count < 0) { |
1879 | printk(KERN_WARNING "release_dev: bad pty slave count " | 1882 | printk(KERN_WARNING "release_dev: bad pty slave count " |
@@ -1887,7 +1890,6 @@ static void release_dev(struct file * filp) | |||
1887 | tty->count, tty_name(tty, buf)); | 1890 | tty->count, tty_name(tty, buf)); |
1888 | tty->count = 0; | 1891 | tty->count = 0; |
1889 | } | 1892 | } |
1890 | up(&tty_sem); | ||
1891 | 1893 | ||
1892 | /* | 1894 | /* |
1893 | * We've decremented tty->count, so we need to remove this file | 1895 | * We've decremented tty->count, so we need to remove this file |
@@ -1932,6 +1934,8 @@ static void release_dev(struct file * filp) | |||
1932 | read_unlock(&tasklist_lock); | 1934 | read_unlock(&tasklist_lock); |
1933 | } | 1935 | } |
1934 | 1936 | ||
1937 | up(&tty_sem); | ||
1938 | |||
1935 | /* check whether both sides are closing ... */ | 1939 | /* check whether both sides are closing ... */ |
1936 | if (!tty_closing || (o_tty && !o_tty_closing)) | 1940 | if (!tty_closing || (o_tty && !o_tty_closing)) |
1937 | return; | 1941 | return; |
@@ -2752,6 +2756,9 @@ static void flush_to_ldisc(void *private_) | |||
2752 | unsigned long flags; | 2756 | unsigned long flags; |
2753 | struct tty_ldisc *disc; | 2757 | struct tty_ldisc *disc; |
2754 | struct tty_buffer *tbuf; | 2758 | struct tty_buffer *tbuf; |
2759 | int count; | ||
2760 | char *char_buf; | ||
2761 | unsigned char *flag_buf; | ||
2755 | 2762 | ||
2756 | disc = tty_ldisc_ref(tty); | 2763 | disc = tty_ldisc_ref(tty); |
2757 | if (disc == NULL) /* !TTY_LDISC */ | 2764 | if (disc == NULL) /* !TTY_LDISC */ |
@@ -2765,16 +2772,20 @@ static void flush_to_ldisc(void *private_) | |||
2765 | goto out; | 2772 | goto out; |
2766 | } | 2773 | } |
2767 | spin_lock_irqsave(&tty->buf.lock, flags); | 2774 | spin_lock_irqsave(&tty->buf.lock, flags); |
2768 | while((tbuf = tty->buf.head) != NULL && !tbuf->active) { | 2775 | while((tbuf = tty->buf.head) != NULL) { |
2776 | while ((count = tbuf->commit - tbuf->read) != 0) { | ||
2777 | char_buf = tbuf->char_buf_ptr + tbuf->read; | ||
2778 | flag_buf = tbuf->flag_buf_ptr + tbuf->read; | ||
2779 | tbuf->read += count; | ||
2780 | spin_unlock_irqrestore(&tty->buf.lock, flags); | ||
2781 | disc->receive_buf(tty, char_buf, flag_buf, count); | ||
2782 | spin_lock_irqsave(&tty->buf.lock, flags); | ||
2783 | } | ||
2784 | if (tbuf->active) | ||
2785 | break; | ||
2769 | tty->buf.head = tbuf->next; | 2786 | tty->buf.head = tbuf->next; |
2770 | if (tty->buf.head == NULL) | 2787 | if (tty->buf.head == NULL) |
2771 | tty->buf.tail = NULL; | 2788 | tty->buf.tail = NULL; |
2772 | spin_unlock_irqrestore(&tty->buf.lock, flags); | ||
2773 | /* printk("Process buffer %p for %d\n", tbuf, tbuf->used); */ | ||
2774 | disc->receive_buf(tty, tbuf->char_buf_ptr, | ||
2775 | tbuf->flag_buf_ptr, | ||
2776 | tbuf->used); | ||
2777 | spin_lock_irqsave(&tty->buf.lock, flags); | ||
2778 | tty_buffer_free(tty, tbuf); | 2789 | tty_buffer_free(tty, tbuf); |
2779 | } | 2790 | } |
2780 | spin_unlock_irqrestore(&tty->buf.lock, flags); | 2791 | spin_unlock_irqrestore(&tty->buf.lock, flags); |
@@ -2871,8 +2882,10 @@ void tty_flip_buffer_push(struct tty_struct *tty) | |||
2871 | { | 2882 | { |
2872 | unsigned long flags; | 2883 | unsigned long flags; |
2873 | spin_lock_irqsave(&tty->buf.lock, flags); | 2884 | spin_lock_irqsave(&tty->buf.lock, flags); |
2874 | if (tty->buf.tail != NULL) | 2885 | if (tty->buf.tail != NULL) { |
2875 | tty->buf.tail->active = 0; | 2886 | tty->buf.tail->active = 0; |
2887 | tty->buf.tail->commit = tty->buf.tail->used; | ||
2888 | } | ||
2876 | spin_unlock_irqrestore(&tty->buf.lock, flags); | 2889 | spin_unlock_irqrestore(&tty->buf.lock, flags); |
2877 | 2890 | ||
2878 | if (tty->low_latency) | 2891 | if (tty->low_latency) |
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c index 37c9e13ad3ac..8d6b249ad66b 100644 --- a/drivers/char/watchdog/pcwd.c +++ b/drivers/char/watchdog/pcwd.c | |||
@@ -49,29 +49,37 @@ | |||
49 | * More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/ | 49 | * More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/ |
50 | */ | 50 | */ |
51 | 51 | ||
52 | #include <linux/module.h> | 52 | #include <linux/config.h> /* For CONFIG_WATCHDOG_NOWAYOUT/... */ |
53 | #include <linux/moduleparam.h> | 53 | #include <linux/module.h> /* For module specific items */ |
54 | #include <linux/types.h> | 54 | #include <linux/moduleparam.h> /* For new moduleparam's */ |
55 | #include <linux/timer.h> | 55 | #include <linux/types.h> /* For standard types (like size_t) */ |
56 | #include <linux/jiffies.h> | 56 | #include <linux/errno.h> /* For the -ENODEV/... values */ |
57 | #include <linux/config.h> | 57 | #include <linux/kernel.h> /* For printk/panic/... */ |
58 | #include <linux/wait.h> | 58 | #include <linux/delay.h> /* For mdelay function */ |
59 | #include <linux/slab.h> | 59 | #include <linux/timer.h> /* For timer related operations */ |
60 | #include <linux/ioport.h> | 60 | #include <linux/jiffies.h> /* For jiffies stuff */ |
61 | #include <linux/delay.h> | 61 | #include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */ |
62 | #include <linux/fs.h> | 62 | #include <linux/watchdog.h> /* For the watchdog specific items */ |
63 | #include <linux/miscdevice.h> | 63 | #include <linux/notifier.h> /* For notifier support */ |
64 | #include <linux/watchdog.h> | 64 | #include <linux/reboot.h> /* For reboot_notifier stuff */ |
65 | #include <linux/notifier.h> | 65 | #include <linux/init.h> /* For __init/__exit/... */ |
66 | #include <linux/init.h> | 66 | #include <linux/fs.h> /* For file operations */ |
67 | #include <linux/spinlock.h> | 67 | #include <linux/ioport.h> /* For io-port access */ |
68 | #include <linux/reboot.h> | 68 | #include <linux/spinlock.h> /* For spin_lock/spin_unlock/... */ |
69 | #include <linux/sched.h> /* TASK_INTERRUPTIBLE, set_current_state() and friends */ | 69 | #include <linux/sched.h> /* TASK_INTERRUPTIBLE, set_current_state() and friends */ |
70 | #include <asm/uaccess.h> | 70 | #include <linux/slab.h> /* For kmalloc */ |
71 | #include <asm/io.h> | ||
72 | 71 | ||
73 | #define WD_VER "1.16 (06/12/2004)" | 72 | #include <asm/uaccess.h> /* For copy_to_user/put_user/... */ |
74 | #define PFX "pcwd: " | 73 | #include <asm/io.h> /* For inb/outb/... */ |
74 | |||
75 | /* Module and version information */ | ||
76 | #define WATCHDOG_VERSION "1.16" | ||
77 | #define WATCHDOG_DATE "03 Jan 2006" | ||
78 | #define WATCHDOG_DRIVER_NAME "ISA-PC Watchdog" | ||
79 | #define WATCHDOG_NAME "pcwd" | ||
80 | #define PFX WATCHDOG_NAME ": " | ||
81 | #define DRIVER_VERSION WATCHDOG_DRIVER_NAME " driver, v" WATCHDOG_VERSION " (" WATCHDOG_DATE ")\n" | ||
82 | #define WD_VER WATCHDOG_VERSION " (" WATCHDOG_DATE ")" | ||
75 | 83 | ||
76 | /* | 84 | /* |
77 | * It should be noted that PCWD_REVISION_B was removed because A and B | 85 | * It should be noted that PCWD_REVISION_B was removed because A and B |
@@ -85,36 +93,38 @@ | |||
85 | 93 | ||
86 | /* | 94 | /* |
87 | * These are the defines that describe the control status bits for the | 95 | * These are the defines that describe the control status bits for the |
88 | * PC Watchdog card, revision A. | 96 | * PCI-PC Watchdog card. |
89 | */ | 97 | */ |
98 | /* Port 1 : Control Status #1 for the PC Watchdog card, revision A. */ | ||
90 | #define WD_WDRST 0x01 /* Previously reset state */ | 99 | #define WD_WDRST 0x01 /* Previously reset state */ |
91 | #define WD_T110 0x02 /* Temperature overheat sense */ | 100 | #define WD_T110 0x02 /* Temperature overheat sense */ |
92 | #define WD_HRTBT 0x04 /* Heartbeat sense */ | 101 | #define WD_HRTBT 0x04 /* Heartbeat sense */ |
93 | #define WD_RLY2 0x08 /* External relay triggered */ | 102 | #define WD_RLY2 0x08 /* External relay triggered */ |
94 | #define WD_SRLY2 0x80 /* Software external relay triggered */ | 103 | #define WD_SRLY2 0x80 /* Software external relay triggered */ |
95 | 104 | /* Port 1 : Control Status #1 for the PC Watchdog card, revision C. */ | |
96 | /* | ||
97 | * These are the defines that describe the control status bits for the | ||
98 | * PC Watchdog card, revision C. | ||
99 | */ | ||
100 | #define WD_REVC_WTRP 0x01 /* Watchdog Trip status */ | 105 | #define WD_REVC_WTRP 0x01 /* Watchdog Trip status */ |
101 | #define WD_REVC_HRBT 0x02 /* Watchdog Heartbeat */ | 106 | #define WD_REVC_HRBT 0x02 /* Watchdog Heartbeat */ |
102 | #define WD_REVC_TTRP 0x04 /* Temperature Trip status */ | 107 | #define WD_REVC_TTRP 0x04 /* Temperature Trip status */ |
108 | /* Port 2 : Control Status #2 */ | ||
109 | #define WD_WDIS 0x10 /* Watchdog Disabled */ | ||
110 | #define WD_ENTP 0x20 /* Watchdog Enable Temperature Trip */ | ||
111 | #define WD_SSEL 0x40 /* Watchdog Switch Select (1:SW1 <-> 0:SW2) */ | ||
112 | #define WD_WCMD 0x80 /* Watchdog Command Mode */ | ||
103 | 113 | ||
104 | /* max. time we give an ISA watchdog card to process a command */ | 114 | /* max. time we give an ISA watchdog card to process a command */ |
105 | /* 500ms for each 4 bit response (according to spec.) */ | 115 | /* 500ms for each 4 bit response (according to spec.) */ |
106 | #define ISA_COMMAND_TIMEOUT 1000 | 116 | #define ISA_COMMAND_TIMEOUT 1000 |
107 | 117 | ||
108 | /* Watchdog's internal commands */ | 118 | /* Watchdog's internal commands */ |
109 | #define CMD_ISA_IDLE 0x00 | 119 | #define CMD_ISA_IDLE 0x00 |
110 | #define CMD_ISA_VERSION_INTEGER 0x01 | 120 | #define CMD_ISA_VERSION_INTEGER 0x01 |
111 | #define CMD_ISA_VERSION_TENTH 0x02 | 121 | #define CMD_ISA_VERSION_TENTH 0x02 |
112 | #define CMD_ISA_VERSION_HUNDRETH 0x03 | 122 | #define CMD_ISA_VERSION_HUNDRETH 0x03 |
113 | #define CMD_ISA_VERSION_MINOR 0x04 | 123 | #define CMD_ISA_VERSION_MINOR 0x04 |
114 | #define CMD_ISA_SWITCH_SETTINGS 0x05 | 124 | #define CMD_ISA_SWITCH_SETTINGS 0x05 |
115 | #define CMD_ISA_DELAY_TIME_2SECS 0x0A | 125 | #define CMD_ISA_DELAY_TIME_2SECS 0x0A |
116 | #define CMD_ISA_DELAY_TIME_4SECS 0x0B | 126 | #define CMD_ISA_DELAY_TIME_4SECS 0x0B |
117 | #define CMD_ISA_DELAY_TIME_8SECS 0x0C | 127 | #define CMD_ISA_DELAY_TIME_8SECS 0x0C |
118 | 128 | ||
119 | /* | 129 | /* |
120 | * We are using an kernel timer to do the pinging of the watchdog | 130 | * We are using an kernel timer to do the pinging of the watchdog |
@@ -130,15 +140,17 @@ static int cards_found; | |||
130 | /* internal variables */ | 140 | /* internal variables */ |
131 | static atomic_t open_allowed = ATOMIC_INIT(1); | 141 | static atomic_t open_allowed = ATOMIC_INIT(1); |
132 | static char expect_close; | 142 | static char expect_close; |
133 | static struct timer_list timer; | ||
134 | static unsigned long next_heartbeat; | ||
135 | static int temp_panic; | 143 | static int temp_panic; |
136 | static int revision; /* The card's revision */ | 144 | static struct { /* this is private data for each ISA-PC watchdog card */ |
137 | static int supports_temp; /* Wether or not the card has a temperature device */ | 145 | int revision; /* The card's revision */ |
138 | static int command_mode; /* Wether or not the card is in command mode */ | 146 | int supports_temp; /* Wether or not the card has a temperature device */ |
139 | static int initial_status; /* The card's boot status */ | 147 | int command_mode; /* Wether or not the card is in command mode */ |
140 | static int current_readport; /* The cards I/O address */ | 148 | int boot_status; /* The card's boot status */ |
141 | static spinlock_t io_lock; | 149 | int io_addr; /* The cards I/O address */ |
150 | spinlock_t io_lock; /* the lock for io operations */ | ||
151 | struct timer_list timer; /* The timer that pings the watchdog */ | ||
152 | unsigned long next_heartbeat; /* the next_heartbeat for the timer */ | ||
153 | } pcwd_private; | ||
142 | 154 | ||
143 | /* module parameters */ | 155 | /* module parameters */ |
144 | #define WATCHDOG_HEARTBEAT 60 /* 60 sec default heartbeat */ | 156 | #define WATCHDOG_HEARTBEAT 60 /* 60 sec default heartbeat */ |
@@ -161,14 +173,14 @@ static int send_isa_command(int cmd) | |||
161 | int port0, last_port0; /* Double read for stabilising */ | 173 | int port0, last_port0; /* Double read for stabilising */ |
162 | 174 | ||
163 | /* The WCMD bit must be 1 and the command is only 4 bits in size */ | 175 | /* The WCMD bit must be 1 and the command is only 4 bits in size */ |
164 | control_status = (cmd & 0x0F) | 0x80; | 176 | control_status = (cmd & 0x0F) | WD_WCMD; |
165 | outb_p(control_status, current_readport + 2); | 177 | outb_p(control_status, pcwd_private.io_addr + 2); |
166 | udelay(ISA_COMMAND_TIMEOUT); | 178 | udelay(ISA_COMMAND_TIMEOUT); |
167 | 179 | ||
168 | port0 = inb_p(current_readport); | 180 | port0 = inb_p(pcwd_private.io_addr); |
169 | for (i = 0; i < 25; ++i) { | 181 | for (i = 0; i < 25; ++i) { |
170 | last_port0 = port0; | 182 | last_port0 = port0; |
171 | port0 = inb_p(current_readport); | 183 | port0 = inb_p(pcwd_private.io_addr); |
172 | 184 | ||
173 | if (port0 == last_port0) | 185 | if (port0 == last_port0) |
174 | break; /* Data is stable */ | 186 | break; /* Data is stable */ |
@@ -184,7 +196,7 @@ static int set_command_mode(void) | |||
184 | int i, found=0, count=0; | 196 | int i, found=0, count=0; |
185 | 197 | ||
186 | /* Set the card into command mode */ | 198 | /* Set the card into command mode */ |
187 | spin_lock(&io_lock); | 199 | spin_lock(&pcwd_private.io_lock); |
188 | while ((!found) && (count < 3)) { | 200 | while ((!found) && (count < 3)) { |
189 | i = send_isa_command(CMD_ISA_IDLE); | 201 | i = send_isa_command(CMD_ISA_IDLE); |
190 | 202 | ||
@@ -192,15 +204,15 @@ static int set_command_mode(void) | |||
192 | found = 1; | 204 | found = 1; |
193 | else if (i == 0xF3) { | 205 | else if (i == 0xF3) { |
194 | /* Card does not like what we've done to it */ | 206 | /* Card does not like what we've done to it */ |
195 | outb_p(0x00, current_readport + 2); | 207 | outb_p(0x00, pcwd_private.io_addr + 2); |
196 | udelay(1200); /* Spec says wait 1ms */ | 208 | udelay(1200); /* Spec says wait 1ms */ |
197 | outb_p(0x00, current_readport + 2); | 209 | outb_p(0x00, pcwd_private.io_addr + 2); |
198 | udelay(ISA_COMMAND_TIMEOUT); | 210 | udelay(ISA_COMMAND_TIMEOUT); |
199 | } | 211 | } |
200 | count++; | 212 | count++; |
201 | } | 213 | } |
202 | spin_unlock(&io_lock); | 214 | spin_unlock(&pcwd_private.io_lock); |
203 | command_mode = found; | 215 | pcwd_private.command_mode = found; |
204 | 216 | ||
205 | return(found); | 217 | return(found); |
206 | } | 218 | } |
@@ -208,12 +220,95 @@ static int set_command_mode(void) | |||
208 | static void unset_command_mode(void) | 220 | static void unset_command_mode(void) |
209 | { | 221 | { |
210 | /* Set the card into normal mode */ | 222 | /* Set the card into normal mode */ |
211 | spin_lock(&io_lock); | 223 | spin_lock(&pcwd_private.io_lock); |
212 | outb_p(0x00, current_readport + 2); | 224 | outb_p(0x00, pcwd_private.io_addr + 2); |
213 | udelay(ISA_COMMAND_TIMEOUT); | 225 | udelay(ISA_COMMAND_TIMEOUT); |
214 | spin_unlock(&io_lock); | 226 | spin_unlock(&pcwd_private.io_lock); |
227 | |||
228 | pcwd_private.command_mode = 0; | ||
229 | } | ||
230 | |||
231 | static inline void pcwd_check_temperature_support(void) | ||
232 | { | ||
233 | if (inb(pcwd_private.io_addr) != 0xF0) | ||
234 | pcwd_private.supports_temp = 1; | ||
235 | } | ||
236 | |||
237 | static inline char *get_firmware(void) | ||
238 | { | ||
239 | int one, ten, hund, minor; | ||
240 | char *ret; | ||
241 | |||
242 | ret = kmalloc(6, GFP_KERNEL); | ||
243 | if(ret == NULL) | ||
244 | return NULL; | ||
245 | |||
246 | if (set_command_mode()) { | ||
247 | one = send_isa_command(CMD_ISA_VERSION_INTEGER); | ||
248 | ten = send_isa_command(CMD_ISA_VERSION_TENTH); | ||
249 | hund = send_isa_command(CMD_ISA_VERSION_HUNDRETH); | ||
250 | minor = send_isa_command(CMD_ISA_VERSION_MINOR); | ||
251 | sprintf(ret, "%c.%c%c%c", one, ten, hund, minor); | ||
252 | } | ||
253 | else | ||
254 | sprintf(ret, "ERROR"); | ||
255 | |||
256 | unset_command_mode(); | ||
257 | return(ret); | ||
258 | } | ||
259 | |||
260 | static inline int pcwd_get_option_switches(void) | ||
261 | { | ||
262 | int option_switches=0; | ||
263 | |||
264 | if (set_command_mode()) { | ||
265 | /* Get switch settings */ | ||
266 | option_switches = send_isa_command(CMD_ISA_SWITCH_SETTINGS); | ||
267 | } | ||
268 | |||
269 | unset_command_mode(); | ||
270 | return(option_switches); | ||
271 | } | ||
272 | |||
273 | static void pcwd_show_card_info(void) | ||
274 | { | ||
275 | char *firmware; | ||
276 | int option_switches; | ||
277 | |||
278 | /* Get some extra info from the hardware (in command/debug/diag mode) */ | ||
279 | if (pcwd_private.revision == PCWD_REVISION_A) | ||
280 | printk(KERN_INFO PFX "ISA-PC Watchdog (REV.A) detected at port 0x%04x\n", pcwd_private.io_addr); | ||
281 | else if (pcwd_private.revision == PCWD_REVISION_C) { | ||
282 | firmware = get_firmware(); | ||
283 | printk(KERN_INFO PFX "ISA-PC Watchdog (REV.C) detected at port 0x%04x (Firmware version: %s)\n", | ||
284 | pcwd_private.io_addr, firmware); | ||
285 | kfree(firmware); | ||
286 | option_switches = pcwd_get_option_switches(); | ||
287 | printk(KERN_INFO PFX "Option switches (0x%02x): Temperature Reset Enable=%s, Power On Delay=%s\n", | ||
288 | option_switches, | ||
289 | ((option_switches & 0x10) ? "ON" : "OFF"), | ||
290 | ((option_switches & 0x08) ? "ON" : "OFF")); | ||
291 | |||
292 | /* Reprogram internal heartbeat to 2 seconds */ | ||
293 | if (set_command_mode()) { | ||
294 | send_isa_command(CMD_ISA_DELAY_TIME_2SECS); | ||
295 | unset_command_mode(); | ||
296 | } | ||
297 | } | ||
298 | |||
299 | if (pcwd_private.supports_temp) | ||
300 | printk(KERN_INFO PFX "Temperature Option Detected\n"); | ||
301 | |||
302 | if (pcwd_private.boot_status & WDIOF_CARDRESET) | ||
303 | printk(KERN_INFO PFX "Previous reboot was caused by the card\n"); | ||
304 | |||
305 | if (pcwd_private.boot_status & WDIOF_OVERHEAT) { | ||
306 | printk(KERN_EMERG PFX "Card senses a CPU Overheat. Panicking!\n"); | ||
307 | printk(KERN_EMERG PFX "CPU Overheat\n"); | ||
308 | } | ||
215 | 309 | ||
216 | command_mode = 0; | 310 | if (pcwd_private.boot_status == 0) |
311 | printk(KERN_INFO PFX "No previous trip detected - Cold boot or reset\n"); | ||
217 | } | 312 | } |
218 | 313 | ||
219 | static void pcwd_timer_ping(unsigned long data) | 314 | static void pcwd_timer_ping(unsigned long data) |
@@ -222,25 +317,25 @@ static void pcwd_timer_ping(unsigned long data) | |||
222 | 317 | ||
223 | /* If we got a heartbeat pulse within the WDT_INTERVAL | 318 | /* If we got a heartbeat pulse within the WDT_INTERVAL |
224 | * we agree to ping the WDT */ | 319 | * we agree to ping the WDT */ |
225 | if(time_before(jiffies, next_heartbeat)) { | 320 | if(time_before(jiffies, pcwd_private.next_heartbeat)) { |
226 | /* Ping the watchdog */ | 321 | /* Ping the watchdog */ |
227 | spin_lock(&io_lock); | 322 | spin_lock(&pcwd_private.io_lock); |
228 | if (revision == PCWD_REVISION_A) { | 323 | if (pcwd_private.revision == PCWD_REVISION_A) { |
229 | /* Rev A cards are reset by setting the WD_WDRST bit in register 1 */ | 324 | /* Rev A cards are reset by setting the WD_WDRST bit in register 1 */ |
230 | wdrst_stat = inb_p(current_readport); | 325 | wdrst_stat = inb_p(pcwd_private.io_addr); |
231 | wdrst_stat &= 0x0F; | 326 | wdrst_stat &= 0x0F; |
232 | wdrst_stat |= WD_WDRST; | 327 | wdrst_stat |= WD_WDRST; |
233 | 328 | ||
234 | outb_p(wdrst_stat, current_readport + 1); | 329 | outb_p(wdrst_stat, pcwd_private.io_addr + 1); |
235 | } else { | 330 | } else { |
236 | /* Re-trigger watchdog by writing to port 0 */ | 331 | /* Re-trigger watchdog by writing to port 0 */ |
237 | outb_p(0x00, current_readport); | 332 | outb_p(0x00, pcwd_private.io_addr); |
238 | } | 333 | } |
239 | 334 | ||
240 | /* Re-set the timer interval */ | 335 | /* Re-set the timer interval */ |
241 | mod_timer(&timer, jiffies + WDT_INTERVAL); | 336 | mod_timer(&pcwd_private.timer, jiffies + WDT_INTERVAL); |
242 | 337 | ||
243 | spin_unlock(&io_lock); | 338 | spin_unlock(&pcwd_private.io_lock); |
244 | } else { | 339 | } else { |
245 | printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n"); | 340 | printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n"); |
246 | } | 341 | } |
@@ -250,19 +345,19 @@ static int pcwd_start(void) | |||
250 | { | 345 | { |
251 | int stat_reg; | 346 | int stat_reg; |
252 | 347 | ||
253 | next_heartbeat = jiffies + (heartbeat * HZ); | 348 | pcwd_private.next_heartbeat = jiffies + (heartbeat * HZ); |
254 | 349 | ||
255 | /* Start the timer */ | 350 | /* Start the timer */ |
256 | mod_timer(&timer, jiffies + WDT_INTERVAL); | 351 | mod_timer(&pcwd_private.timer, jiffies + WDT_INTERVAL); |
257 | 352 | ||
258 | /* Enable the port */ | 353 | /* Enable the port */ |
259 | if (revision == PCWD_REVISION_C) { | 354 | if (pcwd_private.revision == PCWD_REVISION_C) { |
260 | spin_lock(&io_lock); | 355 | spin_lock(&pcwd_private.io_lock); |
261 | outb_p(0x00, current_readport + 3); | 356 | outb_p(0x00, pcwd_private.io_addr + 3); |
262 | udelay(ISA_COMMAND_TIMEOUT); | 357 | udelay(ISA_COMMAND_TIMEOUT); |
263 | stat_reg = inb_p(current_readport + 2); | 358 | stat_reg = inb_p(pcwd_private.io_addr + 2); |
264 | spin_unlock(&io_lock); | 359 | spin_unlock(&pcwd_private.io_lock); |
265 | if (stat_reg & 0x10) { | 360 | if (stat_reg & WD_WDIS) { |
266 | printk(KERN_INFO PFX "Could not start watchdog\n"); | 361 | printk(KERN_INFO PFX "Could not start watchdog\n"); |
267 | return -EIO; | 362 | return -EIO; |
268 | } | 363 | } |
@@ -275,18 +370,18 @@ static int pcwd_stop(void) | |||
275 | int stat_reg; | 370 | int stat_reg; |
276 | 371 | ||
277 | /* Stop the timer */ | 372 | /* Stop the timer */ |
278 | del_timer(&timer); | 373 | del_timer(&pcwd_private.timer); |
279 | 374 | ||
280 | /* Disable the board */ | 375 | /* Disable the board */ |
281 | if (revision == PCWD_REVISION_C) { | 376 | if (pcwd_private.revision == PCWD_REVISION_C) { |
282 | spin_lock(&io_lock); | 377 | spin_lock(&pcwd_private.io_lock); |
283 | outb_p(0xA5, current_readport + 3); | 378 | outb_p(0xA5, pcwd_private.io_addr + 3); |
284 | udelay(ISA_COMMAND_TIMEOUT); | 379 | udelay(ISA_COMMAND_TIMEOUT); |
285 | outb_p(0xA5, current_readport + 3); | 380 | outb_p(0xA5, pcwd_private.io_addr + 3); |
286 | udelay(ISA_COMMAND_TIMEOUT); | 381 | udelay(ISA_COMMAND_TIMEOUT); |
287 | stat_reg = inb_p(current_readport + 2); | 382 | stat_reg = inb_p(pcwd_private.io_addr + 2); |
288 | spin_unlock(&io_lock); | 383 | spin_unlock(&pcwd_private.io_lock); |
289 | if ((stat_reg & 0x10) == 0) { | 384 | if ((stat_reg & WD_WDIS) == 0) { |
290 | printk(KERN_INFO PFX "Could not stop watchdog\n"); | 385 | printk(KERN_INFO PFX "Could not stop watchdog\n"); |
291 | return -EIO; | 386 | return -EIO; |
292 | } | 387 | } |
@@ -297,7 +392,7 @@ static int pcwd_stop(void) | |||
297 | static int pcwd_keepalive(void) | 392 | static int pcwd_keepalive(void) |
298 | { | 393 | { |
299 | /* user land ping */ | 394 | /* user land ping */ |
300 | next_heartbeat = jiffies + (heartbeat * HZ); | 395 | pcwd_private.next_heartbeat = jiffies + (heartbeat * HZ); |
301 | return 0; | 396 | return 0; |
302 | } | 397 | } |
303 | 398 | ||
@@ -315,23 +410,23 @@ static int pcwd_get_status(int *status) | |||
315 | int card_status; | 410 | int card_status; |
316 | 411 | ||
317 | *status=0; | 412 | *status=0; |
318 | spin_lock(&io_lock); | 413 | spin_lock(&pcwd_private.io_lock); |
319 | if (revision == PCWD_REVISION_A) | 414 | if (pcwd_private.revision == PCWD_REVISION_A) |
320 | /* Rev A cards return status information from | 415 | /* Rev A cards return status information from |
321 | * the base register, which is used for the | 416 | * the base register, which is used for the |
322 | * temperature in other cards. */ | 417 | * temperature in other cards. */ |
323 | card_status = inb(current_readport); | 418 | card_status = inb(pcwd_private.io_addr); |
324 | else { | 419 | else { |
325 | /* Rev C cards return card status in the base | 420 | /* Rev C cards return card status in the base |
326 | * address + 1 register. And use different bits | 421 | * address + 1 register. And use different bits |
327 | * to indicate a card initiated reset, and an | 422 | * to indicate a card initiated reset, and an |
328 | * over-temperature condition. And the reboot | 423 | * over-temperature condition. And the reboot |
329 | * status can be reset. */ | 424 | * status can be reset. */ |
330 | card_status = inb(current_readport + 1); | 425 | card_status = inb(pcwd_private.io_addr + 1); |
331 | } | 426 | } |
332 | spin_unlock(&io_lock); | 427 | spin_unlock(&pcwd_private.io_lock); |
333 | 428 | ||
334 | if (revision == PCWD_REVISION_A) { | 429 | if (pcwd_private.revision == PCWD_REVISION_A) { |
335 | if (card_status & WD_WDRST) | 430 | if (card_status & WD_WDRST) |
336 | *status |= WDIOF_CARDRESET; | 431 | *status |= WDIOF_CARDRESET; |
337 | 432 | ||
@@ -360,10 +455,10 @@ static int pcwd_get_status(int *status) | |||
360 | 455 | ||
361 | static int pcwd_clear_status(void) | 456 | static int pcwd_clear_status(void) |
362 | { | 457 | { |
363 | if (revision == PCWD_REVISION_C) { | 458 | if (pcwd_private.revision == PCWD_REVISION_C) { |
364 | spin_lock(&io_lock); | 459 | spin_lock(&pcwd_private.io_lock); |
365 | outb_p(0x00, current_readport + 1); /* clear reset status */ | 460 | outb_p(0x00, pcwd_private.io_addr + 1); /* clear reset status */ |
366 | spin_unlock(&io_lock); | 461 | spin_unlock(&pcwd_private.io_lock); |
367 | } | 462 | } |
368 | return 0; | 463 | return 0; |
369 | } | 464 | } |
@@ -371,20 +466,20 @@ static int pcwd_clear_status(void) | |||
371 | static int pcwd_get_temperature(int *temperature) | 466 | static int pcwd_get_temperature(int *temperature) |
372 | { | 467 | { |
373 | /* check that port 0 gives temperature info and no command results */ | 468 | /* check that port 0 gives temperature info and no command results */ |
374 | if (command_mode) | 469 | if (pcwd_private.command_mode) |
375 | return -1; | 470 | return -1; |
376 | 471 | ||
377 | *temperature = 0; | 472 | *temperature = 0; |
378 | if (!supports_temp) | 473 | if (!pcwd_private.supports_temp) |
379 | return -ENODEV; | 474 | return -ENODEV; |
380 | 475 | ||
381 | /* | 476 | /* |
382 | * Convert celsius to fahrenheit, since this was | 477 | * Convert celsius to fahrenheit, since this was |
383 | * the decided 'standard' for this return value. | 478 | * the decided 'standard' for this return value. |
384 | */ | 479 | */ |
385 | spin_lock(&io_lock); | 480 | spin_lock(&pcwd_private.io_lock); |
386 | *temperature = ((inb(current_readport)) * 9 / 5) + 32; | 481 | *temperature = ((inb(pcwd_private.io_addr)) * 9 / 5) + 32; |
387 | spin_unlock(&io_lock); | 482 | spin_unlock(&pcwd_private.io_lock); |
388 | 483 | ||
389 | return 0; | 484 | return 0; |
390 | } | 485 | } |
@@ -425,7 +520,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file, | |||
425 | return put_user(status, argp); | 520 | return put_user(status, argp); |
426 | 521 | ||
427 | case WDIOC_GETBOOTSTATUS: | 522 | case WDIOC_GETBOOTSTATUS: |
428 | return put_user(initial_status, argp); | 523 | return put_user(pcwd_private.boot_status, argp); |
429 | 524 | ||
430 | case WDIOC_GETTEMP: | 525 | case WDIOC_GETTEMP: |
431 | if (pcwd_get_temperature(&temperature)) | 526 | if (pcwd_get_temperature(&temperature)) |
@@ -434,7 +529,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file, | |||
434 | return put_user(temperature, argp); | 529 | return put_user(temperature, argp); |
435 | 530 | ||
436 | case WDIOC_SETOPTIONS: | 531 | case WDIOC_SETOPTIONS: |
437 | if (revision == PCWD_REVISION_C) | 532 | if (pcwd_private.revision == PCWD_REVISION_C) |
438 | { | 533 | { |
439 | if(copy_from_user(&rv, argp, sizeof(int))) | 534 | if(copy_from_user(&rv, argp, sizeof(int))) |
440 | return -EFAULT; | 535 | return -EFAULT; |
@@ -550,7 +645,7 @@ static ssize_t pcwd_temp_read(struct file *file, char __user *buf, size_t count, | |||
550 | 645 | ||
551 | static int pcwd_temp_open(struct inode *inode, struct file *file) | 646 | static int pcwd_temp_open(struct inode *inode, struct file *file) |
552 | { | 647 | { |
553 | if (!supports_temp) | 648 | if (!pcwd_private.supports_temp) |
554 | return -ENODEV; | 649 | return -ENODEV; |
555 | 650 | ||
556 | return nonseekable_open(inode, file); | 651 | return nonseekable_open(inode, file); |
@@ -616,68 +711,24 @@ static struct notifier_block pcwd_notifier = { | |||
616 | * Init & exit routines | 711 | * Init & exit routines |
617 | */ | 712 | */ |
618 | 713 | ||
619 | static inline void get_support(void) | ||
620 | { | ||
621 | if (inb(current_readport) != 0xF0) | ||
622 | supports_temp = 1; | ||
623 | } | ||
624 | |||
625 | static inline int get_revision(void) | 714 | static inline int get_revision(void) |
626 | { | 715 | { |
627 | int r = PCWD_REVISION_C; | 716 | int r = PCWD_REVISION_C; |
628 | 717 | ||
629 | spin_lock(&io_lock); | 718 | spin_lock(&pcwd_private.io_lock); |
630 | /* REV A cards use only 2 io ports; test | 719 | /* REV A cards use only 2 io ports; test |
631 | * presumes a floating bus reads as 0xff. */ | 720 | * presumes a floating bus reads as 0xff. */ |
632 | if ((inb(current_readport + 2) == 0xFF) || | 721 | if ((inb(pcwd_private.io_addr + 2) == 0xFF) || |
633 | (inb(current_readport + 3) == 0xFF)) | 722 | (inb(pcwd_private.io_addr + 3) == 0xFF)) |
634 | r=PCWD_REVISION_A; | 723 | r=PCWD_REVISION_A; |
635 | spin_unlock(&io_lock); | 724 | spin_unlock(&pcwd_private.io_lock); |
636 | 725 | ||
637 | return r; | 726 | return r; |
638 | } | 727 | } |
639 | 728 | ||
640 | static inline char *get_firmware(void) | ||
641 | { | ||
642 | int one, ten, hund, minor; | ||
643 | char *ret; | ||
644 | |||
645 | ret = kmalloc(6, GFP_KERNEL); | ||
646 | if(ret == NULL) | ||
647 | return NULL; | ||
648 | |||
649 | if (set_command_mode()) { | ||
650 | one = send_isa_command(CMD_ISA_VERSION_INTEGER); | ||
651 | ten = send_isa_command(CMD_ISA_VERSION_TENTH); | ||
652 | hund = send_isa_command(CMD_ISA_VERSION_HUNDRETH); | ||
653 | minor = send_isa_command(CMD_ISA_VERSION_MINOR); | ||
654 | sprintf(ret, "%c.%c%c%c", one, ten, hund, minor); | ||
655 | } | ||
656 | else | ||
657 | sprintf(ret, "ERROR"); | ||
658 | |||
659 | unset_command_mode(); | ||
660 | return(ret); | ||
661 | } | ||
662 | |||
663 | static inline int get_option_switches(void) | ||
664 | { | ||
665 | int rv=0; | ||
666 | |||
667 | if (set_command_mode()) { | ||
668 | /* Get switch settings */ | ||
669 | rv = send_isa_command(CMD_ISA_SWITCH_SETTINGS); | ||
670 | } | ||
671 | |||
672 | unset_command_mode(); | ||
673 | return(rv); | ||
674 | } | ||
675 | |||
676 | static int __devinit pcwatchdog_init(int base_addr) | 729 | static int __devinit pcwatchdog_init(int base_addr) |
677 | { | 730 | { |
678 | int ret; | 731 | int ret; |
679 | char *firmware; | ||
680 | int option_switches; | ||
681 | 732 | ||
682 | cards_found++; | 733 | cards_found++; |
683 | if (cards_found == 1) | 734 | if (cards_found == 1) |
@@ -692,104 +743,66 @@ static int __devinit pcwatchdog_init(int base_addr) | |||
692 | printk(KERN_ERR PFX "No I/O-Address for card detected\n"); | 743 | printk(KERN_ERR PFX "No I/O-Address for card detected\n"); |
693 | return -ENODEV; | 744 | return -ENODEV; |
694 | } | 745 | } |
695 | current_readport = base_addr; | 746 | pcwd_private.io_addr = base_addr; |
696 | 747 | ||
697 | /* Check card's revision */ | 748 | /* Check card's revision */ |
698 | revision = get_revision(); | 749 | pcwd_private.revision = get_revision(); |
699 | 750 | ||
700 | if (!request_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4, "PCWD")) { | 751 | if (!request_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4, "PCWD")) { |
701 | printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", | 752 | printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", |
702 | current_readport); | 753 | pcwd_private.io_addr); |
703 | current_readport = 0x0000; | 754 | pcwd_private.io_addr = 0x0000; |
704 | return -EIO; | 755 | return -EIO; |
705 | } | 756 | } |
706 | 757 | ||
707 | /* Initial variables */ | 758 | /* Initial variables */ |
708 | supports_temp = 0; | 759 | pcwd_private.supports_temp = 0; |
709 | temp_panic = 0; | 760 | temp_panic = 0; |
710 | initial_status = 0x0000; | 761 | pcwd_private.boot_status = 0x0000; |
711 | 762 | ||
712 | /* get the boot_status */ | 763 | /* get the boot_status */ |
713 | pcwd_get_status(&initial_status); | 764 | pcwd_get_status(&pcwd_private.boot_status); |
714 | 765 | ||
715 | /* clear the "card caused reboot" flag */ | 766 | /* clear the "card caused reboot" flag */ |
716 | pcwd_clear_status(); | 767 | pcwd_clear_status(); |
717 | 768 | ||
718 | init_timer(&timer); | 769 | init_timer(&pcwd_private.timer); |
719 | timer.function = pcwd_timer_ping; | 770 | pcwd_private.timer.function = pcwd_timer_ping; |
720 | timer.data = 0; | 771 | pcwd_private.timer.data = 0; |
721 | 772 | ||
722 | /* Disable the board */ | 773 | /* Disable the board */ |
723 | pcwd_stop(); | 774 | pcwd_stop(); |
724 | 775 | ||
725 | /* Check whether or not the card supports the temperature device */ | 776 | /* Check whether or not the card supports the temperature device */ |
726 | get_support(); | 777 | pcwd_check_temperature_support(); |
727 | |||
728 | /* Get some extra info from the hardware (in command/debug/diag mode) */ | ||
729 | if (revision == PCWD_REVISION_A) | ||
730 | printk(KERN_INFO PFX "ISA-PC Watchdog (REV.A) detected at port 0x%04x\n", current_readport); | ||
731 | else if (revision == PCWD_REVISION_C) { | ||
732 | firmware = get_firmware(); | ||
733 | printk(KERN_INFO PFX "ISA-PC Watchdog (REV.C) detected at port 0x%04x (Firmware version: %s)\n", | ||
734 | current_readport, firmware); | ||
735 | kfree(firmware); | ||
736 | option_switches = get_option_switches(); | ||
737 | printk(KERN_INFO PFX "Option switches (0x%02x): Temperature Reset Enable=%s, Power On Delay=%s\n", | ||
738 | option_switches, | ||
739 | ((option_switches & 0x10) ? "ON" : "OFF"), | ||
740 | ((option_switches & 0x08) ? "ON" : "OFF")); | ||
741 | |||
742 | /* Reprogram internal heartbeat to 2 seconds */ | ||
743 | if (set_command_mode()) { | ||
744 | send_isa_command(CMD_ISA_DELAY_TIME_2SECS); | ||
745 | unset_command_mode(); | ||
746 | } | ||
747 | } else { | ||
748 | /* Should NEVER happen, unless get_revision() fails. */ | ||
749 | printk(KERN_INFO PFX "Unable to get revision\n"); | ||
750 | release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4); | ||
751 | current_readport = 0x0000; | ||
752 | return -1; | ||
753 | } | ||
754 | 778 | ||
755 | if (supports_temp) | 779 | /* Show info about the card itself */ |
756 | printk(KERN_INFO PFX "Temperature Option Detected\n"); | 780 | pcwd_show_card_info(); |
757 | |||
758 | if (initial_status & WDIOF_CARDRESET) | ||
759 | printk(KERN_INFO PFX "Previous reboot was caused by the card\n"); | ||
760 | |||
761 | if (initial_status & WDIOF_OVERHEAT) { | ||
762 | printk(KERN_EMERG PFX "Card senses a CPU Overheat. Panicking!\n"); | ||
763 | printk(KERN_EMERG PFX "CPU Overheat\n"); | ||
764 | } | ||
765 | |||
766 | if (initial_status == 0) | ||
767 | printk(KERN_INFO PFX "No previous trip detected - Cold boot or reset\n"); | ||
768 | 781 | ||
769 | /* Check that the heartbeat value is within it's range ; if not reset to the default */ | 782 | /* Check that the heartbeat value is within it's range ; if not reset to the default */ |
770 | if (pcwd_set_heartbeat(heartbeat)) { | 783 | if (pcwd_set_heartbeat(heartbeat)) { |
771 | pcwd_set_heartbeat(WATCHDOG_HEARTBEAT); | 784 | pcwd_set_heartbeat(WATCHDOG_HEARTBEAT); |
772 | printk(KERN_INFO PFX "heartbeat value must be 2<=heartbeat<=7200, using %d\n", | 785 | printk(KERN_INFO PFX "heartbeat value must be 2<=heartbeat<=7200, using %d\n", |
773 | WATCHDOG_HEARTBEAT); | 786 | WATCHDOG_HEARTBEAT); |
774 | } | 787 | } |
775 | 788 | ||
776 | ret = register_reboot_notifier(&pcwd_notifier); | 789 | ret = register_reboot_notifier(&pcwd_notifier); |
777 | if (ret) { | 790 | if (ret) { |
778 | printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", | 791 | printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", |
779 | ret); | 792 | ret); |
780 | release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4); | 793 | release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4); |
781 | current_readport = 0x0000; | 794 | pcwd_private.io_addr = 0x0000; |
782 | return ret; | 795 | return ret; |
783 | } | 796 | } |
784 | 797 | ||
785 | if (supports_temp) { | 798 | if (pcwd_private.supports_temp) { |
786 | ret = misc_register(&temp_miscdev); | 799 | ret = misc_register(&temp_miscdev); |
787 | if (ret) { | 800 | if (ret) { |
788 | printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", | 801 | printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", |
789 | TEMP_MINOR, ret); | 802 | TEMP_MINOR, ret); |
790 | unregister_reboot_notifier(&pcwd_notifier); | 803 | unregister_reboot_notifier(&pcwd_notifier); |
791 | release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4); | 804 | release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4); |
792 | current_readport = 0x0000; | 805 | pcwd_private.io_addr = 0x0000; |
793 | return ret; | 806 | return ret; |
794 | } | 807 | } |
795 | } | 808 | } |
@@ -798,11 +811,11 @@ static int __devinit pcwatchdog_init(int base_addr) | |||
798 | if (ret) { | 811 | if (ret) { |
799 | printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", | 812 | printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", |
800 | WATCHDOG_MINOR, ret); | 813 | WATCHDOG_MINOR, ret); |
801 | if (supports_temp) | 814 | if (pcwd_private.supports_temp) |
802 | misc_deregister(&temp_miscdev); | 815 | misc_deregister(&temp_miscdev); |
803 | unregister_reboot_notifier(&pcwd_notifier); | 816 | unregister_reboot_notifier(&pcwd_notifier); |
804 | release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4); | 817 | release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4); |
805 | current_readport = 0x0000; | 818 | pcwd_private.io_addr = 0x0000; |
806 | return ret; | 819 | return ret; |
807 | } | 820 | } |
808 | 821 | ||
@@ -820,11 +833,12 @@ static void __devexit pcwatchdog_exit(void) | |||
820 | 833 | ||
821 | /* Deregister */ | 834 | /* Deregister */ |
822 | misc_deregister(&pcwd_miscdev); | 835 | misc_deregister(&pcwd_miscdev); |
823 | if (supports_temp) | 836 | if (pcwd_private.supports_temp) |
824 | misc_deregister(&temp_miscdev); | 837 | misc_deregister(&temp_miscdev); |
825 | unregister_reboot_notifier(&pcwd_notifier); | 838 | unregister_reboot_notifier(&pcwd_notifier); |
826 | release_region(current_readport, (revision == PCWD_REVISION_A) ? 2 : 4); | 839 | release_region(pcwd_private.io_addr, (pcwd_private.revision == PCWD_REVISION_A) ? 2 : 4); |
827 | current_readport = 0x0000; | 840 | pcwd_private.io_addr = 0x0000; |
841 | cards_found--; | ||
828 | } | 842 | } |
829 | 843 | ||
830 | /* | 844 | /* |
@@ -887,7 +901,7 @@ static int __init pcwd_init_module(void) | |||
887 | { | 901 | { |
888 | int i, found = 0; | 902 | int i, found = 0; |
889 | 903 | ||
890 | spin_lock_init(&io_lock); | 904 | spin_lock_init(&pcwd_private.io_lock); |
891 | 905 | ||
892 | for (i = 0; pcwd_ioports[i] != 0; i++) { | 906 | for (i = 0; pcwd_ioports[i] != 0; i++) { |
893 | if (pcwd_checkcard(pcwd_ioports[i])) { | 907 | if (pcwd_checkcard(pcwd_ioports[i])) { |
@@ -906,7 +920,7 @@ static int __init pcwd_init_module(void) | |||
906 | 920 | ||
907 | static void __exit pcwd_cleanup_module(void) | 921 | static void __exit pcwd_cleanup_module(void) |
908 | { | 922 | { |
909 | if (current_readport) | 923 | if (pcwd_private.io_addr) |
910 | pcwatchdog_exit(); | 924 | pcwatchdog_exit(); |
911 | return; | 925 | return; |
912 | } | 926 | } |
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c index b474ea52d6e8..522a9370db94 100644 --- a/drivers/char/watchdog/sa1100_wdt.c +++ b/drivers/char/watchdog/sa1100_wdt.c | |||
@@ -93,23 +93,25 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file, | |||
93 | { | 93 | { |
94 | int ret = -ENOIOCTLCMD; | 94 | int ret = -ENOIOCTLCMD; |
95 | int time; | 95 | int time; |
96 | void __user *argp = (void __user *)arg; | ||
97 | int __user *p = argp; | ||
96 | 98 | ||
97 | switch (cmd) { | 99 | switch (cmd) { |
98 | case WDIOC_GETSUPPORT: | 100 | case WDIOC_GETSUPPORT: |
99 | ret = copy_to_user((struct watchdog_info __user *)arg, &ident, | 101 | ret = copy_to_user(argp, &ident, |
100 | sizeof(ident)) ? -EFAULT : 0; | 102 | sizeof(ident)) ? -EFAULT : 0; |
101 | break; | 103 | break; |
102 | 104 | ||
103 | case WDIOC_GETSTATUS: | 105 | case WDIOC_GETSTATUS: |
104 | ret = put_user(0, (int __user *)arg); | 106 | ret = put_user(0, p); |
105 | break; | 107 | break; |
106 | 108 | ||
107 | case WDIOC_GETBOOTSTATUS: | 109 | case WDIOC_GETBOOTSTATUS: |
108 | ret = put_user(boot_status, (int __user *)arg); | 110 | ret = put_user(boot_status, p); |
109 | break; | 111 | break; |
110 | 112 | ||
111 | case WDIOC_SETTIMEOUT: | 113 | case WDIOC_SETTIMEOUT: |
112 | ret = get_user(time, (int __user *)arg); | 114 | ret = get_user(time, p); |
113 | if (ret) | 115 | if (ret) |
114 | break; | 116 | break; |
115 | 117 | ||
@@ -123,7 +125,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file, | |||
123 | /*fall through*/ | 125 | /*fall through*/ |
124 | 126 | ||
125 | case WDIOC_GETTIMEOUT: | 127 | case WDIOC_GETTIMEOUT: |
126 | ret = put_user(pre_margin / OSCR_FREQ, (int __user *)arg); | 128 | ret = put_user(pre_margin / OSCR_FREQ, p); |
127 | break; | 129 | break; |
128 | 130 | ||
129 | case WDIOC_KEEPALIVE: | 131 | case WDIOC_KEEPALIVE: |
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 7a511479ae29..9582de1c9cad 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
@@ -35,8 +35,8 @@ | |||
35 | * level driver of CPUFreq support, and its spinlock. This lock | 35 | * level driver of CPUFreq support, and its spinlock. This lock |
36 | * also protects the cpufreq_cpu_data array. | 36 | * also protects the cpufreq_cpu_data array. |
37 | */ | 37 | */ |
38 | static struct cpufreq_driver *cpufreq_driver; | 38 | static struct cpufreq_driver *cpufreq_driver; |
39 | static struct cpufreq_policy *cpufreq_cpu_data[NR_CPUS]; | 39 | static struct cpufreq_policy *cpufreq_cpu_data[NR_CPUS]; |
40 | static DEFINE_SPINLOCK(cpufreq_driver_lock); | 40 | static DEFINE_SPINLOCK(cpufreq_driver_lock); |
41 | 41 | ||
42 | /* internal prototypes */ | 42 | /* internal prototypes */ |
@@ -50,15 +50,15 @@ static void handle_update(void *data); | |||
50 | * changes to devices when the CPU clock speed changes. | 50 | * changes to devices when the CPU clock speed changes. |
51 | * The mutex locks both lists. | 51 | * The mutex locks both lists. |
52 | */ | 52 | */ |
53 | static struct notifier_block *cpufreq_policy_notifier_list; | 53 | static struct notifier_block *cpufreq_policy_notifier_list; |
54 | static struct notifier_block *cpufreq_transition_notifier_list; | 54 | static struct notifier_block *cpufreq_transition_notifier_list; |
55 | static DECLARE_RWSEM (cpufreq_notifier_rwsem); | 55 | static DECLARE_RWSEM (cpufreq_notifier_rwsem); |
56 | 56 | ||
57 | 57 | ||
58 | static LIST_HEAD(cpufreq_governor_list); | 58 | static LIST_HEAD(cpufreq_governor_list); |
59 | static DEFINE_MUTEX (cpufreq_governor_mutex); | 59 | static DEFINE_MUTEX (cpufreq_governor_mutex); |
60 | 60 | ||
61 | struct cpufreq_policy * cpufreq_cpu_get(unsigned int cpu) | 61 | struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) |
62 | { | 62 | { |
63 | struct cpufreq_policy *data; | 63 | struct cpufreq_policy *data; |
64 | unsigned long flags; | 64 | unsigned long flags; |
@@ -85,20 +85,19 @@ struct cpufreq_policy * cpufreq_cpu_get(unsigned int cpu) | |||
85 | if (!kobject_get(&data->kobj)) | 85 | if (!kobject_get(&data->kobj)) |
86 | goto err_out_put_module; | 86 | goto err_out_put_module; |
87 | 87 | ||
88 | |||
89 | spin_unlock_irqrestore(&cpufreq_driver_lock, flags); | 88 | spin_unlock_irqrestore(&cpufreq_driver_lock, flags); |
90 | |||
91 | return data; | 89 | return data; |
92 | 90 | ||
93 | err_out_put_module: | 91 | err_out_put_module: |
94 | module_put(cpufreq_driver->owner); | 92 | module_put(cpufreq_driver->owner); |
95 | err_out_unlock: | 93 | err_out_unlock: |
96 | spin_unlock_irqrestore(&cpufreq_driver_lock, flags); | 94 | spin_unlock_irqrestore(&cpufreq_driver_lock, flags); |
97 | err_out: | 95 | err_out: |
98 | return NULL; | 96 | return NULL; |
99 | } | 97 | } |
100 | EXPORT_SYMBOL_GPL(cpufreq_cpu_get); | 98 | EXPORT_SYMBOL_GPL(cpufreq_cpu_get); |
101 | 99 | ||
100 | |||
102 | void cpufreq_cpu_put(struct cpufreq_policy *data) | 101 | void cpufreq_cpu_put(struct cpufreq_policy *data) |
103 | { | 102 | { |
104 | kobject_put(&data->kobj); | 103 | kobject_put(&data->kobj); |
@@ -229,44 +228,53 @@ static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci) { | |||
229 | 228 | ||
230 | 229 | ||
231 | /** | 230 | /** |
232 | * cpufreq_notify_transition - call notifier chain and adjust_jiffies on frequency transition | 231 | * cpufreq_notify_transition - call notifier chain and adjust_jiffies |
232 | * on frequency transition. | ||
233 | * | 233 | * |
234 | * This function calls the transition notifiers and the "adjust_jiffies" function. It is called | 234 | * This function calls the transition notifiers and the "adjust_jiffies" |
235 | * twice on all CPU frequency changes that have external effects. | 235 | * function. It is called twice on all CPU frequency changes that have |
236 | * external effects. | ||
236 | */ | 237 | */ |
237 | void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state) | 238 | void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state) |
238 | { | 239 | { |
240 | struct cpufreq_policy *policy; | ||
241 | |||
239 | BUG_ON(irqs_disabled()); | 242 | BUG_ON(irqs_disabled()); |
240 | 243 | ||
241 | freqs->flags = cpufreq_driver->flags; | 244 | freqs->flags = cpufreq_driver->flags; |
242 | dprintk("notification %u of frequency transition to %u kHz\n", state, freqs->new); | 245 | dprintk("notification %u of frequency transition to %u kHz\n", |
246 | state, freqs->new); | ||
243 | 247 | ||
244 | down_read(&cpufreq_notifier_rwsem); | 248 | down_read(&cpufreq_notifier_rwsem); |
249 | |||
250 | policy = cpufreq_cpu_data[freqs->cpu]; | ||
245 | switch (state) { | 251 | switch (state) { |
252 | |||
246 | case CPUFREQ_PRECHANGE: | 253 | case CPUFREQ_PRECHANGE: |
247 | /* detect if the driver reported a value as "old frequency" which | 254 | /* detect if the driver reported a value as "old frequency" |
248 | * is not equal to what the cpufreq core thinks is "old frequency". | 255 | * which is not equal to what the cpufreq core thinks is |
256 | * "old frequency". | ||
249 | */ | 257 | */ |
250 | if (!(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) { | 258 | if (!(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) { |
251 | if ((likely(cpufreq_cpu_data[freqs->cpu])) && | 259 | if ((policy) && (policy->cpu == freqs->cpu) && |
252 | (likely(cpufreq_cpu_data[freqs->cpu]->cpu == freqs->cpu)) && | 260 | (policy->cur) && (policy->cur != freqs->old)) { |
253 | (likely(cpufreq_cpu_data[freqs->cpu]->cur)) && | 261 | dprintk(KERN_WARNING "Warning: CPU frequency is" |
254 | (unlikely(freqs->old != cpufreq_cpu_data[freqs->cpu]->cur))) | 262 | " %u, cpufreq assumed %u kHz.\n", |
255 | { | 263 | freqs->old, policy->cur); |
256 | dprintk(KERN_WARNING "Warning: CPU frequency is %u, " | 264 | freqs->old = policy->cur; |
257 | "cpufreq assumed %u kHz.\n", freqs->old, cpufreq_cpu_data[freqs->cpu]->cur); | ||
258 | freqs->old = cpufreq_cpu_data[freqs->cpu]->cur; | ||
259 | } | 265 | } |
260 | } | 266 | } |
261 | notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_PRECHANGE, freqs); | 267 | notifier_call_chain(&cpufreq_transition_notifier_list, |
268 | CPUFREQ_PRECHANGE, freqs); | ||
262 | adjust_jiffies(CPUFREQ_PRECHANGE, freqs); | 269 | adjust_jiffies(CPUFREQ_PRECHANGE, freqs); |
263 | break; | 270 | break; |
271 | |||
264 | case CPUFREQ_POSTCHANGE: | 272 | case CPUFREQ_POSTCHANGE: |
265 | adjust_jiffies(CPUFREQ_POSTCHANGE, freqs); | 273 | adjust_jiffies(CPUFREQ_POSTCHANGE, freqs); |
266 | notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_POSTCHANGE, freqs); | 274 | notifier_call_chain(&cpufreq_transition_notifier_list, |
267 | if ((likely(cpufreq_cpu_data[freqs->cpu])) && | 275 | CPUFREQ_POSTCHANGE, freqs); |
268 | (likely(cpufreq_cpu_data[freqs->cpu]->cpu == freqs->cpu))) | 276 | if (likely(policy) && likely(policy->cpu == freqs->cpu)) |
269 | cpufreq_cpu_data[freqs->cpu]->cur = freqs->new; | 277 | policy->cur = freqs->new; |
270 | break; | 278 | break; |
271 | } | 279 | } |
272 | up_read(&cpufreq_notifier_rwsem); | 280 | up_read(&cpufreq_notifier_rwsem); |
@@ -308,7 +316,7 @@ static int cpufreq_parse_governor (char *str_governor, unsigned int *policy, | |||
308 | return 0; | 316 | return 0; |
309 | } | 317 | } |
310 | } | 318 | } |
311 | out: | 319 | out: |
312 | mutex_unlock(&cpufreq_governor_mutex); | 320 | mutex_unlock(&cpufreq_governor_mutex); |
313 | } | 321 | } |
314 | return -EINVAL; | 322 | return -EINVAL; |
@@ -415,7 +423,6 @@ static ssize_t store_scaling_governor (struct cpufreq_policy * policy, | |||
415 | return -EINVAL; | 423 | return -EINVAL; |
416 | 424 | ||
417 | ret = cpufreq_set_policy(&new_policy); | 425 | ret = cpufreq_set_policy(&new_policy); |
418 | |||
419 | return ret ? ret : count; | 426 | return ret ? ret : count; |
420 | } | 427 | } |
421 | 428 | ||
@@ -446,7 +453,7 @@ static ssize_t show_scaling_available_governors (struct cpufreq_policy * policy, | |||
446 | goto out; | 453 | goto out; |
447 | i += scnprintf(&buf[i], CPUFREQ_NAME_LEN, "%s ", t->name); | 454 | i += scnprintf(&buf[i], CPUFREQ_NAME_LEN, "%s ", t->name); |
448 | } | 455 | } |
449 | out: | 456 | out: |
450 | i += sprintf(&buf[i], "\n"); | 457 | i += sprintf(&buf[i], "\n"); |
451 | return i; | 458 | return i; |
452 | } | 459 | } |
@@ -789,7 +796,6 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev) | |||
789 | kfree(data); | 796 | kfree(data); |
790 | 797 | ||
791 | cpufreq_debug_enable_ratelimit(); | 798 | cpufreq_debug_enable_ratelimit(); |
792 | |||
793 | return 0; | 799 | return 0; |
794 | } | 800 | } |
795 | 801 | ||
@@ -870,8 +876,7 @@ unsigned int cpufreq_get(unsigned int cpu) | |||
870 | 876 | ||
871 | ret = cpufreq_driver->get(cpu); | 877 | ret = cpufreq_driver->get(cpu); |
872 | 878 | ||
873 | if (ret && policy->cur && !(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) | 879 | if (ret && policy->cur && !(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) { |
874 | { | ||
875 | /* verify no discrepancy between actual and saved value exists */ | 880 | /* verify no discrepancy between actual and saved value exists */ |
876 | if (unlikely(ret != policy->cur)) { | 881 | if (unlikely(ret != policy->cur)) { |
877 | cpufreq_out_of_sync(cpu, policy->cur, ret); | 882 | cpufreq_out_of_sync(cpu, policy->cur, ret); |
@@ -881,7 +886,7 @@ unsigned int cpufreq_get(unsigned int cpu) | |||
881 | 886 | ||
882 | mutex_unlock(&policy->lock); | 887 | mutex_unlock(&policy->lock); |
883 | 888 | ||
884 | out: | 889 | out: |
885 | cpufreq_cpu_put(policy); | 890 | cpufreq_cpu_put(policy); |
886 | 891 | ||
887 | return (ret); | 892 | return (ret); |
@@ -962,7 +967,7 @@ static int cpufreq_suspend(struct sys_device * sysdev, pm_message_t pmsg) | |||
962 | cpu_policy->cur = cur_freq; | 967 | cpu_policy->cur = cur_freq; |
963 | } | 968 | } |
964 | 969 | ||
965 | out: | 970 | out: |
966 | cpufreq_cpu_put(cpu_policy); | 971 | cpufreq_cpu_put(cpu_policy); |
967 | return 0; | 972 | return 0; |
968 | } | 973 | } |
@@ -1169,7 +1174,6 @@ int cpufreq_driver_target(struct cpufreq_policy *policy, | |||
1169 | mutex_unlock(&policy->lock); | 1174 | mutex_unlock(&policy->lock); |
1170 | 1175 | ||
1171 | cpufreq_cpu_put(policy); | 1176 | cpufreq_cpu_put(policy); |
1172 | |||
1173 | return ret; | 1177 | return ret; |
1174 | } | 1178 | } |
1175 | EXPORT_SYMBOL_GPL(cpufreq_driver_target); | 1179 | EXPORT_SYMBOL_GPL(cpufreq_driver_target); |
@@ -1208,7 +1212,6 @@ int cpufreq_governor(unsigned int cpu, unsigned int event) | |||
1208 | mutex_unlock(&policy->lock); | 1212 | mutex_unlock(&policy->lock); |
1209 | 1213 | ||
1210 | cpufreq_cpu_put(policy); | 1214 | cpufreq_cpu_put(policy); |
1211 | |||
1212 | return ret; | 1215 | return ret; |
1213 | } | 1216 | } |
1214 | EXPORT_SYMBOL_GPL(cpufreq_governor); | 1217 | EXPORT_SYMBOL_GPL(cpufreq_governor); |
@@ -1232,7 +1235,6 @@ int cpufreq_register_governor(struct cpufreq_governor *governor) | |||
1232 | list_add(&governor->governor_list, &cpufreq_governor_list); | 1235 | list_add(&governor->governor_list, &cpufreq_governor_list); |
1233 | 1236 | ||
1234 | mutex_unlock(&cpufreq_governor_mutex); | 1237 | mutex_unlock(&cpufreq_governor_mutex); |
1235 | |||
1236 | return 0; | 1238 | return 0; |
1237 | } | 1239 | } |
1238 | EXPORT_SYMBOL_GPL(cpufreq_register_governor); | 1240 | EXPORT_SYMBOL_GPL(cpufreq_register_governor); |
@@ -1277,7 +1279,6 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu) | |||
1277 | mutex_unlock(&cpu_policy->lock); | 1279 | mutex_unlock(&cpu_policy->lock); |
1278 | 1280 | ||
1279 | cpufreq_cpu_put(cpu_policy); | 1281 | cpufreq_cpu_put(cpu_policy); |
1280 | |||
1281 | return 0; | 1282 | return 0; |
1282 | } | 1283 | } |
1283 | EXPORT_SYMBOL(cpufreq_get_policy); | 1284 | EXPORT_SYMBOL(cpufreq_get_policy); |
@@ -1291,9 +1292,7 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_poli | |||
1291 | dprintk("setting new policy for CPU %u: %u - %u kHz\n", policy->cpu, | 1292 | dprintk("setting new policy for CPU %u: %u - %u kHz\n", policy->cpu, |
1292 | policy->min, policy->max); | 1293 | policy->min, policy->max); |
1293 | 1294 | ||
1294 | memcpy(&policy->cpuinfo, | 1295 | memcpy(&policy->cpuinfo, &data->cpuinfo, sizeof(struct cpufreq_cpuinfo)); |
1295 | &data->cpuinfo, | ||
1296 | sizeof(struct cpufreq_cpuinfo)); | ||
1297 | 1296 | ||
1298 | /* verify the cpu speed can be set within this limit */ | 1297 | /* verify the cpu speed can be set within this limit */ |
1299 | ret = cpufreq_driver->verify(policy); | 1298 | ret = cpufreq_driver->verify(policy); |
@@ -1324,8 +1323,8 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_poli | |||
1324 | 1323 | ||
1325 | up_read(&cpufreq_notifier_rwsem); | 1324 | up_read(&cpufreq_notifier_rwsem); |
1326 | 1325 | ||
1327 | data->min = policy->min; | 1326 | data->min = policy->min; |
1328 | data->max = policy->max; | 1327 | data->max = policy->max; |
1329 | 1328 | ||
1330 | dprintk("new min and max freqs are %u - %u kHz\n", data->min, data->max); | 1329 | dprintk("new min and max freqs are %u - %u kHz\n", data->min, data->max); |
1331 | 1330 | ||
@@ -1362,7 +1361,7 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_poli | |||
1362 | __cpufreq_governor(data, CPUFREQ_GOV_LIMITS); | 1361 | __cpufreq_governor(data, CPUFREQ_GOV_LIMITS); |
1363 | } | 1362 | } |
1364 | 1363 | ||
1365 | error_out: | 1364 | error_out: |
1366 | cpufreq_debug_enable_ratelimit(); | 1365 | cpufreq_debug_enable_ratelimit(); |
1367 | return ret; | 1366 | return ret; |
1368 | } | 1367 | } |
@@ -1421,9 +1420,7 @@ int cpufreq_update_policy(unsigned int cpu) | |||
1421 | mutex_lock(&data->lock); | 1420 | mutex_lock(&data->lock); |
1422 | 1421 | ||
1423 | dprintk("updating policy for CPU %u\n", cpu); | 1422 | dprintk("updating policy for CPU %u\n", cpu); |
1424 | memcpy(&policy, | 1423 | memcpy(&policy, data, sizeof(struct cpufreq_policy)); |
1425 | data, | ||
1426 | sizeof(struct cpufreq_policy)); | ||
1427 | policy.min = data->user_policy.min; | 1424 | policy.min = data->user_policy.min; |
1428 | policy.max = data->user_policy.max; | 1425 | policy.max = data->user_policy.max; |
1429 | policy.policy = data->user_policy.policy; | 1426 | policy.policy = data->user_policy.policy; |
@@ -1433,8 +1430,13 @@ int cpufreq_update_policy(unsigned int cpu) | |||
1433 | -> ask driver for current freq and notify governors about a change */ | 1430 | -> ask driver for current freq and notify governors about a change */ |
1434 | if (cpufreq_driver->get) { | 1431 | if (cpufreq_driver->get) { |
1435 | policy.cur = cpufreq_driver->get(cpu); | 1432 | policy.cur = cpufreq_driver->get(cpu); |
1436 | if (data->cur != policy.cur) | 1433 | if (!data->cur) { |
1437 | cpufreq_out_of_sync(cpu, data->cur, policy.cur); | 1434 | dprintk("Driver did not initialize current freq"); |
1435 | data->cur = policy.cur; | ||
1436 | } else { | ||
1437 | if (data->cur != policy.cur) | ||
1438 | cpufreq_out_of_sync(cpu, data->cur, policy.cur); | ||
1439 | } | ||
1438 | } | 1440 | } |
1439 | 1441 | ||
1440 | ret = __cpufreq_set_policy(data, &policy); | 1442 | ret = __cpufreq_set_policy(data, &policy); |
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index 64819aa7cac4..0c08c58252be 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c | |||
@@ -348,10 +348,10 @@ aes_set_key(void *ctx_arg, const uint8_t *in_key, unsigned int key_len, uint32_t | |||
348 | break; | 348 | break; |
349 | 349 | ||
350 | case 32: | 350 | case 32: |
351 | E_KEY[4] = le32_to_cpu(in_key[4]); | 351 | E_KEY[4] = le32_to_cpu(key[4]); |
352 | E_KEY[5] = le32_to_cpu(in_key[5]); | 352 | E_KEY[5] = le32_to_cpu(key[5]); |
353 | E_KEY[6] = le32_to_cpu(in_key[6]); | 353 | E_KEY[6] = le32_to_cpu(key[6]); |
354 | t = E_KEY[7] = le32_to_cpu(in_key[7]); | 354 | t = E_KEY[7] = le32_to_cpu(key[7]); |
355 | for (i = 0; i < 7; ++i) | 355 | for (i = 0; i < 7; ++i) |
356 | loop8 (i); | 356 | loop8 (i); |
357 | break; | 357 | break; |
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c index 5c8943509cc1..66d03f242d3c 100644 --- a/drivers/fc4/fc.c +++ b/drivers/fc4/fc.c | |||
@@ -1053,7 +1053,7 @@ static int fc_do_els(fc_channel *fc, unsigned int alpa, void *data, int len) | |||
1053 | int i; | 1053 | int i; |
1054 | 1054 | ||
1055 | fcmd = &_fcmd; | 1055 | fcmd = &_fcmd; |
1056 | memset(fcmd, 0, sizeof(fcmd)); | 1056 | memset(fcmd, 0, sizeof(fcp_cmnd)); |
1057 | FCD(("PLOGI SID %d DID %d\n", fc->sid, alpa)) | 1057 | FCD(("PLOGI SID %d DID %d\n", fc->sid, alpa)) |
1058 | fch = &fcmd->fch; | 1058 | fch = &fcmd->fch; |
1059 | FILL_FCHDR_RCTL_DID(fch, R_CTL_ELS_REQ, alpa); | 1059 | FILL_FCHDR_RCTL_DID(fch, R_CTL_ELS_REQ, alpa); |
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index e87d52c59940..d7a9401600bb 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
@@ -1186,7 +1186,8 @@ static int __init sm_it87_init(void) | |||
1186 | 1186 | ||
1187 | static void __exit sm_it87_exit(void) | 1187 | static void __exit sm_it87_exit(void) |
1188 | { | 1188 | { |
1189 | i2c_isa_del_driver(&it87_isa_driver); | 1189 | if (isa_address) |
1190 | i2c_isa_del_driver(&it87_isa_driver); | ||
1190 | i2c_del_driver(&it87_driver); | 1191 | i2c_del_driver(&it87_driver); |
1191 | } | 1192 | } |
1192 | 1193 | ||
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c index 3eb08f004c0f..271e9cb9532c 100644 --- a/drivers/hwmon/vt8231.c +++ b/drivers/hwmon/vt8231.c | |||
@@ -437,12 +437,12 @@ static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \ | |||
437 | show_temp, NULL, offset - 1); \ | 437 | show_temp, NULL, offset - 1); \ |
438 | static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \ | 438 | static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \ |
439 | show_temp_max, set_temp_max, offset - 1); \ | 439 | show_temp_max, set_temp_max, offset - 1); \ |
440 | static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \ | 440 | static SENSOR_DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR, \ |
441 | show_temp_min, set_temp_min, offset - 1) | 441 | show_temp_min, set_temp_min, offset - 1) |
442 | 442 | ||
443 | static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp0, NULL); | 443 | static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp0, NULL); |
444 | static DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR, show_temp0_max, set_temp0_max); | 444 | static DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR, show_temp0_max, set_temp0_max); |
445 | static DEVICE_ATTR(temp1_min, S_IRUGO | S_IWUSR, show_temp0_min, set_temp0_min); | 445 | static DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp0_min, set_temp0_min); |
446 | 446 | ||
447 | define_temperature_sysfs(2); | 447 | define_temperature_sysfs(2); |
448 | define_temperature_sysfs(3); | 448 | define_temperature_sysfs(3); |
@@ -451,7 +451,7 @@ define_temperature_sysfs(5); | |||
451 | define_temperature_sysfs(6); | 451 | define_temperature_sysfs(6); |
452 | 452 | ||
453 | #define CFG_INFO_TEMP(id) { &sensor_dev_attr_temp##id##_input.dev_attr, \ | 453 | #define CFG_INFO_TEMP(id) { &sensor_dev_attr_temp##id##_input.dev_attr, \ |
454 | &sensor_dev_attr_temp##id##_min.dev_attr, \ | 454 | &sensor_dev_attr_temp##id##_max_hyst.dev_attr, \ |
455 | &sensor_dev_attr_temp##id##_max.dev_attr } | 455 | &sensor_dev_attr_temp##id##_max.dev_attr } |
456 | #define CFG_INFO_VOLT(id) { &sensor_dev_attr_in##id##_input.dev_attr, \ | 456 | #define CFG_INFO_VOLT(id) { &sensor_dev_attr_in##id##_input.dev_attr, \ |
457 | &sensor_dev_attr_in##id##_min.dev_attr, \ | 457 | &sensor_dev_attr_in##id##_min.dev_attr, \ |
@@ -464,7 +464,7 @@ struct str_device_attr_table { | |||
464 | }; | 464 | }; |
465 | 465 | ||
466 | static struct str_device_attr_table cfg_info_temp[] = { | 466 | static struct str_device_attr_table cfg_info_temp[] = { |
467 | { &dev_attr_temp1_input, &dev_attr_temp1_min, &dev_attr_temp1_max }, | 467 | { &dev_attr_temp1_input, &dev_attr_temp1_max_hyst, &dev_attr_temp1_max }, |
468 | CFG_INFO_TEMP(2), | 468 | CFG_INFO_TEMP(2), |
469 | CFG_INFO_TEMP(3), | 469 | CFG_INFO_TEMP(3), |
470 | CFG_INFO_TEMP(4), | 470 | CFG_INFO_TEMP(4), |
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index 557114872f3c..64c1f8af5bb2 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
@@ -95,11 +95,16 @@ MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization"); | |||
95 | (0x39))) | 95 | (0x39))) |
96 | 96 | ||
97 | #define W83781D_REG_CONFIG 0x40 | 97 | #define W83781D_REG_CONFIG 0x40 |
98 | |||
99 | /* Interrupt status (W83781D, AS99127F) */ | ||
98 | #define W83781D_REG_ALARM1 0x41 | 100 | #define W83781D_REG_ALARM1 0x41 |
99 | #define W83781D_REG_ALARM2 0x42 | 101 | #define W83781D_REG_ALARM2 0x42 |
100 | #define W83781D_REG_ALARM3 0x450 /* not on W83781D */ | ||
101 | 102 | ||
102 | #define W83781D_REG_IRQ 0x4C | 103 | /* Real-time status (W83782D, W83783S, W83627HF) */ |
104 | #define W83782D_REG_ALARM1 0x459 | ||
105 | #define W83782D_REG_ALARM2 0x45A | ||
106 | #define W83782D_REG_ALARM3 0x45B | ||
107 | |||
103 | #define W83781D_REG_BEEP_CONFIG 0x4D | 108 | #define W83781D_REG_BEEP_CONFIG 0x4D |
104 | #define W83781D_REG_BEEP_INTS1 0x56 | 109 | #define W83781D_REG_BEEP_INTS1 0x56 |
105 | #define W83781D_REG_BEEP_INTS2 0x57 | 110 | #define W83781D_REG_BEEP_INTS2 0x57 |
@@ -1513,15 +1518,6 @@ w83781d_init_client(struct i2c_client *client) | |||
1513 | W83781D_REG_TEMP3_CONFIG, tmp & 0xfe); | 1518 | W83781D_REG_TEMP3_CONFIG, tmp & 0xfe); |
1514 | } | 1519 | } |
1515 | } | 1520 | } |
1516 | |||
1517 | if (type != w83781d) { | ||
1518 | /* enable comparator mode for temp2 and temp3 so | ||
1519 | alarm indication will work correctly */ | ||
1520 | i = w83781d_read_value(client, W83781D_REG_IRQ); | ||
1521 | if (!(i & 0x40)) | ||
1522 | w83781d_write_value(client, W83781D_REG_IRQ, | ||
1523 | i | 0x40); | ||
1524 | } | ||
1525 | } | 1521 | } |
1526 | 1522 | ||
1527 | /* Start monitoring */ | 1523 | /* Start monitoring */ |
@@ -1612,14 +1608,25 @@ static struct w83781d_data *w83781d_update_device(struct device *dev) | |||
1612 | data->fan_div[1] |= (i >> 4) & 0x04; | 1608 | data->fan_div[1] |= (i >> 4) & 0x04; |
1613 | data->fan_div[2] |= (i >> 5) & 0x04; | 1609 | data->fan_div[2] |= (i >> 5) & 0x04; |
1614 | } | 1610 | } |
1615 | data->alarms = | ||
1616 | w83781d_read_value(client, | ||
1617 | W83781D_REG_ALARM1) + | ||
1618 | (w83781d_read_value(client, W83781D_REG_ALARM2) << 8); | ||
1619 | if ((data->type == w83782d) || (data->type == w83627hf)) { | 1611 | if ((data->type == w83782d) || (data->type == w83627hf)) { |
1620 | data->alarms |= | 1612 | data->alarms = w83781d_read_value(client, |
1621 | w83781d_read_value(client, | 1613 | W83782D_REG_ALARM1) |
1622 | W83781D_REG_ALARM3) << 16; | 1614 | | (w83781d_read_value(client, |
1615 | W83782D_REG_ALARM2) << 8) | ||
1616 | | (w83781d_read_value(client, | ||
1617 | W83782D_REG_ALARM3) << 16); | ||
1618 | } else if (data->type == w83783s) { | ||
1619 | data->alarms = w83781d_read_value(client, | ||
1620 | W83782D_REG_ALARM1) | ||
1621 | | (w83781d_read_value(client, | ||
1622 | W83782D_REG_ALARM2) << 8); | ||
1623 | } else { | ||
1624 | /* No real-time status registers, fall back to | ||
1625 | interrupt status registers */ | ||
1626 | data->alarms = w83781d_read_value(client, | ||
1627 | W83781D_REG_ALARM1) | ||
1628 | | (w83781d_read_value(client, | ||
1629 | W83781D_REG_ALARM2) << 8); | ||
1623 | } | 1630 | } |
1624 | i = w83781d_read_value(client, W83781D_REG_BEEP_INTS2); | 1631 | i = w83781d_read_value(client, W83781D_REG_BEEP_INTS2); |
1625 | data->beep_enable = i >> 7; | 1632 | data->beep_enable = i >> 7; |
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c index 9f2ffef4d812..4344ae6b1fcb 100644 --- a/drivers/i2c/busses/i2c-isa.c +++ b/drivers/i2c/busses/i2c-isa.c | |||
@@ -72,16 +72,6 @@ static ssize_t show_adapter_name(struct device *dev, | |||
72 | } | 72 | } |
73 | static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL); | 73 | static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL); |
74 | 74 | ||
75 | static int i2c_isa_device_probe(struct device *dev) | ||
76 | { | ||
77 | return -ENODEV; | ||
78 | } | ||
79 | |||
80 | static int i2c_isa_device_remove(struct device *dev) | ||
81 | { | ||
82 | return 0; | ||
83 | } | ||
84 | |||
85 | 75 | ||
86 | /* We implement an interface which resembles i2c_{add,del}_driver, | 76 | /* We implement an interface which resembles i2c_{add,del}_driver, |
87 | but for i2c-isa drivers. We don't have to remember and handle lists | 77 | but for i2c-isa drivers. We don't have to remember and handle lists |
@@ -93,8 +83,6 @@ int i2c_isa_add_driver(struct i2c_driver *driver) | |||
93 | 83 | ||
94 | /* Add the driver to the list of i2c drivers in the driver core */ | 84 | /* Add the driver to the list of i2c drivers in the driver core */ |
95 | driver->driver.bus = &i2c_bus_type; | 85 | driver->driver.bus = &i2c_bus_type; |
96 | driver->driver.probe = i2c_isa_device_probe; | ||
97 | driver->driver.remove = i2c_isa_device_remove; | ||
98 | res = driver_register(&driver->driver); | 86 | res = driver_register(&driver->driver); |
99 | if (res) | 87 | if (res) |
100 | return res; | 88 | return res; |
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 9834dce4e20f..0606bd2f6020 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
35 | #include <linux/timer.h> | 35 | #include <linux/timer.h> |
36 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
37 | #include <linux/sched.h> | ||
37 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
38 | #include <linux/major.h> | 39 | #include <linux/major.h> |
39 | #include <linux/errno.h> | 40 | #include <linux/errno.h> |
@@ -314,6 +315,8 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq, | |||
314 | if (rq->bio) /* fs request */ | 315 | if (rq->bio) /* fs request */ |
315 | rq->errors = 0; | 316 | rq->errors = 0; |
316 | 317 | ||
318 | touch_softlockup_watchdog(); | ||
319 | |||
317 | switch (drive->hwif->data_phase) { | 320 | switch (drive->hwif->data_phase) { |
318 | case TASKFILE_MULTI_IN: | 321 | case TASKFILE_MULTI_IN: |
319 | case TASKFILE_MULTI_OUT: | 322 | case TASKFILE_MULTI_OUT: |
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 2b286e865163..43b96e298363 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -13,11 +13,6 @@ | |||
13 | * License along with this program; if not, write the Free Software | 13 | * License along with this program; if not, write the Free Software |
14 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 14 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
15 | * | 15 | * |
16 | * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, | ||
17 | * Mountain View, CA 94043, or: | ||
18 | * | ||
19 | * http://www.sgi.com | ||
20 | * | ||
21 | * For further information regarding this notice, see: | 16 | * For further information regarding this notice, see: |
22 | * | 17 | * |
23 | * http://oss.sgi.com/projects/GenInfo/NoticeExplan | 18 | * http://oss.sgi.com/projects/GenInfo/NoticeExplan |
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 18d7eda38851..c2c776fbda01 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
@@ -2082,9 +2082,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id, | |||
2082 | 2082 | ||
2083 | SBP2_DEBUG("sbp2_check_sbp2_response"); | 2083 | SBP2_DEBUG("sbp2_check_sbp2_response"); |
2084 | 2084 | ||
2085 | switch (SCpnt->cmnd[0]) { | 2085 | if (SCpnt->cmnd[0] == INQUIRY && (SCpnt->cmnd[1] & 3) == 0) { |
2086 | |||
2087 | case INQUIRY: | ||
2088 | /* | 2086 | /* |
2089 | * Make sure data length is ok. Minimum length is 36 bytes | 2087 | * Make sure data length is ok. Minimum length is 36 bytes |
2090 | */ | 2088 | */ |
@@ -2097,13 +2095,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id, | |||
2097 | */ | 2095 | */ |
2098 | scsi_buf[2] |= 2; | 2096 | scsi_buf[2] |= 2; |
2099 | scsi_buf[3] = (scsi_buf[3] & 0xf0) | 2; | 2097 | scsi_buf[3] = (scsi_buf[3] & 0xf0) | 2; |
2100 | |||
2101 | break; | ||
2102 | |||
2103 | default: | ||
2104 | break; | ||
2105 | } | 2098 | } |
2106 | return; | ||
2107 | } | 2099 | } |
2108 | 2100 | ||
2109 | /* | 2101 | /* |
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index d393b504bf26..c82f47a66e48 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c | |||
@@ -665,7 +665,15 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, | |||
665 | struct ib_wc mad_wc; | 665 | struct ib_wc mad_wc; |
666 | struct ib_send_wr *send_wr = &mad_send_wr->send_wr; | 666 | struct ib_send_wr *send_wr = &mad_send_wr->send_wr; |
667 | 667 | ||
668 | if (!smi_handle_dr_smp_send(smp, device->node_type, port_num)) { | 668 | /* |
669 | * Directed route handling starts if the initial LID routed part of | ||
670 | * a request or the ending LID routed part of a response is empty. | ||
671 | * If we are at the start of the LID routed part, don't update the | ||
672 | * hop_ptr or hop_cnt. See section 14.2.2, Vol 1 IB spec. | ||
673 | */ | ||
674 | if ((ib_get_smp_direction(smp) ? smp->dr_dlid : smp->dr_slid) == | ||
675 | IB_LID_PERMISSIVE && | ||
676 | !smi_handle_dr_smp_send(smp, device->node_type, port_num)) { | ||
669 | ret = -EINVAL; | 677 | ret = -EINVAL; |
670 | printk(KERN_ERR PFX "Invalid directed route\n"); | 678 | printk(KERN_ERR PFX "Invalid directed route\n"); |
671 | goto out; | 679 | goto out; |
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c index f9b9b93dc501..2825615ce81c 100644 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c | |||
@@ -1029,25 +1029,6 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev *dev, | |||
1029 | MTHCA_GET(size, outbox, QUERY_DEV_LIM_UAR_ENTRY_SZ_OFFSET); | 1029 | MTHCA_GET(size, outbox, QUERY_DEV_LIM_UAR_ENTRY_SZ_OFFSET); |
1030 | dev_lim->uar_scratch_entry_sz = size; | 1030 | dev_lim->uar_scratch_entry_sz = size; |
1031 | 1031 | ||
1032 | mthca_dbg(dev, "Max QPs: %d, reserved QPs: %d, entry size: %d\n", | ||
1033 | dev_lim->max_qps, dev_lim->reserved_qps, dev_lim->qpc_entry_sz); | ||
1034 | mthca_dbg(dev, "Max SRQs: %d, reserved SRQs: %d, entry size: %d\n", | ||
1035 | dev_lim->max_srqs, dev_lim->reserved_srqs, dev_lim->srq_entry_sz); | ||
1036 | mthca_dbg(dev, "Max CQs: %d, reserved CQs: %d, entry size: %d\n", | ||
1037 | dev_lim->max_cqs, dev_lim->reserved_cqs, dev_lim->cqc_entry_sz); | ||
1038 | mthca_dbg(dev, "Max EQs: %d, reserved EQs: %d, entry size: %d\n", | ||
1039 | dev_lim->max_eqs, dev_lim->reserved_eqs, dev_lim->eqc_entry_sz); | ||
1040 | mthca_dbg(dev, "reserved MPTs: %d, reserved MTTs: %d\n", | ||
1041 | dev_lim->reserved_mrws, dev_lim->reserved_mtts); | ||
1042 | mthca_dbg(dev, "Max PDs: %d, reserved PDs: %d, reserved UARs: %d\n", | ||
1043 | dev_lim->max_pds, dev_lim->reserved_pds, dev_lim->reserved_uars); | ||
1044 | mthca_dbg(dev, "Max QP/MCG: %d, reserved MGMs: %d\n", | ||
1045 | dev_lim->max_pds, dev_lim->reserved_mgms); | ||
1046 | mthca_dbg(dev, "Max CQEs: %d, max WQEs: %d, max SRQ WQEs: %d\n", | ||
1047 | dev_lim->max_cq_sz, dev_lim->max_qp_sz, dev_lim->max_srq_sz); | ||
1048 | |||
1049 | mthca_dbg(dev, "Flags: %08x\n", dev_lim->flags); | ||
1050 | |||
1051 | if (mthca_is_memfree(dev)) { | 1032 | if (mthca_is_memfree(dev)) { |
1052 | MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SRQ_SZ_OFFSET); | 1033 | MTHCA_GET(field, outbox, QUERY_DEV_LIM_MAX_SRQ_SZ_OFFSET); |
1053 | dev_lim->max_srq_sz = 1 << field; | 1034 | dev_lim->max_srq_sz = 1 << field; |
@@ -1093,6 +1074,25 @@ int mthca_QUERY_DEV_LIM(struct mthca_dev *dev, | |||
1093 | dev_lim->mpt_entry_sz = MTHCA_MPT_ENTRY_SIZE; | 1074 | dev_lim->mpt_entry_sz = MTHCA_MPT_ENTRY_SIZE; |
1094 | } | 1075 | } |
1095 | 1076 | ||
1077 | mthca_dbg(dev, "Max QPs: %d, reserved QPs: %d, entry size: %d\n", | ||
1078 | dev_lim->max_qps, dev_lim->reserved_qps, dev_lim->qpc_entry_sz); | ||
1079 | mthca_dbg(dev, "Max SRQs: %d, reserved SRQs: %d, entry size: %d\n", | ||
1080 | dev_lim->max_srqs, dev_lim->reserved_srqs, dev_lim->srq_entry_sz); | ||
1081 | mthca_dbg(dev, "Max CQs: %d, reserved CQs: %d, entry size: %d\n", | ||
1082 | dev_lim->max_cqs, dev_lim->reserved_cqs, dev_lim->cqc_entry_sz); | ||
1083 | mthca_dbg(dev, "Max EQs: %d, reserved EQs: %d, entry size: %d\n", | ||
1084 | dev_lim->max_eqs, dev_lim->reserved_eqs, dev_lim->eqc_entry_sz); | ||
1085 | mthca_dbg(dev, "reserved MPTs: %d, reserved MTTs: %d\n", | ||
1086 | dev_lim->reserved_mrws, dev_lim->reserved_mtts); | ||
1087 | mthca_dbg(dev, "Max PDs: %d, reserved PDs: %d, reserved UARs: %d\n", | ||
1088 | dev_lim->max_pds, dev_lim->reserved_pds, dev_lim->reserved_uars); | ||
1089 | mthca_dbg(dev, "Max QP/MCG: %d, reserved MGMs: %d\n", | ||
1090 | dev_lim->max_pds, dev_lim->reserved_mgms); | ||
1091 | mthca_dbg(dev, "Max CQEs: %d, max WQEs: %d, max SRQ WQEs: %d\n", | ||
1092 | dev_lim->max_cq_sz, dev_lim->max_qp_sz, dev_lim->max_srq_sz); | ||
1093 | |||
1094 | mthca_dbg(dev, "Flags: %08x\n", dev_lim->flags); | ||
1095 | |||
1096 | out: | 1096 | out: |
1097 | mthca_free_mailbox(dev, mailbox); | 1097 | mthca_free_mailbox(dev, mailbox); |
1098 | return err; | 1098 | return err; |
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h index 2a165fd06e57..e481037288d6 100644 --- a/drivers/infiniband/hw/mthca/mthca_dev.h +++ b/drivers/infiniband/hw/mthca/mthca_dev.h | |||
@@ -53,8 +53,8 @@ | |||
53 | 53 | ||
54 | #define DRV_NAME "ib_mthca" | 54 | #define DRV_NAME "ib_mthca" |
55 | #define PFX DRV_NAME ": " | 55 | #define PFX DRV_NAME ": " |
56 | #define DRV_VERSION "0.06" | 56 | #define DRV_VERSION "0.07" |
57 | #define DRV_RELDATE "June 23, 2005" | 57 | #define DRV_RELDATE "February 13, 2006" |
58 | 58 | ||
59 | enum { | 59 | enum { |
60 | MTHCA_FLAG_DDR_HIDDEN = 1 << 1, | 60 | MTHCA_FLAG_DDR_HIDDEN = 1 << 1, |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index e0a5412b7e68..2f85a9a831b1 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h | |||
@@ -78,6 +78,7 @@ enum { | |||
78 | IPOIB_FLAG_SUBINTERFACE = 4, | 78 | IPOIB_FLAG_SUBINTERFACE = 4, |
79 | IPOIB_MCAST_RUN = 5, | 79 | IPOIB_MCAST_RUN = 5, |
80 | IPOIB_STOP_REAPER = 6, | 80 | IPOIB_STOP_REAPER = 6, |
81 | IPOIB_MCAST_STARTED = 7, | ||
81 | 82 | ||
82 | IPOIB_MAX_BACKOFF_SECONDS = 16, | 83 | IPOIB_MAX_BACKOFF_SECONDS = 16, |
83 | 84 | ||
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index ccaa0c387076..a2408d7ec598 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
@@ -533,8 +533,10 @@ void ipoib_mcast_join_task(void *dev_ptr) | |||
533 | } | 533 | } |
534 | 534 | ||
535 | if (!priv->broadcast) { | 535 | if (!priv->broadcast) { |
536 | priv->broadcast = ipoib_mcast_alloc(dev, 1); | 536 | struct ipoib_mcast *broadcast; |
537 | if (!priv->broadcast) { | 537 | |
538 | broadcast = ipoib_mcast_alloc(dev, 1); | ||
539 | if (!broadcast) { | ||
538 | ipoib_warn(priv, "failed to allocate broadcast group\n"); | 540 | ipoib_warn(priv, "failed to allocate broadcast group\n"); |
539 | mutex_lock(&mcast_mutex); | 541 | mutex_lock(&mcast_mutex); |
540 | if (test_bit(IPOIB_MCAST_RUN, &priv->flags)) | 542 | if (test_bit(IPOIB_MCAST_RUN, &priv->flags)) |
@@ -544,10 +546,11 @@ void ipoib_mcast_join_task(void *dev_ptr) | |||
544 | return; | 546 | return; |
545 | } | 547 | } |
546 | 548 | ||
547 | memcpy(priv->broadcast->mcmember.mgid.raw, priv->dev->broadcast + 4, | 549 | spin_lock_irq(&priv->lock); |
550 | memcpy(broadcast->mcmember.mgid.raw, priv->dev->broadcast + 4, | ||
548 | sizeof (union ib_gid)); | 551 | sizeof (union ib_gid)); |
552 | priv->broadcast = broadcast; | ||
549 | 553 | ||
550 | spin_lock_irq(&priv->lock); | ||
551 | __ipoib_mcast_add(dev, priv->broadcast); | 554 | __ipoib_mcast_add(dev, priv->broadcast); |
552 | spin_unlock_irq(&priv->lock); | 555 | spin_unlock_irq(&priv->lock); |
553 | } | 556 | } |
@@ -601,6 +604,10 @@ int ipoib_mcast_start_thread(struct net_device *dev) | |||
601 | queue_work(ipoib_workqueue, &priv->mcast_task); | 604 | queue_work(ipoib_workqueue, &priv->mcast_task); |
602 | mutex_unlock(&mcast_mutex); | 605 | mutex_unlock(&mcast_mutex); |
603 | 606 | ||
607 | spin_lock_irq(&priv->lock); | ||
608 | set_bit(IPOIB_MCAST_STARTED, &priv->flags); | ||
609 | spin_unlock_irq(&priv->lock); | ||
610 | |||
604 | return 0; | 611 | return 0; |
605 | } | 612 | } |
606 | 613 | ||
@@ -611,6 +618,10 @@ int ipoib_mcast_stop_thread(struct net_device *dev, int flush) | |||
611 | 618 | ||
612 | ipoib_dbg_mcast(priv, "stopping multicast thread\n"); | 619 | ipoib_dbg_mcast(priv, "stopping multicast thread\n"); |
613 | 620 | ||
621 | spin_lock_irq(&priv->lock); | ||
622 | clear_bit(IPOIB_MCAST_STARTED, &priv->flags); | ||
623 | spin_unlock_irq(&priv->lock); | ||
624 | |||
614 | mutex_lock(&mcast_mutex); | 625 | mutex_lock(&mcast_mutex); |
615 | clear_bit(IPOIB_MCAST_RUN, &priv->flags); | 626 | clear_bit(IPOIB_MCAST_RUN, &priv->flags); |
616 | cancel_delayed_work(&priv->mcast_task); | 627 | cancel_delayed_work(&priv->mcast_task); |
@@ -693,6 +704,14 @@ void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid, | |||
693 | */ | 704 | */ |
694 | spin_lock(&priv->lock); | 705 | spin_lock(&priv->lock); |
695 | 706 | ||
707 | if (!test_bit(IPOIB_MCAST_STARTED, &priv->flags) || | ||
708 | !priv->broadcast || | ||
709 | !test_bit(IPOIB_MCAST_FLAG_ATTACHED, &priv->broadcast->flags)) { | ||
710 | ++priv->stats.tx_dropped; | ||
711 | dev_kfree_skb_any(skb); | ||
712 | goto unlock; | ||
713 | } | ||
714 | |||
696 | mcast = __ipoib_mcast_find(dev, mgid); | 715 | mcast = __ipoib_mcast_find(dev, mgid); |
697 | if (!mcast) { | 716 | if (!mcast) { |
698 | /* Let's create a new send only group now */ | 717 | /* Let's create a new send only group now */ |
@@ -754,6 +773,7 @@ out: | |||
754 | ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN); | 773 | ipoib_send(dev, skb, mcast->ah, IB_MULTICAST_QPN); |
755 | } | 774 | } |
756 | 775 | ||
776 | unlock: | ||
757 | spin_unlock(&priv->lock); | 777 | spin_unlock(&priv->lock); |
758 | } | 778 | } |
759 | 779 | ||
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 6e0afbb22383..2708167ba175 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile | |||
@@ -11,7 +11,6 @@ obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o | |||
11 | obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o | 11 | obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o |
12 | obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o | 12 | obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o |
13 | obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o | 13 | obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o |
14 | obj-$(CONFIG_KEYBOARD_98KBD) += 98kbd.o | ||
15 | obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o | 14 | obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o |
16 | obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o | 15 | obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o |
17 | obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o | 16 | obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o |
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 184c4129470d..415c49178985 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile | |||
@@ -7,7 +7,6 @@ | |||
7 | obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o | 7 | obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o |
8 | obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o | 8 | obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o |
9 | obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o | 9 | obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o |
10 | obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o | ||
11 | obj-$(CONFIG_INPUT_UINPUT) += uinput.o | 10 | obj-$(CONFIG_INPUT_UINPUT) += uinput.o |
12 | obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o | 11 | obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o |
13 | obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o | 12 | obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o |
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index d448bb5e4869..3a6ae85cd69c 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/input.h> | 19 | #include <linux/input.h> |
20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/interrupt.h> | ||
22 | #include <asm/hardware.h> | 23 | #include <asm/hardware.h> |
23 | 24 | ||
24 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); | 25 | MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); |
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index c88520d3d13c..40333d61093c 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c | |||
@@ -232,6 +232,7 @@ static struct ps2pp_info *get_model_info(unsigned char model) | |||
232 | { 88, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, | 232 | { 88, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, |
233 | { 96, 0, 0 }, | 233 | { 96, 0, 0 }, |
234 | { 97, PS2PP_KIND_TP3, PS2PP_WHEEL | PS2PP_HWHEEL }, | 234 | { 97, PS2PP_KIND_TP3, PS2PP_WHEEL | PS2PP_HWHEEL }, |
235 | { 99, PS2PP_KIND_WHEEL, PS2PP_WHEEL }, | ||
235 | { 100, PS2PP_KIND_MX, /* MX510 */ | 236 | { 100, PS2PP_KIND_MX, /* MX510 */ |
236 | PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN | | 237 | PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN | |
237 | PS2PP_EXTRA_BTN | PS2PP_NAV_BTN }, | 238 | PS2PP_EXTRA_BTN | PS2PP_NAV_BTN }, |
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index b4898d8a68e2..6d9ec9ab1b90 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c | |||
@@ -68,15 +68,19 @@ struct trackpoint_attr_data { | |||
68 | size_t field_offset; | 68 | size_t field_offset; |
69 | unsigned char command; | 69 | unsigned char command; |
70 | unsigned char mask; | 70 | unsigned char mask; |
71 | unsigned char inverted; | ||
71 | }; | 72 | }; |
72 | 73 | ||
73 | static ssize_t trackpoint_show_int_attr(struct psmouse *psmouse, void *data, char *buf) | 74 | static ssize_t trackpoint_show_int_attr(struct psmouse *psmouse, void *data, char *buf) |
74 | { | 75 | { |
75 | struct trackpoint_data *tp = psmouse->private; | 76 | struct trackpoint_data *tp = psmouse->private; |
76 | struct trackpoint_attr_data *attr = data; | 77 | struct trackpoint_attr_data *attr = data; |
77 | unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); | 78 | unsigned char value = *(unsigned char *)((char *)tp + attr->field_offset); |
79 | |||
80 | if (attr->inverted) | ||
81 | value = !value; | ||
78 | 82 | ||
79 | return sprintf(buf, "%u\n", *field); | 83 | return sprintf(buf, "%u\n", value); |
80 | } | 84 | } |
81 | 85 | ||
82 | static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data, | 86 | static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data, |
@@ -120,6 +124,9 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, | |||
120 | if (*rest || value > 1) | 124 | if (*rest || value > 1) |
121 | return -EINVAL; | 125 | return -EINVAL; |
122 | 126 | ||
127 | if (attr->inverted) | ||
128 | value = !value; | ||
129 | |||
123 | if (*field != value) { | 130 | if (*field != value) { |
124 | *field = value; | 131 | *field = value; |
125 | trackpoint_toggle_bit(&psmouse->ps2dev, attr->command, attr->mask); | 132 | trackpoint_toggle_bit(&psmouse->ps2dev, attr->command, attr->mask); |
@@ -129,11 +136,12 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, | |||
129 | } | 136 | } |
130 | 137 | ||
131 | 138 | ||
132 | #define TRACKPOINT_BIT_ATTR(_name, _command, _mask) \ | 139 | #define TRACKPOINT_BIT_ATTR(_name, _command, _mask, _inv) \ |
133 | static struct trackpoint_attr_data trackpoint_attr_##_name = { \ | 140 | static struct trackpoint_attr_data trackpoint_attr_##_name = { \ |
134 | .field_offset = offsetof(struct trackpoint_data, _name), \ | 141 | .field_offset = offsetof(struct trackpoint_data, _name), \ |
135 | .command = _command, \ | 142 | .command = _command, \ |
136 | .mask = _mask, \ | 143 | .mask = _mask, \ |
144 | .inverted = _inv, \ | ||
137 | }; \ | 145 | }; \ |
138 | PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO, \ | 146 | PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO, \ |
139 | &trackpoint_attr_##_name, \ | 147 | &trackpoint_attr_##_name, \ |
@@ -150,9 +158,9 @@ TRACKPOINT_INT_ATTR(upthresh, TP_UP_THRESH); | |||
150 | TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME); | 158 | TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME); |
151 | TRACKPOINT_INT_ATTR(jenks, TP_JENKS_CURV); | 159 | TRACKPOINT_INT_ATTR(jenks, TP_JENKS_CURV); |
152 | 160 | ||
153 | TRACKPOINT_BIT_ATTR(press_to_select, TP_TOGGLE_PTSON, TP_MASK_PTSON); | 161 | TRACKPOINT_BIT_ATTR(press_to_select, TP_TOGGLE_PTSON, TP_MASK_PTSON, 0); |
154 | TRACKPOINT_BIT_ATTR(skipback, TP_TOGGLE_SKIPBACK, TP_MASK_SKIPBACK); | 162 | TRACKPOINT_BIT_ATTR(skipback, TP_TOGGLE_SKIPBACK, TP_MASK_SKIPBACK, 0); |
155 | TRACKPOINT_BIT_ATTR(ext_dev, TP_TOGGLE_EXT_DEV, TP_MASK_EXT_DEV); | 163 | TRACKPOINT_BIT_ATTR(ext_dev, TP_TOGGLE_EXT_DEV, TP_MASK_EXT_DEV, 1); |
156 | 164 | ||
157 | static struct attribute *trackpoint_attrs[] = { | 165 | static struct attribute *trackpoint_attrs[] = { |
158 | &psmouse_attr_sensitivity.dattr.attr, | 166 | &psmouse_attr_sensitivity.dattr.attr, |
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h index 9857d8b6ad66..050298b1a09d 100644 --- a/drivers/input/mouse/trackpoint.h +++ b/drivers/input/mouse/trackpoint.h | |||
@@ -78,7 +78,7 @@ | |||
78 | 78 | ||
79 | #define TP_TOGGLE_MB 0x23 /* Disable/Enable Middle Button */ | 79 | #define TP_TOGGLE_MB 0x23 /* Disable/Enable Middle Button */ |
80 | #define TP_MASK_MB 0x01 | 80 | #define TP_MASK_MB 0x01 |
81 | #define TP_TOGGLE_EXT_DEV 0x23 /* Toggle external device */ | 81 | #define TP_TOGGLE_EXT_DEV 0x23 /* Disable external device */ |
82 | #define TP_MASK_EXT_DEV 0x02 | 82 | #define TP_MASK_EXT_DEV 0x02 |
83 | #define TP_TOGGLE_DRIFT 0x23 /* Drift Correction */ | 83 | #define TP_TOGGLE_DRIFT 0x23 /* Drift Correction */ |
84 | #define TP_MASK_DRIFT 0x80 | 84 | #define TP_MASK_DRIFT 0x80 |
@@ -125,7 +125,7 @@ | |||
125 | #define TP_DEF_MB 0x00 | 125 | #define TP_DEF_MB 0x00 |
126 | #define TP_DEF_PTSON 0x00 | 126 | #define TP_DEF_PTSON 0x00 |
127 | #define TP_DEF_SKIPBACK 0x00 | 127 | #define TP_DEF_SKIPBACK 0x00 |
128 | #define TP_DEF_EXT_DEV 0x01 | 128 | #define TP_DEF_EXT_DEV 0x00 /* 0 means enabled */ |
129 | 129 | ||
130 | #define MAKE_PS2_CMD(params, results, cmd) ((params<<12) | (results<<8) | (cmd)) | 130 | #define MAKE_PS2_CMD(params, results, cmd) ((params<<12) | (results<<8) | (cmd)) |
131 | 131 | ||
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile index 678a8599f9ff..4155197867a3 100644 --- a/drivers/input/serio/Makefile +++ b/drivers/input/serio/Makefile | |||
@@ -13,7 +13,6 @@ obj-$(CONFIG_SERIO_RPCKBD) += rpckbd.o | |||
13 | obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o | 13 | obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o |
14 | obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o | 14 | obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o |
15 | obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o | 15 | obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o |
16 | obj-$(CONFIG_SERIO_98KBD) += 98kbd-io.o | ||
17 | obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o | 16 | obj-$(CONFIG_SERIO_GSCPS2) += gscps2.o |
18 | obj-$(CONFIG_HP_SDC) += hp_sdc.o | 17 | obj-$(CONFIG_HP_SDC) += hp_sdc.o |
19 | obj-$(CONFIG_HIL_MLC) += hp_sdc_mlc.o hil_mlc.o | 18 | obj-$(CONFIG_HIL_MLC) += hp_sdc_mlc.o hil_mlc.o |
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index b45a45ca7cc9..8c12a974b411 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c | |||
@@ -48,10 +48,13 @@ | |||
48 | 48 | ||
49 | #define TS_POLL_PERIOD msecs_to_jiffies(10) | 49 | #define TS_POLL_PERIOD msecs_to_jiffies(10) |
50 | 50 | ||
51 | /* this driver doesn't aim at the peak continuous sample rate */ | ||
52 | #define SAMPLE_BITS (8 /*cmd*/ + 16 /*sample*/ + 2 /* before, after */) | ||
53 | |||
51 | struct ts_event { | 54 | struct ts_event { |
52 | /* For portability, we can't read 12 bit values using SPI (which | 55 | /* For portability, we can't read 12 bit values using SPI (which |
53 | * would make the controller deliver them as native byteorder u16 | 56 | * would make the controller deliver them as native byteorder u16 |
54 | * with msbs zeroed). Instead, we read them as two 8-byte values, | 57 | * with msbs zeroed). Instead, we read them as two 8-bit values, |
55 | * which need byteswapping then range adjustment. | 58 | * which need byteswapping then range adjustment. |
56 | */ | 59 | */ |
57 | __be16 x; | 60 | __be16 x; |
@@ -60,7 +63,7 @@ struct ts_event { | |||
60 | }; | 63 | }; |
61 | 64 | ||
62 | struct ads7846 { | 65 | struct ads7846 { |
63 | struct input_dev input; | 66 | struct input_dev *input; |
64 | char phys[32]; | 67 | char phys[32]; |
65 | 68 | ||
66 | struct spi_device *spi; | 69 | struct spi_device *spi; |
@@ -68,6 +71,7 @@ struct ads7846 { | |||
68 | u16 vref_delay_usecs; | 71 | u16 vref_delay_usecs; |
69 | u16 x_plate_ohms; | 72 | u16 x_plate_ohms; |
70 | 73 | ||
74 | u8 read_x, read_y, read_z1, read_z2; | ||
71 | struct ts_event tc; | 75 | struct ts_event tc; |
72 | 76 | ||
73 | struct spi_transfer xfer[8]; | 77 | struct spi_transfer xfer[8]; |
@@ -117,10 +121,10 @@ struct ads7846 { | |||
117 | #define READ_12BIT_DFR(x) (ADS_START | ADS_A2A1A0_d_ ## x \ | 121 | #define READ_12BIT_DFR(x) (ADS_START | ADS_A2A1A0_d_ ## x \ |
118 | | ADS_12_BIT | ADS_DFR) | 122 | | ADS_12_BIT | ADS_DFR) |
119 | 123 | ||
120 | static const u8 read_y = READ_12BIT_DFR(y) | ADS_PD10_ADC_ON; | 124 | #define READ_Y (READ_12BIT_DFR(y) | ADS_PD10_ADC_ON) |
121 | static const u8 read_z1 = READ_12BIT_DFR(z1) | ADS_PD10_ADC_ON; | 125 | #define READ_Z1 (READ_12BIT_DFR(z1) | ADS_PD10_ADC_ON) |
122 | static const u8 read_z2 = READ_12BIT_DFR(z2) | ADS_PD10_ADC_ON; | 126 | #define READ_Z2 (READ_12BIT_DFR(z2) | ADS_PD10_ADC_ON) |
123 | static const u8 read_x = READ_12BIT_DFR(x) | ADS_PD10_PDOWN; /* LAST */ | 127 | #define READ_X (READ_12BIT_DFR(x) | ADS_PD10_PDOWN) /* LAST */ |
124 | 128 | ||
125 | /* single-ended samples need to first power up reference voltage; | 129 | /* single-ended samples need to first power up reference voltage; |
126 | * we leave both ADC and VREF powered | 130 | * we leave both ADC and VREF powered |
@@ -128,8 +132,8 @@ static const u8 read_x = READ_12BIT_DFR(x) | ADS_PD10_PDOWN; /* LAST */ | |||
128 | #define READ_12BIT_SER(x) (ADS_START | ADS_A2A1A0_ ## x \ | 132 | #define READ_12BIT_SER(x) (ADS_START | ADS_A2A1A0_ ## x \ |
129 | | ADS_12_BIT | ADS_SER) | 133 | | ADS_12_BIT | ADS_SER) |
130 | 134 | ||
131 | static const u8 ref_on = READ_12BIT_DFR(x) | ADS_PD10_ALL_ON; | 135 | #define REF_ON (READ_12BIT_DFR(x) | ADS_PD10_ALL_ON) |
132 | static const u8 ref_off = READ_12BIT_DFR(y) | ADS_PD10_PDOWN; | 136 | #define REF_OFF (READ_12BIT_DFR(y) | ADS_PD10_PDOWN) |
133 | 137 | ||
134 | /*--------------------------------------------------------------------------*/ | 138 | /*--------------------------------------------------------------------------*/ |
135 | 139 | ||
@@ -138,7 +142,9 @@ static const u8 ref_off = READ_12BIT_DFR(y) | ADS_PD10_PDOWN; | |||
138 | */ | 142 | */ |
139 | 143 | ||
140 | struct ser_req { | 144 | struct ser_req { |
145 | u8 ref_on; | ||
141 | u8 command; | 146 | u8 command; |
147 | u8 ref_off; | ||
142 | u16 scratch; | 148 | u16 scratch; |
143 | __be16 sample; | 149 | __be16 sample; |
144 | struct spi_message msg; | 150 | struct spi_message msg; |
@@ -152,7 +158,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command) | |||
152 | struct ser_req *req = kzalloc(sizeof *req, SLAB_KERNEL); | 158 | struct ser_req *req = kzalloc(sizeof *req, SLAB_KERNEL); |
153 | int status; | 159 | int status; |
154 | int sample; | 160 | int sample; |
155 | int i; | 161 | int i; |
156 | 162 | ||
157 | if (!req) | 163 | if (!req) |
158 | return -ENOMEM; | 164 | return -ENOMEM; |
@@ -160,7 +166,8 @@ static int ads7846_read12_ser(struct device *dev, unsigned command) | |||
160 | INIT_LIST_HEAD(&req->msg.transfers); | 166 | INIT_LIST_HEAD(&req->msg.transfers); |
161 | 167 | ||
162 | /* activate reference, so it has time to settle; */ | 168 | /* activate reference, so it has time to settle; */ |
163 | req->xfer[0].tx_buf = &ref_on; | 169 | req->ref_on = REF_ON; |
170 | req->xfer[0].tx_buf = &req->ref_on; | ||
164 | req->xfer[0].len = 1; | 171 | req->xfer[0].len = 1; |
165 | req->xfer[1].rx_buf = &req->scratch; | 172 | req->xfer[1].rx_buf = &req->scratch; |
166 | req->xfer[1].len = 2; | 173 | req->xfer[1].len = 2; |
@@ -182,7 +189,8 @@ static int ads7846_read12_ser(struct device *dev, unsigned command) | |||
182 | /* REVISIT: take a few more samples, and compare ... */ | 189 | /* REVISIT: take a few more samples, and compare ... */ |
183 | 190 | ||
184 | /* turn off reference */ | 191 | /* turn off reference */ |
185 | req->xfer[4].tx_buf = &ref_off; | 192 | req->ref_off = REF_OFF; |
193 | req->xfer[4].tx_buf = &req->ref_off; | ||
186 | req->xfer[4].len = 1; | 194 | req->xfer[4].len = 1; |
187 | req->xfer[5].rx_buf = &req->scratch; | 195 | req->xfer[5].rx_buf = &req->scratch; |
188 | req->xfer[5].len = 2; | 196 | req->xfer[5].len = 2; |
@@ -236,11 +244,12 @@ SHOW(vbatt) | |||
236 | 244 | ||
237 | static void ads7846_rx(void *ads) | 245 | static void ads7846_rx(void *ads) |
238 | { | 246 | { |
239 | struct ads7846 *ts = ads; | 247 | struct ads7846 *ts = ads; |
240 | unsigned Rt; | 248 | struct input_dev *input_dev = ts->input; |
241 | unsigned sync = 0; | 249 | unsigned Rt; |
242 | u16 x, y, z1, z2; | 250 | unsigned sync = 0; |
243 | unsigned long flags; | 251 | u16 x, y, z1, z2; |
252 | unsigned long flags; | ||
244 | 253 | ||
245 | /* adjust: 12 bit samples (left aligned), built from | 254 | /* adjust: 12 bit samples (left aligned), built from |
246 | * two 8 bit values writen msb-first. | 255 | * two 8 bit values writen msb-first. |
@@ -276,21 +285,21 @@ static void ads7846_rx(void *ads) | |||
276 | * won't notice that, even if nPENIRQ never fires ... | 285 | * won't notice that, even if nPENIRQ never fires ... |
277 | */ | 286 | */ |
278 | if (!ts->pendown && Rt != 0) { | 287 | if (!ts->pendown && Rt != 0) { |
279 | input_report_key(&ts->input, BTN_TOUCH, 1); | 288 | input_report_key(input_dev, BTN_TOUCH, 1); |
280 | sync = 1; | 289 | sync = 1; |
281 | } else if (ts->pendown && Rt == 0) { | 290 | } else if (ts->pendown && Rt == 0) { |
282 | input_report_key(&ts->input, BTN_TOUCH, 0); | 291 | input_report_key(input_dev, BTN_TOUCH, 0); |
283 | sync = 1; | 292 | sync = 1; |
284 | } | 293 | } |
285 | 294 | ||
286 | if (Rt) { | 295 | if (Rt) { |
287 | input_report_abs(&ts->input, ABS_X, x); | 296 | input_report_abs(input_dev, ABS_X, x); |
288 | input_report_abs(&ts->input, ABS_Y, y); | 297 | input_report_abs(input_dev, ABS_Y, y); |
289 | input_report_abs(&ts->input, ABS_PRESSURE, Rt); | 298 | input_report_abs(input_dev, ABS_PRESSURE, Rt); |
290 | sync = 1; | 299 | sync = 1; |
291 | } | 300 | } |
292 | if (sync) | 301 | if (sync) |
293 | input_sync(&ts->input); | 302 | input_sync(input_dev); |
294 | 303 | ||
295 | #ifdef VERBOSE | 304 | #ifdef VERBOSE |
296 | if (Rt || ts->pendown) | 305 | if (Rt || ts->pendown) |
@@ -396,9 +405,10 @@ static int ads7846_resume(struct spi_device *spi) | |||
396 | static int __devinit ads7846_probe(struct spi_device *spi) | 405 | static int __devinit ads7846_probe(struct spi_device *spi) |
397 | { | 406 | { |
398 | struct ads7846 *ts; | 407 | struct ads7846 *ts; |
408 | struct input_dev *input_dev; | ||
399 | struct ads7846_platform_data *pdata = spi->dev.platform_data; | 409 | struct ads7846_platform_data *pdata = spi->dev.platform_data; |
400 | struct spi_transfer *x; | 410 | struct spi_transfer *x; |
401 | int i; | 411 | int err; |
402 | 412 | ||
403 | if (!spi->irq) { | 413 | if (!spi->irq) { |
404 | dev_dbg(&spi->dev, "no IRQ?\n"); | 414 | dev_dbg(&spi->dev, "no IRQ?\n"); |
@@ -411,9 +421,9 @@ static int __devinit ads7846_probe(struct spi_device *spi) | |||
411 | } | 421 | } |
412 | 422 | ||
413 | /* don't exceed max specified sample rate */ | 423 | /* don't exceed max specified sample rate */ |
414 | if (spi->max_speed_hz > (125000 * 16)) { | 424 | if (spi->max_speed_hz > (125000 * SAMPLE_BITS)) { |
415 | dev_dbg(&spi->dev, "f(sample) %d KHz?\n", | 425 | dev_dbg(&spi->dev, "f(sample) %d KHz?\n", |
416 | (spi->max_speed_hz/16)/1000); | 426 | (spi->max_speed_hz/SAMPLE_BITS)/1000); |
417 | return -EINVAL; | 427 | return -EINVAL; |
418 | } | 428 | } |
419 | 429 | ||
@@ -423,13 +433,18 @@ static int __devinit ads7846_probe(struct spi_device *spi) | |||
423 | * to discard the four garbage LSBs. | 433 | * to discard the four garbage LSBs. |
424 | */ | 434 | */ |
425 | 435 | ||
426 | if (!(ts = kzalloc(sizeof(struct ads7846), GFP_KERNEL))) | 436 | ts = kzalloc(sizeof(struct ads7846), GFP_KERNEL); |
427 | return -ENOMEM; | 437 | input_dev = input_allocate_device(); |
438 | if (!ts || !input_dev) { | ||
439 | err = -ENOMEM; | ||
440 | goto err_free_mem; | ||
441 | } | ||
428 | 442 | ||
429 | dev_set_drvdata(&spi->dev, ts); | 443 | dev_set_drvdata(&spi->dev, ts); |
444 | spi->dev.power.power_state = PMSG_ON; | ||
430 | 445 | ||
431 | ts->spi = spi; | 446 | ts->spi = spi; |
432 | spi->dev.power.power_state = PMSG_ON; | 447 | ts->input = input_dev; |
433 | 448 | ||
434 | init_timer(&ts->timer); | 449 | init_timer(&ts->timer); |
435 | ts->timer.data = (unsigned long) ts; | 450 | ts->timer.data = (unsigned long) ts; |
@@ -439,70 +454,80 @@ static int __devinit ads7846_probe(struct spi_device *spi) | |||
439 | ts->vref_delay_usecs = pdata->vref_delay_usecs ? : 100; | 454 | ts->vref_delay_usecs = pdata->vref_delay_usecs ? : 100; |
440 | ts->x_plate_ohms = pdata->x_plate_ohms ? : 400; | 455 | ts->x_plate_ohms = pdata->x_plate_ohms ? : 400; |
441 | 456 | ||
442 | init_input_dev(&ts->input); | 457 | snprintf(ts->phys, sizeof(ts->phys), "%s/input0", spi->dev.bus_id); |
443 | 458 | ||
444 | ts->input.dev = &spi->dev; | 459 | input_dev->name = "ADS784x Touchscreen"; |
445 | ts->input.name = "ADS784x Touchscreen"; | 460 | input_dev->phys = ts->phys; |
446 | snprintf(ts->phys, sizeof ts->phys, "%s/input0", spi->dev.bus_id); | 461 | input_dev->cdev.dev = &spi->dev; |
447 | ts->input.phys = ts->phys; | ||
448 | 462 | ||
449 | ts->input.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); | 463 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); |
450 | ts->input.keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); | 464 | input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); |
451 | input_set_abs_params(&ts->input, ABS_X, | 465 | input_set_abs_params(input_dev, ABS_X, |
452 | pdata->x_min ? : 0, | 466 | pdata->x_min ? : 0, |
453 | pdata->x_max ? : MAX_12BIT, | 467 | pdata->x_max ? : MAX_12BIT, |
454 | 0, 0); | 468 | 0, 0); |
455 | input_set_abs_params(&ts->input, ABS_Y, | 469 | input_set_abs_params(input_dev, ABS_Y, |
456 | pdata->y_min ? : 0, | 470 | pdata->y_min ? : 0, |
457 | pdata->y_max ? : MAX_12BIT, | 471 | pdata->y_max ? : MAX_12BIT, |
458 | 0, 0); | 472 | 0, 0); |
459 | input_set_abs_params(&ts->input, ABS_PRESSURE, | 473 | input_set_abs_params(input_dev, ABS_PRESSURE, |
460 | pdata->pressure_min, pdata->pressure_max, 0, 0); | 474 | pdata->pressure_min, pdata->pressure_max, 0, 0); |
461 | 475 | ||
462 | input_register_device(&ts->input); | ||
463 | |||
464 | /* set up the transfers to read touchscreen state; this assumes we | 476 | /* set up the transfers to read touchscreen state; this assumes we |
465 | * use formula #2 for pressure, not #3. | 477 | * use formula #2 for pressure, not #3. |
466 | */ | 478 | */ |
479 | INIT_LIST_HEAD(&ts->msg.transfers); | ||
467 | x = ts->xfer; | 480 | x = ts->xfer; |
468 | 481 | ||
469 | /* y- still on; turn on only y+ (and ADC) */ | 482 | /* y- still on; turn on only y+ (and ADC) */ |
470 | x->tx_buf = &read_y; | 483 | ts->read_y = READ_Y; |
484 | x->tx_buf = &ts->read_y; | ||
471 | x->len = 1; | 485 | x->len = 1; |
486 | spi_message_add_tail(x, &ts->msg); | ||
487 | |||
472 | x++; | 488 | x++; |
473 | x->rx_buf = &ts->tc.y; | 489 | x->rx_buf = &ts->tc.y; |
474 | x->len = 2; | 490 | x->len = 2; |
475 | x++; | 491 | spi_message_add_tail(x, &ts->msg); |
476 | 492 | ||
477 | /* turn y+ off, x- on; we'll use formula #2 */ | 493 | /* turn y+ off, x- on; we'll use formula #2 */ |
478 | if (ts->model == 7846) { | 494 | if (ts->model == 7846) { |
479 | x->tx_buf = &read_z1; | 495 | x++; |
496 | ts->read_z1 = READ_Z1; | ||
497 | x->tx_buf = &ts->read_z1; | ||
480 | x->len = 1; | 498 | x->len = 1; |
499 | spi_message_add_tail(x, &ts->msg); | ||
500 | |||
481 | x++; | 501 | x++; |
482 | x->rx_buf = &ts->tc.z1; | 502 | x->rx_buf = &ts->tc.z1; |
483 | x->len = 2; | 503 | x->len = 2; |
484 | x++; | 504 | spi_message_add_tail(x, &ts->msg); |
485 | 505 | ||
486 | x->tx_buf = &read_z2; | 506 | x++; |
507 | ts->read_z2 = READ_Z2; | ||
508 | x->tx_buf = &ts->read_z2; | ||
487 | x->len = 1; | 509 | x->len = 1; |
510 | spi_message_add_tail(x, &ts->msg); | ||
511 | |||
488 | x++; | 512 | x++; |
489 | x->rx_buf = &ts->tc.z2; | 513 | x->rx_buf = &ts->tc.z2; |
490 | x->len = 2; | 514 | x->len = 2; |
491 | x++; | 515 | spi_message_add_tail(x, &ts->msg); |
492 | } | 516 | } |
493 | 517 | ||
494 | /* turn y- off, x+ on, then leave in lowpower */ | 518 | /* turn y- off, x+ on, then leave in lowpower */ |
495 | x->tx_buf = &read_x; | 519 | x++; |
520 | ts->read_x = READ_X; | ||
521 | x->tx_buf = &ts->read_x; | ||
496 | x->len = 1; | 522 | x->len = 1; |
523 | spi_message_add_tail(x, &ts->msg); | ||
524 | |||
497 | x++; | 525 | x++; |
498 | x->rx_buf = &ts->tc.x; | 526 | x->rx_buf = &ts->tc.x; |
499 | x->len = 2; | 527 | x->len = 2; |
500 | x++; | 528 | CS_CHANGE(*x); |
501 | 529 | spi_message_add_tail(x, &ts->msg); | |
502 | CS_CHANGE(x[-1]); | ||
503 | 530 | ||
504 | for (i = 0; i < x - ts->xfer; i++) | ||
505 | spi_message_add_tail(&ts->xfer[i], &ts->msg); | ||
506 | ts->msg.complete = ads7846_rx; | 531 | ts->msg.complete = ads7846_rx; |
507 | ts->msg.context = ts; | 532 | ts->msg.context = ts; |
508 | 533 | ||
@@ -510,9 +535,8 @@ static int __devinit ads7846_probe(struct spi_device *spi) | |||
510 | SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING, | 535 | SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING, |
511 | spi->dev.bus_id, ts)) { | 536 | spi->dev.bus_id, ts)) { |
512 | dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); | 537 | dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); |
513 | input_unregister_device(&ts->input); | 538 | err = -EBUSY; |
514 | kfree(ts); | 539 | goto err_free_mem; |
515 | return -EBUSY; | ||
516 | } | 540 | } |
517 | 541 | ||
518 | dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq); | 542 | dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq); |
@@ -534,7 +558,18 @@ static int __devinit ads7846_probe(struct spi_device *spi) | |||
534 | device_create_file(&spi->dev, &dev_attr_vbatt); | 558 | device_create_file(&spi->dev, &dev_attr_vbatt); |
535 | device_create_file(&spi->dev, &dev_attr_vaux); | 559 | device_create_file(&spi->dev, &dev_attr_vaux); |
536 | 560 | ||
561 | err = input_register_device(input_dev); | ||
562 | if (err) | ||
563 | goto err_free_irq; | ||
564 | |||
537 | return 0; | 565 | return 0; |
566 | |||
567 | err_free_irq: | ||
568 | free_irq(spi->irq, ts); | ||
569 | err_free_mem: | ||
570 | input_free_device(input_dev); | ||
571 | kfree(ts); | ||
572 | return err; | ||
538 | } | 573 | } |
539 | 574 | ||
540 | static int __devexit ads7846_remove(struct spi_device *spi) | 575 | static int __devexit ads7846_remove(struct spi_device *spi) |
@@ -554,7 +589,7 @@ static int __devexit ads7846_remove(struct spi_device *spi) | |||
554 | device_remove_file(&spi->dev, &dev_attr_vbatt); | 589 | device_remove_file(&spi->dev, &dev_attr_vbatt); |
555 | device_remove_file(&spi->dev, &dev_attr_vaux); | 590 | device_remove_file(&spi->dev, &dev_attr_vaux); |
556 | 591 | ||
557 | input_unregister_device(&ts->input); | 592 | input_unregister_device(ts->input); |
558 | kfree(ts); | 593 | kfree(ts); |
559 | 594 | ||
560 | dev_dbg(&spi->dev, "unregistered touchscreen\n"); | 595 | dev_dbg(&spi->dev, "unregistered touchscreen\n"); |
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index f190a99604f0..393633681f49 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c | |||
@@ -2359,8 +2359,8 @@ isdn_tty_at_cout(char *msg, modem_info * info) | |||
2359 | 2359 | ||
2360 | /* use queue instead of direct, if online and */ | 2360 | /* use queue instead of direct, if online and */ |
2361 | /* data is in queue or buffer is full */ | 2361 | /* data is in queue or buffer is full */ |
2362 | if ((info->online && tty_buffer_request_room(tty, l) < l) || | 2362 | if (info->online && ((tty_buffer_request_room(tty, l) < l) || |
2363 | (!skb_queue_empty(&dev->drv[info->isdn_driver]->rpqueue[info->isdn_channel]))) { | 2363 | !skb_queue_empty(&dev->drv[info->isdn_driver]->rpqueue[info->isdn_channel]))) { |
2364 | skb = alloc_skb(l, GFP_ATOMIC); | 2364 | skb = alloc_skb(l, GFP_ATOMIC); |
2365 | if (!skb) { | 2365 | if (!skb) { |
2366 | spin_unlock_irqrestore(&info->readlock, flags); | 2366 | spin_unlock_irqrestore(&info->readlock, flags); |
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c index 3a32c59494f2..24e51d5e97fc 100644 --- a/drivers/macintosh/windfarm_smu_sat.c +++ b/drivers/macintosh/windfarm_smu_sat.c | |||
@@ -151,6 +151,7 @@ struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id, int id, | |||
151 | kfree(buf); | 151 | kfree(buf); |
152 | return NULL; | 152 | return NULL; |
153 | } | 153 | } |
154 | EXPORT_SYMBOL_GPL(smu_sat_get_sdb_partition); | ||
154 | 155 | ||
155 | /* refresh the cache */ | 156 | /* refresh the cache */ |
156 | static int wf_sat_read_cache(struct wf_sat *sat) | 157 | static int wf_sat_read_cache(struct wf_sat *sat) |
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 9a2c7605d49c..642a61b6d0a4 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -452,8 +452,7 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply) | |||
452 | } else if (func == MPI_FUNCTION_EVENT_ACK) { | 452 | } else if (func == MPI_FUNCTION_EVENT_ACK) { |
453 | dprintk((MYIOC_s_INFO_FMT "mpt_base_reply, EventAck reply received\n", | 453 | dprintk((MYIOC_s_INFO_FMT "mpt_base_reply, EventAck reply received\n", |
454 | ioc->name)); | 454 | ioc->name)); |
455 | } else if (func == MPI_FUNCTION_CONFIG || | 455 | } else if (func == MPI_FUNCTION_CONFIG) { |
456 | func == MPI_FUNCTION_TOOLBOX) { | ||
457 | CONFIGPARMS *pCfg; | 456 | CONFIGPARMS *pCfg; |
458 | unsigned long flags; | 457 | unsigned long flags; |
459 | 458 | ||
@@ -5327,115 +5326,6 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg) | |||
5327 | } | 5326 | } |
5328 | 5327 | ||
5329 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 5328 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
5330 | /** | ||
5331 | * mpt_toolbox - Generic function to issue toolbox message | ||
5332 | * @ioc - Pointer to an adapter structure | ||
5333 | * @cfg - Pointer to a toolbox structure. Struct contains | ||
5334 | * action, page address, direction, physical address | ||
5335 | * and pointer to a configuration page header | ||
5336 | * Page header is updated. | ||
5337 | * | ||
5338 | * Returns 0 for success | ||
5339 | * -EPERM if not allowed due to ISR context | ||
5340 | * -EAGAIN if no msg frames currently available | ||
5341 | * -EFAULT for non-successful reply or no reply (timeout) | ||
5342 | */ | ||
5343 | int | ||
5344 | mpt_toolbox(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg) | ||
5345 | { | ||
5346 | ToolboxIstwiReadWriteRequest_t *pReq; | ||
5347 | MPT_FRAME_HDR *mf; | ||
5348 | struct pci_dev *pdev; | ||
5349 | unsigned long flags; | ||
5350 | int rc; | ||
5351 | u32 flagsLength; | ||
5352 | int in_isr; | ||
5353 | |||
5354 | /* Prevent calling wait_event() (below), if caller happens | ||
5355 | * to be in ISR context, because that is fatal! | ||
5356 | */ | ||
5357 | in_isr = in_interrupt(); | ||
5358 | if (in_isr) { | ||
5359 | dcprintk((MYIOC_s_WARN_FMT "toobox request not allowed in ISR context!\n", | ||
5360 | ioc->name)); | ||
5361 | return -EPERM; | ||
5362 | } | ||
5363 | |||
5364 | /* Get and Populate a free Frame | ||
5365 | */ | ||
5366 | if ((mf = mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) { | ||
5367 | dcprintk((MYIOC_s_WARN_FMT "mpt_toolbox: no msg frames!\n", | ||
5368 | ioc->name)); | ||
5369 | return -EAGAIN; | ||
5370 | } | ||
5371 | pReq = (ToolboxIstwiReadWriteRequest_t *)mf; | ||
5372 | pReq->Tool = pCfg->action; | ||
5373 | pReq->Reserved = 0; | ||
5374 | pReq->ChainOffset = 0; | ||
5375 | pReq->Function = MPI_FUNCTION_TOOLBOX; | ||
5376 | pReq->Reserved1 = 0; | ||
5377 | pReq->Reserved2 = 0; | ||
5378 | pReq->MsgFlags = 0; | ||
5379 | pReq->Flags = pCfg->dir; | ||
5380 | pReq->BusNum = 0; | ||
5381 | pReq->Reserved3 = 0; | ||
5382 | pReq->NumAddressBytes = 0x01; | ||
5383 | pReq->Reserved4 = 0; | ||
5384 | pReq->DataLength = cpu_to_le16(0x04); | ||
5385 | pdev = ioc->pcidev; | ||
5386 | if (pdev->devfn & 1) | ||
5387 | pReq->DeviceAddr = 0xB2; | ||
5388 | else | ||
5389 | pReq->DeviceAddr = 0xB0; | ||
5390 | pReq->Addr1 = 0; | ||
5391 | pReq->Addr2 = 0; | ||
5392 | pReq->Addr3 = 0; | ||
5393 | pReq->Reserved5 = 0; | ||
5394 | |||
5395 | /* Add a SGE to the config request. | ||
5396 | */ | ||
5397 | |||
5398 | flagsLength = MPT_SGE_FLAGS_SSIMPLE_READ | 4; | ||
5399 | |||
5400 | mpt_add_sge((char *)&pReq->SGL, flagsLength, pCfg->physAddr); | ||
5401 | |||
5402 | dcprintk((MYIOC_s_INFO_FMT "Sending Toolbox request, Tool=%x\n", | ||
5403 | ioc->name, pReq->Tool)); | ||
5404 | |||
5405 | /* Append pCfg pointer to end of mf | ||
5406 | */ | ||
5407 | *((void **) (((u8 *) mf) + (ioc->req_sz - sizeof(void *)))) = (void *) pCfg; | ||
5408 | |||
5409 | /* Initalize the timer | ||
5410 | */ | ||
5411 | init_timer(&pCfg->timer); | ||
5412 | pCfg->timer.data = (unsigned long) ioc; | ||
5413 | pCfg->timer.function = mpt_timer_expired; | ||
5414 | pCfg->wait_done = 0; | ||
5415 | |||
5416 | /* Set the timer; ensure 10 second minimum */ | ||
5417 | if (pCfg->timeout < 10) | ||
5418 | pCfg->timer.expires = jiffies + HZ*10; | ||
5419 | else | ||
5420 | pCfg->timer.expires = jiffies + HZ*pCfg->timeout; | ||
5421 | |||
5422 | /* Add to end of Q, set timer and then issue this command */ | ||
5423 | spin_lock_irqsave(&ioc->FreeQlock, flags); | ||
5424 | list_add_tail(&pCfg->linkage, &ioc->configQ); | ||
5425 | spin_unlock_irqrestore(&ioc->FreeQlock, flags); | ||
5426 | |||
5427 | add_timer(&pCfg->timer); | ||
5428 | mpt_put_msg_frame(mpt_base_index, ioc, mf); | ||
5429 | wait_event(mpt_waitq, pCfg->wait_done); | ||
5430 | |||
5431 | /* mf has been freed - do not access */ | ||
5432 | |||
5433 | rc = pCfg->status; | ||
5434 | |||
5435 | return rc; | ||
5436 | } | ||
5437 | |||
5438 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | ||
5439 | /* | 5329 | /* |
5440 | * mpt_timer_expired - Call back for timer process. | 5330 | * mpt_timer_expired - Call back for timer process. |
5441 | * Used only internal config functionality. | 5331 | * Used only internal config functionality. |
@@ -6142,7 +6032,7 @@ ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply | |||
6142 | if (ioc->events && (ioc->eventTypes & ( 1 << event))) { | 6032 | if (ioc->events && (ioc->eventTypes & ( 1 << event))) { |
6143 | int idx; | 6033 | int idx; |
6144 | 6034 | ||
6145 | idx = ioc->eventContext % ioc->eventLogSize; | 6035 | idx = ioc->eventContext % MPTCTL_EVENT_LOG_SIZE; |
6146 | 6036 | ||
6147 | ioc->events[idx].event = event; | 6037 | ioc->events[idx].event = event; |
6148 | ioc->events[idx].eventContext = ioc->eventContext; | 6038 | ioc->events[idx].eventContext = ioc->eventContext; |
@@ -6540,7 +6430,6 @@ EXPORT_SYMBOL(mpt_lan_index); | |||
6540 | EXPORT_SYMBOL(mpt_stm_index); | 6430 | EXPORT_SYMBOL(mpt_stm_index); |
6541 | EXPORT_SYMBOL(mpt_HardResetHandler); | 6431 | EXPORT_SYMBOL(mpt_HardResetHandler); |
6542 | EXPORT_SYMBOL(mpt_config); | 6432 | EXPORT_SYMBOL(mpt_config); |
6543 | EXPORT_SYMBOL(mpt_toolbox); | ||
6544 | EXPORT_SYMBOL(mpt_findImVolumes); | 6433 | EXPORT_SYMBOL(mpt_findImVolumes); |
6545 | EXPORT_SYMBOL(mpt_read_ioc_pg_3); | 6434 | EXPORT_SYMBOL(mpt_read_ioc_pg_3); |
6546 | EXPORT_SYMBOL(mpt_alloc_fw_memory); | 6435 | EXPORT_SYMBOL(mpt_alloc_fw_memory); |
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index ea2649ecad1f..723d54300953 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h | |||
@@ -616,6 +616,7 @@ typedef struct _MPT_ADAPTER | |||
616 | * increments by 32 bytes | 616 | * increments by 32 bytes |
617 | */ | 617 | */ |
618 | int errata_flag_1064; | 618 | int errata_flag_1064; |
619 | int aen_event_read_flag; /* flag to indicate event log was read*/ | ||
619 | u8 FirstWhoInit; | 620 | u8 FirstWhoInit; |
620 | u8 upload_fw; /* If set, do a fw upload */ | 621 | u8 upload_fw; /* If set, do a fw upload */ |
621 | u8 reload_fw; /* Force a FW Reload on next reset */ | 622 | u8 reload_fw; /* Force a FW Reload on next reset */ |
@@ -1026,7 +1027,6 @@ extern u32 mpt_GetIocState(MPT_ADAPTER *ioc, int cooked); | |||
1026 | extern void mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buf, int *size, int len, int showlan); | 1027 | extern void mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buf, int *size, int len, int showlan); |
1027 | extern int mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag); | 1028 | extern int mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag); |
1028 | extern int mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg); | 1029 | extern int mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg); |
1029 | extern int mpt_toolbox(MPT_ADAPTER *ioc, CONFIGPARMS *cfg); | ||
1030 | extern void mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size); | 1030 | extern void mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size); |
1031 | extern void mpt_free_fw_memory(MPT_ADAPTER *ioc); | 1031 | extern void mpt_free_fw_memory(MPT_ADAPTER *ioc); |
1032 | extern int mpt_findImVolumes(MPT_ADAPTER *ioc); | 1032 | extern int mpt_findImVolumes(MPT_ADAPTER *ioc); |
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index bdf709987982..9b64e07400da 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
@@ -136,6 +136,12 @@ static void mptctl_free_tm_flags(MPT_ADAPTER *ioc); | |||
136 | */ | 136 | */ |
137 | static int mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase); | 137 | static int mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase); |
138 | 138 | ||
139 | /* | ||
140 | * Event Handler function | ||
141 | */ | ||
142 | static int mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply); | ||
143 | struct fasync_struct *async_queue=NULL; | ||
144 | |||
139 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 145 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
140 | /* | 146 | /* |
141 | * Scatter gather list (SGL) sizes and limits... | 147 | * Scatter gather list (SGL) sizes and limits... |
@@ -385,18 +391,18 @@ static int mptctl_bus_reset(MPT_IOCTL *ioctl) | |||
385 | } | 391 | } |
386 | 392 | ||
387 | /* Now wait for the command to complete */ | 393 | /* Now wait for the command to complete */ |
388 | ii = wait_event_interruptible_timeout(mptctl_wait, | 394 | ii = wait_event_timeout(mptctl_wait, |
389 | ioctl->wait_done == 1, | 395 | ioctl->wait_done == 1, |
390 | HZ*5 /* 5 second timeout */); | 396 | HZ*5 /* 5 second timeout */); |
391 | 397 | ||
392 | if(ii <=0 && (ioctl->wait_done != 1 )) { | 398 | if(ii <=0 && (ioctl->wait_done != 1 )) { |
399 | mpt_free_msg_frame(hd->ioc, mf); | ||
393 | ioctl->wait_done = 0; | 400 | ioctl->wait_done = 0; |
394 | retval = -1; /* return failure */ | 401 | retval = -1; /* return failure */ |
395 | } | 402 | } |
396 | 403 | ||
397 | mptctl_bus_reset_done: | 404 | mptctl_bus_reset_done: |
398 | 405 | ||
399 | mpt_free_msg_frame(hd->ioc, mf); | ||
400 | mptctl_free_tm_flags(ioctl->ioc); | 406 | mptctl_free_tm_flags(ioctl->ioc); |
401 | return retval; | 407 | return retval; |
402 | } | 408 | } |
@@ -472,6 +478,69 @@ mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) | |||
472 | } | 478 | } |
473 | 479 | ||
474 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 480 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
481 | /* ASYNC Event Notification Support */ | ||
482 | static int | ||
483 | mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply) | ||
484 | { | ||
485 | u8 event; | ||
486 | |||
487 | event = le32_to_cpu(pEvReply->Event) & 0xFF; | ||
488 | |||
489 | dctlprintk(("%s() called\n", __FUNCTION__)); | ||
490 | if(async_queue == NULL) | ||
491 | return 1; | ||
492 | |||
493 | /* Raise SIGIO for persistent events. | ||
494 | * TODO - this define is not in MPI spec yet, | ||
495 | * but they plan to set it to 0x21 | ||
496 | */ | ||
497 | if (event == 0x21 ) { | ||
498 | ioc->aen_event_read_flag=1; | ||
499 | dctlprintk(("Raised SIGIO to application\n")); | ||
500 | devtprintk(("Raised SIGIO to application\n")); | ||
501 | kill_fasync(&async_queue, SIGIO, POLL_IN); | ||
502 | return 1; | ||
503 | } | ||
504 | |||
505 | /* This flag is set after SIGIO was raised, and | ||
506 | * remains set until the application has read | ||
507 | * the event log via ioctl=MPTEVENTREPORT | ||
508 | */ | ||
509 | if(ioc->aen_event_read_flag) | ||
510 | return 1; | ||
511 | |||
512 | /* Signal only for the events that are | ||
513 | * requested for by the application | ||
514 | */ | ||
515 | if (ioc->events && (ioc->eventTypes & ( 1 << event))) { | ||
516 | ioc->aen_event_read_flag=1; | ||
517 | dctlprintk(("Raised SIGIO to application\n")); | ||
518 | devtprintk(("Raised SIGIO to application\n")); | ||
519 | kill_fasync(&async_queue, SIGIO, POLL_IN); | ||
520 | } | ||
521 | return 1; | ||
522 | } | ||
523 | |||
524 | static int | ||
525 | mptctl_fasync(int fd, struct file *filep, int mode) | ||
526 | { | ||
527 | MPT_ADAPTER *ioc; | ||
528 | |||
529 | list_for_each_entry(ioc, &ioc_list, list) | ||
530 | ioc->aen_event_read_flag=0; | ||
531 | |||
532 | dctlprintk(("%s() called\n", __FUNCTION__)); | ||
533 | return fasync_helper(fd, filep, mode, &async_queue); | ||
534 | } | ||
535 | |||
536 | static int | ||
537 | mptctl_release(struct inode *inode, struct file *filep) | ||
538 | { | ||
539 | dctlprintk(("%s() called\n", __FUNCTION__)); | ||
540 | return fasync_helper(-1, filep, 0, &async_queue); | ||
541 | } | ||
542 | |||
543 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | ||
475 | /* | 544 | /* |
476 | * MPT ioctl handler | 545 | * MPT ioctl handler |
477 | * cmd - specify the particular IOCTL command to be issued | 546 | * cmd - specify the particular IOCTL command to be issued |
@@ -674,22 +743,23 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen) | |||
674 | u16 iocstat; | 743 | u16 iocstat; |
675 | pFWDownloadReply_t ReplyMsg = NULL; | 744 | pFWDownloadReply_t ReplyMsg = NULL; |
676 | 745 | ||
677 | dctlprintk((KERN_INFO "mptctl_do_fwdl called. mptctl_id = %xh.\n", mptctl_id)); | 746 | dctlprintk(("mptctl_do_fwdl called. mptctl_id = %xh.\n", mptctl_id)); |
678 | 747 | ||
679 | dctlprintk((KERN_INFO "DbG: kfwdl.bufp = %p\n", ufwbuf)); | 748 | dctlprintk(("DbG: kfwdl.bufp = %p\n", ufwbuf)); |
680 | dctlprintk((KERN_INFO "DbG: kfwdl.fwlen = %d\n", (int)fwlen)); | 749 | dctlprintk(("DbG: kfwdl.fwlen = %d\n", (int)fwlen)); |
681 | dctlprintk((KERN_INFO "DbG: kfwdl.ioc = %04xh\n", ioc)); | 750 | dctlprintk(("DbG: kfwdl.ioc = %04xh\n", ioc)); |
682 | 751 | ||
683 | if ((ioc = mpt_verify_adapter(ioc, &iocp)) < 0) { | 752 | if (mpt_verify_adapter(ioc, &iocp) < 0) { |
684 | dctlprintk(("%s@%d::_ioctl_fwdl - ioc%d not found!\n", | 753 | dctlprintk(("ioctl_fwdl - ioc%d not found!\n", |
685 | __FILE__, __LINE__, ioc)); | 754 | ioc)); |
686 | return -ENODEV; /* (-6) No such device or address */ | 755 | return -ENODEV; /* (-6) No such device or address */ |
687 | } | 756 | } else { |
688 | 757 | ||
689 | /* Valid device. Get a message frame and construct the FW download message. | 758 | /* Valid device. Get a message frame and construct the FW download message. |
690 | */ | 759 | */ |
691 | if ((mf = mpt_get_msg_frame(mptctl_id, iocp)) == NULL) | 760 | if ((mf = mpt_get_msg_frame(mptctl_id, iocp)) == NULL) |
692 | return -EAGAIN; | 761 | return -EAGAIN; |
762 | } | ||
693 | dlmsg = (FWDownload_t*) mf; | 763 | dlmsg = (FWDownload_t*) mf; |
694 | ptsge = (FWDownloadTCSGE_t *) &dlmsg->SGL; | 764 | ptsge = (FWDownloadTCSGE_t *) &dlmsg->SGL; |
695 | sgOut = (char *) (ptsge + 1); | 765 | sgOut = (char *) (ptsge + 1); |
@@ -702,7 +772,11 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen) | |||
702 | dlmsg->ChainOffset = 0; | 772 | dlmsg->ChainOffset = 0; |
703 | dlmsg->Function = MPI_FUNCTION_FW_DOWNLOAD; | 773 | dlmsg->Function = MPI_FUNCTION_FW_DOWNLOAD; |
704 | dlmsg->Reserved1[0] = dlmsg->Reserved1[1] = dlmsg->Reserved1[2] = 0; | 774 | dlmsg->Reserved1[0] = dlmsg->Reserved1[1] = dlmsg->Reserved1[2] = 0; |
705 | dlmsg->MsgFlags = 0; | 775 | if (iocp->facts.MsgVersion >= MPI_VERSION_01_05) |
776 | dlmsg->MsgFlags = MPI_FW_DOWNLOAD_MSGFLGS_LAST_SEGMENT; | ||
777 | else | ||
778 | dlmsg->MsgFlags = 0; | ||
779 | |||
706 | 780 | ||
707 | /* Set up the Transaction SGE. | 781 | /* Set up the Transaction SGE. |
708 | */ | 782 | */ |
@@ -754,7 +828,7 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen) | |||
754 | goto fwdl_out; | 828 | goto fwdl_out; |
755 | } | 829 | } |
756 | 830 | ||
757 | dctlprintk((KERN_INFO "DbG: sgl buffer = %p, sgfrags = %d\n", sgl, numfrags)); | 831 | dctlprintk(("DbG: sgl buffer = %p, sgfrags = %d\n", sgl, numfrags)); |
758 | 832 | ||
759 | /* | 833 | /* |
760 | * Parse SG list, copying sgl itself, | 834 | * Parse SG list, copying sgl itself, |
@@ -803,11 +877,11 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen) | |||
803 | /* | 877 | /* |
804 | * Finally, perform firmware download. | 878 | * Finally, perform firmware download. |
805 | */ | 879 | */ |
806 | iocp->ioctl->wait_done = 0; | 880 | ReplyMsg = NULL; |
807 | mpt_put_msg_frame(mptctl_id, iocp, mf); | 881 | mpt_put_msg_frame(mptctl_id, iocp, mf); |
808 | 882 | ||
809 | /* Now wait for the command to complete */ | 883 | /* Now wait for the command to complete */ |
810 | ret = wait_event_interruptible_timeout(mptctl_wait, | 884 | ret = wait_event_timeout(mptctl_wait, |
811 | iocp->ioctl->wait_done == 1, | 885 | iocp->ioctl->wait_done == 1, |
812 | HZ*60); | 886 | HZ*60); |
813 | 887 | ||
@@ -1145,7 +1219,9 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size) | |||
1145 | /* Fill in the data and return the structure to the calling | 1219 | /* Fill in the data and return the structure to the calling |
1146 | * program | 1220 | * program |
1147 | */ | 1221 | */ |
1148 | if (ioc->bus_type == FC) | 1222 | if (ioc->bus_type == SAS) |
1223 | karg->adapterType = MPT_IOCTL_INTERFACE_SAS; | ||
1224 | else if (ioc->bus_type == FC) | ||
1149 | karg->adapterType = MPT_IOCTL_INTERFACE_FC; | 1225 | karg->adapterType = MPT_IOCTL_INTERFACE_FC; |
1150 | else | 1226 | else |
1151 | karg->adapterType = MPT_IOCTL_INTERFACE_SCSI; | 1227 | karg->adapterType = MPT_IOCTL_INTERFACE_SCSI; |
@@ -1170,12 +1246,11 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size) | |||
1170 | karg->pciInfo.u.bits.deviceNumber = PCI_SLOT( pdev->devfn ); | 1246 | karg->pciInfo.u.bits.deviceNumber = PCI_SLOT( pdev->devfn ); |
1171 | karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn ); | 1247 | karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn ); |
1172 | } else if (cim_rev == 2) { | 1248 | } else if (cim_rev == 2) { |
1173 | /* Get the PCI bus, device, function and segment ID numbers | 1249 | /* Get the PCI bus, device, function and segment ID numbers |
1174 | for the IOC */ | 1250 | for the IOC */ |
1175 | karg->pciInfo.u.bits.busNumber = pdev->bus->number; | 1251 | karg->pciInfo.u.bits.busNumber = pdev->bus->number; |
1176 | karg->pciInfo.u.bits.deviceNumber = PCI_SLOT( pdev->devfn ); | 1252 | karg->pciInfo.u.bits.deviceNumber = PCI_SLOT( pdev->devfn ); |
1177 | karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn ); | 1253 | karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn ); |
1178 | karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn ); | ||
1179 | karg->pciInfo.segmentID = pci_domain_nr(pdev->bus); | 1254 | karg->pciInfo.segmentID = pci_domain_nr(pdev->bus); |
1180 | } | 1255 | } |
1181 | 1256 | ||
@@ -1500,7 +1575,7 @@ mptctl_eventquery (unsigned long arg) | |||
1500 | return -ENODEV; | 1575 | return -ENODEV; |
1501 | } | 1576 | } |
1502 | 1577 | ||
1503 | karg.eventEntries = ioc->eventLogSize; | 1578 | karg.eventEntries = MPTCTL_EVENT_LOG_SIZE; |
1504 | karg.eventTypes = ioc->eventTypes; | 1579 | karg.eventTypes = ioc->eventTypes; |
1505 | 1580 | ||
1506 | /* Copy the data from kernel memory to user memory | 1581 | /* Copy the data from kernel memory to user memory |
@@ -1550,7 +1625,6 @@ mptctl_eventenable (unsigned long arg) | |||
1550 | memset(ioc->events, 0, sz); | 1625 | memset(ioc->events, 0, sz); |
1551 | ioc->alloc_total += sz; | 1626 | ioc->alloc_total += sz; |
1552 | 1627 | ||
1553 | ioc->eventLogSize = MPTCTL_EVENT_LOG_SIZE; | ||
1554 | ioc->eventContext = 0; | 1628 | ioc->eventContext = 0; |
1555 | } | 1629 | } |
1556 | 1630 | ||
@@ -1590,7 +1664,7 @@ mptctl_eventreport (unsigned long arg) | |||
1590 | maxEvents = numBytes/sizeof(MPT_IOCTL_EVENTS); | 1664 | maxEvents = numBytes/sizeof(MPT_IOCTL_EVENTS); |
1591 | 1665 | ||
1592 | 1666 | ||
1593 | max = ioc->eventLogSize < maxEvents ? ioc->eventLogSize : maxEvents; | 1667 | max = MPTCTL_EVENT_LOG_SIZE < maxEvents ? MPTCTL_EVENT_LOG_SIZE : maxEvents; |
1594 | 1668 | ||
1595 | /* If fewer than 1 event is requested, there must have | 1669 | /* If fewer than 1 event is requested, there must have |
1596 | * been some type of error. | 1670 | * been some type of error. |
@@ -1598,6 +1672,9 @@ mptctl_eventreport (unsigned long arg) | |||
1598 | if ((max < 1) || !ioc->events) | 1672 | if ((max < 1) || !ioc->events) |
1599 | return -ENODATA; | 1673 | return -ENODATA; |
1600 | 1674 | ||
1675 | /* reset this flag so SIGIO can restart */ | ||
1676 | ioc->aen_event_read_flag=0; | ||
1677 | |||
1601 | /* Copy the data from kernel memory to user memory | 1678 | /* Copy the data from kernel memory to user memory |
1602 | */ | 1679 | */ |
1603 | numBytes = max * sizeof(MPT_IOCTL_EVENTS); | 1680 | numBytes = max * sizeof(MPT_IOCTL_EVENTS); |
@@ -1817,6 +1894,8 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) | |||
1817 | case MPI_FUNCTION_SCSI_ENCLOSURE_PROCESSOR: | 1894 | case MPI_FUNCTION_SCSI_ENCLOSURE_PROCESSOR: |
1818 | case MPI_FUNCTION_FW_DOWNLOAD: | 1895 | case MPI_FUNCTION_FW_DOWNLOAD: |
1819 | case MPI_FUNCTION_FC_PRIMITIVE_SEND: | 1896 | case MPI_FUNCTION_FC_PRIMITIVE_SEND: |
1897 | case MPI_FUNCTION_TOOLBOX: | ||
1898 | case MPI_FUNCTION_SAS_IO_UNIT_CONTROL: | ||
1820 | break; | 1899 | break; |
1821 | 1900 | ||
1822 | case MPI_FUNCTION_SCSI_IO_REQUEST: | 1901 | case MPI_FUNCTION_SCSI_IO_REQUEST: |
@@ -1837,7 +1916,9 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) | |||
1837 | goto done_free_mem; | 1916 | goto done_free_mem; |
1838 | } | 1917 | } |
1839 | 1918 | ||
1840 | pScsiReq->MsgFlags = mpt_msg_flags(); | 1919 | pScsiReq->MsgFlags &= ~MPI_SCSIIO_MSGFLGS_SENSE_WIDTH; |
1920 | pScsiReq->MsgFlags |= mpt_msg_flags(); | ||
1921 | |||
1841 | 1922 | ||
1842 | /* verify that app has not requested | 1923 | /* verify that app has not requested |
1843 | * more sense data than driver | 1924 | * more sense data than driver |
@@ -1888,6 +1969,25 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) | |||
1888 | } | 1969 | } |
1889 | break; | 1970 | break; |
1890 | 1971 | ||
1972 | case MPI_FUNCTION_SMP_PASSTHROUGH: | ||
1973 | /* Check mf->PassthruFlags to determine if | ||
1974 | * transfer is ImmediateMode or not. | ||
1975 | * Immediate mode returns data in the ReplyFrame. | ||
1976 | * Else, we are sending request and response data | ||
1977 | * in two SGLs at the end of the mf. | ||
1978 | */ | ||
1979 | break; | ||
1980 | |||
1981 | case MPI_FUNCTION_SATA_PASSTHROUGH: | ||
1982 | if (!ioc->sh) { | ||
1983 | printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - " | ||
1984 | "SCSI driver is not loaded. \n", | ||
1985 | __FILE__, __LINE__); | ||
1986 | rc = -EFAULT; | ||
1987 | goto done_free_mem; | ||
1988 | } | ||
1989 | break; | ||
1990 | |||
1891 | case MPI_FUNCTION_RAID_ACTION: | 1991 | case MPI_FUNCTION_RAID_ACTION: |
1892 | /* Just add a SGE | 1992 | /* Just add a SGE |
1893 | */ | 1993 | */ |
@@ -1900,7 +2000,9 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) | |||
1900 | int scsidir = MPI_SCSIIO_CONTROL_READ; | 2000 | int scsidir = MPI_SCSIIO_CONTROL_READ; |
1901 | int dataSize; | 2001 | int dataSize; |
1902 | 2002 | ||
1903 | pScsiReq->MsgFlags = mpt_msg_flags(); | 2003 | pScsiReq->MsgFlags &= ~MPI_SCSIIO_MSGFLGS_SENSE_WIDTH; |
2004 | pScsiReq->MsgFlags |= mpt_msg_flags(); | ||
2005 | |||
1904 | 2006 | ||
1905 | /* verify that app has not requested | 2007 | /* verify that app has not requested |
1906 | * more sense data than driver | 2008 | * more sense data than driver |
@@ -2130,7 +2232,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) | |||
2130 | 2232 | ||
2131 | /* Now wait for the command to complete */ | 2233 | /* Now wait for the command to complete */ |
2132 | timeout = (karg.timeout > 0) ? karg.timeout : MPT_IOCTL_DEFAULT_TIMEOUT; | 2234 | timeout = (karg.timeout > 0) ? karg.timeout : MPT_IOCTL_DEFAULT_TIMEOUT; |
2133 | timeout = wait_event_interruptible_timeout(mptctl_wait, | 2235 | timeout = wait_event_timeout(mptctl_wait, |
2134 | ioc->ioctl->wait_done == 1, | 2236 | ioc->ioctl->wait_done == 1, |
2135 | HZ*timeout); | 2237 | HZ*timeout); |
2136 | 2238 | ||
@@ -2246,13 +2348,16 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) | |||
2246 | hp_host_info_t __user *uarg = (void __user *) arg; | 2348 | hp_host_info_t __user *uarg = (void __user *) arg; |
2247 | MPT_ADAPTER *ioc; | 2349 | MPT_ADAPTER *ioc; |
2248 | struct pci_dev *pdev; | 2350 | struct pci_dev *pdev; |
2249 | char *pbuf; | 2351 | char *pbuf=NULL; |
2250 | dma_addr_t buf_dma; | 2352 | dma_addr_t buf_dma; |
2251 | hp_host_info_t karg; | 2353 | hp_host_info_t karg; |
2252 | CONFIGPARMS cfg; | 2354 | CONFIGPARMS cfg; |
2253 | ConfigPageHeader_t hdr; | 2355 | ConfigPageHeader_t hdr; |
2254 | int iocnum; | 2356 | int iocnum; |
2255 | int rc, cim_rev; | 2357 | int rc, cim_rev; |
2358 | ToolboxIstwiReadWriteRequest_t *IstwiRWRequest; | ||
2359 | MPT_FRAME_HDR *mf = NULL; | ||
2360 | MPIHeader_t *mpi_hdr; | ||
2256 | 2361 | ||
2257 | dctlprintk((": mptctl_hp_hostinfo called.\n")); | 2362 | dctlprintk((": mptctl_hp_hostinfo called.\n")); |
2258 | /* Reset long to int. Should affect IA64 and SPARC only | 2363 | /* Reset long to int. Should affect IA64 and SPARC only |
@@ -2370,7 +2475,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) | |||
2370 | 2475 | ||
2371 | karg.base_io_addr = pci_resource_start(pdev, 0); | 2476 | karg.base_io_addr = pci_resource_start(pdev, 0); |
2372 | 2477 | ||
2373 | if (ioc->bus_type == FC) | 2478 | if ((ioc->bus_type == SAS) || (ioc->bus_type == FC)) |
2374 | karg.bus_phys_width = HP_BUS_WIDTH_UNK; | 2479 | karg.bus_phys_width = HP_BUS_WIDTH_UNK; |
2375 | else | 2480 | else |
2376 | karg.bus_phys_width = HP_BUS_WIDTH_16; | 2481 | karg.bus_phys_width = HP_BUS_WIDTH_16; |
@@ -2388,20 +2493,67 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) | |||
2388 | } | 2493 | } |
2389 | } | 2494 | } |
2390 | 2495 | ||
2391 | cfg.pageAddr = 0; | 2496 | /* |
2392 | cfg.action = MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL; | 2497 | * Gather ISTWI(Industry Standard Two Wire Interface) Data |
2393 | cfg.dir = MPI_TB_ISTWI_FLAGS_READ; | 2498 | */ |
2394 | cfg.timeout = 10; | 2499 | if ((mf = mpt_get_msg_frame(mptctl_id, ioc)) == NULL) { |
2500 | dfailprintk((MYIOC_s_WARN_FMT "%s, no msg frames!!\n", | ||
2501 | ioc->name,__FUNCTION__)); | ||
2502 | goto out; | ||
2503 | } | ||
2504 | |||
2505 | IstwiRWRequest = (ToolboxIstwiReadWriteRequest_t *)mf; | ||
2506 | mpi_hdr = (MPIHeader_t *) mf; | ||
2507 | memset(IstwiRWRequest,0,sizeof(ToolboxIstwiReadWriteRequest_t)); | ||
2508 | IstwiRWRequest->Function = MPI_FUNCTION_TOOLBOX; | ||
2509 | IstwiRWRequest->Tool = MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL; | ||
2510 | IstwiRWRequest->MsgContext = mpi_hdr->MsgContext; | ||
2511 | IstwiRWRequest->Flags = MPI_TB_ISTWI_FLAGS_READ; | ||
2512 | IstwiRWRequest->NumAddressBytes = 0x01; | ||
2513 | IstwiRWRequest->DataLength = cpu_to_le16(0x04); | ||
2514 | if (pdev->devfn & 1) | ||
2515 | IstwiRWRequest->DeviceAddr = 0xB2; | ||
2516 | else | ||
2517 | IstwiRWRequest->DeviceAddr = 0xB0; | ||
2518 | |||
2395 | pbuf = pci_alloc_consistent(ioc->pcidev, 4, &buf_dma); | 2519 | pbuf = pci_alloc_consistent(ioc->pcidev, 4, &buf_dma); |
2396 | if (pbuf) { | 2520 | if (!pbuf) |
2397 | cfg.physAddr = buf_dma; | 2521 | goto out; |
2398 | if ((mpt_toolbox(ioc, &cfg)) == 0) { | 2522 | mpt_add_sge((char *)&IstwiRWRequest->SGL, |
2399 | karg.rsvd = *(u32 *)pbuf; | 2523 | (MPT_SGE_FLAGS_SSIMPLE_READ|4), buf_dma); |
2400 | } | 2524 | |
2401 | pci_free_consistent(ioc->pcidev, 4, pbuf, buf_dma); | 2525 | ioc->ioctl->wait_done = 0; |
2402 | pbuf = NULL; | 2526 | mpt_put_msg_frame(mptctl_id, ioc, mf); |
2527 | |||
2528 | rc = wait_event_timeout(mptctl_wait, | ||
2529 | ioc->ioctl->wait_done == 1, | ||
2530 | HZ*MPT_IOCTL_DEFAULT_TIMEOUT /* 10 sec */); | ||
2531 | |||
2532 | if(rc <=0 && (ioc->ioctl->wait_done != 1 )) { | ||
2533 | /* | ||
2534 | * Now we need to reset the board | ||
2535 | */ | ||
2536 | mpt_free_msg_frame(ioc, mf); | ||
2537 | mptctl_timeout_expired(ioc->ioctl); | ||
2538 | goto out; | ||
2403 | } | 2539 | } |
2404 | 2540 | ||
2541 | /* | ||
2542 | *ISTWI Data Definition | ||
2543 | * pbuf[0] = FW_VERSION = 0x4 | ||
2544 | * pbuf[1] = Bay Count = 6 or 4 or 2, depending on | ||
2545 | * the config, you should be seeing one out of these three values | ||
2546 | * pbuf[2] = Drive Installed Map = bit pattern depend on which | ||
2547 | * bays have drives in them | ||
2548 | * pbuf[3] = Checksum (0x100 = (byte0 + byte2 + byte3) | ||
2549 | */ | ||
2550 | if (ioc->ioctl->status & MPT_IOCTL_STATUS_RF_VALID) | ||
2551 | karg.rsvd = *(u32 *)pbuf; | ||
2552 | |||
2553 | out: | ||
2554 | if (pbuf) | ||
2555 | pci_free_consistent(ioc->pcidev, 4, pbuf, buf_dma); | ||
2556 | |||
2405 | /* Copy the data from kernel memory to user memory | 2557 | /* Copy the data from kernel memory to user memory |
2406 | */ | 2558 | */ |
2407 | if (copy_to_user((char __user *)arg, &karg, sizeof(hp_host_info_t))) { | 2559 | if (copy_to_user((char __user *)arg, &karg, sizeof(hp_host_info_t))) { |
@@ -2459,7 +2611,7 @@ mptctl_hp_targetinfo(unsigned long arg) | |||
2459 | 2611 | ||
2460 | /* There is nothing to do for FCP parts. | 2612 | /* There is nothing to do for FCP parts. |
2461 | */ | 2613 | */ |
2462 | if (ioc->bus_type == FC) | 2614 | if ((ioc->bus_type == SAS) || (ioc->bus_type == FC)) |
2463 | return 0; | 2615 | return 0; |
2464 | 2616 | ||
2465 | if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL)) | 2617 | if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL)) |
@@ -2569,6 +2721,8 @@ mptctl_hp_targetinfo(unsigned long arg) | |||
2569 | static struct file_operations mptctl_fops = { | 2721 | static struct file_operations mptctl_fops = { |
2570 | .owner = THIS_MODULE, | 2722 | .owner = THIS_MODULE, |
2571 | .llseek = no_llseek, | 2723 | .llseek = no_llseek, |
2724 | .release = mptctl_release, | ||
2725 | .fasync = mptctl_fasync, | ||
2572 | .unlocked_ioctl = mptctl_ioctl, | 2726 | .unlocked_ioctl = mptctl_ioctl, |
2573 | #ifdef CONFIG_COMPAT | 2727 | #ifdef CONFIG_COMPAT |
2574 | .compat_ioctl = compat_mpctl_ioctl, | 2728 | .compat_ioctl = compat_mpctl_ioctl, |
@@ -2813,6 +2967,11 @@ static int __init mptctl_init(void) | |||
2813 | /* FIXME! */ | 2967 | /* FIXME! */ |
2814 | } | 2968 | } |
2815 | 2969 | ||
2970 | if (mpt_event_register(mptctl_id, mptctl_event_process) == 0) { | ||
2971 | devtprintk((KERN_INFO MYNAM | ||
2972 | ": Registered for IOC event notifications\n")); | ||
2973 | } | ||
2974 | |||
2816 | return 0; | 2975 | return 0; |
2817 | 2976 | ||
2818 | out_fail: | 2977 | out_fail: |
diff --git a/drivers/message/fusion/mptctl.h b/drivers/message/fusion/mptctl.h index 518996e03481..a2f8a97992e6 100644 --- a/drivers/message/fusion/mptctl.h +++ b/drivers/message/fusion/mptctl.h | |||
@@ -169,8 +169,10 @@ struct mpt_ioctl_pci_info2 { | |||
169 | * Read only. | 169 | * Read only. |
170 | * Data starts at offset 0xC | 170 | * Data starts at offset 0xC |
171 | */ | 171 | */ |
172 | #define MPT_IOCTL_INTERFACE_FC (0x01) | ||
173 | #define MPT_IOCTL_INTERFACE_SCSI (0x00) | 172 | #define MPT_IOCTL_INTERFACE_SCSI (0x00) |
173 | #define MPT_IOCTL_INTERFACE_FC (0x01) | ||
174 | #define MPT_IOCTL_INTERFACE_FC_IP (0x02) | ||
175 | #define MPT_IOCTL_INTERFACE_SAS (0x03) | ||
174 | #define MPT_IOCTL_VERSION_LENGTH (32) | 176 | #define MPT_IOCTL_VERSION_LENGTH (32) |
175 | 177 | ||
176 | struct mpt_ioctl_iocinfo { | 178 | struct mpt_ioctl_iocinfo { |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 05789e505464..4fee6befc93d 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -2489,7 +2489,7 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR | |||
2489 | int idx; | 2489 | int idx; |
2490 | MPT_ADAPTER *ioc = hd->ioc; | 2490 | MPT_ADAPTER *ioc = hd->ioc; |
2491 | 2491 | ||
2492 | idx = ioc->eventContext % ioc->eventLogSize; | 2492 | idx = ioc->eventContext % MPTCTL_EVENT_LOG_SIZE; |
2493 | ioc->events[idx].event = MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE; | 2493 | ioc->events[idx].event = MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE; |
2494 | ioc->events[idx].eventContext = ioc->eventContext; | 2494 | ioc->events[idx].eventContext = ioc->eventContext; |
2495 | 2495 | ||
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 37ee7f8dc82f..9fef29d978b5 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c | |||
@@ -97,6 +97,13 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) | |||
97 | if (data->flags & MMC_DATA_READ) { | 97 | if (data->flags & MMC_DATA_READ) { |
98 | datactrl |= MCI_DPSM_DIRECTION; | 98 | datactrl |= MCI_DPSM_DIRECTION; |
99 | irqmask = MCI_RXFIFOHALFFULLMASK; | 99 | irqmask = MCI_RXFIFOHALFFULLMASK; |
100 | |||
101 | /* | ||
102 | * If we have less than a FIFOSIZE of bytes to transfer, | ||
103 | * trigger a PIO interrupt as soon as any data is available. | ||
104 | */ | ||
105 | if (host->size < MCI_FIFOSIZE) | ||
106 | irqmask |= MCI_RXDATAAVLBLMASK; | ||
100 | } else { | 107 | } else { |
101 | /* | 108 | /* |
102 | * We don't actually need to include "FIFO empty" here | 109 | * We don't actually need to include "FIFO empty" here |
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index 69c04945591f..ded2c33f5b85 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c | |||
@@ -1019,8 +1019,8 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip, | |||
1019 | #define XIP_INVAL_CACHED_RANGE(map, from, size) \ | 1019 | #define XIP_INVAL_CACHED_RANGE(map, from, size) \ |
1020 | INVALIDATE_CACHED_RANGE(map, from, size) | 1020 | INVALIDATE_CACHED_RANGE(map, from, size) |
1021 | 1021 | ||
1022 | #define INVALIDATE_CACHE_UDELAY(map, chip, adr, len, usec) \ | 1022 | #define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec) \ |
1023 | UDELAY(map, chip, adr, usec) | 1023 | UDELAY(map, chip, cmd_adr, usec) |
1024 | 1024 | ||
1025 | /* | 1025 | /* |
1026 | * Extra notes: | 1026 | * Extra notes: |
@@ -1052,7 +1052,7 @@ do { \ | |||
1052 | spin_lock(chip->mutex); \ | 1052 | spin_lock(chip->mutex); \ |
1053 | } while (0) | 1053 | } while (0) |
1054 | 1054 | ||
1055 | #define INVALIDATE_CACHE_UDELAY(map, chip, adr, len, usec) \ | 1055 | #define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec) \ |
1056 | do { \ | 1056 | do { \ |
1057 | spin_unlock(chip->mutex); \ | 1057 | spin_unlock(chip->mutex); \ |
1058 | INVALIDATE_CACHED_RANGE(map, adr, len); \ | 1058 | INVALIDATE_CACHED_RANGE(map, adr, len); \ |
@@ -1284,7 +1284,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, | |||
1284 | map_write(map, datum, adr); | 1284 | map_write(map, datum, adr); |
1285 | chip->state = mode; | 1285 | chip->state = mode; |
1286 | 1286 | ||
1287 | INVALIDATE_CACHE_UDELAY(map, chip, | 1287 | INVALIDATE_CACHE_UDELAY(map, chip, adr, |
1288 | adr, map_bankwidth(map), | 1288 | adr, map_bankwidth(map), |
1289 | chip->word_write_time); | 1289 | chip->word_write_time); |
1290 | 1290 | ||
@@ -1572,8 +1572,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, | |||
1572 | map_write(map, CMD(0xd0), cmd_adr); | 1572 | map_write(map, CMD(0xd0), cmd_adr); |
1573 | chip->state = FL_WRITING; | 1573 | chip->state = FL_WRITING; |
1574 | 1574 | ||
1575 | INVALIDATE_CACHE_UDELAY(map, chip, | 1575 | INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, |
1576 | cmd_adr, len, | 1576 | adr, len, |
1577 | chip->buffer_write_time); | 1577 | chip->buffer_write_time); |
1578 | 1578 | ||
1579 | timeo = jiffies + (HZ/2); | 1579 | timeo = jiffies + (HZ/2); |
@@ -1744,7 +1744,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, | |||
1744 | chip->state = FL_ERASING; | 1744 | chip->state = FL_ERASING; |
1745 | chip->erase_suspended = 0; | 1745 | chip->erase_suspended = 0; |
1746 | 1746 | ||
1747 | INVALIDATE_CACHE_UDELAY(map, chip, | 1747 | INVALIDATE_CACHE_UDELAY(map, chip, adr, |
1748 | adr, len, | 1748 | adr, len, |
1749 | chip->erase_time*1000/2); | 1749 | chip->erase_time*1000/2); |
1750 | 1750 | ||
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 47c72a63dfe1..e45a8f959719 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2020,8 +2020,8 @@ config SIS190 | |||
2020 | will be called sis190. This is recommended. | 2020 | will be called sis190. This is recommended. |
2021 | 2021 | ||
2022 | config SKGE | 2022 | config SKGE |
2023 | tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)" | 2023 | tristate "New SysKonnect GigaEthernet support" |
2024 | depends on PCI && EXPERIMENTAL | 2024 | depends on PCI |
2025 | select CRC32 | 2025 | select CRC32 |
2026 | ---help--- | 2026 | ---help--- |
2027 | This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx | 2027 | This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx |
@@ -2082,7 +2082,6 @@ config SK98LIN | |||
2082 | - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter | 2082 | - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter |
2083 | - Allied Telesyn AT-2971T Gigabit Ethernet Adapter | 2083 | - Allied Telesyn AT-2971T Gigabit Ethernet Adapter |
2084 | - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45 | 2084 | - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45 |
2085 | - DGE-530T Gigabit Ethernet Adapter | ||
2086 | - EG1032 v2 Instant Gigabit Network Adapter | 2085 | - EG1032 v2 Instant Gigabit Network Adapter |
2087 | - EG1064 v2 Instant Gigabit Network Adapter | 2086 | - EG1064 v2 Instant Gigabit Network Adapter |
2088 | - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit) | 2087 | - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit) |
diff --git a/drivers/net/appletalk/cops.h b/drivers/net/appletalk/cops.h index c68ba9c2ef46..fd2750b269c8 100644 --- a/drivers/net/appletalk/cops.h +++ b/drivers/net/appletalk/cops.h | |||
@@ -51,7 +51,7 @@ | |||
51 | struct ltfirmware | 51 | struct ltfirmware |
52 | { | 52 | { |
53 | unsigned int length; | 53 | unsigned int length; |
54 | unsigned char * data; | 54 | const unsigned char *data; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | #define DAYNA 1 | 57 | #define DAYNA 1 |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index e0f51afec778..bcf9f17daf0d 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -1581,6 +1581,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) | |||
1581 | printk(KERN_INFO DRV_NAME | 1581 | printk(KERN_INFO DRV_NAME |
1582 | ": %s: %s not enslaved\n", | 1582 | ": %s: %s not enslaved\n", |
1583 | bond_dev->name, slave_dev->name); | 1583 | bond_dev->name, slave_dev->name); |
1584 | write_unlock_bh(&bond->lock); | ||
1584 | return -EINVAL; | 1585 | return -EINVAL; |
1585 | } | 1586 | } |
1586 | 1587 | ||
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index fa176ffb4ad5..8936058a3cce 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c | |||
@@ -108,6 +108,7 @@ static void irda_usb_close(struct irda_usb_cb *self); | |||
108 | static void speed_bulk_callback(struct urb *urb, struct pt_regs *regs); | 108 | static void speed_bulk_callback(struct urb *urb, struct pt_regs *regs); |
109 | static void write_bulk_callback(struct urb *urb, struct pt_regs *regs); | 109 | static void write_bulk_callback(struct urb *urb, struct pt_regs *regs); |
110 | static void irda_usb_receive(struct urb *urb, struct pt_regs *regs); | 110 | static void irda_usb_receive(struct urb *urb, struct pt_regs *regs); |
111 | static void irda_usb_rx_defer_expired(unsigned long data); | ||
111 | static int irda_usb_net_open(struct net_device *dev); | 112 | static int irda_usb_net_open(struct net_device *dev); |
112 | static int irda_usb_net_close(struct net_device *dev); | 113 | static int irda_usb_net_close(struct net_device *dev); |
113 | static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 114 | static int irda_usb_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
@@ -677,6 +678,12 @@ static void irda_usb_net_timeout(struct net_device *netdev) | |||
677 | * on the interrupt pipe and hang the Rx URB only when an interrupt is | 678 | * on the interrupt pipe and hang the Rx URB only when an interrupt is |
678 | * received. | 679 | * received. |
679 | * Jean II | 680 | * Jean II |
681 | * | ||
682 | * Note : don't read the above as what we are currently doing, but as | ||
683 | * something we could do with KC dongle. Also don't forget that the | ||
684 | * interrupt pipe is not part of the original standard, so this would | ||
685 | * need to be optional... | ||
686 | * Jean II | ||
680 | */ | 687 | */ |
681 | 688 | ||
682 | /*------------------------------------------------------------------*/ | 689 | /*------------------------------------------------------------------*/ |
@@ -704,10 +711,8 @@ static void irda_usb_submit(struct irda_usb_cb *self, struct sk_buff *skb, struc | |||
704 | /* Reinitialize URB */ | 711 | /* Reinitialize URB */ |
705 | usb_fill_bulk_urb(urb, self->usbdev, | 712 | usb_fill_bulk_urb(urb, self->usbdev, |
706 | usb_rcvbulkpipe(self->usbdev, self->bulk_in_ep), | 713 | usb_rcvbulkpipe(self->usbdev, self->bulk_in_ep), |
707 | skb->data, skb->truesize, | 714 | skb->data, IRDA_SKB_MAX_MTU, |
708 | irda_usb_receive, skb); | 715 | irda_usb_receive, skb); |
709 | /* Note : unlink *must* be synchronous because of the code in | ||
710 | * irda_usb_net_close() -> free the skb - Jean II */ | ||
711 | urb->status = 0; | 716 | urb->status = 0; |
712 | 717 | ||
713 | /* Can be called from irda_usb_receive (irq handler) -> GFP_ATOMIC */ | 718 | /* Can be called from irda_usb_receive (irq handler) -> GFP_ATOMIC */ |
@@ -734,6 +739,7 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs) | |||
734 | struct irda_skb_cb *cb; | 739 | struct irda_skb_cb *cb; |
735 | struct sk_buff *newskb; | 740 | struct sk_buff *newskb; |
736 | struct sk_buff *dataskb; | 741 | struct sk_buff *dataskb; |
742 | struct urb *next_urb; | ||
737 | int docopy; | 743 | int docopy; |
738 | 744 | ||
739 | IRDA_DEBUG(2, "%s(), len=%d\n", __FUNCTION__, urb->actual_length); | 745 | IRDA_DEBUG(2, "%s(), len=%d\n", __FUNCTION__, urb->actual_length); |
@@ -755,20 +761,37 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs) | |||
755 | if (urb->status != 0) { | 761 | if (urb->status != 0) { |
756 | switch (urb->status) { | 762 | switch (urb->status) { |
757 | case -EILSEQ: | 763 | case -EILSEQ: |
758 | self->stats.rx_errors++; | ||
759 | self->stats.rx_crc_errors++; | 764 | self->stats.rx_crc_errors++; |
760 | break; | 765 | /* Also precursor to a hot-unplug on UHCI. */ |
766 | /* Fallthrough... */ | ||
761 | case -ECONNRESET: /* -104 */ | 767 | case -ECONNRESET: /* -104 */ |
762 | IRDA_DEBUG(0, "%s(), Connection Reset (-104), transfer_flags 0x%04X \n", __FUNCTION__, urb->transfer_flags); | 768 | /* Random error, if I remember correctly */ |
763 | /* uhci_cleanup_unlink() is going to kill the Rx | 769 | /* uhci_cleanup_unlink() is going to kill the Rx |
764 | * URB just after we return. No problem, at this | 770 | * URB just after we return. No problem, at this |
765 | * point the URB will be idle ;-) - Jean II */ | 771 | * point the URB will be idle ;-) - Jean II */ |
766 | break; | 772 | case -ESHUTDOWN: /* -108 */ |
773 | /* That's usually a hot-unplug. Submit will fail... */ | ||
774 | case -ETIMEDOUT: /* -110 */ | ||
775 | /* Usually precursor to a hot-unplug on OHCI. */ | ||
767 | default: | 776 | default: |
768 | IRDA_DEBUG(0, "%s(), RX status %d,transfer_flags 0x%04X \n", __FUNCTION__, urb->status, urb->transfer_flags); | 777 | self->stats.rx_errors++; |
778 | IRDA_DEBUG(0, "%s(), RX status %d, transfer_flags 0x%04X \n", __FUNCTION__, urb->status, urb->transfer_flags); | ||
769 | break; | 779 | break; |
770 | } | 780 | } |
771 | goto done; | 781 | /* If we received an error, we don't want to resubmit the |
782 | * Rx URB straight away but to give the USB layer a little | ||
783 | * bit of breathing room. | ||
784 | * We are in the USB thread context, therefore there is a | ||
785 | * danger of recursion (new URB we submit fails, we come | ||
786 | * back here). | ||
787 | * With recent USB stack (2.6.15+), I'm seeing that on | ||
788 | * hot unplug of the dongle... | ||
789 | * Lowest effective timer is 10ms... | ||
790 | * Jean II */ | ||
791 | self->rx_defer_timer.function = &irda_usb_rx_defer_expired; | ||
792 | self->rx_defer_timer.data = (unsigned long) urb; | ||
793 | mod_timer(&self->rx_defer_timer, jiffies + (10 * HZ / 1000)); | ||
794 | return; | ||
772 | } | 795 | } |
773 | 796 | ||
774 | /* Check for empty frames */ | 797 | /* Check for empty frames */ |
@@ -845,13 +868,45 @@ done: | |||
845 | * idle slot.... | 868 | * idle slot.... |
846 | * Jean II */ | 869 | * Jean II */ |
847 | /* Note : with this scheme, we could submit the idle URB before | 870 | /* Note : with this scheme, we could submit the idle URB before |
848 | * processing the Rx URB. Another time... Jean II */ | 871 | * processing the Rx URB. I don't think it would buy us anything as |
872 | * we are running in the USB thread context. Jean II */ | ||
873 | next_urb = self->idle_rx_urb; | ||
849 | 874 | ||
850 | /* Submit the idle URB to replace the URB we've just received */ | ||
851 | irda_usb_submit(self, skb, self->idle_rx_urb); | ||
852 | /* Recycle Rx URB : Now, the idle URB is the present one */ | 875 | /* Recycle Rx URB : Now, the idle URB is the present one */ |
853 | urb->context = NULL; | 876 | urb->context = NULL; |
854 | self->idle_rx_urb = urb; | 877 | self->idle_rx_urb = urb; |
878 | |||
879 | /* Submit the idle URB to replace the URB we've just received. | ||
880 | * Do it last to avoid race conditions... Jean II */ | ||
881 | irda_usb_submit(self, skb, next_urb); | ||
882 | } | ||
883 | |||
884 | /*------------------------------------------------------------------*/ | ||
885 | /* | ||
886 | * In case of errors, we want the USB layer to have time to recover. | ||
887 | * Now, it is time to resubmit ouur Rx URB... | ||
888 | */ | ||
889 | static void irda_usb_rx_defer_expired(unsigned long data) | ||
890 | { | ||
891 | struct urb *urb = (struct urb *) data; | ||
892 | struct sk_buff *skb = (struct sk_buff *) urb->context; | ||
893 | struct irda_usb_cb *self; | ||
894 | struct irda_skb_cb *cb; | ||
895 | struct urb *next_urb; | ||
896 | |||
897 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | ||
898 | |||
899 | /* Find ourselves */ | ||
900 | cb = (struct irda_skb_cb *) skb->cb; | ||
901 | IRDA_ASSERT(cb != NULL, return;); | ||
902 | self = (struct irda_usb_cb *) cb->context; | ||
903 | IRDA_ASSERT(self != NULL, return;); | ||
904 | |||
905 | /* Same stuff as when Rx is done, see above... */ | ||
906 | next_urb = self->idle_rx_urb; | ||
907 | urb->context = NULL; | ||
908 | self->idle_rx_urb = urb; | ||
909 | irda_usb_submit(self, skb, next_urb); | ||
855 | } | 910 | } |
856 | 911 | ||
857 | /*------------------------------------------------------------------*/ | 912 | /*------------------------------------------------------------------*/ |
@@ -990,6 +1045,9 @@ static int irda_usb_net_close(struct net_device *netdev) | |||
990 | /* Stop network Tx queue */ | 1045 | /* Stop network Tx queue */ |
991 | netif_stop_queue(netdev); | 1046 | netif_stop_queue(netdev); |
992 | 1047 | ||
1048 | /* Kill defered Rx URB */ | ||
1049 | del_timer(&self->rx_defer_timer); | ||
1050 | |||
993 | /* Deallocate all the Rx path buffers (URBs and skb) */ | 1051 | /* Deallocate all the Rx path buffers (URBs and skb) */ |
994 | for (i = 0; i < IU_MAX_RX_URBS; i++) { | 1052 | for (i = 0; i < IU_MAX_RX_URBS; i++) { |
995 | struct urb *urb = self->rx_urb[i]; | 1053 | struct urb *urb = self->rx_urb[i]; |
@@ -1365,6 +1423,7 @@ static int irda_usb_probe(struct usb_interface *intf, | |||
1365 | self = net->priv; | 1423 | self = net->priv; |
1366 | self->netdev = net; | 1424 | self->netdev = net; |
1367 | spin_lock_init(&self->lock); | 1425 | spin_lock_init(&self->lock); |
1426 | init_timer(&self->rx_defer_timer); | ||
1368 | 1427 | ||
1369 | /* Create all of the needed urbs */ | 1428 | /* Create all of the needed urbs */ |
1370 | for (i = 0; i < IU_MAX_RX_URBS; i++) { | 1429 | for (i = 0; i < IU_MAX_RX_URBS; i++) { |
@@ -1498,6 +1557,9 @@ static void irda_usb_disconnect(struct usb_interface *intf) | |||
1498 | * This will stop/desactivate the Tx path. - Jean II */ | 1557 | * This will stop/desactivate the Tx path. - Jean II */ |
1499 | self->present = 0; | 1558 | self->present = 0; |
1500 | 1559 | ||
1560 | /* Kill defered Rx URB */ | ||
1561 | del_timer(&self->rx_defer_timer); | ||
1562 | |||
1501 | /* We need to have irq enabled to unlink the URBs. That's OK, | 1563 | /* We need to have irq enabled to unlink the URBs. That's OK, |
1502 | * at this point the Tx path is gone - Jean II */ | 1564 | * at this point the Tx path is gone - Jean II */ |
1503 | spin_unlock_irqrestore(&self->lock, flags); | 1565 | spin_unlock_irqrestore(&self->lock, flags); |
@@ -1507,11 +1569,11 @@ static void irda_usb_disconnect(struct usb_interface *intf) | |||
1507 | /* Accept no more transmissions */ | 1569 | /* Accept no more transmissions */ |
1508 | /*netif_device_detach(self->netdev);*/ | 1570 | /*netif_device_detach(self->netdev);*/ |
1509 | netif_stop_queue(self->netdev); | 1571 | netif_stop_queue(self->netdev); |
1510 | /* Stop all the receive URBs */ | 1572 | /* Stop all the receive URBs. Must be synchronous. */ |
1511 | for (i = 0; i < IU_MAX_RX_URBS; i++) | 1573 | for (i = 0; i < IU_MAX_RX_URBS; i++) |
1512 | usb_kill_urb(self->rx_urb[i]); | 1574 | usb_kill_urb(self->rx_urb[i]); |
1513 | /* Cancel Tx and speed URB. | 1575 | /* Cancel Tx and speed URB. |
1514 | * Toggle flags to make sure it's synchronous. */ | 1576 | * Make sure it's synchronous to avoid races. */ |
1515 | usb_kill_urb(self->tx_urb); | 1577 | usb_kill_urb(self->tx_urb); |
1516 | usb_kill_urb(self->speed_urb); | 1578 | usb_kill_urb(self->speed_urb); |
1517 | } | 1579 | } |
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h index bd8f66542322..4026af42dd47 100644 --- a/drivers/net/irda/irda-usb.h +++ b/drivers/net/irda/irda-usb.h | |||
@@ -136,8 +136,6 @@ struct irda_usb_cb { | |||
136 | __u16 bulk_out_mtu; /* Max Tx packet size in bytes */ | 136 | __u16 bulk_out_mtu; /* Max Tx packet size in bytes */ |
137 | __u8 bulk_int_ep; /* Interrupt Endpoint assignments */ | 137 | __u8 bulk_int_ep; /* Interrupt Endpoint assignments */ |
138 | 138 | ||
139 | wait_queue_head_t wait_q; /* for timeouts */ | ||
140 | |||
141 | struct urb *rx_urb[IU_MAX_RX_URBS]; /* URBs used to receive data frames */ | 139 | struct urb *rx_urb[IU_MAX_RX_URBS]; /* URBs used to receive data frames */ |
142 | struct urb *idle_rx_urb; /* Pointer to idle URB in Rx path */ | 140 | struct urb *idle_rx_urb; /* Pointer to idle URB in Rx path */ |
143 | struct urb *tx_urb; /* URB used to send data frames */ | 141 | struct urb *tx_urb; /* URB used to send data frames */ |
@@ -147,17 +145,18 @@ struct irda_usb_cb { | |||
147 | struct net_device_stats stats; | 145 | struct net_device_stats stats; |
148 | struct irlap_cb *irlap; /* The link layer we are binded to */ | 146 | struct irlap_cb *irlap; /* The link layer we are binded to */ |
149 | struct qos_info qos; | 147 | struct qos_info qos; |
150 | hashbin_t *tx_list; /* Queued transmit skb's */ | ||
151 | char *speed_buff; /* Buffer for speed changes */ | 148 | char *speed_buff; /* Buffer for speed changes */ |
152 | 149 | ||
153 | struct timeval stamp; | 150 | struct timeval stamp; |
154 | struct timeval now; | 151 | struct timeval now; |
155 | 152 | ||
156 | spinlock_t lock; /* For serializing operations */ | 153 | spinlock_t lock; /* For serializing Tx operations */ |
157 | 154 | ||
158 | __u16 xbofs; /* Current xbofs setting */ | 155 | __u16 xbofs; /* Current xbofs setting */ |
159 | __s16 new_xbofs; /* xbofs we need to set */ | 156 | __s16 new_xbofs; /* xbofs we need to set */ |
160 | __u32 speed; /* Current speed */ | 157 | __u32 speed; /* Current speed */ |
161 | __s32 new_speed; /* speed we need to set */ | 158 | __s32 new_speed; /* speed we need to set */ |
159 | |||
160 | struct timer_list rx_defer_timer; /* Wait for Rx error to clear */ | ||
162 | }; | 161 | }; |
163 | 162 | ||
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index b420182eec4b..ed4bc91638d2 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -1791,6 +1791,8 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, | |||
1791 | goto out; | 1791 | goto out; |
1792 | } | 1792 | } |
1793 | 1793 | ||
1794 | pci_set_drvdata(pdev, dev); | ||
1795 | |||
1794 | tp = netdev_priv(dev); | 1796 | tp = netdev_priv(dev); |
1795 | ioaddr = tp->mmio_addr; | 1797 | ioaddr = tp->mmio_addr; |
1796 | 1798 | ||
@@ -1827,8 +1829,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, | |||
1827 | if (rc < 0) | 1829 | if (rc < 0) |
1828 | goto err_remove_mii; | 1830 | goto err_remove_mii; |
1829 | 1831 | ||
1830 | pci_set_drvdata(pdev, dev); | ||
1831 | |||
1832 | net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), " | 1832 | net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), " |
1833 | "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", | 1833 | "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", |
1834 | pci_name(pdev), sis_chip_info[ent->driver_data].name, | 1834 | pci_name(pdev), sis_chip_info[ent->driver_data].name, |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index bf55a4cfb3d2..67fb19b8fde9 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -1697,6 +1697,7 @@ static void yukon_mac_init(struct skge_hw *hw, int port) | |||
1697 | skge_write32(hw, SK_REG(port, GPHY_CTRL), reg | GPC_RST_SET); | 1697 | skge_write32(hw, SK_REG(port, GPHY_CTRL), reg | GPC_RST_SET); |
1698 | skge_write32(hw, SK_REG(port, GPHY_CTRL), reg | GPC_RST_CLR); | 1698 | skge_write32(hw, SK_REG(port, GPHY_CTRL), reg | GPC_RST_CLR); |
1699 | skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR); | 1699 | skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR); |
1700 | |||
1700 | if (skge->autoneg == AUTONEG_DISABLE) { | 1701 | if (skge->autoneg == AUTONEG_DISABLE) { |
1701 | reg = GM_GPCR_AU_ALL_DIS; | 1702 | reg = GM_GPCR_AU_ALL_DIS; |
1702 | gma_write16(hw, port, GM_GP_CTRL, | 1703 | gma_write16(hw, port, GM_GP_CTRL, |
@@ -1704,16 +1705,23 @@ static void yukon_mac_init(struct skge_hw *hw, int port) | |||
1704 | 1705 | ||
1705 | switch (skge->speed) { | 1706 | switch (skge->speed) { |
1706 | case SPEED_1000: | 1707 | case SPEED_1000: |
1708 | reg &= ~GM_GPCR_SPEED_100; | ||
1707 | reg |= GM_GPCR_SPEED_1000; | 1709 | reg |= GM_GPCR_SPEED_1000; |
1708 | /* fallthru */ | 1710 | break; |
1709 | case SPEED_100: | 1711 | case SPEED_100: |
1712 | reg &= ~GM_GPCR_SPEED_1000; | ||
1710 | reg |= GM_GPCR_SPEED_100; | 1713 | reg |= GM_GPCR_SPEED_100; |
1714 | break; | ||
1715 | case SPEED_10: | ||
1716 | reg &= ~(GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100); | ||
1717 | break; | ||
1711 | } | 1718 | } |
1712 | 1719 | ||
1713 | if (skge->duplex == DUPLEX_FULL) | 1720 | if (skge->duplex == DUPLEX_FULL) |
1714 | reg |= GM_GPCR_DUP_FULL; | 1721 | reg |= GM_GPCR_DUP_FULL; |
1715 | } else | 1722 | } else |
1716 | reg = GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100 | GM_GPCR_DUP_FULL; | 1723 | reg = GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100 | GM_GPCR_DUP_FULL; |
1724 | |||
1717 | switch (skge->flow_control) { | 1725 | switch (skge->flow_control) { |
1718 | case FLOW_MODE_NONE: | 1726 | case FLOW_MODE_NONE: |
1719 | skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF); | 1727 | skge_write32(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF); |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index cae2edf23004..bfeba5b9cd7a 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -520,10 +520,16 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) | |||
520 | 520 | ||
521 | switch (sky2->speed) { | 521 | switch (sky2->speed) { |
522 | case SPEED_1000: | 522 | case SPEED_1000: |
523 | reg &= ~GM_GPCR_SPEED_100; | ||
523 | reg |= GM_GPCR_SPEED_1000; | 524 | reg |= GM_GPCR_SPEED_1000; |
524 | /* fallthru */ | 525 | break; |
525 | case SPEED_100: | 526 | case SPEED_100: |
527 | reg &= ~GM_GPCR_SPEED_1000; | ||
526 | reg |= GM_GPCR_SPEED_100; | 528 | reg |= GM_GPCR_SPEED_100; |
529 | break; | ||
530 | case SPEED_10: | ||
531 | reg &= ~(GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100); | ||
532 | break; | ||
527 | } | 533 | } |
528 | 534 | ||
529 | if (sky2->duplex == DUPLEX_FULL) | 535 | if (sky2->duplex == DUPLEX_FULL) |
@@ -1446,6 +1452,29 @@ static void sky2_link_up(struct sky2_port *sky2) | |||
1446 | sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), GMAC_DEF_MSK); | 1452 | sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), GMAC_DEF_MSK); |
1447 | 1453 | ||
1448 | reg = gma_read16(hw, port, GM_GP_CTRL); | 1454 | reg = gma_read16(hw, port, GM_GP_CTRL); |
1455 | if (sky2->autoneg == AUTONEG_DISABLE) { | ||
1456 | reg |= GM_GPCR_AU_ALL_DIS; | ||
1457 | |||
1458 | /* Is write/read necessary? Copied from sky2_mac_init */ | ||
1459 | gma_write16(hw, port, GM_GP_CTRL, reg); | ||
1460 | gma_read16(hw, port, GM_GP_CTRL); | ||
1461 | |||
1462 | switch (sky2->speed) { | ||
1463 | case SPEED_1000: | ||
1464 | reg &= ~GM_GPCR_SPEED_100; | ||
1465 | reg |= GM_GPCR_SPEED_1000; | ||
1466 | break; | ||
1467 | case SPEED_100: | ||
1468 | reg &= ~GM_GPCR_SPEED_1000; | ||
1469 | reg |= GM_GPCR_SPEED_100; | ||
1470 | break; | ||
1471 | case SPEED_10: | ||
1472 | reg &= ~(GM_GPCR_SPEED_1000 | GM_GPCR_SPEED_100); | ||
1473 | break; | ||
1474 | } | ||
1475 | } else | ||
1476 | reg &= ~GM_GPCR_AU_ALL_DIS; | ||
1477 | |||
1449 | if (sky2->duplex == DUPLEX_FULL || sky2->autoneg == AUTONEG_ENABLE) | 1478 | if (sky2->duplex == DUPLEX_FULL || sky2->autoneg == AUTONEG_ENABLE) |
1450 | reg |= GM_GPCR_DUP_FULL; | 1479 | reg |= GM_GPCR_DUP_FULL; |
1451 | 1480 | ||
diff --git a/drivers/net/tokenring/smctr.h b/drivers/net/tokenring/smctr.h index b306c7e4c793..88dfa2e01d6e 100644 --- a/drivers/net/tokenring/smctr.h +++ b/drivers/net/tokenring/smctr.h | |||
@@ -1042,7 +1042,7 @@ typedef struct net_local { | |||
1042 | __u16 functional_address[2]; | 1042 | __u16 functional_address[2]; |
1043 | __u16 bitwise_group_address[2]; | 1043 | __u16 bitwise_group_address[2]; |
1044 | 1044 | ||
1045 | __u8 *ptr_ucode; | 1045 | const __u8 *ptr_ucode; |
1046 | 1046 | ||
1047 | __u8 cleanup; | 1047 | __u8 cleanup; |
1048 | 1048 | ||
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 233a4f608084..ef85d76575a2 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
@@ -148,7 +148,7 @@ config IPW2100 | |||
148 | In order to use this driver, you will need a firmware image for it. | 148 | In order to use this driver, you will need a firmware image for it. |
149 | You can obtain the firmware from | 149 | You can obtain the firmware from |
150 | <http://ipw2100.sf.net/>. Once you have the firmware image, you | 150 | <http://ipw2100.sf.net/>. Once you have the firmware image, you |
151 | will need to place it in /etc/firmware. | 151 | will need to place it in /lib/firmware. |
152 | 152 | ||
153 | You will also very likely need the Wireless Tools in order to | 153 | You will also very likely need the Wireless Tools in order to |
154 | configure your card: | 154 | configure your card: |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 98a76f10a0f7..dfc24016ba81 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -1872,7 +1872,7 @@ static int atmel_set_encodeext(struct net_device *dev, | |||
1872 | struct atmel_private *priv = netdev_priv(dev); | 1872 | struct atmel_private *priv = netdev_priv(dev); |
1873 | struct iw_point *encoding = &wrqu->encoding; | 1873 | struct iw_point *encoding = &wrqu->encoding; |
1874 | struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; | 1874 | struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; |
1875 | int idx, key_len; | 1875 | int idx, key_len, alg = ext->alg, set_key = 1; |
1876 | 1876 | ||
1877 | /* Determine and validate the key index */ | 1877 | /* Determine and validate the key index */ |
1878 | idx = encoding->flags & IW_ENCODE_INDEX; | 1878 | idx = encoding->flags & IW_ENCODE_INDEX; |
@@ -1883,39 +1883,42 @@ static int atmel_set_encodeext(struct net_device *dev, | |||
1883 | } else | 1883 | } else |
1884 | idx = priv->default_key; | 1884 | idx = priv->default_key; |
1885 | 1885 | ||
1886 | if ((encoding->flags & IW_ENCODE_DISABLED) || | 1886 | if (encoding->flags & IW_ENCODE_DISABLED) |
1887 | ext->alg == IW_ENCODE_ALG_NONE) { | 1887 | alg = IW_ENCODE_ALG_NONE; |
1888 | priv->wep_is_on = 0; | ||
1889 | priv->encryption_level = 0; | ||
1890 | priv->pairwise_cipher_suite = CIPHER_SUITE_NONE; | ||
1891 | } | ||
1892 | 1888 | ||
1893 | if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) | 1889 | if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { |
1894 | priv->default_key = idx; | 1890 | priv->default_key = idx; |
1891 | set_key = ext->key_len > 0 ? 1 : 0; | ||
1892 | } | ||
1895 | 1893 | ||
1896 | /* Set the requested key */ | 1894 | if (set_key) { |
1897 | switch (ext->alg) { | 1895 | /* Set the requested key first */ |
1898 | case IW_ENCODE_ALG_NONE: | 1896 | switch (alg) { |
1899 | break; | 1897 | case IW_ENCODE_ALG_NONE: |
1900 | case IW_ENCODE_ALG_WEP: | 1898 | priv->wep_is_on = 0; |
1901 | if (ext->key_len > 5) { | 1899 | priv->encryption_level = 0; |
1902 | priv->wep_key_len[idx] = 13; | 1900 | priv->pairwise_cipher_suite = CIPHER_SUITE_NONE; |
1903 | priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_128; | 1901 | break; |
1904 | priv->encryption_level = 2; | 1902 | case IW_ENCODE_ALG_WEP: |
1905 | } else if (ext->key_len > 0) { | 1903 | if (ext->key_len > 5) { |
1906 | priv->wep_key_len[idx] = 5; | 1904 | priv->wep_key_len[idx] = 13; |
1907 | priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_64; | 1905 | priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_128; |
1908 | priv->encryption_level = 1; | 1906 | priv->encryption_level = 2; |
1909 | } else { | 1907 | } else if (ext->key_len > 0) { |
1908 | priv->wep_key_len[idx] = 5; | ||
1909 | priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_64; | ||
1910 | priv->encryption_level = 1; | ||
1911 | } else { | ||
1912 | return -EINVAL; | ||
1913 | } | ||
1914 | priv->wep_is_on = 1; | ||
1915 | memset(priv->wep_keys[idx], 0, 13); | ||
1916 | key_len = min ((int)ext->key_len, priv->wep_key_len[idx]); | ||
1917 | memcpy(priv->wep_keys[idx], ext->key, key_len); | ||
1918 | break; | ||
1919 | default: | ||
1910 | return -EINVAL; | 1920 | return -EINVAL; |
1911 | } | 1921 | } |
1912 | priv->wep_is_on = 1; | ||
1913 | memset(priv->wep_keys[idx], 0, 13); | ||
1914 | key_len = min ((int)ext->key_len, priv->wep_key_len[idx]); | ||
1915 | memcpy(priv->wep_keys[idx], ext->key, key_len); | ||
1916 | break; | ||
1917 | default: | ||
1918 | return -EINVAL; | ||
1919 | } | 1922 | } |
1920 | 1923 | ||
1921 | return -EINPROGRESS; | 1924 | return -EINPROGRESS; |
@@ -3061,17 +3064,26 @@ static void authenticate(struct atmel_private *priv, u16 frame_len) | |||
3061 | } | 3064 | } |
3062 | 3065 | ||
3063 | if (status == C80211_MGMT_SC_Success && priv->wep_is_on) { | 3066 | if (status == C80211_MGMT_SC_Success && priv->wep_is_on) { |
3067 | int should_associate = 0; | ||
3064 | /* WEP */ | 3068 | /* WEP */ |
3065 | if (trans_seq_no != priv->ExpectedAuthentTransactionSeqNum) | 3069 | if (trans_seq_no != priv->ExpectedAuthentTransactionSeqNum) |
3066 | return; | 3070 | return; |
3067 | 3071 | ||
3068 | if (trans_seq_no == 0x0002 && | 3072 | if (system == C80211_MGMT_AAN_OPENSYSTEM) { |
3069 | auth->el_id == C80211_MGMT_ElementID_ChallengeText) { | 3073 | if (trans_seq_no == 0x0002) { |
3070 | send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len); | 3074 | should_associate = 1; |
3071 | return; | 3075 | } |
3076 | } else if (system == C80211_MGMT_AAN_SHAREDKEY) { | ||
3077 | if (trans_seq_no == 0x0002 && | ||
3078 | auth->el_id == C80211_MGMT_ElementID_ChallengeText) { | ||
3079 | send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len); | ||
3080 | return; | ||
3081 | } else if (trans_seq_no == 0x0004) { | ||
3082 | should_associate = 1; | ||
3083 | } | ||
3072 | } | 3084 | } |
3073 | 3085 | ||
3074 | if (trans_seq_no == 0x0004) { | 3086 | if (should_associate) { |
3075 | if(priv->station_was_associated) { | 3087 | if(priv->station_was_associated) { |
3076 | atmel_enter_state(priv, STATION_STATE_REASSOCIATING); | 3088 | atmel_enter_state(priv, STATION_STATE_REASSOCIATING); |
3077 | send_association_request(priv, 1); | 3089 | send_association_request(priv, 1); |
@@ -3084,11 +3096,13 @@ static void authenticate(struct atmel_private *priv, u16 frame_len) | |||
3084 | } | 3096 | } |
3085 | } | 3097 | } |
3086 | 3098 | ||
3087 | if (status == C80211_MGMT_SC_AuthAlgNotSupported) { | 3099 | if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) { |
3088 | /* Do opensystem first, then try sharedkey */ | 3100 | /* Do opensystem first, then try sharedkey */ |
3089 | if (system == C80211_MGMT_AAN_OPENSYSTEM) { | 3101 | if (system == WLAN_AUTH_OPEN) { |
3090 | priv->CurrentAuthentTransactionSeqNum = 0x001; | 3102 | priv->CurrentAuthentTransactionSeqNum = 0x001; |
3091 | send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0); | 3103 | priv->exclude_unencrypted = 1; |
3104 | send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0); | ||
3105 | return; | ||
3092 | } else if (priv->connect_to_any_BSS) { | 3106 | } else if (priv->connect_to_any_BSS) { |
3093 | int bss_index; | 3107 | int bss_index; |
3094 | 3108 | ||
@@ -3439,10 +3453,13 @@ static void atmel_management_timer(u_long a) | |||
3439 | priv->AuthenticationRequestRetryCnt = 0; | 3453 | priv->AuthenticationRequestRetryCnt = 0; |
3440 | restart_search(priv); | 3454 | restart_search(priv); |
3441 | } else { | 3455 | } else { |
3456 | int auth = C80211_MGMT_AAN_OPENSYSTEM; | ||
3442 | priv->AuthenticationRequestRetryCnt++; | 3457 | priv->AuthenticationRequestRetryCnt++; |
3443 | priv->CurrentAuthentTransactionSeqNum = 0x0001; | 3458 | priv->CurrentAuthentTransactionSeqNum = 0x0001; |
3444 | mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES); | 3459 | mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES); |
3445 | send_authentication_request(priv, C80211_MGMT_AAN_OPENSYSTEM, NULL, 0); | 3460 | if (priv->wep_is_on && priv->exclude_unencrypted) |
3461 | auth = C80211_MGMT_AAN_SHAREDKEY; | ||
3462 | send_authentication_request(priv, auth, NULL, 0); | ||
3446 | } | 3463 | } |
3447 | break; | 3464 | break; |
3448 | 3465 | ||
@@ -3541,12 +3558,15 @@ static void atmel_command_irq(struct atmel_private *priv) | |||
3541 | priv->station_was_associated = priv->station_is_associated; | 3558 | priv->station_was_associated = priv->station_is_associated; |
3542 | atmel_enter_state(priv, STATION_STATE_READY); | 3559 | atmel_enter_state(priv, STATION_STATE_READY); |
3543 | } else { | 3560 | } else { |
3561 | int auth = C80211_MGMT_AAN_OPENSYSTEM; | ||
3544 | priv->AuthenticationRequestRetryCnt = 0; | 3562 | priv->AuthenticationRequestRetryCnt = 0; |
3545 | atmel_enter_state(priv, STATION_STATE_AUTHENTICATING); | 3563 | atmel_enter_state(priv, STATION_STATE_AUTHENTICATING); |
3546 | 3564 | ||
3547 | mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES); | 3565 | mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES); |
3548 | priv->CurrentAuthentTransactionSeqNum = 0x0001; | 3566 | priv->CurrentAuthentTransactionSeqNum = 0x0001; |
3549 | send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0); | 3567 | if (priv->wep_is_on && priv->exclude_unencrypted) |
3568 | auth = C80211_MGMT_AAN_SHAREDKEY; | ||
3569 | send_authentication_request(priv, auth, NULL, 0); | ||
3550 | } | 3570 | } |
3551 | return; | 3571 | return; |
3552 | } | 3572 | } |
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 14beab4bc91c..287676ad80df 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -4616,9 +4616,9 @@ static void ipw_rx_notification(struct ipw_priv *priv, | |||
4616 | } | 4616 | } |
4617 | 4617 | ||
4618 | default: | 4618 | default: |
4619 | IPW_ERROR("Unknown notification: " | 4619 | IPW_DEBUG_NOTIF("Unknown notification: " |
4620 | "subtype=%d,flags=0x%2x,size=%d\n", | 4620 | "subtype=%d,flags=0x%2x,size=%d\n", |
4621 | notif->subtype, notif->flags, notif->size); | 4621 | notif->subtype, notif->flags, notif->size); |
4622 | } | 4622 | } |
4623 | } | 4623 | } |
4624 | 4624 | ||
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c index 3c128b692bce..ec6f2a48895b 100644 --- a/drivers/net/wireless/orinoco_cs.c +++ b/drivers/net/wireless/orinoco_cs.c | |||
@@ -590,6 +590,7 @@ static struct pcmcia_device_id orinoco_cs_ids[] = { | |||
590 | PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9), | 590 | PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9), |
591 | PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26), | 591 | PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26), |
592 | PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b), | 592 | PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b), |
593 | PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2532W-B EliteConnect Wireless Adapter", 0xc4f8b18b, 0x196bd757), | ||
593 | PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2632W", 0xc4f8b18b, 0x474a1f2a), | 594 | PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2632W", 0xc4f8b18b, 0x474a1f2a), |
594 | PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e), | 595 | PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e), |
595 | PCMCIA_DEVICE_PROD_ID123("The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39), | 596 | PCMCIA_DEVICE_PROD_ID123("The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39), |
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index cf373625fc70..98122f3a4bc2 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -950,16 +950,8 @@ wv_82593_cmd(struct net_device * dev, | |||
950 | static inline int | 950 | static inline int |
951 | wv_diag(struct net_device * dev) | 951 | wv_diag(struct net_device * dev) |
952 | { | 952 | { |
953 | int ret = FALSE; | 953 | return(wv_82593_cmd(dev, "wv_diag(): diagnose", |
954 | 954 | OP0_DIAGNOSE, SR0_DIAGNOSE_PASSED)); | |
955 | if(wv_82593_cmd(dev, "wv_diag(): diagnose", | ||
956 | OP0_DIAGNOSE, SR0_DIAGNOSE_PASSED)) | ||
957 | ret = TRUE; | ||
958 | |||
959 | #ifdef DEBUG_CONFIG_ERRORS | ||
960 | printk(KERN_INFO "wavelan_cs: i82593 Self Test failed!\n"); | ||
961 | #endif | ||
962 | return(ret); | ||
963 | } /* wv_diag */ | 955 | } /* wv_diag */ |
964 | 956 | ||
965 | /*------------------------------------------------------------------*/ | 957 | /*------------------------------------------------------------------*/ |
@@ -3604,8 +3596,8 @@ wv_82593_config(struct net_device * dev) | |||
3604 | cfblk.lin_prio = 0; /* conform to 802.3 backoff algoritm */ | 3596 | cfblk.lin_prio = 0; /* conform to 802.3 backoff algoritm */ |
3605 | cfblk.exp_prio = 5; /* conform to 802.3 backoff algoritm */ | 3597 | cfblk.exp_prio = 5; /* conform to 802.3 backoff algoritm */ |
3606 | cfblk.bof_met = 1; /* conform to 802.3 backoff algoritm */ | 3598 | cfblk.bof_met = 1; /* conform to 802.3 backoff algoritm */ |
3607 | cfblk.ifrm_spc = 0x20; /* 32 bit times interframe spacing */ | 3599 | cfblk.ifrm_spc = 0x20 >> 4; /* 32 bit times interframe spacing */ |
3608 | cfblk.slottim_low = 0x20; /* 32 bit times slot time */ | 3600 | cfblk.slottim_low = 0x20 >> 5; /* 32 bit times slot time */ |
3609 | cfblk.slottim_hi = 0x0; | 3601 | cfblk.slottim_hi = 0x0; |
3610 | cfblk.max_retr = 15; | 3602 | cfblk.max_retr = 15; |
3611 | cfblk.prmisc = ((lp->promiscuous) ? TRUE: FALSE); /* Promiscuous mode */ | 3603 | cfblk.prmisc = ((lp->promiscuous) ? TRUE: FALSE); /* Promiscuous mode */ |
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index f46e8438e0d2..93f8a8fa8890 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -40,6 +40,8 @@ | |||
40 | #include <linux/string.h> | 40 | #include <linux/string.h> |
41 | #include <linux/pci.h> | 41 | #include <linux/pci.h> |
42 | #include <linux/reboot.h> | 42 | #include <linux/reboot.h> |
43 | #include <linux/proc_fs.h> | ||
44 | #include <linux/seq_file.h> | ||
43 | 45 | ||
44 | #include <asm/byteorder.h> | 46 | #include <asm/byteorder.h> |
45 | #include <asm/cache.h> /* for L1_CACHE_BYTES */ | 47 | #include <asm/cache.h> /* for L1_CACHE_BYTES */ |
@@ -1019,62 +1021,33 @@ static struct hppa_dma_ops ccio_ops = { | |||
1019 | }; | 1021 | }; |
1020 | 1022 | ||
1021 | #ifdef CONFIG_PROC_FS | 1023 | #ifdef CONFIG_PROC_FS |
1022 | static int proc_append(char *src, int len, char **dst, off_t *offset, int *max) | 1024 | static int ccio_proc_info(struct seq_file *m, void *p) |
1023 | { | ||
1024 | if (len < *offset) { | ||
1025 | *offset -= len; | ||
1026 | return 0; | ||
1027 | } | ||
1028 | if (*offset > 0) { | ||
1029 | src += *offset; | ||
1030 | len -= *offset; | ||
1031 | *offset = 0; | ||
1032 | } | ||
1033 | if (len > *max) { | ||
1034 | len = *max; | ||
1035 | } | ||
1036 | memcpy(*dst, src, len); | ||
1037 | *dst += len; | ||
1038 | *max -= len; | ||
1039 | return (*max == 0); | ||
1040 | } | ||
1041 | |||
1042 | static int ccio_proc_info(char *buf, char **start, off_t offset, int count, | ||
1043 | int *eof, void *data) | ||
1044 | { | 1025 | { |
1045 | int max = count; | 1026 | int len = 0; |
1046 | char tmp[80]; /* width of an ANSI-standard terminal */ | ||
1047 | struct ioc *ioc = ioc_list; | 1027 | struct ioc *ioc = ioc_list; |
1048 | 1028 | ||
1049 | while (ioc != NULL) { | 1029 | while (ioc != NULL) { |
1050 | unsigned int total_pages = ioc->res_size << 3; | 1030 | unsigned int total_pages = ioc->res_size << 3; |
1051 | unsigned long avg = 0, min, max; | 1031 | unsigned long avg = 0, min, max; |
1052 | int j, len; | 1032 | int j; |
1053 | 1033 | ||
1054 | len = sprintf(tmp, "%s\n", ioc->name); | 1034 | len += seq_printf(m, "%s\n", ioc->name); |
1055 | if (proc_append(tmp, len, &buf, &offset, &count)) | ||
1056 | break; | ||
1057 | 1035 | ||
1058 | len = sprintf(tmp, "Cujo 2.0 bug : %s\n", | 1036 | len += seq_printf(m, "Cujo 2.0 bug : %s\n", |
1059 | (ioc->cujo20_bug ? "yes" : "no")); | 1037 | (ioc->cujo20_bug ? "yes" : "no")); |
1060 | if (proc_append(tmp, len, &buf, &offset, &count)) | ||
1061 | break; | ||
1062 | 1038 | ||
1063 | len = sprintf(tmp, "IO PDIR size : %d bytes (%d entries)\n", | 1039 | len += seq_printf(m, "IO PDIR size : %d bytes (%d entries)\n", |
1064 | total_pages * 8, total_pages); | 1040 | total_pages * 8, total_pages); |
1065 | if (proc_append(tmp, len, &buf, &offset, &count)) | 1041 | |
1066 | break; | ||
1067 | #ifdef CCIO_MAP_STATS | 1042 | #ifdef CCIO_MAP_STATS |
1068 | len = sprintf(tmp, "IO PDIR entries : %ld free %ld used (%d%%)\n", | 1043 | len += seq_printf(m, "IO PDIR entries : %ld free %ld used (%d%%)\n", |
1069 | total_pages - ioc->used_pages, ioc->used_pages, | 1044 | total_pages - ioc->used_pages, ioc->used_pages, |
1070 | (int)(ioc->used_pages * 100 / total_pages)); | 1045 | (int)(ioc->used_pages * 100 / total_pages)); |
1071 | if (proc_append(tmp, len, &buf, &offset, &count)) | ||
1072 | break; | ||
1073 | #endif | 1046 | #endif |
1074 | len = sprintf(tmp, "Resource bitmap : %d bytes (%d pages)\n", | 1047 | |
1075 | ioc->res_size, total_pages); | 1048 | len += seq_printf(m, "Resource bitmap : %d bytes (%d pages)\n", |
1076 | if (proc_append(tmp, len, &buf, &offset, &count)) | 1049 | ioc->res_size, total_pages); |
1077 | break; | 1050 | |
1078 | #ifdef CCIO_SEARCH_TIME | 1051 | #ifdef CCIO_SEARCH_TIME |
1079 | min = max = ioc->avg_search[0]; | 1052 | min = max = ioc->avg_search[0]; |
1080 | for(j = 0; j < CCIO_SEARCH_SAMPLE; ++j) { | 1053 | for(j = 0; j < CCIO_SEARCH_SAMPLE; ++j) { |
@@ -1085,70 +1058,83 @@ static int ccio_proc_info(char *buf, char **start, off_t offset, int count, | |||
1085 | min = ioc->avg_search[j]; | 1058 | min = ioc->avg_search[j]; |
1086 | } | 1059 | } |
1087 | avg /= CCIO_SEARCH_SAMPLE; | 1060 | avg /= CCIO_SEARCH_SAMPLE; |
1088 | len = sprintf(tmp, " Bitmap search : %ld/%ld/%ld (min/avg/max CPU Cycles)\n", | 1061 | len += seq_printf(m, " Bitmap search : %ld/%ld/%ld (min/avg/max CPU Cycles)\n", |
1089 | min, avg, max); | 1062 | min, avg, max); |
1090 | if (proc_append(tmp, len, &buf, &offset, &count)) | ||
1091 | break; | ||
1092 | #endif | 1063 | #endif |
1093 | #ifdef CCIO_MAP_STATS | 1064 | #ifdef CCIO_MAP_STATS |
1094 | len = sprintf(tmp, "pci_map_single(): %8ld calls %8ld pages (avg %d/1000)\n", | 1065 | len += seq_printf(m, "pci_map_single(): %8ld calls %8ld pages (avg %d/1000)\n", |
1095 | ioc->msingle_calls, ioc->msingle_pages, | 1066 | ioc->msingle_calls, ioc->msingle_pages, |
1096 | (int)((ioc->msingle_pages * 1000)/ioc->msingle_calls)); | 1067 | (int)((ioc->msingle_pages * 1000)/ioc->msingle_calls)); |
1097 | if (proc_append(tmp, len, &buf, &offset, &count)) | ||
1098 | break; | ||
1099 | |||
1100 | 1068 | ||
1101 | /* KLUGE - unmap_sg calls unmap_single for each mapped page */ | 1069 | /* KLUGE - unmap_sg calls unmap_single for each mapped page */ |
1102 | min = ioc->usingle_calls - ioc->usg_calls; | 1070 | min = ioc->usingle_calls - ioc->usg_calls; |
1103 | max = ioc->usingle_pages - ioc->usg_pages; | 1071 | max = ioc->usingle_pages - ioc->usg_pages; |
1104 | len = sprintf(tmp, "pci_unmap_single: %8ld calls %8ld pages (avg %d/1000)\n", | 1072 | len += seq_printf(m, "pci_unmap_single: %8ld calls %8ld pages (avg %d/1000)\n", |
1105 | min, max, (int)((max * 1000)/min)); | 1073 | min, max, (int)((max * 1000)/min)); |
1106 | if (proc_append(tmp, len, &buf, &offset, &count)) | ||
1107 | break; | ||
1108 | 1074 | ||
1109 | len = sprintf(tmp, "pci_map_sg() : %8ld calls %8ld pages (avg %d/1000)\n", | 1075 | len += seq_printf(m, "pci_map_sg() : %8ld calls %8ld pages (avg %d/1000)\n", |
1110 | ioc->msg_calls, ioc->msg_pages, | 1076 | ioc->msg_calls, ioc->msg_pages, |
1111 | (int)((ioc->msg_pages * 1000)/ioc->msg_calls)); | 1077 | (int)((ioc->msg_pages * 1000)/ioc->msg_calls)); |
1112 | if (proc_append(tmp, len, &buf, &offset, &count)) | 1078 | |
1113 | break; | 1079 | len += seq_printf(m, "pci_unmap_sg() : %8ld calls %8ld pages (avg %d/1000)\n\n\n", |
1114 | len = sprintf(tmp, "pci_unmap_sg() : %8ld calls %8ld pages (avg %d/1000)\n\n\n", | 1080 | ioc->usg_calls, ioc->usg_pages, |
1115 | ioc->usg_calls, ioc->usg_pages, | 1081 | (int)((ioc->usg_pages * 1000)/ioc->usg_calls)); |
1116 | (int)((ioc->usg_pages * 1000)/ioc->usg_calls)); | ||
1117 | if (proc_append(tmp, len, &buf, &offset, &count)) | ||
1118 | break; | ||
1119 | #endif /* CCIO_MAP_STATS */ | 1082 | #endif /* CCIO_MAP_STATS */ |
1083 | |||
1120 | ioc = ioc->next; | 1084 | ioc = ioc->next; |
1121 | } | 1085 | } |
1122 | 1086 | ||
1123 | if (count == 0) { | 1087 | return 0; |
1124 | *eof = 1; | 1088 | } |
1125 | } | 1089 | |
1126 | return (max - count); | 1090 | static int ccio_proc_info_open(struct inode *inode, struct file *file) |
1091 | { | ||
1092 | return single_open(file, &ccio_proc_info, NULL); | ||
1127 | } | 1093 | } |
1128 | 1094 | ||
1129 | static int ccio_resource_map(char *buf, char **start, off_t offset, int len, | 1095 | static struct file_operations ccio_proc_info_fops = { |
1130 | int *eof, void *data) | 1096 | .owner = THIS_MODULE, |
1097 | .open = ccio_proc_info_open, | ||
1098 | .read = seq_read, | ||
1099 | .llseek = seq_lseek, | ||
1100 | .release = single_release, | ||
1101 | }; | ||
1102 | |||
1103 | static int ccio_proc_bitmap_info(struct seq_file *m, void *p) | ||
1131 | { | 1104 | { |
1105 | int len = 0; | ||
1132 | struct ioc *ioc = ioc_list; | 1106 | struct ioc *ioc = ioc_list; |
1133 | 1107 | ||
1134 | buf[0] = '\0'; | ||
1135 | while (ioc != NULL) { | 1108 | while (ioc != NULL) { |
1136 | u32 *res_ptr = (u32 *)ioc->res_map; | 1109 | u32 *res_ptr = (u32 *)ioc->res_map; |
1137 | int j; | 1110 | int j; |
1138 | 1111 | ||
1139 | for (j = 0; j < (ioc->res_size / sizeof(u32)); j++) { | 1112 | for (j = 0; j < (ioc->res_size / sizeof(u32)); j++) { |
1140 | if ((j & 7) == 0) | 1113 | if ((j & 7) == 0) |
1141 | strcat(buf,"\n "); | 1114 | len += seq_puts(m, "\n "); |
1142 | sprintf(buf, "%s %08x", buf, *res_ptr); | 1115 | len += seq_printf(m, "%08x", *res_ptr); |
1143 | res_ptr++; | 1116 | res_ptr++; |
1144 | } | 1117 | } |
1145 | strcat(buf, "\n\n"); | 1118 | len += seq_puts(m, "\n\n"); |
1146 | ioc = ioc->next; | 1119 | ioc = ioc->next; |
1147 | break; /* XXX - remove me */ | 1120 | break; /* XXX - remove me */ |
1148 | } | 1121 | } |
1149 | 1122 | ||
1150 | return strlen(buf); | 1123 | return 0; |
1151 | } | 1124 | } |
1125 | |||
1126 | static int ccio_proc_bitmap_open(struct inode *inode, struct file *file) | ||
1127 | { | ||
1128 | return single_open(file, &ccio_proc_bitmap_info, NULL); | ||
1129 | } | ||
1130 | |||
1131 | static struct file_operations ccio_proc_bitmap_fops = { | ||
1132 | .owner = THIS_MODULE, | ||
1133 | .open = ccio_proc_bitmap_open, | ||
1134 | .read = seq_read, | ||
1135 | .llseek = seq_lseek, | ||
1136 | .release = single_release, | ||
1137 | }; | ||
1152 | #endif | 1138 | #endif |
1153 | 1139 | ||
1154 | /** | 1140 | /** |
@@ -1556,6 +1542,7 @@ static int ccio_probe(struct parisc_device *dev) | |||
1556 | { | 1542 | { |
1557 | int i; | 1543 | int i; |
1558 | struct ioc *ioc, **ioc_p = &ioc_list; | 1544 | struct ioc *ioc, **ioc_p = &ioc_list; |
1545 | struct proc_dir_entry *info_entry, *bitmap_entry; | ||
1559 | 1546 | ||
1560 | ioc = kzalloc(sizeof(struct ioc), GFP_KERNEL); | 1547 | ioc = kzalloc(sizeof(struct ioc), GFP_KERNEL); |
1561 | if (ioc == NULL) { | 1548 | if (ioc == NULL) { |
@@ -1583,13 +1570,14 @@ static int ccio_probe(struct parisc_device *dev) | |||
1583 | BUG_ON(dev->dev.platform_data == NULL); | 1570 | BUG_ON(dev->dev.platform_data == NULL); |
1584 | HBA_DATA(dev->dev.platform_data)->iommu = ioc; | 1571 | HBA_DATA(dev->dev.platform_data)->iommu = ioc; |
1585 | 1572 | ||
1586 | |||
1587 | if (ioc_count == 0) { | 1573 | if (ioc_count == 0) { |
1588 | /* FIXME: Create separate entries for each ioc */ | 1574 | info_entry = create_proc_entry(MODULE_NAME, 0, proc_runway_root); |
1589 | create_proc_read_entry(MODULE_NAME, S_IRWXU, proc_runway_root, | 1575 | if (info_entry) |
1590 | ccio_proc_info, NULL); | 1576 | info_entry->proc_fops = &ccio_proc_info_fops; |
1591 | create_proc_read_entry(MODULE_NAME"-bitmap", S_IRWXU, | 1577 | |
1592 | proc_runway_root, ccio_resource_map, NULL); | 1578 | bitmap_entry = create_proc_entry(MODULE_NAME"-bitmap", 0, proc_runway_root); |
1579 | if (bitmap_entry) | ||
1580 | bitmap_entry->proc_fops = &ccio_proc_bitmap_fops; | ||
1593 | } | 1581 | } |
1594 | 1582 | ||
1595 | ioc_count++; | 1583 | ioc_count++; |
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 52f265e97729..5d47c5965c51 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
@@ -37,6 +37,8 @@ | |||
37 | #include <asm/hardware.h> /* for register_parisc_driver() stuff */ | 37 | #include <asm/hardware.h> /* for register_parisc_driver() stuff */ |
38 | 38 | ||
39 | #include <linux/proc_fs.h> | 39 | #include <linux/proc_fs.h> |
40 | #include <linux/seq_file.h> | ||
41 | |||
40 | #include <asm/runway.h> /* for proc_runway_root */ | 42 | #include <asm/runway.h> /* for proc_runway_root */ |
41 | #include <asm/pdc.h> /* for PDC_MODEL_* */ | 43 | #include <asm/pdc.h> /* for PDC_MODEL_* */ |
42 | #include <asm/pdcpat.h> /* for is_pdc_pat() */ | 44 | #include <asm/pdcpat.h> /* for is_pdc_pat() */ |
@@ -1892,46 +1894,43 @@ sba_common_init(struct sba_device *sba_dev) | |||
1892 | } | 1894 | } |
1893 | 1895 | ||
1894 | #ifdef CONFIG_PROC_FS | 1896 | #ifdef CONFIG_PROC_FS |
1895 | static int sba_proc_info(char *buf, char **start, off_t offset, int len) | 1897 | static int sba_proc_info(struct seq_file *m, void *p) |
1896 | { | 1898 | { |
1897 | struct sba_device *sba_dev = sba_list; | 1899 | struct sba_device *sba_dev = sba_list; |
1898 | struct ioc *ioc = &sba_dev->ioc[0]; /* FIXME: Multi-IOC support! */ | 1900 | struct ioc *ioc = &sba_dev->ioc[0]; /* FIXME: Multi-IOC support! */ |
1899 | int total_pages = (int) (ioc->res_size << 3); /* 8 bits per byte */ | 1901 | int total_pages = (int) (ioc->res_size << 3); /* 8 bits per byte */ |
1900 | unsigned long i; | ||
1901 | #ifdef SBA_COLLECT_STATS | 1902 | #ifdef SBA_COLLECT_STATS |
1902 | unsigned long avg = 0, min, max; | 1903 | unsigned long avg = 0, min, max; |
1903 | #endif | 1904 | #endif |
1905 | int i, len = 0; | ||
1904 | 1906 | ||
1905 | sprintf(buf, "%s rev %d.%d\n", | 1907 | len += seq_printf(m, "%s rev %d.%d\n", |
1906 | sba_dev->name, | 1908 | sba_dev->name, |
1907 | (sba_dev->hw_rev & 0x7) + 1, | 1909 | (sba_dev->hw_rev & 0x7) + 1, |
1908 | (sba_dev->hw_rev & 0x18) >> 3 | 1910 | (sba_dev->hw_rev & 0x18) >> 3 |
1909 | ); | 1911 | ); |
1910 | sprintf(buf, "%sIO PDIR size : %d bytes (%d entries)\n", | 1912 | len += seq_printf(m, "IO PDIR size : %d bytes (%d entries)\n", |
1911 | buf, | ||
1912 | (int) ((ioc->res_size << 3) * sizeof(u64)), /* 8 bits/byte */ | 1913 | (int) ((ioc->res_size << 3) * sizeof(u64)), /* 8 bits/byte */ |
1913 | total_pages); | 1914 | total_pages); |
1914 | 1915 | ||
1915 | sprintf(buf, "%sResource bitmap : %d bytes (%d pages)\n", | 1916 | len += seq_printf(m, "Resource bitmap : %d bytes (%d pages)\n", |
1916 | buf, ioc->res_size, ioc->res_size << 3); /* 8 bits per byte */ | 1917 | ioc->res_size, ioc->res_size << 3); /* 8 bits per byte */ |
1917 | 1918 | ||
1918 | sprintf(buf, "%sLMMIO_BASE/MASK/ROUTE %08x %08x %08x\n", | 1919 | len += seq_printf(m, "LMMIO_BASE/MASK/ROUTE %08x %08x %08x\n", |
1919 | buf, | ||
1920 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_BASE), | 1920 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_BASE), |
1921 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_MASK), | 1921 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_MASK), |
1922 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_ROUTE) | 1922 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_ROUTE) |
1923 | ); | 1923 | ); |
1924 | 1924 | ||
1925 | for (i=0; i<4; i++) | 1925 | for (i=0; i<4; i++) |
1926 | sprintf(buf, "%sDIR%ld_BASE/MASK/ROUTE %08x %08x %08x\n", | 1926 | len += seq_printf(m, "DIR%d_BASE/MASK/ROUTE %08x %08x %08x\n", i, |
1927 | buf, i, | ||
1928 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_BASE + i*0x18), | 1927 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_BASE + i*0x18), |
1929 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_MASK + i*0x18), | 1928 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_MASK + i*0x18), |
1930 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_ROUTE + i*0x18) | 1929 | READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_ROUTE + i*0x18) |
1931 | ); | 1930 | ); |
1932 | 1931 | ||
1933 | #ifdef SBA_COLLECT_STATS | 1932 | #ifdef SBA_COLLECT_STATS |
1934 | sprintf(buf, "%sIO PDIR entries : %ld free %ld used (%d%%)\n", buf, | 1933 | len += seq_printf(m, "IO PDIR entries : %ld free %ld used (%d%%)\n", |
1935 | total_pages - ioc->used_pages, ioc->used_pages, | 1934 | total_pages - ioc->used_pages, ioc->used_pages, |
1936 | (int) (ioc->used_pages * 100 / total_pages)); | 1935 | (int) (ioc->used_pages * 100 / total_pages)); |
1937 | 1936 | ||
@@ -1942,53 +1941,76 @@ static int sba_proc_info(char *buf, char **start, off_t offset, int len) | |||
1942 | if (ioc->avg_search[i] < min) min = ioc->avg_search[i]; | 1941 | if (ioc->avg_search[i] < min) min = ioc->avg_search[i]; |
1943 | } | 1942 | } |
1944 | avg /= SBA_SEARCH_SAMPLE; | 1943 | avg /= SBA_SEARCH_SAMPLE; |
1945 | sprintf(buf, "%s Bitmap search : %ld/%ld/%ld (min/avg/max CPU Cycles)\n", | 1944 | len += seq_printf(m, " Bitmap search : %ld/%ld/%ld (min/avg/max CPU Cycles)\n", |
1946 | buf, min, avg, max); | 1945 | min, avg, max); |
1947 | 1946 | ||
1948 | sprintf(buf, "%spci_map_single(): %12ld calls %12ld pages (avg %d/1000)\n", | 1947 | len += seq_printf(m, "pci_map_single(): %12ld calls %12ld pages (avg %d/1000)\n", |
1949 | buf, ioc->msingle_calls, ioc->msingle_pages, | 1948 | ioc->msingle_calls, ioc->msingle_pages, |
1950 | (int) ((ioc->msingle_pages * 1000)/ioc->msingle_calls)); | 1949 | (int) ((ioc->msingle_pages * 1000)/ioc->msingle_calls)); |
1951 | 1950 | ||
1952 | /* KLUGE - unmap_sg calls unmap_single for each mapped page */ | 1951 | /* KLUGE - unmap_sg calls unmap_single for each mapped page */ |
1953 | min = ioc->usingle_calls; | 1952 | min = ioc->usingle_calls; |
1954 | max = ioc->usingle_pages - ioc->usg_pages; | 1953 | max = ioc->usingle_pages - ioc->usg_pages; |
1955 | sprintf(buf, "%spci_unmap_single: %12ld calls %12ld pages (avg %d/1000)\n", | 1954 | len += seq_printf(m, "pci_unmap_single: %12ld calls %12ld pages (avg %d/1000)\n", |
1956 | buf, min, max, | 1955 | min, max, (int) ((max * 1000)/min)); |
1957 | (int) ((max * 1000)/min)); | ||
1958 | 1956 | ||
1959 | sprintf(buf, "%spci_map_sg() : %12ld calls %12ld pages (avg %d/1000)\n", | 1957 | len += seq_printf(m, "pci_map_sg() : %12ld calls %12ld pages (avg %d/1000)\n", |
1960 | buf, ioc->msg_calls, ioc->msg_pages, | 1958 | ioc->msg_calls, ioc->msg_pages, |
1961 | (int) ((ioc->msg_pages * 1000)/ioc->msg_calls)); | 1959 | (int) ((ioc->msg_pages * 1000)/ioc->msg_calls)); |
1962 | 1960 | ||
1963 | sprintf(buf, "%spci_unmap_sg() : %12ld calls %12ld pages (avg %d/1000)\n", | 1961 | len += seq_printf(m, "pci_unmap_sg() : %12ld calls %12ld pages (avg %d/1000)\n", |
1964 | buf, ioc->usg_calls, ioc->usg_pages, | 1962 | ioc->usg_calls, ioc->usg_pages, |
1965 | (int) ((ioc->usg_pages * 1000)/ioc->usg_calls)); | 1963 | (int) ((ioc->usg_pages * 1000)/ioc->usg_calls)); |
1966 | #endif | 1964 | #endif |
1967 | 1965 | ||
1968 | return strlen(buf); | 1966 | return 0; |
1969 | } | 1967 | } |
1970 | 1968 | ||
1971 | #if 0 | ||
1972 | /* XXX too much output - exceeds 4k limit and needs to be re-written */ | ||
1973 | static int | 1969 | static int |
1974 | sba_resource_map(char *buf, char **start, off_t offset, int len) | 1970 | sba_proc_open(struct inode *i, struct file *f) |
1971 | { | ||
1972 | return single_open(f, &sba_proc_info, NULL); | ||
1973 | } | ||
1974 | |||
1975 | static struct file_operations sba_proc_fops = { | ||
1976 | .owner = THIS_MODULE, | ||
1977 | .open = sba_proc_open, | ||
1978 | .read = seq_read, | ||
1979 | .llseek = seq_lseek, | ||
1980 | .release = single_release, | ||
1981 | }; | ||
1982 | |||
1983 | static int | ||
1984 | sba_proc_bitmap_info(struct seq_file *m, void *p) | ||
1975 | { | 1985 | { |
1976 | struct sba_device *sba_dev = sba_list; | 1986 | struct sba_device *sba_dev = sba_list; |
1977 | struct ioc *ioc = &sba_dev->ioc[0]; /* FIXME: Mutli-IOC suppoer! */ | 1987 | struct ioc *ioc = &sba_dev->ioc[0]; /* FIXME: Multi-IOC support! */ |
1978 | unsigned int *res_ptr = (unsigned int *)ioc->res_map; | 1988 | unsigned int *res_ptr = (unsigned int *)ioc->res_map; |
1979 | int i; | 1989 | int i, len = 0; |
1980 | 1990 | ||
1981 | buf[0] = '\0'; | 1991 | for (i = 0; i < (ioc->res_size/sizeof(unsigned int)); ++i, ++res_ptr) { |
1982 | for(i = 0; i < (ioc->res_size / sizeof(unsigned int)); ++i, ++res_ptr) { | ||
1983 | if ((i & 7) == 0) | 1992 | if ((i & 7) == 0) |
1984 | strcat(buf,"\n "); | 1993 | len += seq_printf(m, "\n "); |
1985 | sprintf(buf, "%s %08x", buf, *res_ptr); | 1994 | len += seq_printf(m, " %08x", *res_ptr); |
1986 | } | 1995 | } |
1987 | strcat(buf, "\n"); | 1996 | len += seq_printf(m, "\n"); |
1988 | 1997 | ||
1989 | return strlen(buf); | 1998 | return 0; |
1990 | } | 1999 | } |
1991 | #endif /* 0 */ | 2000 | |
2001 | static int | ||
2002 | sba_proc_bitmap_open(struct inode *i, struct file *f) | ||
2003 | { | ||
2004 | return single_open(f, &sba_proc_bitmap_info, NULL); | ||
2005 | } | ||
2006 | |||
2007 | static struct file_operations sba_proc_bitmap_fops = { | ||
2008 | .owner = THIS_MODULE, | ||
2009 | .open = sba_proc_bitmap_open, | ||
2010 | .read = seq_read, | ||
2011 | .llseek = seq_lseek, | ||
2012 | .release = single_release, | ||
2013 | }; | ||
1992 | #endif /* CONFIG_PROC_FS */ | 2014 | #endif /* CONFIG_PROC_FS */ |
1993 | 2015 | ||
1994 | static struct parisc_device_id sba_tbl[] = { | 2016 | static struct parisc_device_id sba_tbl[] = { |
@@ -2021,6 +2043,7 @@ sba_driver_callback(struct parisc_device *dev) | |||
2021 | int i; | 2043 | int i; |
2022 | char *version; | 2044 | char *version; |
2023 | void __iomem *sba_addr = ioremap(dev->hpa.start, SBA_FUNC_SIZE); | 2045 | void __iomem *sba_addr = ioremap(dev->hpa.start, SBA_FUNC_SIZE); |
2046 | struct proc_dir_entry *info_entry, *bitmap_entry, *root; | ||
2024 | 2047 | ||
2025 | sba_dump_ranges(sba_addr); | 2048 | sba_dump_ranges(sba_addr); |
2026 | 2049 | ||
@@ -2088,19 +2111,27 @@ sba_driver_callback(struct parisc_device *dev) | |||
2088 | hppa_dma_ops = &sba_ops; | 2111 | hppa_dma_ops = &sba_ops; |
2089 | 2112 | ||
2090 | #ifdef CONFIG_PROC_FS | 2113 | #ifdef CONFIG_PROC_FS |
2091 | if (IS_ASTRO(&dev->id)) { | 2114 | switch (dev->id.hversion) { |
2092 | create_proc_info_entry("Astro", 0, proc_runway_root, sba_proc_info); | 2115 | case PLUTO_MCKINLEY_PORT: |
2093 | } else if (IS_IKE(&dev->id)) { | 2116 | root = proc_mckinley_root; |
2094 | create_proc_info_entry("Ike", 0, proc_runway_root, sba_proc_info); | 2117 | break; |
2095 | } else if (IS_PLUTO(&dev->id)) { | 2118 | case ASTRO_RUNWAY_PORT: |
2096 | create_proc_info_entry("Pluto", 0, proc_mckinley_root, sba_proc_info); | 2119 | case IKE_MERCED_PORT: |
2097 | } else { | 2120 | default: |
2098 | create_proc_info_entry("Reo", 0, proc_runway_root, sba_proc_info); | 2121 | root = proc_runway_root; |
2122 | break; | ||
2099 | } | 2123 | } |
2100 | #if 0 | 2124 | |
2101 | create_proc_info_entry("bitmap", 0, proc_runway_root, sba_resource_map); | 2125 | info_entry = create_proc_entry("sba_iommu", 0, root); |
2102 | #endif | 2126 | bitmap_entry = create_proc_entry("sba_iommu-bitmap", 0, root); |
2127 | |||
2128 | if (info_entry) | ||
2129 | info_entry->proc_fops = &sba_proc_fops; | ||
2130 | |||
2131 | if (bitmap_entry) | ||
2132 | bitmap_entry->proc_fops = &sba_proc_bitmap_fops; | ||
2103 | #endif | 2133 | #endif |
2134 | |||
2104 | parisc_vmerge_boundary = IOVP_SIZE; | 2135 | parisc_vmerge_boundary = IOVP_SIZE; |
2105 | parisc_vmerge_max_size = IOVP_SIZE * BITS_PER_LONG; | 2136 | parisc_vmerge_max_size = IOVP_SIZE * BITS_PER_LONG; |
2106 | parisc_has_iommu(); | 2137 | parisc_has_iommu(); |
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig index 6912399d0937..6f50cc9323d9 100644 --- a/drivers/s390/block/Kconfig +++ b/drivers/s390/block/Kconfig | |||
@@ -55,21 +55,13 @@ config DASD_DIAG | |||
55 | Disks under VM. If you are not running under VM or unsure what it is, | 55 | Disks under VM. If you are not running under VM or unsure what it is, |
56 | say "N". | 56 | say "N". |
57 | 57 | ||
58 | config DASD_EER | ||
59 | tristate "Extended error reporting (EER)" | ||
60 | depends on DASD | ||
61 | help | ||
62 | This driver provides a character device interface to the | ||
63 | DASD extended error reporting. This is only needed if you want to | ||
64 | use applications written for the EER facility. | ||
65 | |||
66 | config DASD_CMB | 58 | config DASD_CMB |
67 | tristate "Compatibility interface for DASD channel measurement blocks" | 59 | tristate "Compatibility interface for DASD channel measurement blocks" |
68 | depends on DASD | 60 | depends on DASD |
69 | help | 61 | help |
70 | This driver provides an additional interface to the channel | 62 | This driver provides an additional interface to the channel measurement |
71 | measurement facility, which is normally accessed though sysfs, with | 63 | facility, which is normally accessed though sysfs, with a set of |
72 | a set of ioctl functions specific to the dasd driver. | 64 | ioctl functions specific to the dasd driver. |
73 | This is only needed if you want to use applications written for | 65 | This is only needed if you want to use applications written for |
74 | linux-2.4 dasd channel measurement facility interface. | 66 | linux-2.4 dasd channel measurement facility interface. |
75 | 67 | ||
diff --git a/drivers/s390/block/Makefile b/drivers/s390/block/Makefile index 0c0d871e8f51..58c6780134f7 100644 --- a/drivers/s390/block/Makefile +++ b/drivers/s390/block/Makefile | |||
@@ -5,7 +5,6 @@ | |||
5 | dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o | 5 | dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o |
6 | dasd_fba_mod-objs := dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o | 6 | dasd_fba_mod-objs := dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o |
7 | dasd_diag_mod-objs := dasd_diag.o | 7 | dasd_diag_mod-objs := dasd_diag.o |
8 | dasd_eer_mod-objs := dasd_eer.o | ||
9 | dasd_mod-objs := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \ | 8 | dasd_mod-objs := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \ |
10 | dasd_genhd.o dasd_erp.o | 9 | dasd_genhd.o dasd_erp.o |
11 | 10 | ||
@@ -14,6 +13,5 @@ obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o | |||
14 | obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o | 13 | obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o |
15 | obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o | 14 | obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o |
16 | obj-$(CONFIG_DASD_CMB) += dasd_cmb.o | 15 | obj-$(CONFIG_DASD_CMB) += dasd_cmb.o |
17 | obj-$(CONFIG_DASD_EER) += dasd_eer.o | ||
18 | obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o | 16 | obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o |
19 | obj-$(CONFIG_DCSSBLK) += dcssblk.o | 17 | obj-$(CONFIG_DCSSBLK) += dcssblk.o |
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 08c88fcd8963..af1d5b404cee 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/buffer_head.h> | 19 | #include <linux/buffer_head.h> |
20 | #include <linux/hdreg.h> | 20 | #include <linux/hdreg.h> |
21 | #include <linux/notifier.h> | ||
22 | 21 | ||
23 | #include <asm/ccwdev.h> | 22 | #include <asm/ccwdev.h> |
24 | #include <asm/ebcdic.h> | 23 | #include <asm/ebcdic.h> |
@@ -58,7 +57,6 @@ static void dasd_int_handler(struct ccw_device *, unsigned long, struct irb *); | |||
58 | static void dasd_flush_ccw_queue(struct dasd_device *, int); | 57 | static void dasd_flush_ccw_queue(struct dasd_device *, int); |
59 | static void dasd_tasklet(struct dasd_device *); | 58 | static void dasd_tasklet(struct dasd_device *); |
60 | static void do_kick_device(void *data); | 59 | static void do_kick_device(void *data); |
61 | static void dasd_disable_eer(struct dasd_device *device); | ||
62 | 60 | ||
63 | /* | 61 | /* |
64 | * SECTION: Operations on the device structure. | 62 | * SECTION: Operations on the device structure. |
@@ -153,10 +151,13 @@ dasd_state_new_to_known(struct dasd_device *device) | |||
153 | static inline void | 151 | static inline void |
154 | dasd_state_known_to_new(struct dasd_device * device) | 152 | dasd_state_known_to_new(struct dasd_device * device) |
155 | { | 153 | { |
156 | /* disable extended error reporting for this device */ | ||
157 | dasd_disable_eer(device); | ||
158 | /* Forget the discipline information. */ | 154 | /* Forget the discipline information. */ |
155 | if (device->discipline) | ||
156 | module_put(device->discipline->owner); | ||
159 | device->discipline = NULL; | 157 | device->discipline = NULL; |
158 | if (device->base_discipline) | ||
159 | module_put(device->base_discipline->owner); | ||
160 | device->base_discipline = NULL; | ||
160 | device->state = DASD_STATE_NEW; | 161 | device->state = DASD_STATE_NEW; |
161 | 162 | ||
162 | dasd_free_queue(device); | 163 | dasd_free_queue(device); |
@@ -871,9 +872,6 @@ dasd_handle_state_change_pending(struct dasd_device *device) | |||
871 | struct dasd_ccw_req *cqr; | 872 | struct dasd_ccw_req *cqr; |
872 | struct list_head *l, *n; | 873 | struct list_head *l, *n; |
873 | 874 | ||
874 | /* first of all call extended error reporting */ | ||
875 | dasd_write_eer_trigger(DASD_EER_STATECHANGE, device, NULL); | ||
876 | |||
877 | device->stopped &= ~DASD_STOPPED_PENDING; | 875 | device->stopped &= ~DASD_STOPPED_PENDING; |
878 | 876 | ||
879 | /* restart all 'running' IO on queue */ | 877 | /* restart all 'running' IO on queue */ |
@@ -1093,19 +1091,6 @@ restart: | |||
1093 | } | 1091 | } |
1094 | goto restart; | 1092 | goto restart; |
1095 | } | 1093 | } |
1096 | |||
1097 | /* first of all call extended error reporting */ | ||
1098 | if (device->eer && cqr->status == DASD_CQR_FAILED) { | ||
1099 | dasd_write_eer_trigger(DASD_EER_FATALERROR, | ||
1100 | device, cqr); | ||
1101 | |||
1102 | /* restart request */ | ||
1103 | cqr->status = DASD_CQR_QUEUED; | ||
1104 | cqr->retries = 255; | ||
1105 | device->stopped |= DASD_STOPPED_QUIESCE; | ||
1106 | goto restart; | ||
1107 | } | ||
1108 | |||
1109 | /* Process finished ERP request. */ | 1094 | /* Process finished ERP request. */ |
1110 | if (cqr->refers) { | 1095 | if (cqr->refers) { |
1111 | __dasd_process_erp(device, cqr); | 1096 | __dasd_process_erp(device, cqr); |
@@ -1243,8 +1228,7 @@ __dasd_start_head(struct dasd_device * device) | |||
1243 | cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, list); | 1228 | cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, list); |
1244 | /* check FAILFAST */ | 1229 | /* check FAILFAST */ |
1245 | if (device->stopped & ~DASD_STOPPED_PENDING && | 1230 | if (device->stopped & ~DASD_STOPPED_PENDING && |
1246 | test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags) && | 1231 | test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags)) { |
1247 | (!device->eer)) { | ||
1248 | cqr->status = DASD_CQR_FAILED; | 1232 | cqr->status = DASD_CQR_FAILED; |
1249 | dasd_schedule_bh(device); | 1233 | dasd_schedule_bh(device); |
1250 | } | 1234 | } |
@@ -1880,9 +1864,10 @@ dasd_generic_remove (struct ccw_device *cdev) | |||
1880 | */ | 1864 | */ |
1881 | int | 1865 | int |
1882 | dasd_generic_set_online (struct ccw_device *cdev, | 1866 | dasd_generic_set_online (struct ccw_device *cdev, |
1883 | struct dasd_discipline *discipline) | 1867 | struct dasd_discipline *base_discipline) |
1884 | 1868 | ||
1885 | { | 1869 | { |
1870 | struct dasd_discipline *discipline; | ||
1886 | struct dasd_device *device; | 1871 | struct dasd_device *device; |
1887 | int rc; | 1872 | int rc; |
1888 | 1873 | ||
@@ -1890,6 +1875,7 @@ dasd_generic_set_online (struct ccw_device *cdev, | |||
1890 | if (IS_ERR(device)) | 1875 | if (IS_ERR(device)) |
1891 | return PTR_ERR(device); | 1876 | return PTR_ERR(device); |
1892 | 1877 | ||
1878 | discipline = base_discipline; | ||
1893 | if (device->features & DASD_FEATURE_USEDIAG) { | 1879 | if (device->features & DASD_FEATURE_USEDIAG) { |
1894 | if (!dasd_diag_discipline_pointer) { | 1880 | if (!dasd_diag_discipline_pointer) { |
1895 | printk (KERN_WARNING | 1881 | printk (KERN_WARNING |
@@ -1901,6 +1887,16 @@ dasd_generic_set_online (struct ccw_device *cdev, | |||
1901 | } | 1887 | } |
1902 | discipline = dasd_diag_discipline_pointer; | 1888 | discipline = dasd_diag_discipline_pointer; |
1903 | } | 1889 | } |
1890 | if (!try_module_get(base_discipline->owner)) { | ||
1891 | dasd_delete_device(device); | ||
1892 | return -EINVAL; | ||
1893 | } | ||
1894 | if (!try_module_get(discipline->owner)) { | ||
1895 | module_put(base_discipline->owner); | ||
1896 | dasd_delete_device(device); | ||
1897 | return -EINVAL; | ||
1898 | } | ||
1899 | device->base_discipline = base_discipline; | ||
1904 | device->discipline = discipline; | 1900 | device->discipline = discipline; |
1905 | 1901 | ||
1906 | rc = discipline->check_device(device); | 1902 | rc = discipline->check_device(device); |
@@ -1909,6 +1905,8 @@ dasd_generic_set_online (struct ccw_device *cdev, | |||
1909 | "dasd_generic couldn't online device %s " | 1905 | "dasd_generic couldn't online device %s " |
1910 | "with discipline %s rc=%i\n", | 1906 | "with discipline %s rc=%i\n", |
1911 | cdev->dev.bus_id, discipline->name, rc); | 1907 | cdev->dev.bus_id, discipline->name, rc); |
1908 | module_put(discipline->owner); | ||
1909 | module_put(base_discipline->owner); | ||
1912 | dasd_delete_device(device); | 1910 | dasd_delete_device(device); |
1913 | return rc; | 1911 | return rc; |
1914 | } | 1912 | } |
@@ -1986,9 +1984,6 @@ dasd_generic_notify(struct ccw_device *cdev, int event) | |||
1986 | switch (event) { | 1984 | switch (event) { |
1987 | case CIO_GONE: | 1985 | case CIO_GONE: |
1988 | case CIO_NO_PATH: | 1986 | case CIO_NO_PATH: |
1989 | /* first of all call extended error reporting */ | ||
1990 | dasd_write_eer_trigger(DASD_EER_NOPATH, device, NULL); | ||
1991 | |||
1992 | if (device->state < DASD_STATE_BASIC) | 1987 | if (device->state < DASD_STATE_BASIC) |
1993 | break; | 1988 | break; |
1994 | /* Device is active. We want to keep it. */ | 1989 | /* Device is active. We want to keep it. */ |
@@ -2046,51 +2041,6 @@ dasd_generic_auto_online (struct ccw_driver *dasd_discipline_driver) | |||
2046 | put_driver(drv); | 2041 | put_driver(drv); |
2047 | } | 2042 | } |
2048 | 2043 | ||
2049 | /* | ||
2050 | * notifications for extended error reports | ||
2051 | */ | ||
2052 | static struct notifier_block *dasd_eer_chain; | ||
2053 | |||
2054 | int | ||
2055 | dasd_register_eer_notifier(struct notifier_block *nb) | ||
2056 | { | ||
2057 | return notifier_chain_register(&dasd_eer_chain, nb); | ||
2058 | } | ||
2059 | |||
2060 | int | ||
2061 | dasd_unregister_eer_notifier(struct notifier_block *nb) | ||
2062 | { | ||
2063 | return notifier_chain_unregister(&dasd_eer_chain, nb); | ||
2064 | } | ||
2065 | |||
2066 | /* | ||
2067 | * Notify the registered error reporting module of a problem | ||
2068 | */ | ||
2069 | void | ||
2070 | dasd_write_eer_trigger(unsigned int id, struct dasd_device *device, | ||
2071 | struct dasd_ccw_req *cqr) | ||
2072 | { | ||
2073 | if (device->eer) { | ||
2074 | struct dasd_eer_trigger temp; | ||
2075 | temp.id = id; | ||
2076 | temp.device = device; | ||
2077 | temp.cqr = cqr; | ||
2078 | notifier_call_chain(&dasd_eer_chain, DASD_EER_TRIGGER, | ||
2079 | (void *)&temp); | ||
2080 | } | ||
2081 | } | ||
2082 | |||
2083 | /* | ||
2084 | * Tell the registered error reporting module to disable error reporting for | ||
2085 | * a given device and to cleanup any private data structures on that device. | ||
2086 | */ | ||
2087 | static void | ||
2088 | dasd_disable_eer(struct dasd_device *device) | ||
2089 | { | ||
2090 | notifier_call_chain(&dasd_eer_chain, DASD_EER_DISABLE, (void *)device); | ||
2091 | } | ||
2092 | |||
2093 | |||
2094 | static int __init | 2044 | static int __init |
2095 | dasd_init(void) | 2045 | dasd_init(void) |
2096 | { | 2046 | { |
@@ -2172,11 +2122,6 @@ EXPORT_SYMBOL_GPL(dasd_generic_set_online); | |||
2172 | EXPORT_SYMBOL_GPL(dasd_generic_set_offline); | 2122 | EXPORT_SYMBOL_GPL(dasd_generic_set_offline); |
2173 | EXPORT_SYMBOL_GPL(dasd_generic_auto_online); | 2123 | EXPORT_SYMBOL_GPL(dasd_generic_auto_online); |
2174 | 2124 | ||
2175 | EXPORT_SYMBOL(dasd_register_eer_notifier); | ||
2176 | EXPORT_SYMBOL(dasd_unregister_eer_notifier); | ||
2177 | EXPORT_SYMBOL(dasd_write_eer_trigger); | ||
2178 | |||
2179 | |||
2180 | /* | 2125 | /* |
2181 | * Overrides for Emacs so that we follow Linus's tabbing style. | 2126 | * Overrides for Emacs so that we follow Linus's tabbing style. |
2182 | * Emacs will notice this stuff at the end of the file and automatically | 2127 | * Emacs will notice this stuff at the end of the file and automatically |
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index c811380b9079..4ee0f934e325 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c | |||
@@ -1108,9 +1108,6 @@ dasd_3990_handle_env_data(struct dasd_ccw_req * erp, char *sense) | |||
1108 | case 0x0B: | 1108 | case 0x0B: |
1109 | DEV_MESSAGE(KERN_WARNING, device, "%s", | 1109 | DEV_MESSAGE(KERN_WARNING, device, "%s", |
1110 | "FORMAT F - Volume is suspended duplex"); | 1110 | "FORMAT F - Volume is suspended duplex"); |
1111 | /* call extended error reporting (EER) */ | ||
1112 | dasd_write_eer_trigger(DASD_EER_PPRCSUSPEND, device, | ||
1113 | erp->refers); | ||
1114 | break; | 1111 | break; |
1115 | case 0x0C: | 1112 | case 0x0C: |
1116 | DEV_MESSAGE(KERN_WARNING, device, "%s", | 1113 | DEV_MESSAGE(KERN_WARNING, device, "%s", |
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h index e15dd7978050..bc3823d35223 100644 --- a/drivers/s390/block/dasd_eckd.h +++ b/drivers/s390/block/dasd_eckd.h | |||
@@ -29,7 +29,6 @@ | |||
29 | #define DASD_ECKD_CCW_PSF 0x27 | 29 | #define DASD_ECKD_CCW_PSF 0x27 |
30 | #define DASD_ECKD_CCW_RSSD 0x3e | 30 | #define DASD_ECKD_CCW_RSSD 0x3e |
31 | #define DASD_ECKD_CCW_LOCATE_RECORD 0x47 | 31 | #define DASD_ECKD_CCW_LOCATE_RECORD 0x47 |
32 | #define DASD_ECKD_CCW_SNSS 0x54 | ||
33 | #define DASD_ECKD_CCW_DEFINE_EXTENT 0x63 | 32 | #define DASD_ECKD_CCW_DEFINE_EXTENT 0x63 |
34 | #define DASD_ECKD_CCW_WRITE_MT 0x85 | 33 | #define DASD_ECKD_CCW_WRITE_MT 0x85 |
35 | #define DASD_ECKD_CCW_READ_MT 0x86 | 34 | #define DASD_ECKD_CCW_READ_MT 0x86 |
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c deleted file mode 100644 index f70cd7716b24..000000000000 --- a/drivers/s390/block/dasd_eer.c +++ /dev/null | |||
@@ -1,1090 +0,0 @@ | |||
1 | /* | ||
2 | * character device driver for extended error reporting | ||
3 | * | ||
4 | * | ||
5 | * Copyright (C) 2005 IBM Corporation | ||
6 | * extended error reporting for DASD ECKD devices | ||
7 | * Author(s): Stefan Weinhuber <wein@de.ibm.com> | ||
8 | * | ||
9 | */ | ||
10 | |||
11 | #include <linux/init.h> | ||
12 | #include <linux/fs.h> | ||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/miscdevice.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/moduleparam.h> | ||
17 | #include <linux/device.h> | ||
18 | #include <linux/workqueue.h> | ||
19 | #include <linux/poll.h> | ||
20 | #include <linux/notifier.h> | ||
21 | |||
22 | #include <asm/uaccess.h> | ||
23 | #include <asm/semaphore.h> | ||
24 | #include <asm/atomic.h> | ||
25 | #include <asm/ebcdic.h> | ||
26 | |||
27 | #include "dasd_int.h" | ||
28 | #include "dasd_eckd.h" | ||
29 | |||
30 | |||
31 | MODULE_LICENSE("GPL"); | ||
32 | |||
33 | MODULE_AUTHOR("Stefan Weinhuber <wein@de.ibm.com>"); | ||
34 | MODULE_DESCRIPTION("DASD extended error reporting module"); | ||
35 | |||
36 | |||
37 | #ifdef PRINTK_HEADER | ||
38 | #undef PRINTK_HEADER | ||
39 | #endif /* PRINTK_HEADER */ | ||
40 | #define PRINTK_HEADER "dasd(eer):" | ||
41 | |||
42 | |||
43 | |||
44 | |||
45 | |||
46 | /*****************************************************************************/ | ||
47 | /* the internal buffer */ | ||
48 | /*****************************************************************************/ | ||
49 | |||
50 | /* | ||
51 | * The internal buffer is meant to store obaque blobs of data, so it doesn't | ||
52 | * know of higher level concepts like triggers. | ||
53 | * It consists of a number of pages that are used as a ringbuffer. Each data | ||
54 | * blob is stored in a simple record that consists of an integer, which | ||
55 | * contains the size of the following data, and the data bytes themselfes. | ||
56 | * | ||
57 | * To allow for multiple independent readers we create one internal buffer | ||
58 | * each time the device is opened and destroy the buffer when the file is | ||
59 | * closed again. | ||
60 | * | ||
61 | * One record can be written to a buffer by using the functions | ||
62 | * - dasd_eer_start_record (one time per record to write the size to the buffer | ||
63 | * and reserve the space for the data) | ||
64 | * - dasd_eer_write_buffer (one or more times per record to write the data) | ||
65 | * The data can be written in several steps but you will have to compute | ||
66 | * the total size up front for the invocation of dasd_eer_start_record. | ||
67 | * If the ringbuffer is full, dasd_eer_start_record will remove the required | ||
68 | * number of old records. | ||
69 | * | ||
70 | * A record is typically read in two steps, first read the integer that | ||
71 | * specifies the size of the following data, then read the data. | ||
72 | * Both can be done by | ||
73 | * - dasd_eer_read_buffer | ||
74 | * | ||
75 | * For all mentioned functions you need to get the bufferlock first and keep it | ||
76 | * until a complete record is written or read. | ||
77 | */ | ||
78 | |||
79 | |||
80 | /* | ||
81 | * Alle information necessary to keep track of an internal buffer is kept in | ||
82 | * a struct eerbuffer. The buffer specific to a file pointer is strored in | ||
83 | * the private_data field of that file. To be able to write data to all | ||
84 | * existing buffers, each buffer is also added to the bufferlist. | ||
85 | * If the user doesn't want to read a complete record in one go, we have to | ||
86 | * keep track of the rest of the record. residual stores the number of bytes | ||
87 | * that are still to deliver. If the rest of the record is invalidated between | ||
88 | * two reads then residual will be set to -1 so that the next read will fail. | ||
89 | * All entries in the eerbuffer structure are protected with the bufferlock. | ||
90 | * To avoid races between writing to a buffer on the one side and creating | ||
91 | * and destroying buffers on the other side, the bufferlock must also be used | ||
92 | * to protect the bufferlist. | ||
93 | */ | ||
94 | |||
95 | struct eerbuffer { | ||
96 | struct list_head list; | ||
97 | char **buffer; | ||
98 | int buffersize; | ||
99 | int buffer_page_count; | ||
100 | int head; | ||
101 | int tail; | ||
102 | int residual; | ||
103 | }; | ||
104 | |||
105 | LIST_HEAD(bufferlist); | ||
106 | |||
107 | static spinlock_t bufferlock = SPIN_LOCK_UNLOCKED; | ||
108 | |||
109 | DECLARE_WAIT_QUEUE_HEAD(dasd_eer_read_wait_queue); | ||
110 | |||
111 | /* | ||
112 | * How many free bytes are available on the buffer. | ||
113 | * needs to be called with bufferlock held | ||
114 | */ | ||
115 | static int | ||
116 | dasd_eer_get_free_bytes(struct eerbuffer *eerb) | ||
117 | { | ||
118 | if (eerb->head < eerb->tail) { | ||
119 | return eerb->tail - eerb->head - 1; | ||
120 | } else | ||
121 | return eerb->buffersize - eerb->head + eerb->tail -1; | ||
122 | } | ||
123 | |||
124 | /* | ||
125 | * How many bytes of buffer space are used. | ||
126 | * needs to be called with bufferlock held | ||
127 | */ | ||
128 | static int | ||
129 | dasd_eer_get_filled_bytes(struct eerbuffer *eerb) | ||
130 | { | ||
131 | |||
132 | if (eerb->head >= eerb->tail) { | ||
133 | return eerb->head - eerb->tail; | ||
134 | } else | ||
135 | return eerb->buffersize - eerb->tail + eerb->head; | ||
136 | } | ||
137 | |||
138 | /* | ||
139 | * The dasd_eer_write_buffer function just copies count bytes of data | ||
140 | * to the buffer. Make sure to call dasd_eer_start_record first, to | ||
141 | * make sure that enough free space is available. | ||
142 | * needs to be called with bufferlock held | ||
143 | */ | ||
144 | static void | ||
145 | dasd_eer_write_buffer(struct eerbuffer *eerb, int count, char *data) | ||
146 | { | ||
147 | |||
148 | unsigned long headindex,localhead; | ||
149 | unsigned long rest, len; | ||
150 | char *nextdata; | ||
151 | |||
152 | nextdata = data; | ||
153 | rest = count; | ||
154 | while (rest > 0) { | ||
155 | headindex = eerb->head / PAGE_SIZE; | ||
156 | localhead = eerb->head % PAGE_SIZE; | ||
157 | len = min(rest, (PAGE_SIZE - localhead)); | ||
158 | memcpy(eerb->buffer[headindex]+localhead, nextdata, len); | ||
159 | nextdata += len; | ||
160 | rest -= len; | ||
161 | eerb->head += len; | ||
162 | if ( eerb->head == eerb->buffersize ) | ||
163 | eerb->head = 0; /* wrap around */ | ||
164 | if (eerb->head > eerb->buffersize) { | ||
165 | MESSAGE(KERN_ERR, "%s", "runaway buffer head."); | ||
166 | BUG(); | ||
167 | } | ||
168 | } | ||
169 | } | ||
170 | |||
171 | /* | ||
172 | * needs to be called with bufferlock held | ||
173 | */ | ||
174 | static int | ||
175 | dasd_eer_read_buffer(struct eerbuffer *eerb, int count, char *data) | ||
176 | { | ||
177 | |||
178 | unsigned long tailindex,localtail; | ||
179 | unsigned long rest, len, finalcount; | ||
180 | char *nextdata; | ||
181 | |||
182 | finalcount = min(count, dasd_eer_get_filled_bytes(eerb)); | ||
183 | nextdata = data; | ||
184 | rest = finalcount; | ||
185 | while (rest > 0) { | ||
186 | tailindex = eerb->tail / PAGE_SIZE; | ||
187 | localtail = eerb->tail % PAGE_SIZE; | ||
188 | len = min(rest, (PAGE_SIZE - localtail)); | ||
189 | memcpy(nextdata, eerb->buffer[tailindex]+localtail, len); | ||
190 | nextdata += len; | ||
191 | rest -= len; | ||
192 | eerb->tail += len; | ||
193 | if ( eerb->tail == eerb->buffersize ) | ||
194 | eerb->tail = 0; /* wrap around */ | ||
195 | if (eerb->tail > eerb->buffersize) { | ||
196 | MESSAGE(KERN_ERR, "%s", "runaway buffer tail."); | ||
197 | BUG(); | ||
198 | } | ||
199 | } | ||
200 | return finalcount; | ||
201 | } | ||
202 | |||
203 | /* | ||
204 | * Whenever you want to write a blob of data to the internal buffer you | ||
205 | * have to start by using this function first. It will write the number | ||
206 | * of bytes that will be written to the buffer. If necessary it will remove | ||
207 | * old records to make room for the new one. | ||
208 | * needs to be called with bufferlock held | ||
209 | */ | ||
210 | static int | ||
211 | dasd_eer_start_record(struct eerbuffer *eerb, int count) | ||
212 | { | ||
213 | int tailcount; | ||
214 | if (count + sizeof(count) > eerb->buffersize) | ||
215 | return -ENOMEM; | ||
216 | while (dasd_eer_get_free_bytes(eerb) < count + sizeof(count)) { | ||
217 | if (eerb->residual > 0) { | ||
218 | eerb->tail += eerb->residual; | ||
219 | if (eerb->tail >= eerb->buffersize) | ||
220 | eerb->tail -= eerb->buffersize; | ||
221 | eerb->residual = -1; | ||
222 | } | ||
223 | dasd_eer_read_buffer(eerb, sizeof(tailcount), | ||
224 | (char*)(&tailcount)); | ||
225 | eerb->tail += tailcount; | ||
226 | if (eerb->tail >= eerb->buffersize) | ||
227 | eerb->tail -= eerb->buffersize; | ||
228 | } | ||
229 | dasd_eer_write_buffer(eerb, sizeof(count), (char*)(&count)); | ||
230 | |||
231 | return 0; | ||
232 | }; | ||
233 | |||
234 | /* | ||
235 | * release pages that are not used anymore | ||
236 | */ | ||
237 | static void | ||
238 | dasd_eer_free_buffer_pages(char **buf, int no_pages) | ||
239 | { | ||
240 | int i; | ||
241 | |||
242 | for (i = 0; i < no_pages; ++i) { | ||
243 | free_page((unsigned long)buf[i]); | ||
244 | } | ||
245 | } | ||
246 | |||
247 | /* | ||
248 | * allocate a new set of memory pages | ||
249 | */ | ||
250 | static int | ||
251 | dasd_eer_allocate_buffer_pages(char **buf, int no_pages) | ||
252 | { | ||
253 | int i; | ||
254 | |||
255 | for (i = 0; i < no_pages; ++i) { | ||
256 | buf[i] = (char *) get_zeroed_page(GFP_KERNEL); | ||
257 | if (!buf[i]) { | ||
258 | dasd_eer_free_buffer_pages(buf, i); | ||
259 | return -ENOMEM; | ||
260 | } | ||
261 | } | ||
262 | return 0; | ||
263 | } | ||
264 | |||
265 | /* | ||
266 | * empty the buffer by resetting head and tail | ||
267 | * In case there is a half read data blob in the buffer, we set residual | ||
268 | * to -1 to indicate that the remainder of the blob is lost. | ||
269 | */ | ||
270 | static void | ||
271 | dasd_eer_purge_buffer(struct eerbuffer *eerb) | ||
272 | { | ||
273 | unsigned long flags; | ||
274 | |||
275 | spin_lock_irqsave(&bufferlock, flags); | ||
276 | if (eerb->residual > 0) | ||
277 | eerb->residual = -1; | ||
278 | eerb->tail=0; | ||
279 | eerb->head=0; | ||
280 | spin_unlock_irqrestore(&bufferlock, flags); | ||
281 | } | ||
282 | |||
283 | /* | ||
284 | * set the size of the buffer, newsize is the new number of pages to be used | ||
285 | * we don't try to copy any data back an forth, so any resize will also purge | ||
286 | * the buffer | ||
287 | */ | ||
288 | static int | ||
289 | dasd_eer_resize_buffer(struct eerbuffer *eerb, int newsize) | ||
290 | { | ||
291 | int i, oldcount, reuse; | ||
292 | char **new; | ||
293 | char **old; | ||
294 | unsigned long flags; | ||
295 | |||
296 | if (newsize < 1) | ||
297 | return -EINVAL; | ||
298 | if (eerb->buffer_page_count == newsize) { | ||
299 | /* documented behaviour is that any successfull invocation | ||
300 | * will purge all records */ | ||
301 | dasd_eer_purge_buffer(eerb); | ||
302 | return 0; | ||
303 | } | ||
304 | new = kmalloc(newsize*sizeof(char*), GFP_KERNEL); | ||
305 | if (!new) | ||
306 | return -ENOMEM; | ||
307 | |||
308 | reuse=min(eerb->buffer_page_count, newsize); | ||
309 | for (i = 0; i < reuse; ++i) { | ||
310 | new[i] = eerb->buffer[i]; | ||
311 | } | ||
312 | if (eerb->buffer_page_count < newsize) { | ||
313 | if (dasd_eer_allocate_buffer_pages( | ||
314 | &new[eerb->buffer_page_count], | ||
315 | newsize - eerb->buffer_page_count)) { | ||
316 | kfree(new); | ||
317 | return -ENOMEM; | ||
318 | } | ||
319 | } | ||
320 | |||
321 | spin_lock_irqsave(&bufferlock, flags); | ||
322 | old = eerb->buffer; | ||
323 | eerb->buffer = new; | ||
324 | if (eerb->residual > 0) | ||
325 | eerb->residual = -1; | ||
326 | eerb->tail = 0; | ||
327 | eerb->head = 0; | ||
328 | oldcount = eerb->buffer_page_count; | ||
329 | eerb->buffer_page_count = newsize; | ||
330 | spin_unlock_irqrestore(&bufferlock, flags); | ||
331 | |||
332 | if (oldcount > newsize) { | ||
333 | for (i = newsize; i < oldcount; ++i) { | ||
334 | free_page((unsigned long)old[i]); | ||
335 | } | ||
336 | } | ||
337 | kfree(old); | ||
338 | |||
339 | return 0; | ||
340 | } | ||
341 | |||
342 | |||
343 | /*****************************************************************************/ | ||
344 | /* The extended error reporting functionality */ | ||
345 | /*****************************************************************************/ | ||
346 | |||
347 | /* | ||
348 | * When a DASD device driver wants to report an error, it calls the | ||
349 | * function dasd_eer_write_trigger (via a notifier mechanism) and gives the | ||
350 | * respective trigger ID as parameter. | ||
351 | * Currently there are four kinds of triggers: | ||
352 | * | ||
353 | * DASD_EER_FATALERROR: all kinds of unrecoverable I/O problems | ||
354 | * DASD_EER_PPRCSUSPEND: PPRC was suspended | ||
355 | * DASD_EER_NOPATH: There is no path to the device left. | ||
356 | * DASD_EER_STATECHANGE: The state of the device has changed. | ||
357 | * | ||
358 | * For the first three triggers all required information can be supplied by | ||
359 | * the caller. For these triggers a record is written by the function | ||
360 | * dasd_eer_write_standard_trigger. | ||
361 | * | ||
362 | * When dasd_eer_write_trigger is called to write a DASD_EER_STATECHANGE | ||
363 | * trigger, we have to gather the necessary sense data first. We cannot queue | ||
364 | * the necessary SNSS (sense subsystem status) request immediatly, since we | ||
365 | * are likely to run in a deadlock situation. Instead, we schedule a | ||
366 | * work_struct that calls the function dasd_eer_sense_subsystem_status to | ||
367 | * create and start an SNSS request asynchronously. | ||
368 | * | ||
369 | * To avoid memory allocations at runtime, the necessary memory is allocated | ||
370 | * when the extended error reporting is enabled for a device (by | ||
371 | * dasd_eer_probe). There is one private eer data structure for each eer | ||
372 | * enabled DASD device. It contains memory for the work_struct, one SNSS cqr | ||
373 | * and a flags field that is used to coordinate the use of the cqr. The call | ||
374 | * to write a state change trigger can come in at any time, so we have one flag | ||
375 | * CQR_IN_USE that protects the cqr itself. When this flag indicates that the | ||
376 | * cqr is currently in use, dasd_eer_sense_subsystem_status cannot start a | ||
377 | * second request but sets the SNSS_REQUESTED flag instead. | ||
378 | * | ||
379 | * When the request is finished, the callback function dasd_eer_SNSS_cb | ||
380 | * is called. This function will invoke the function | ||
381 | * dasd_eer_write_SNSS_trigger to finally write the trigger. It will also | ||
382 | * check the SNSS_REQUESTED flag and if it is set it will call | ||
383 | * dasd_eer_sense_subsystem_status again. | ||
384 | * | ||
385 | * To avoid race conditions during the handling of the lock, the flags must | ||
386 | * be protected by the snsslock. | ||
387 | */ | ||
388 | |||
389 | struct dasd_eer_private { | ||
390 | struct dasd_ccw_req *cqr; | ||
391 | unsigned long flags; | ||
392 | struct work_struct worker; | ||
393 | }; | ||
394 | |||
395 | static void dasd_eer_destroy(struct dasd_device *device, | ||
396 | struct dasd_eer_private *eer); | ||
397 | static int | ||
398 | dasd_eer_write_trigger(struct dasd_eer_trigger *trigger); | ||
399 | static void dasd_eer_sense_subsystem_status(void *data); | ||
400 | static int dasd_eer_notify(struct notifier_block *self, | ||
401 | unsigned long action, void *data); | ||
402 | |||
403 | struct workqueue_struct *dasd_eer_workqueue; | ||
404 | |||
405 | #define SNSS_DATA_SIZE 44 | ||
406 | static spinlock_t snsslock = SPIN_LOCK_UNLOCKED; | ||
407 | |||
408 | #define DASD_EER_BUSID_SIZE 10 | ||
409 | struct dasd_eer_header { | ||
410 | __u32 total_size; | ||
411 | __u32 trigger; | ||
412 | __u64 tv_sec; | ||
413 | __u64 tv_usec; | ||
414 | char busid[DASD_EER_BUSID_SIZE]; | ||
415 | } __attribute__ ((packed)); | ||
416 | |||
417 | static struct notifier_block dasd_eer_nb = { | ||
418 | .notifier_call = dasd_eer_notify, | ||
419 | }; | ||
420 | |||
421 | /* | ||
422 | * flags for use with dasd_eer_private | ||
423 | */ | ||
424 | #define CQR_IN_USE 0 | ||
425 | #define SNSS_REQUESTED 1 | ||
426 | |||
427 | /* | ||
428 | * This function checks if extended error reporting is available for a given | ||
429 | * dasd_device. If yes, then it creates and returns a struct dasd_eer, | ||
430 | * otherwise it returns an -EPERM error pointer. | ||
431 | */ | ||
432 | struct dasd_eer_private * | ||
433 | dasd_eer_probe(struct dasd_device *device) | ||
434 | { | ||
435 | struct dasd_eer_private *private; | ||
436 | |||
437 | if (!(device && device->discipline | ||
438 | && !strcmp(device->discipline->name, "ECKD"))) { | ||
439 | return ERR_PTR(-EPERM); | ||
440 | } | ||
441 | /* allocate the private data structure */ | ||
442 | private = (struct dasd_eer_private *)kmalloc( | ||
443 | sizeof(struct dasd_eer_private), GFP_KERNEL); | ||
444 | if (!private) { | ||
445 | return ERR_PTR(-ENOMEM); | ||
446 | } | ||
447 | INIT_WORK(&private->worker, dasd_eer_sense_subsystem_status, | ||
448 | (void *)device); | ||
449 | private->cqr = dasd_kmalloc_request("ECKD", | ||
450 | 1 /* SNSS */ , | ||
451 | SNSS_DATA_SIZE , | ||
452 | device); | ||
453 | if (!private->cqr) { | ||
454 | kfree(private); | ||
455 | return ERR_PTR(-ENOMEM); | ||
456 | } | ||
457 | private->flags = 0; | ||
458 | return private; | ||
459 | }; | ||
460 | |||
461 | /* | ||
462 | * If our private SNSS request is queued, remove it from the | ||
463 | * dasd ccw queue so we can free the requests memory. | ||
464 | */ | ||
465 | static void | ||
466 | dasd_eer_dequeue_SNSS_request(struct dasd_device *device, | ||
467 | struct dasd_eer_private *eer) | ||
468 | { | ||
469 | struct list_head *lst, *nxt; | ||
470 | struct dasd_ccw_req *cqr, *erpcqr; | ||
471 | dasd_erp_fn_t erp_fn; | ||
472 | |||
473 | spin_lock_irq(get_ccwdev_lock(device->cdev)); | ||
474 | list_for_each_safe(lst, nxt, &device->ccw_queue) { | ||
475 | cqr = list_entry(lst, struct dasd_ccw_req, list); | ||
476 | /* we are looking for two kinds or requests */ | ||
477 | /* first kind: our SNSS request: */ | ||
478 | if (cqr == eer->cqr) { | ||
479 | if (cqr->status == DASD_CQR_IN_IO) | ||
480 | device->discipline->term_IO(cqr); | ||
481 | list_del(&cqr->list); | ||
482 | break; | ||
483 | } | ||
484 | /* second kind: ERP requests for our SNSS request */ | ||
485 | if (cqr->refers) { | ||
486 | /* If this erp request chain ends in our cqr, then */ | ||
487 | /* cal the erp_postaction to clean it up */ | ||
488 | erpcqr = cqr; | ||
489 | while (erpcqr->refers) { | ||
490 | erpcqr = erpcqr->refers; | ||
491 | } | ||
492 | if (erpcqr == eer->cqr) { | ||
493 | erp_fn = device->discipline->erp_postaction( | ||
494 | cqr); | ||
495 | erp_fn(cqr); | ||
496 | } | ||
497 | continue; | ||
498 | } | ||
499 | } | ||
500 | spin_unlock_irq(get_ccwdev_lock(device->cdev)); | ||
501 | } | ||
502 | |||
503 | /* | ||
504 | * This function dismantles a struct dasd_eer that was created by | ||
505 | * dasd_eer_probe. Since we want to free our private data structure, | ||
506 | * we must make sure that the memory is not in use anymore. | ||
507 | * We have to flush the work queue and remove a possible SNSS request | ||
508 | * from the dasd queue. | ||
509 | */ | ||
510 | static void | ||
511 | dasd_eer_destroy(struct dasd_device *device, struct dasd_eer_private *eer) | ||
512 | { | ||
513 | flush_workqueue(dasd_eer_workqueue); | ||
514 | dasd_eer_dequeue_SNSS_request(device, eer); | ||
515 | dasd_kfree_request(eer->cqr, device); | ||
516 | kfree(eer); | ||
517 | }; | ||
518 | |||
519 | /* | ||
520 | * enable the extended error reporting for a particular device | ||
521 | */ | ||
522 | static int | ||
523 | dasd_eer_enable_on_device(struct dasd_device *device) | ||
524 | { | ||
525 | void *eer; | ||
526 | if (!device) | ||
527 | return -ENODEV; | ||
528 | if (device->eer) | ||
529 | return 0; | ||
530 | if (!try_module_get(THIS_MODULE)) { | ||
531 | return -EINVAL; | ||
532 | } | ||
533 | eer = (void *)dasd_eer_probe(device); | ||
534 | if (IS_ERR(eer)) { | ||
535 | module_put(THIS_MODULE); | ||
536 | return PTR_ERR(eer); | ||
537 | } | ||
538 | device->eer = eer; | ||
539 | return 0; | ||
540 | } | ||
541 | |||
542 | /* | ||
543 | * enable the extended error reporting for a particular device | ||
544 | */ | ||
545 | static int | ||
546 | dasd_eer_disable_on_device(struct dasd_device *device) | ||
547 | { | ||
548 | struct dasd_eer_private *eer = device->eer; | ||
549 | |||
550 | if (!device) | ||
551 | return -ENODEV; | ||
552 | if (!device->eer) | ||
553 | return 0; | ||
554 | device->eer = NULL; | ||
555 | dasd_eer_destroy(device,eer); | ||
556 | module_put(THIS_MODULE); | ||
557 | |||
558 | return 0; | ||
559 | } | ||
560 | |||
561 | /* | ||
562 | * Set extended error reporting (eer) | ||
563 | * Note: This will be registered as a DASD ioctl, to be called on DASD devices. | ||
564 | */ | ||
565 | static int | ||
566 | dasd_ioctl_set_eer(struct block_device *bdev, int no, long args) | ||
567 | { | ||
568 | struct dasd_device *device; | ||
569 | int intval; | ||
570 | |||
571 | if (!capable(CAP_SYS_ADMIN)) | ||
572 | return -EACCES; | ||
573 | if (bdev != bdev->bd_contains) | ||
574 | /* Error-reporting is not allowed for partitions */ | ||
575 | return -EINVAL; | ||
576 | if (get_user(intval, (int __user *) args)) | ||
577 | return -EFAULT; | ||
578 | device = bdev->bd_disk->private_data; | ||
579 | if (device == NULL) | ||
580 | return -ENODEV; | ||
581 | |||
582 | intval = (intval != 0); | ||
583 | DEV_MESSAGE (KERN_DEBUG, device, | ||
584 | "set eer on device to %d", intval); | ||
585 | if (intval) | ||
586 | return dasd_eer_enable_on_device(device); | ||
587 | else | ||
588 | return dasd_eer_disable_on_device(device); | ||
589 | } | ||
590 | |||
591 | /* | ||
592 | * Get value of extended error reporting. | ||
593 | * Note: This will be registered as a DASD ioctl, to be called on DASD devices. | ||
594 | */ | ||
595 | static int | ||
596 | dasd_ioctl_get_eer(struct block_device *bdev, int no, long args) | ||
597 | { | ||
598 | struct dasd_device *device; | ||
599 | |||
600 | device = bdev->bd_disk->private_data; | ||
601 | if (device == NULL) | ||
602 | return -ENODEV; | ||
603 | return put_user((device->eer != NULL), (int __user *) args); | ||
604 | } | ||
605 | |||
606 | /* | ||
607 | * The following function can be used for those triggers that have | ||
608 | * all necessary data available when the function is called. | ||
609 | * If the parameter cqr is not NULL, the chain of requests will be searched | ||
610 | * for valid sense data, and all valid sense data sets will be added to | ||
611 | * the triggers data. | ||
612 | */ | ||
613 | static int | ||
614 | dasd_eer_write_standard_trigger(int trigger, struct dasd_device *device, | ||
615 | struct dasd_ccw_req *cqr) | ||
616 | { | ||
617 | struct dasd_ccw_req *temp_cqr; | ||
618 | int data_size; | ||
619 | struct timeval tv; | ||
620 | struct dasd_eer_header header; | ||
621 | unsigned long flags; | ||
622 | struct eerbuffer *eerb; | ||
623 | |||
624 | /* go through cqr chain and count the valid sense data sets */ | ||
625 | temp_cqr = cqr; | ||
626 | data_size = 0; | ||
627 | while (temp_cqr) { | ||
628 | if (temp_cqr->irb.esw.esw0.erw.cons) | ||
629 | data_size += 32; | ||
630 | temp_cqr = temp_cqr->refers; | ||
631 | } | ||
632 | |||
633 | header.total_size = sizeof(header) + data_size + 4; /* "EOR" */ | ||
634 | header.trigger = trigger; | ||
635 | do_gettimeofday(&tv); | ||
636 | header.tv_sec = tv.tv_sec; | ||
637 | header.tv_usec = tv.tv_usec; | ||
638 | strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE); | ||
639 | |||
640 | spin_lock_irqsave(&bufferlock, flags); | ||
641 | list_for_each_entry(eerb, &bufferlist, list) { | ||
642 | dasd_eer_start_record(eerb, header.total_size); | ||
643 | dasd_eer_write_buffer(eerb, sizeof(header), (char*)(&header)); | ||
644 | temp_cqr = cqr; | ||
645 | while (temp_cqr) { | ||
646 | if (temp_cqr->irb.esw.esw0.erw.cons) | ||
647 | dasd_eer_write_buffer(eerb, 32, cqr->irb.ecw); | ||
648 | temp_cqr = temp_cqr->refers; | ||
649 | } | ||
650 | dasd_eer_write_buffer(eerb, 4,"EOR"); | ||
651 | } | ||
652 | spin_unlock_irqrestore(&bufferlock, flags); | ||
653 | |||
654 | wake_up_interruptible(&dasd_eer_read_wait_queue); | ||
655 | |||
656 | return 0; | ||
657 | } | ||
658 | |||
659 | /* | ||
660 | * This function writes a DASD_EER_STATECHANGE trigger. | ||
661 | */ | ||
662 | static void | ||
663 | dasd_eer_write_SNSS_trigger(struct dasd_device *device, | ||
664 | struct dasd_ccw_req *cqr) | ||
665 | { | ||
666 | int data_size; | ||
667 | int snss_rc; | ||
668 | struct timeval tv; | ||
669 | struct dasd_eer_header header; | ||
670 | unsigned long flags; | ||
671 | struct eerbuffer *eerb; | ||
672 | |||
673 | snss_rc = (cqr->status == DASD_CQR_FAILED) ? -EIO : 0; | ||
674 | if (snss_rc) | ||
675 | data_size = 0; | ||
676 | else | ||
677 | data_size = SNSS_DATA_SIZE; | ||
678 | |||
679 | header.total_size = sizeof(header) + data_size + 4; /* "EOR" */ | ||
680 | header.trigger = DASD_EER_STATECHANGE; | ||
681 | do_gettimeofday(&tv); | ||
682 | header.tv_sec = tv.tv_sec; | ||
683 | header.tv_usec = tv.tv_usec; | ||
684 | strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE); | ||
685 | |||
686 | spin_lock_irqsave(&bufferlock, flags); | ||
687 | list_for_each_entry(eerb, &bufferlist, list) { | ||
688 | dasd_eer_start_record(eerb, header.total_size); | ||
689 | dasd_eer_write_buffer(eerb, sizeof(header),(char*)(&header)); | ||
690 | if (!snss_rc) | ||
691 | dasd_eer_write_buffer(eerb, SNSS_DATA_SIZE, cqr->data); | ||
692 | dasd_eer_write_buffer(eerb, 4,"EOR"); | ||
693 | } | ||
694 | spin_unlock_irqrestore(&bufferlock, flags); | ||
695 | |||
696 | wake_up_interruptible(&dasd_eer_read_wait_queue); | ||
697 | } | ||
698 | |||
699 | /* | ||
700 | * callback function for use with SNSS request | ||
701 | */ | ||
702 | static void | ||
703 | dasd_eer_SNSS_cb(struct dasd_ccw_req *cqr, void *data) | ||
704 | { | ||
705 | struct dasd_device *device; | ||
706 | struct dasd_eer_private *private; | ||
707 | unsigned long irqflags; | ||
708 | |||
709 | device = (struct dasd_device *)data; | ||
710 | private = (struct dasd_eer_private *)device->eer; | ||
711 | dasd_eer_write_SNSS_trigger(device, cqr); | ||
712 | spin_lock_irqsave(&snsslock, irqflags); | ||
713 | if(!test_and_clear_bit(SNSS_REQUESTED, &private->flags)) { | ||
714 | clear_bit(CQR_IN_USE, &private->flags); | ||
715 | spin_unlock_irqrestore(&snsslock, irqflags); | ||
716 | return; | ||
717 | }; | ||
718 | clear_bit(CQR_IN_USE, &private->flags); | ||
719 | spin_unlock_irqrestore(&snsslock, irqflags); | ||
720 | dasd_eer_sense_subsystem_status(device); | ||
721 | return; | ||
722 | } | ||
723 | |||
724 | /* | ||
725 | * clean a used cqr before using it again | ||
726 | */ | ||
727 | static void | ||
728 | dasd_eer_clean_SNSS_request(struct dasd_ccw_req *cqr) | ||
729 | { | ||
730 | struct ccw1 *cpaddr = cqr->cpaddr; | ||
731 | void *data = cqr->data; | ||
732 | |||
733 | memset(cqr, 0, sizeof(struct dasd_ccw_req)); | ||
734 | memset(cpaddr, 0, sizeof(struct ccw1)); | ||
735 | memset(data, 0, SNSS_DATA_SIZE); | ||
736 | cqr->cpaddr = cpaddr; | ||
737 | cqr->data = data; | ||
738 | strncpy((char *) &cqr->magic, "ECKD", 4); | ||
739 | ASCEBC((char *) &cqr->magic, 4); | ||
740 | set_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags); | ||
741 | } | ||
742 | |||
743 | /* | ||
744 | * build and start an SNSS request | ||
745 | * This function is called from a work queue so we have to | ||
746 | * pass the dasd_device pointer as a void pointer. | ||
747 | */ | ||
748 | static void | ||
749 | dasd_eer_sense_subsystem_status(void *data) | ||
750 | { | ||
751 | struct dasd_device *device; | ||
752 | struct dasd_eer_private *private; | ||
753 | struct dasd_ccw_req *cqr; | ||
754 | struct ccw1 *ccw; | ||
755 | unsigned long irqflags; | ||
756 | |||
757 | device = (struct dasd_device *)data; | ||
758 | private = (struct dasd_eer_private *)device->eer; | ||
759 | if (!private) /* device not eer enabled any more */ | ||
760 | return; | ||
761 | cqr = private->cqr; | ||
762 | spin_lock_irqsave(&snsslock, irqflags); | ||
763 | if(test_and_set_bit(CQR_IN_USE, &private->flags)) { | ||
764 | set_bit(SNSS_REQUESTED, &private->flags); | ||
765 | spin_unlock_irqrestore(&snsslock, irqflags); | ||
766 | return; | ||
767 | }; | ||
768 | spin_unlock_irqrestore(&snsslock, irqflags); | ||
769 | dasd_eer_clean_SNSS_request(cqr); | ||
770 | cqr->device = device; | ||
771 | cqr->retries = 255; | ||
772 | cqr->expires = 10 * HZ; | ||
773 | |||
774 | ccw = cqr->cpaddr; | ||
775 | ccw->cmd_code = DASD_ECKD_CCW_SNSS; | ||
776 | ccw->count = SNSS_DATA_SIZE; | ||
777 | ccw->flags = 0; | ||
778 | ccw->cda = (__u32)(addr_t)cqr->data; | ||
779 | |||
780 | cqr->buildclk = get_clock(); | ||
781 | cqr->status = DASD_CQR_FILLED; | ||
782 | cqr->callback = dasd_eer_SNSS_cb; | ||
783 | cqr->callback_data = (void *)device; | ||
784 | dasd_add_request_head(cqr); | ||
785 | |||
786 | return; | ||
787 | } | ||
788 | |||
789 | /* | ||
790 | * This function is called for all triggers. It calls the appropriate | ||
791 | * function that writes the actual trigger records. | ||
792 | */ | ||
793 | static int | ||
794 | dasd_eer_write_trigger(struct dasd_eer_trigger *trigger) | ||
795 | { | ||
796 | int rc; | ||
797 | struct dasd_eer_private *private = trigger->device->eer; | ||
798 | |||
799 | switch (trigger->id) { | ||
800 | case DASD_EER_FATALERROR: | ||
801 | case DASD_EER_PPRCSUSPEND: | ||
802 | rc = dasd_eer_write_standard_trigger( | ||
803 | trigger->id, trigger->device, trigger->cqr); | ||
804 | break; | ||
805 | case DASD_EER_NOPATH: | ||
806 | rc = dasd_eer_write_standard_trigger( | ||
807 | trigger->id, trigger->device, NULL); | ||
808 | break; | ||
809 | case DASD_EER_STATECHANGE: | ||
810 | if (queue_work(dasd_eer_workqueue, &private->worker)) { | ||
811 | rc=0; | ||
812 | } else { | ||
813 | /* If the work_struct was already queued, it can't | ||
814 | * be queued again. But this is OK since we don't | ||
815 | * need to have it queued twice. | ||
816 | */ | ||
817 | rc = -EBUSY; | ||
818 | } | ||
819 | break; | ||
820 | default: /* unknown trigger, so we write it without any sense data */ | ||
821 | rc = dasd_eer_write_standard_trigger( | ||
822 | trigger->id, trigger->device, NULL); | ||
823 | break; | ||
824 | } | ||
825 | return rc; | ||
826 | } | ||
827 | |||
828 | /* | ||
829 | * This function is registered with the dasd device driver and gets called | ||
830 | * for all dasd eer notifications. | ||
831 | */ | ||
832 | static int dasd_eer_notify(struct notifier_block *self, | ||
833 | unsigned long action, void *data) | ||
834 | { | ||
835 | switch (action) { | ||
836 | case DASD_EER_DISABLE: | ||
837 | dasd_eer_disable_on_device((struct dasd_device *)data); | ||
838 | break; | ||
839 | case DASD_EER_TRIGGER: | ||
840 | dasd_eer_write_trigger((struct dasd_eer_trigger *)data); | ||
841 | break; | ||
842 | } | ||
843 | return NOTIFY_OK; | ||
844 | } | ||
845 | |||
846 | |||
847 | /*****************************************************************************/ | ||
848 | /* the device operations */ | ||
849 | /*****************************************************************************/ | ||
850 | |||
851 | /* | ||
852 | * On the one side we need a lock to access our internal buffer, on the | ||
853 | * other side a copy_to_user can sleep. So we need to copy the data we have | ||
854 | * to transfer in a readbuffer, which is protected by the readbuffer_mutex. | ||
855 | */ | ||
856 | static char readbuffer[PAGE_SIZE]; | ||
857 | DECLARE_MUTEX(readbuffer_mutex); | ||
858 | |||
859 | |||
860 | static int | ||
861 | dasd_eer_open(struct inode *inp, struct file *filp) | ||
862 | { | ||
863 | struct eerbuffer *eerb; | ||
864 | unsigned long flags; | ||
865 | |||
866 | eerb = kmalloc(sizeof(struct eerbuffer), GFP_KERNEL); | ||
867 | eerb->head = 0; | ||
868 | eerb->tail = 0; | ||
869 | eerb->residual = 0; | ||
870 | eerb->buffer_page_count = 1; | ||
871 | eerb->buffersize = eerb->buffer_page_count * PAGE_SIZE; | ||
872 | eerb->buffer = kmalloc(eerb->buffer_page_count*sizeof(char*), | ||
873 | GFP_KERNEL); | ||
874 | if (!eerb->buffer) | ||
875 | return -ENOMEM; | ||
876 | if (dasd_eer_allocate_buffer_pages(eerb->buffer, | ||
877 | eerb->buffer_page_count)) { | ||
878 | kfree(eerb->buffer); | ||
879 | return -ENOMEM; | ||
880 | } | ||
881 | filp->private_data = eerb; | ||
882 | spin_lock_irqsave(&bufferlock, flags); | ||
883 | list_add(&eerb->list, &bufferlist); | ||
884 | spin_unlock_irqrestore(&bufferlock, flags); | ||
885 | |||
886 | return nonseekable_open(inp,filp); | ||
887 | } | ||
888 | |||
889 | static int | ||
890 | dasd_eer_close(struct inode *inp, struct file *filp) | ||
891 | { | ||
892 | struct eerbuffer *eerb; | ||
893 | unsigned long flags; | ||
894 | |||
895 | eerb = (struct eerbuffer *)filp->private_data; | ||
896 | spin_lock_irqsave(&bufferlock, flags); | ||
897 | list_del(&eerb->list); | ||
898 | spin_unlock_irqrestore(&bufferlock, flags); | ||
899 | dasd_eer_free_buffer_pages(eerb->buffer, eerb->buffer_page_count); | ||
900 | kfree(eerb->buffer); | ||
901 | kfree(eerb); | ||
902 | |||
903 | return 0; | ||
904 | } | ||
905 | |||
906 | static long | ||
907 | dasd_eer_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | ||
908 | { | ||
909 | int intval; | ||
910 | struct eerbuffer *eerb; | ||
911 | |||
912 | eerb = (struct eerbuffer *)filp->private_data; | ||
913 | switch (cmd) { | ||
914 | case DASD_EER_PURGE: | ||
915 | dasd_eer_purge_buffer(eerb); | ||
916 | return 0; | ||
917 | case DASD_EER_SETBUFSIZE: | ||
918 | if (get_user(intval, (int __user *)arg)) | ||
919 | return -EFAULT; | ||
920 | return dasd_eer_resize_buffer(eerb, intval); | ||
921 | default: | ||
922 | return -ENOIOCTLCMD; | ||
923 | } | ||
924 | } | ||
925 | |||
926 | static ssize_t | ||
927 | dasd_eer_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos) | ||
928 | { | ||
929 | int tc,rc; | ||
930 | int tailcount,effective_count; | ||
931 | unsigned long flags; | ||
932 | struct eerbuffer *eerb; | ||
933 | |||
934 | eerb = (struct eerbuffer *)filp->private_data; | ||
935 | if(down_interruptible(&readbuffer_mutex)) | ||
936 | return -ERESTARTSYS; | ||
937 | |||
938 | spin_lock_irqsave(&bufferlock, flags); | ||
939 | |||
940 | if (eerb->residual < 0) { /* the remainder of this record */ | ||
941 | /* has been deleted */ | ||
942 | eerb->residual = 0; | ||
943 | spin_unlock_irqrestore(&bufferlock, flags); | ||
944 | up(&readbuffer_mutex); | ||
945 | return -EIO; | ||
946 | } else if (eerb->residual > 0) { | ||
947 | /* OK we still have a second half of a record to deliver */ | ||
948 | effective_count = min(eerb->residual, (int)count); | ||
949 | eerb->residual -= effective_count; | ||
950 | } else { | ||
951 | tc = 0; | ||
952 | while (!tc) { | ||
953 | tc = dasd_eer_read_buffer(eerb, | ||
954 | sizeof(tailcount), (char*)(&tailcount)); | ||
955 | if (!tc) { | ||
956 | /* no data available */ | ||
957 | spin_unlock_irqrestore(&bufferlock, flags); | ||
958 | up(&readbuffer_mutex); | ||
959 | if (filp->f_flags & O_NONBLOCK) | ||
960 | return -EAGAIN; | ||
961 | rc = wait_event_interruptible( | ||
962 | dasd_eer_read_wait_queue, | ||
963 | eerb->head != eerb->tail); | ||
964 | if (rc) { | ||
965 | return rc; | ||
966 | } | ||
967 | if(down_interruptible(&readbuffer_mutex)) | ||
968 | return -ERESTARTSYS; | ||
969 | spin_lock_irqsave(&bufferlock, flags); | ||
970 | } | ||
971 | } | ||
972 | WARN_ON(tc != sizeof(tailcount)); | ||
973 | effective_count = min(tailcount,(int)count); | ||
974 | eerb->residual = tailcount - effective_count; | ||
975 | } | ||
976 | |||
977 | tc = dasd_eer_read_buffer(eerb, effective_count, readbuffer); | ||
978 | WARN_ON(tc != effective_count); | ||
979 | |||
980 | spin_unlock_irqrestore(&bufferlock, flags); | ||
981 | |||
982 | if (copy_to_user(buf, readbuffer, effective_count)) { | ||
983 | up(&readbuffer_mutex); | ||
984 | return -EFAULT; | ||
985 | } | ||
986 | |||
987 | up(&readbuffer_mutex); | ||
988 | return effective_count; | ||
989 | } | ||
990 | |||
991 | static unsigned int | ||
992 | dasd_eer_poll (struct file *filp, poll_table *ptable) | ||
993 | { | ||
994 | unsigned int mask; | ||
995 | unsigned long flags; | ||
996 | struct eerbuffer *eerb; | ||
997 | |||
998 | eerb = (struct eerbuffer *)filp->private_data; | ||
999 | poll_wait(filp, &dasd_eer_read_wait_queue, ptable); | ||
1000 | spin_lock_irqsave(&bufferlock, flags); | ||
1001 | if (eerb->head != eerb->tail) | ||
1002 | mask = POLLIN | POLLRDNORM ; | ||
1003 | else | ||
1004 | mask = 0; | ||
1005 | spin_unlock_irqrestore(&bufferlock, flags); | ||
1006 | return mask; | ||
1007 | } | ||
1008 | |||
1009 | static struct file_operations dasd_eer_fops = { | ||
1010 | .open = &dasd_eer_open, | ||
1011 | .release = &dasd_eer_close, | ||
1012 | .unlocked_ioctl = &dasd_eer_ioctl, | ||
1013 | .compat_ioctl = &dasd_eer_ioctl, | ||
1014 | .read = &dasd_eer_read, | ||
1015 | .poll = &dasd_eer_poll, | ||
1016 | .owner = THIS_MODULE, | ||
1017 | }; | ||
1018 | |||
1019 | static struct miscdevice dasd_eer_dev = { | ||
1020 | .minor = MISC_DYNAMIC_MINOR, | ||
1021 | .name = "dasd_eer", | ||
1022 | .fops = &dasd_eer_fops, | ||
1023 | }; | ||
1024 | |||
1025 | |||
1026 | /*****************************************************************************/ | ||
1027 | /* Init and exit */ | ||
1028 | /*****************************************************************************/ | ||
1029 | |||
1030 | static int | ||
1031 | __init dasd_eer_init(void) | ||
1032 | { | ||
1033 | int rc; | ||
1034 | |||
1035 | dasd_eer_workqueue = create_singlethread_workqueue("dasd_eer"); | ||
1036 | if (!dasd_eer_workqueue) { | ||
1037 | MESSAGE(KERN_ERR , "%s", "dasd_eer_init could not " | ||
1038 | "create workqueue \n"); | ||
1039 | rc = -ENOMEM; | ||
1040 | goto out; | ||
1041 | } | ||
1042 | |||
1043 | rc = dasd_register_eer_notifier(&dasd_eer_nb); | ||
1044 | if (rc) { | ||
1045 | MESSAGE(KERN_ERR, "%s", "dasd_eer_init could not " | ||
1046 | "register error reporting"); | ||
1047 | goto queue; | ||
1048 | } | ||
1049 | |||
1050 | dasd_ioctl_no_register(THIS_MODULE, BIODASDEERSET, dasd_ioctl_set_eer); | ||
1051 | dasd_ioctl_no_register(THIS_MODULE, BIODASDEERGET, dasd_ioctl_get_eer); | ||
1052 | |||
1053 | /* we don't need our own character device, | ||
1054 | * so we just register as misc device */ | ||
1055 | rc = misc_register(&dasd_eer_dev); | ||
1056 | if (rc) { | ||
1057 | MESSAGE(KERN_ERR, "%s", "dasd_eer_init could not " | ||
1058 | "register misc device"); | ||
1059 | goto unregister; | ||
1060 | } | ||
1061 | |||
1062 | return 0; | ||
1063 | |||
1064 | unregister: | ||
1065 | dasd_unregister_eer_notifier(&dasd_eer_nb); | ||
1066 | dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERSET, | ||
1067 | dasd_ioctl_set_eer); | ||
1068 | dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERGET, | ||
1069 | dasd_ioctl_get_eer); | ||
1070 | queue: | ||
1071 | destroy_workqueue(dasd_eer_workqueue); | ||
1072 | out: | ||
1073 | return rc; | ||
1074 | |||
1075 | } | ||
1076 | module_init(dasd_eer_init); | ||
1077 | |||
1078 | static void | ||
1079 | __exit dasd_eer_exit(void) | ||
1080 | { | ||
1081 | dasd_unregister_eer_notifier(&dasd_eer_nb); | ||
1082 | dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERSET, | ||
1083 | dasd_ioctl_set_eer); | ||
1084 | dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERGET, | ||
1085 | dasd_ioctl_get_eer); | ||
1086 | destroy_workqueue(dasd_eer_workqueue); | ||
1087 | |||
1088 | WARN_ON(misc_deregister(&dasd_eer_dev) != 0); | ||
1089 | } | ||
1090 | module_exit(dasd_eer_exit); | ||
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index d1b08fa13fd2..0592354cc604 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h | |||
@@ -275,34 +275,6 @@ struct dasd_discipline { | |||
275 | 275 | ||
276 | extern struct dasd_discipline *dasd_diag_discipline_pointer; | 276 | extern struct dasd_discipline *dasd_diag_discipline_pointer; |
277 | 277 | ||
278 | |||
279 | /* | ||
280 | * Notification numbers for extended error reporting notifications: | ||
281 | * The DASD_EER_DISABLE notification is sent before a dasd_device (and it's | ||
282 | * eer pointer) is freed. The error reporting module needs to do all necessary | ||
283 | * cleanup steps. | ||
284 | * The DASD_EER_TRIGGER notification sends the actual error reports (triggers). | ||
285 | */ | ||
286 | #define DASD_EER_DISABLE 0 | ||
287 | #define DASD_EER_TRIGGER 1 | ||
288 | |||
289 | /* Trigger IDs for extended error reporting DASD_EER_TRIGGER notification */ | ||
290 | #define DASD_EER_FATALERROR 1 | ||
291 | #define DASD_EER_NOPATH 2 | ||
292 | #define DASD_EER_STATECHANGE 3 | ||
293 | #define DASD_EER_PPRCSUSPEND 4 | ||
294 | |||
295 | /* | ||
296 | * The dasd_eer_trigger structure contains all data that we need to send | ||
297 | * along with an DASD_EER_TRIGGER notification. | ||
298 | */ | ||
299 | struct dasd_eer_trigger { | ||
300 | unsigned int id; | ||
301 | struct dasd_device *device; | ||
302 | struct dasd_ccw_req *cqr; | ||
303 | }; | ||
304 | |||
305 | |||
306 | struct dasd_device { | 278 | struct dasd_device { |
307 | /* Block device stuff. */ | 279 | /* Block device stuff. */ |
308 | struct gendisk *gdp; | 280 | struct gendisk *gdp; |
@@ -316,11 +288,9 @@ struct dasd_device { | |||
316 | unsigned long flags; /* per device flags */ | 288 | unsigned long flags; /* per device flags */ |
317 | unsigned short features; /* copy of devmap-features (read-only!) */ | 289 | unsigned short features; /* copy of devmap-features (read-only!) */ |
318 | 290 | ||
319 | /* extended error reporting stuff (eer) */ | ||
320 | void *eer; | ||
321 | |||
322 | /* Device discipline stuff. */ | 291 | /* Device discipline stuff. */ |
323 | struct dasd_discipline *discipline; | 292 | struct dasd_discipline *discipline; |
293 | struct dasd_discipline *base_discipline; | ||
324 | char *private; | 294 | char *private; |
325 | 295 | ||
326 | /* Device state and target state. */ | 296 | /* Device state and target state. */ |
@@ -519,12 +489,6 @@ int dasd_generic_set_online(struct ccw_device *, struct dasd_discipline *); | |||
519 | int dasd_generic_set_offline (struct ccw_device *cdev); | 489 | int dasd_generic_set_offline (struct ccw_device *cdev); |
520 | int dasd_generic_notify(struct ccw_device *, int); | 490 | int dasd_generic_notify(struct ccw_device *, int); |
521 | void dasd_generic_auto_online (struct ccw_driver *); | 491 | void dasd_generic_auto_online (struct ccw_driver *); |
522 | int dasd_register_eer_notifier(struct notifier_block *); | ||
523 | int dasd_unregister_eer_notifier(struct notifier_block *); | ||
524 | void dasd_write_eer_trigger(unsigned int , struct dasd_device *, | ||
525 | struct dasd_ccw_req *); | ||
526 | |||
527 | |||
528 | 492 | ||
529 | /* externals in dasd_devmap.c */ | 493 | /* externals in dasd_devmap.c */ |
530 | extern int dasd_max_devindex; | 494 | extern int dasd_max_devindex; |
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index ceb0e474fde4..4138564402b8 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c | |||
@@ -85,11 +85,10 @@ static volatile enum sclp_mask_state_t { | |||
85 | /* Maximum retry counts */ | 85 | /* Maximum retry counts */ |
86 | #define SCLP_INIT_RETRY 3 | 86 | #define SCLP_INIT_RETRY 3 |
87 | #define SCLP_MASK_RETRY 3 | 87 | #define SCLP_MASK_RETRY 3 |
88 | #define SCLP_REQUEST_RETRY 3 | ||
89 | 88 | ||
90 | /* Timeout intervals in seconds.*/ | 89 | /* Timeout intervals in seconds.*/ |
91 | #define SCLP_BUSY_INTERVAL 2 | 90 | #define SCLP_BUSY_INTERVAL 10 |
92 | #define SCLP_RETRY_INTERVAL 5 | 91 | #define SCLP_RETRY_INTERVAL 15 |
93 | 92 | ||
94 | static void sclp_process_queue(void); | 93 | static void sclp_process_queue(void); |
95 | static int sclp_init_mask(int calculate); | 94 | static int sclp_init_mask(int calculate); |
@@ -153,11 +152,9 @@ __sclp_start_request(struct sclp_req *req) | |||
153 | if (sclp_running_state != sclp_running_state_idle) | 152 | if (sclp_running_state != sclp_running_state_idle) |
154 | return 0; | 153 | return 0; |
155 | del_timer(&sclp_request_timer); | 154 | del_timer(&sclp_request_timer); |
156 | if (req->start_count <= SCLP_REQUEST_RETRY) { | 155 | rc = service_call(req->command, req->sccb); |
157 | rc = service_call(req->command, req->sccb); | 156 | req->start_count++; |
158 | req->start_count++; | 157 | |
159 | } else | ||
160 | rc = -EIO; | ||
161 | if (rc == 0) { | 158 | if (rc == 0) { |
162 | /* Sucessfully started request */ | 159 | /* Sucessfully started request */ |
163 | req->status = SCLP_REQ_RUNNING; | 160 | req->status = SCLP_REQ_RUNNING; |
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index 92be75d99a56..8cf9905d484b 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c | |||
@@ -232,7 +232,7 @@ s390_subchannel_remove_chpid(struct device *dev, void *data) | |||
232 | return 0; | 232 | return 0; |
233 | 233 | ||
234 | mask = 0x80 >> j; | 234 | mask = 0x80 >> j; |
235 | spin_lock(&sch->lock); | 235 | spin_lock_irq(&sch->lock); |
236 | 236 | ||
237 | stsch(sch->schid, &schib); | 237 | stsch(sch->schid, &schib); |
238 | if (!schib.pmcw.dnv) | 238 | if (!schib.pmcw.dnv) |
@@ -281,10 +281,10 @@ s390_subchannel_remove_chpid(struct device *dev, void *data) | |||
281 | if (sch->driver && sch->driver->verify) | 281 | if (sch->driver && sch->driver->verify) |
282 | sch->driver->verify(&sch->dev); | 282 | sch->driver->verify(&sch->dev); |
283 | out_unlock: | 283 | out_unlock: |
284 | spin_unlock(&sch->lock); | 284 | spin_unlock_irq(&sch->lock); |
285 | return 0; | 285 | return 0; |
286 | out_unreg: | 286 | out_unreg: |
287 | spin_unlock(&sch->lock); | 287 | spin_unlock_irq(&sch->lock); |
288 | sch->lpm = 0; | 288 | sch->lpm = 0; |
289 | if (css_enqueue_subchannel_slow(sch->schid)) { | 289 | if (css_enqueue_subchannel_slow(sch->schid)) { |
290 | css_clear_subchannel_slow_list(); | 290 | css_clear_subchannel_slow_list(); |
@@ -652,7 +652,7 @@ __chp_add(struct subchannel_id schid, void *data) | |||
652 | if (!sch) | 652 | if (!sch) |
653 | /* Check if the subchannel is now available. */ | 653 | /* Check if the subchannel is now available. */ |
654 | return __chp_add_new_sch(schid); | 654 | return __chp_add_new_sch(schid); |
655 | spin_lock(&sch->lock); | 655 | spin_lock_irq(&sch->lock); |
656 | for (i=0; i<8; i++) | 656 | for (i=0; i<8; i++) |
657 | if (sch->schib.pmcw.chpid[i] == chp->id) { | 657 | if (sch->schib.pmcw.chpid[i] == chp->id) { |
658 | if (stsch(sch->schid, &sch->schib) != 0) { | 658 | if (stsch(sch->schid, &sch->schib) != 0) { |
@@ -674,7 +674,7 @@ __chp_add(struct subchannel_id schid, void *data) | |||
674 | if (sch->driver && sch->driver->verify) | 674 | if (sch->driver && sch->driver->verify) |
675 | sch->driver->verify(&sch->dev); | 675 | sch->driver->verify(&sch->dev); |
676 | 676 | ||
677 | spin_unlock(&sch->lock); | 677 | spin_unlock_irq(&sch->lock); |
678 | put_device(&sch->dev); | 678 | put_device(&sch->dev); |
679 | return 0; | 679 | return 0; |
680 | } | 680 | } |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 062fb100d94c..afc4e88551ad 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
@@ -359,7 +359,7 @@ ccw_device_set_online(struct ccw_device *cdev) | |||
359 | else | 359 | else |
360 | pr_debug("ccw_device_offline returned %d, device %s\n", | 360 | pr_debug("ccw_device_offline returned %d, device %s\n", |
361 | ret, cdev->dev.bus_id); | 361 | ret, cdev->dev.bus_id); |
362 | return (ret = 0) ? -ENODEV : ret; | 362 | return (ret == 0) ? -ENODEV : ret; |
363 | } | 363 | } |
364 | 364 | ||
365 | static ssize_t | 365 | static ssize_t |
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c index d2a5b04d7cba..85b1020a1fcc 100644 --- a/drivers/s390/cio/device_pgid.c +++ b/drivers/s390/cio/device_pgid.c | |||
@@ -405,7 +405,7 @@ __ccw_device_disband_start(struct ccw_device *cdev) | |||
405 | cdev->private->iretry = 5; | 405 | cdev->private->iretry = 5; |
406 | cdev->private->imask >>= 1; | 406 | cdev->private->imask >>= 1; |
407 | } | 407 | } |
408 | ccw_device_verify_done(cdev, (sch->lpm != 0) ? 0 : -ENODEV); | 408 | ccw_device_disband_done(cdev, (sch->lpm != 0) ? 0 : -ENODEV); |
409 | } | 409 | } |
410 | 410 | ||
411 | /* | 411 | /* |
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c index dad4dd9887c9..6c762b43f921 100644 --- a/drivers/s390/cio/device_status.c +++ b/drivers/s390/cio/device_status.c | |||
@@ -317,7 +317,6 @@ ccw_device_do_sense(struct ccw_device *cdev, struct irb *irb) | |||
317 | /* | 317 | /* |
318 | * We have ending status but no sense information. Do a basic sense. | 318 | * We have ending status but no sense information. Do a basic sense. |
319 | */ | 319 | */ |
320 | sch = to_subchannel(cdev->dev.parent); | ||
321 | sch->sense_ccw.cmd_code = CCW_CMD_BASIC_SENSE; | 320 | sch->sense_ccw.cmd_code = CCW_CMD_BASIC_SENSE; |
322 | sch->sense_ccw.cda = (__u32) __pa(cdev->private->irb.ecw); | 321 | sch->sense_ccw.cda = (__u32) __pa(cdev->private->irb.ecw); |
323 | sch->sense_ccw.count = SENSE_MAX_COUNT; | 322 | sch->sense_ccw.count = SENSE_MAX_COUNT; |
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index 45ce032772f4..9ed37dc9a1b0 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c | |||
@@ -165,8 +165,13 @@ qdio_do_eqbs(struct qdio_q *q, unsigned char *state, | |||
165 | q_no = q->q_no; | 165 | q_no = q->q_no; |
166 | if(!q->is_input_q) | 166 | if(!q->is_input_q) |
167 | q_no += irq->no_input_qs; | 167 | q_no += irq->no_input_qs; |
168 | again: | ||
168 | ccq = do_eqbs(irq->sch_token, state, q_no, start, cnt); | 169 | ccq = do_eqbs(irq->sch_token, state, q_no, start, cnt); |
169 | rc = qdio_check_ccq(q, ccq); | 170 | rc = qdio_check_ccq(q, ccq); |
171 | if (rc == 1) { | ||
172 | QDIO_DBF_TEXT5(1,trace,"eqAGAIN"); | ||
173 | goto again; | ||
174 | } | ||
170 | if (rc < 0) { | 175 | if (rc < 0) { |
171 | QDIO_DBF_TEXT2(1,trace,"eqberr"); | 176 | QDIO_DBF_TEXT2(1,trace,"eqberr"); |
172 | sprintf(dbf_text,"%2x,%2x,%d,%d",tmp_cnt, *cnt, ccq, q_no); | 177 | sprintf(dbf_text,"%2x,%2x,%d,%d",tmp_cnt, *cnt, ccq, q_no); |
@@ -195,8 +200,13 @@ qdio_do_sqbs(struct qdio_q *q, unsigned char state, | |||
195 | q_no = q->q_no; | 200 | q_no = q->q_no; |
196 | if(!q->is_input_q) | 201 | if(!q->is_input_q) |
197 | q_no += irq->no_input_qs; | 202 | q_no += irq->no_input_qs; |
203 | again: | ||
198 | ccq = do_sqbs(irq->sch_token, state, q_no, start, cnt); | 204 | ccq = do_sqbs(irq->sch_token, state, q_no, start, cnt); |
199 | rc = qdio_check_ccq(q, ccq); | 205 | rc = qdio_check_ccq(q, ccq); |
206 | if (rc == 1) { | ||
207 | QDIO_DBF_TEXT5(1,trace,"sqAGAIN"); | ||
208 | goto again; | ||
209 | } | ||
200 | if (rc < 0) { | 210 | if (rc < 0) { |
201 | QDIO_DBF_TEXT3(1,trace,"sqberr"); | 211 | QDIO_DBF_TEXT3(1,trace,"sqberr"); |
202 | sprintf(dbf_text,"%2x,%2x,%d,%d",tmp_cnt,*cnt,ccq,q_no); | 212 | sprintf(dbf_text,"%2x,%2x,%d,%d",tmp_cnt,*cnt,ccq,q_no); |
@@ -1187,8 +1197,7 @@ tiqdio_is_inbound_q_done(struct qdio_q *q) | |||
1187 | 1197 | ||
1188 | if (!no_used) | 1198 | if (!no_used) |
1189 | return 1; | 1199 | return 1; |
1190 | 1200 | if (!q->siga_sync && !irq->is_qebsm) | |
1191 | if (!q->siga_sync) | ||
1192 | /* we'll check for more primed buffers in qeth_stop_polling */ | 1201 | /* we'll check for more primed buffers in qeth_stop_polling */ |
1193 | return 0; | 1202 | return 0; |
1194 | if (irq->is_qebsm) { | 1203 | if (irq->is_qebsm) { |
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 6229ba4995ad..9cf88d7201d3 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -98,9 +98,9 @@ lcs_register_debug_facility(void) | |||
98 | return -ENOMEM; | 98 | return -ENOMEM; |
99 | } | 99 | } |
100 | debug_register_view(lcs_dbf_setup, &debug_hex_ascii_view); | 100 | debug_register_view(lcs_dbf_setup, &debug_hex_ascii_view); |
101 | debug_set_level(lcs_dbf_setup, 4); | 101 | debug_set_level(lcs_dbf_setup, 2); |
102 | debug_register_view(lcs_dbf_trace, &debug_hex_ascii_view); | 102 | debug_register_view(lcs_dbf_trace, &debug_hex_ascii_view); |
103 | debug_set_level(lcs_dbf_trace, 4); | 103 | debug_set_level(lcs_dbf_trace, 2); |
104 | return 0; | 104 | return 0; |
105 | } | 105 | } |
106 | 106 | ||
@@ -1292,9 +1292,8 @@ lcs_set_multicast_list(struct net_device *dev) | |||
1292 | LCS_DBF_TEXT(4, trace, "setmulti"); | 1292 | LCS_DBF_TEXT(4, trace, "setmulti"); |
1293 | card = (struct lcs_card *) dev->priv; | 1293 | card = (struct lcs_card *) dev->priv; |
1294 | 1294 | ||
1295 | if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) { | 1295 | if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) |
1296 | schedule_work(&card->kernel_thread_starter); | 1296 | schedule_work(&card->kernel_thread_starter); |
1297 | } | ||
1298 | } | 1297 | } |
1299 | 1298 | ||
1300 | #endif /* CONFIG_IP_MULTICAST */ | 1299 | #endif /* CONFIG_IP_MULTICAST */ |
@@ -1459,6 +1458,8 @@ lcs_txbuffer_cb(struct lcs_channel *channel, struct lcs_buffer *buffer) | |||
1459 | lcs_release_buffer(channel, buffer); | 1458 | lcs_release_buffer(channel, buffer); |
1460 | card = (struct lcs_card *) | 1459 | card = (struct lcs_card *) |
1461 | ((char *) channel - offsetof(struct lcs_card, write)); | 1460 | ((char *) channel - offsetof(struct lcs_card, write)); |
1461 | if (netif_queue_stopped(card->dev)) | ||
1462 | netif_wake_queue(card->dev); | ||
1462 | spin_lock(&card->lock); | 1463 | spin_lock(&card->lock); |
1463 | card->tx_emitted--; | 1464 | card->tx_emitted--; |
1464 | if (card->tx_emitted <= 0 && card->tx_buffer != NULL) | 1465 | if (card->tx_emitted <= 0 && card->tx_buffer != NULL) |
@@ -1478,6 +1479,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb, | |||
1478 | struct net_device *dev) | 1479 | struct net_device *dev) |
1479 | { | 1480 | { |
1480 | struct lcs_header *header; | 1481 | struct lcs_header *header; |
1482 | int rc = 0; | ||
1481 | 1483 | ||
1482 | LCS_DBF_TEXT(5, trace, "hardxmit"); | 1484 | LCS_DBF_TEXT(5, trace, "hardxmit"); |
1483 | if (skb == NULL) { | 1485 | if (skb == NULL) { |
@@ -1492,10 +1494,8 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb, | |||
1492 | card->stats.tx_carrier_errors++; | 1494 | card->stats.tx_carrier_errors++; |
1493 | return 0; | 1495 | return 0; |
1494 | } | 1496 | } |
1495 | if (netif_queue_stopped(dev) ) { | 1497 | netif_stop_queue(card->dev); |
1496 | card->stats.tx_dropped++; | 1498 | spin_lock(&card->lock); |
1497 | return -EBUSY; | ||
1498 | } | ||
1499 | if (card->tx_buffer != NULL && | 1499 | if (card->tx_buffer != NULL && |
1500 | card->tx_buffer->count + sizeof(struct lcs_header) + | 1500 | card->tx_buffer->count + sizeof(struct lcs_header) + |
1501 | skb->len + sizeof(u16) > LCS_IOBUFFERSIZE) | 1501 | skb->len + sizeof(u16) > LCS_IOBUFFERSIZE) |
@@ -1506,7 +1506,8 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb, | |||
1506 | card->tx_buffer = lcs_get_buffer(&card->write); | 1506 | card->tx_buffer = lcs_get_buffer(&card->write); |
1507 | if (card->tx_buffer == NULL) { | 1507 | if (card->tx_buffer == NULL) { |
1508 | card->stats.tx_dropped++; | 1508 | card->stats.tx_dropped++; |
1509 | return -EBUSY; | 1509 | rc = -EBUSY; |
1510 | goto out; | ||
1510 | } | 1511 | } |
1511 | card->tx_buffer->callback = lcs_txbuffer_cb; | 1512 | card->tx_buffer->callback = lcs_txbuffer_cb; |
1512 | card->tx_buffer->count = 0; | 1513 | card->tx_buffer->count = 0; |
@@ -1518,13 +1519,18 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb, | |||
1518 | header->type = card->lan_type; | 1519 | header->type = card->lan_type; |
1519 | header->slot = card->portno; | 1520 | header->slot = card->portno; |
1520 | memcpy(header + 1, skb->data, skb->len); | 1521 | memcpy(header + 1, skb->data, skb->len); |
1522 | spin_unlock(&card->lock); | ||
1521 | card->stats.tx_bytes += skb->len; | 1523 | card->stats.tx_bytes += skb->len; |
1522 | card->stats.tx_packets++; | 1524 | card->stats.tx_packets++; |
1523 | dev_kfree_skb(skb); | 1525 | dev_kfree_skb(skb); |
1524 | if (card->tx_emitted <= 0) | 1526 | netif_wake_queue(card->dev); |
1527 | spin_lock(&card->lock); | ||
1528 | if (card->tx_emitted <= 0 && card->tx_buffer != NULL) | ||
1525 | /* If this is the first tx buffer emit it immediately. */ | 1529 | /* If this is the first tx buffer emit it immediately. */ |
1526 | __lcs_emit_txbuffer(card); | 1530 | __lcs_emit_txbuffer(card); |
1527 | return 0; | 1531 | out: |
1532 | spin_unlock(&card->lock); | ||
1533 | return rc; | ||
1528 | } | 1534 | } |
1529 | 1535 | ||
1530 | static int | 1536 | static int |
@@ -1535,9 +1541,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1535 | 1541 | ||
1536 | LCS_DBF_TEXT(5, trace, "pktxmit"); | 1542 | LCS_DBF_TEXT(5, trace, "pktxmit"); |
1537 | card = (struct lcs_card *) dev->priv; | 1543 | card = (struct lcs_card *) dev->priv; |
1538 | spin_lock(&card->lock); | ||
1539 | rc = __lcs_start_xmit(card, skb, dev); | 1544 | rc = __lcs_start_xmit(card, skb, dev); |
1540 | spin_unlock(&card->lock); | ||
1541 | return rc; | 1545 | return rc; |
1542 | } | 1546 | } |
1543 | 1547 | ||
@@ -2319,7 +2323,6 @@ __init lcs_init_module(void) | |||
2319 | PRINT_ERR("Initialization failed\n"); | 2323 | PRINT_ERR("Initialization failed\n"); |
2320 | return rc; | 2324 | return rc; |
2321 | } | 2325 | } |
2322 | |||
2323 | return 0; | 2326 | return 0; |
2324 | } | 2327 | } |
2325 | 2328 | ||
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h index 08e60ad43916..2fad5e40c2e4 100644 --- a/drivers/s390/net/lcs.h +++ b/drivers/s390/net/lcs.h | |||
@@ -95,7 +95,7 @@ do { \ | |||
95 | */ | 95 | */ |
96 | #define LCS_ILLEGAL_OFFSET 0xffff | 96 | #define LCS_ILLEGAL_OFFSET 0xffff |
97 | #define LCS_IOBUFFERSIZE 0x5000 | 97 | #define LCS_IOBUFFERSIZE 0x5000 |
98 | #define LCS_NUM_BUFFS 8 /* needs to be power of 2 */ | 98 | #define LCS_NUM_BUFFS 32 /* needs to be power of 2 */ |
99 | #define LCS_MAC_LENGTH 6 | 99 | #define LCS_MAC_LENGTH 6 |
100 | #define LCS_INVALID_PORT_NO -1 | 100 | #define LCS_INVALID_PORT_NO -1 |
101 | #define LCS_LANCMD_TIMEOUT_DEFAULT 5 | 101 | #define LCS_LANCMD_TIMEOUT_DEFAULT 5 |
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h index 9a064d4727ad..4df0fcd7b10b 100644 --- a/drivers/s390/net/qeth.h +++ b/drivers/s390/net/qeth.h | |||
@@ -1076,16 +1076,6 @@ qeth_get_qdio_q_format(struct qeth_card *card) | |||
1076 | } | 1076 | } |
1077 | 1077 | ||
1078 | static inline int | 1078 | static inline int |
1079 | qeth_isdigit(char * buf) | ||
1080 | { | ||
1081 | while (*buf) { | ||
1082 | if (!isdigit(*buf++)) | ||
1083 | return 0; | ||
1084 | } | ||
1085 | return 1; | ||
1086 | } | ||
1087 | |||
1088 | static inline int | ||
1089 | qeth_isxdigit(char * buf) | 1079 | qeth_isxdigit(char * buf) |
1090 | { | 1080 | { |
1091 | while (*buf) { | 1081 | while (*buf) { |
@@ -1104,33 +1094,17 @@ qeth_ipaddr4_to_string(const __u8 *addr, char *buf) | |||
1104 | static inline int | 1094 | static inline int |
1105 | qeth_string_to_ipaddr4(const char *buf, __u8 *addr) | 1095 | qeth_string_to_ipaddr4(const char *buf, __u8 *addr) |
1106 | { | 1096 | { |
1107 | const char *start, *end; | 1097 | int count = 0, rc = 0; |
1108 | char abuf[4]; | 1098 | int in[4]; |
1109 | char *tmp; | 1099 | |
1110 | int len; | 1100 | rc = sscanf(buf, "%d.%d.%d.%d%n", |
1111 | int i; | 1101 | &in[0], &in[1], &in[2], &in[3], &count); |
1112 | 1102 | if (rc != 4 || count) | |
1113 | start = buf; | 1103 | return -EINVAL; |
1114 | for (i = 0; i < 4; i++) { | 1104 | for (count = 0; count < 4; count++) { |
1115 | if (i == 3) { | 1105 | if (in[count] > 255) |
1116 | end = strchr(start,0xa); | ||
1117 | if (end) | ||
1118 | len = end - start; | ||
1119 | else | ||
1120 | len = strlen(start); | ||
1121 | } | ||
1122 | else { | ||
1123 | end = strchr(start, '.'); | ||
1124 | len = end - start; | ||
1125 | } | ||
1126 | if ((len <= 0) || (len > 3)) | ||
1127 | return -EINVAL; | ||
1128 | memset(abuf, 0, 4); | ||
1129 | strncpy(abuf, start, len); | ||
1130 | if (!qeth_isdigit(abuf)) | ||
1131 | return -EINVAL; | 1106 | return -EINVAL; |
1132 | addr[i] = simple_strtoul(abuf, &tmp, 10); | 1107 | addr[count] = in[count]; |
1133 | start = end + 1; | ||
1134 | } | 1108 | } |
1135 | return 0; | 1109 | return 0; |
1136 | } | 1110 | } |
@@ -1149,36 +1123,44 @@ qeth_ipaddr6_to_string(const __u8 *addr, char *buf) | |||
1149 | static inline int | 1123 | static inline int |
1150 | qeth_string_to_ipaddr6(const char *buf, __u8 *addr) | 1124 | qeth_string_to_ipaddr6(const char *buf, __u8 *addr) |
1151 | { | 1125 | { |
1152 | const char *start, *end; | 1126 | char *end, *start; |
1153 | u16 *tmp_addr; | 1127 | __u16 *in; |
1154 | char abuf[5]; | 1128 | char num[5]; |
1155 | char *tmp; | 1129 | int num2, cnt, out, found, save_cnt; |
1156 | int len; | 1130 | unsigned short in_tmp[8] = {0, }; |
1157 | int i; | 1131 | |
1158 | 1132 | cnt = out = found = save_cnt = num2 = 0; | |
1159 | tmp_addr = (u16 *)addr; | 1133 | end = start = (char *) buf; |
1160 | start = buf; | 1134 | in = (__u16 *) addr; |
1161 | for (i = 0; i < 8; i++) { | 1135 | memset(in, 0, 16); |
1162 | if (i == 7) { | 1136 | while (end) { |
1163 | end = strchr(start,0xa); | 1137 | end = strchr(end,':'); |
1164 | if (end) | 1138 | if (end == NULL) { |
1165 | len = end - start; | 1139 | end = (char *)buf + (strlen(buf)); |
1166 | else | 1140 | out = 1; |
1167 | len = strlen(start); | 1141 | } |
1168 | } | 1142 | if ((end - start)) { |
1169 | else { | 1143 | memset(num, 0, 5); |
1170 | end = strchr(start, ':'); | 1144 | memcpy(num, start, end - start); |
1171 | len = end - start; | 1145 | if (!qeth_isxdigit(num)) |
1146 | return -EINVAL; | ||
1147 | sscanf(start, "%x", &num2); | ||
1148 | if (found) | ||
1149 | in_tmp[save_cnt++] = num2; | ||
1150 | else | ||
1151 | in[cnt++] = num2; | ||
1152 | if (out) | ||
1153 | break; | ||
1154 | } else { | ||
1155 | if (found) | ||
1156 | return -EINVAL; | ||
1157 | found = 1; | ||
1172 | } | 1158 | } |
1173 | if ((len <= 0) || (len > 4)) | 1159 | start = ++end; |
1174 | return -EINVAL; | 1160 | } |
1175 | memset(abuf, 0, 5); | 1161 | cnt = 7; |
1176 | strncpy(abuf, start, len); | 1162 | while (save_cnt) |
1177 | if (!qeth_isxdigit(abuf)) | 1163 | in[cnt--] = in_tmp[--save_cnt]; |
1178 | return -EINVAL; | ||
1179 | tmp_addr[i] = simple_strtoul(abuf, &tmp, 16); | ||
1180 | start = end + 1; | ||
1181 | } | ||
1182 | return 0; | 1164 | return 0; |
1183 | } | 1165 | } |
1184 | 1166 | ||
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c index b02313127780..82cb4af2f0e7 100644 --- a/drivers/s390/net/qeth_eddp.c +++ b/drivers/s390/net/qeth_eddp.c | |||
@@ -59,8 +59,7 @@ qeth_eddp_free_context(struct qeth_eddp_context *ctx) | |||
59 | for (i = 0; i < ctx->num_pages; ++i) | 59 | for (i = 0; i < ctx->num_pages; ++i) |
60 | free_page((unsigned long)ctx->pages[i]); | 60 | free_page((unsigned long)ctx->pages[i]); |
61 | kfree(ctx->pages); | 61 | kfree(ctx->pages); |
62 | if (ctx->elements != NULL) | 62 | kfree(ctx->elements); |
63 | kfree(ctx->elements); | ||
64 | kfree(ctx); | 63 | kfree(ctx); |
65 | } | 64 | } |
66 | 65 | ||
@@ -413,6 +412,13 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, | |||
413 | 412 | ||
414 | QETH_DBF_TEXT(trace, 5, "eddpftcp"); | 413 | QETH_DBF_TEXT(trace, 5, "eddpftcp"); |
415 | eddp->skb_offset = sizeof(struct qeth_hdr) + eddp->nhl + eddp->thl; | 414 | eddp->skb_offset = sizeof(struct qeth_hdr) + eddp->nhl + eddp->thl; |
415 | if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2) { | ||
416 | eddp->skb_offset += sizeof(struct ethhdr); | ||
417 | #ifdef CONFIG_QETH_VLAN | ||
418 | if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q)) | ||
419 | eddp->skb_offset += VLAN_HLEN; | ||
420 | #endif /* CONFIG_QETH_VLAN */ | ||
421 | } | ||
416 | tcph = eddp->skb->h.th; | 422 | tcph = eddp->skb->h.th; |
417 | while (eddp->skb_offset < eddp->skb->len) { | 423 | while (eddp->skb_offset < eddp->skb->len) { |
418 | data_len = min((int)skb_shinfo(eddp->skb)->tso_size, | 424 | data_len = min((int)skb_shinfo(eddp->skb)->tso_size, |
@@ -483,6 +489,7 @@ qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, | |||
483 | return -ENOMEM; | 489 | return -ENOMEM; |
484 | } | 490 | } |
485 | if (qhdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2) { | 491 | if (qhdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2) { |
492 | skb->mac.raw = (skb->data) + sizeof(struct qeth_hdr); | ||
486 | memcpy(&eddp->mac, eth_hdr(skb), ETH_HLEN); | 493 | memcpy(&eddp->mac, eth_hdr(skb), ETH_HLEN); |
487 | #ifdef CONFIG_QETH_VLAN | 494 | #ifdef CONFIG_QETH_VLAN |
488 | if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q)) { | 495 | if (eddp->mac.h_proto == __constant_htons(ETH_P_8021Q)) { |
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 410abeada6c4..dba7f7f02e79 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
@@ -516,7 +516,8 @@ __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode) | |||
516 | QETH_DBF_TEXT(setup, 3, "setoffl"); | 516 | QETH_DBF_TEXT(setup, 3, "setoffl"); |
517 | QETH_DBF_HEX(setup, 3, &card, sizeof(void *)); | 517 | QETH_DBF_HEX(setup, 3, &card, sizeof(void *)); |
518 | 518 | ||
519 | netif_carrier_off(card->dev); | 519 | if (card->dev && netif_carrier_ok(card->dev)) |
520 | netif_carrier_off(card->dev); | ||
520 | recover_flag = card->state; | 521 | recover_flag = card->state; |
521 | if (qeth_stop_card(card, recovery_mode) == -ERESTARTSYS){ | 522 | if (qeth_stop_card(card, recovery_mode) == -ERESTARTSYS){ |
522 | PRINT_WARN("Stopping card %s interrupted by user!\n", | 523 | PRINT_WARN("Stopping card %s interrupted by user!\n", |
@@ -1679,6 +1680,7 @@ qeth_cmd_timeout(unsigned long data) | |||
1679 | spin_unlock_irqrestore(&reply->card->lock, flags); | 1680 | spin_unlock_irqrestore(&reply->card->lock, flags); |
1680 | } | 1681 | } |
1681 | 1682 | ||
1683 | |||
1682 | static struct qeth_ipa_cmd * | 1684 | static struct qeth_ipa_cmd * |
1683 | qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob) | 1685 | qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob) |
1684 | { | 1686 | { |
@@ -1699,7 +1701,8 @@ qeth_check_ipa_data(struct qeth_card *card, struct qeth_cmd_buffer *iob) | |||
1699 | QETH_CARD_IFNAME(card), | 1701 | QETH_CARD_IFNAME(card), |
1700 | card->info.chpid); | 1702 | card->info.chpid); |
1701 | card->lan_online = 0; | 1703 | card->lan_online = 0; |
1702 | netif_carrier_off(card->dev); | 1704 | if (card->dev && netif_carrier_ok(card->dev)) |
1705 | netif_carrier_off(card->dev); | ||
1703 | return NULL; | 1706 | return NULL; |
1704 | case IPA_CMD_STARTLAN: | 1707 | case IPA_CMD_STARTLAN: |
1705 | PRINT_INFO("Link reestablished on %s " | 1708 | PRINT_INFO("Link reestablished on %s " |
@@ -5562,7 +5565,7 @@ qeth_set_multicast_list(struct net_device *dev) | |||
5562 | if (card->info.type == QETH_CARD_TYPE_OSN) | 5565 | if (card->info.type == QETH_CARD_TYPE_OSN) |
5563 | return ; | 5566 | return ; |
5564 | 5567 | ||
5565 | QETH_DBF_TEXT(trace,3,"setmulti"); | 5568 | QETH_DBF_TEXT(trace, 3, "setmulti"); |
5566 | qeth_delete_mc_addresses(card); | 5569 | qeth_delete_mc_addresses(card); |
5567 | if (card->options.layer2) { | 5570 | if (card->options.layer2) { |
5568 | qeth_layer2_add_multicast(card); | 5571 | qeth_layer2_add_multicast(card); |
@@ -5579,7 +5582,6 @@ out: | |||
5579 | return; | 5582 | return; |
5580 | if (qeth_set_thread_start_bit(card, QETH_SET_PROMISC_MODE_THREAD)==0) | 5583 | if (qeth_set_thread_start_bit(card, QETH_SET_PROMISC_MODE_THREAD)==0) |
5581 | schedule_work(&card->kernel_thread_starter); | 5584 | schedule_work(&card->kernel_thread_starter); |
5582 | |||
5583 | } | 5585 | } |
5584 | 5586 | ||
5585 | static int | 5587 | static int |
@@ -7452,6 +7454,7 @@ qeth_softsetup_card(struct qeth_card *card) | |||
7452 | card->lan_online = 1; | 7454 | card->lan_online = 1; |
7453 | if (card->info.type==QETH_CARD_TYPE_OSN) | 7455 | if (card->info.type==QETH_CARD_TYPE_OSN) |
7454 | goto out; | 7456 | goto out; |
7457 | qeth_set_large_send(card, card->options.large_send); | ||
7455 | if (card->options.layer2) { | 7458 | if (card->options.layer2) { |
7456 | card->dev->features |= | 7459 | card->dev->features |= |
7457 | NETIF_F_HW_VLAN_FILTER | | 7460 | NETIF_F_HW_VLAN_FILTER | |
@@ -7468,12 +7471,6 @@ qeth_softsetup_card(struct qeth_card *card) | |||
7468 | #endif | 7471 | #endif |
7469 | goto out; | 7472 | goto out; |
7470 | } | 7473 | } |
7471 | if ((card->options.large_send == QETH_LARGE_SEND_EDDP) || | ||
7472 | (card->options.large_send == QETH_LARGE_SEND_TSO)) | ||
7473 | card->dev->features |= NETIF_F_TSO | NETIF_F_SG; | ||
7474 | else | ||
7475 | card->dev->features &= ~(NETIF_F_TSO | NETIF_F_SG); | ||
7476 | |||
7477 | if ((rc = qeth_setadapter_parms(card))) | 7474 | if ((rc = qeth_setadapter_parms(card))) |
7478 | QETH_DBF_TEXT_(setup, 2, "2err%d", rc); | 7475 | QETH_DBF_TEXT_(setup, 2, "2err%d", rc); |
7479 | if ((rc = qeth_start_ipassists(card))) | 7476 | if ((rc = qeth_start_ipassists(card))) |
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index 4d7d47cf2394..a5f2ba9a8fdb 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c | |||
@@ -710,10 +710,9 @@ static inline void | |||
710 | _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, | 710 | _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, |
711 | struct zfcp_adapter *adapter, | 711 | struct zfcp_adapter *adapter, |
712 | struct scsi_cmnd *scsi_cmnd, | 712 | struct scsi_cmnd *scsi_cmnd, |
713 | struct zfcp_fsf_req *new_fsf_req) | 713 | struct zfcp_fsf_req *fsf_req, |
714 | struct zfcp_fsf_req *old_fsf_req) | ||
714 | { | 715 | { |
715 | struct zfcp_fsf_req *fsf_req = | ||
716 | (struct zfcp_fsf_req *)scsi_cmnd->host_scribble; | ||
717 | struct zfcp_scsi_dbf_record *rec = &adapter->scsi_dbf_buf; | 716 | struct zfcp_scsi_dbf_record *rec = &adapter->scsi_dbf_buf; |
718 | struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)rec; | 717 | struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)rec; |
719 | unsigned long flags; | 718 | unsigned long flags; |
@@ -727,19 +726,20 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, | |||
727 | if (offset == 0) { | 726 | if (offset == 0) { |
728 | strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE); | 727 | strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE); |
729 | strncpy(rec->tag2, tag2, ZFCP_DBF_TAG_SIZE); | 728 | strncpy(rec->tag2, tag2, ZFCP_DBF_TAG_SIZE); |
730 | if (scsi_cmnd->device) { | 729 | if (scsi_cmnd != NULL) { |
731 | rec->scsi_id = scsi_cmnd->device->id; | 730 | if (scsi_cmnd->device) { |
732 | rec->scsi_lun = scsi_cmnd->device->lun; | 731 | rec->scsi_id = scsi_cmnd->device->id; |
732 | rec->scsi_lun = scsi_cmnd->device->lun; | ||
733 | } | ||
734 | rec->scsi_result = scsi_cmnd->result; | ||
735 | rec->scsi_cmnd = (unsigned long)scsi_cmnd; | ||
736 | rec->scsi_serial = scsi_cmnd->serial_number; | ||
737 | memcpy(rec->scsi_opcode, &scsi_cmnd->cmnd, | ||
738 | min((int)scsi_cmnd->cmd_len, | ||
739 | ZFCP_DBF_SCSI_OPCODE)); | ||
740 | rec->scsi_retries = scsi_cmnd->retries; | ||
741 | rec->scsi_allowed = scsi_cmnd->allowed; | ||
733 | } | 742 | } |
734 | rec->scsi_result = scsi_cmnd->result; | ||
735 | rec->scsi_cmnd = (unsigned long)scsi_cmnd; | ||
736 | rec->scsi_serial = scsi_cmnd->serial_number; | ||
737 | memcpy(rec->scsi_opcode, | ||
738 | &scsi_cmnd->cmnd, | ||
739 | min((int)scsi_cmnd->cmd_len, | ||
740 | ZFCP_DBF_SCSI_OPCODE)); | ||
741 | rec->scsi_retries = scsi_cmnd->retries; | ||
742 | rec->scsi_allowed = scsi_cmnd->allowed; | ||
743 | if (fsf_req != NULL) { | 743 | if (fsf_req != NULL) { |
744 | fcp_rsp = (struct fcp_rsp_iu *) | 744 | fcp_rsp = (struct fcp_rsp_iu *) |
745 | &(fsf_req->qtcb->bottom.io.fcp_rsp); | 745 | &(fsf_req->qtcb->bottom.io.fcp_rsp); |
@@ -772,15 +772,8 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, | |||
772 | rec->fsf_seqno = fsf_req->seq_no; | 772 | rec->fsf_seqno = fsf_req->seq_no; |
773 | rec->fsf_issued = fsf_req->issued; | 773 | rec->fsf_issued = fsf_req->issued; |
774 | } | 774 | } |
775 | if (new_fsf_req != NULL) { | 775 | rec->type.old_fsf_reqid = |
776 | rec->type.new_fsf_req.fsf_reqid = | 776 | (unsigned long) old_fsf_req; |
777 | (unsigned long) | ||
778 | new_fsf_req; | ||
779 | rec->type.new_fsf_req.fsf_seqno = | ||
780 | new_fsf_req->seq_no; | ||
781 | rec->type.new_fsf_req.fsf_issued = | ||
782 | new_fsf_req->issued; | ||
783 | } | ||
784 | } else { | 777 | } else { |
785 | strncpy(dump->tag, "dump", ZFCP_DBF_TAG_SIZE); | 778 | strncpy(dump->tag, "dump", ZFCP_DBF_TAG_SIZE); |
786 | dump->total_size = buflen; | 779 | dump->total_size = buflen; |
@@ -801,19 +794,21 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, | |||
801 | inline void | 794 | inline void |
802 | zfcp_scsi_dbf_event_result(const char *tag, int level, | 795 | zfcp_scsi_dbf_event_result(const char *tag, int level, |
803 | struct zfcp_adapter *adapter, | 796 | struct zfcp_adapter *adapter, |
804 | struct scsi_cmnd *scsi_cmnd) | 797 | struct scsi_cmnd *scsi_cmnd, |
798 | struct zfcp_fsf_req *fsf_req) | ||
805 | { | 799 | { |
806 | _zfcp_scsi_dbf_event_common("rslt", | 800 | _zfcp_scsi_dbf_event_common("rslt", tag, level, |
807 | tag, level, adapter, scsi_cmnd, NULL); | 801 | adapter, scsi_cmnd, fsf_req, NULL); |
808 | } | 802 | } |
809 | 803 | ||
810 | inline void | 804 | inline void |
811 | zfcp_scsi_dbf_event_abort(const char *tag, struct zfcp_adapter *adapter, | 805 | zfcp_scsi_dbf_event_abort(const char *tag, struct zfcp_adapter *adapter, |
812 | struct scsi_cmnd *scsi_cmnd, | 806 | struct scsi_cmnd *scsi_cmnd, |
813 | struct zfcp_fsf_req *new_fsf_req) | 807 | struct zfcp_fsf_req *new_fsf_req, |
808 | struct zfcp_fsf_req *old_fsf_req) | ||
814 | { | 809 | { |
815 | _zfcp_scsi_dbf_event_common("abrt", | 810 | _zfcp_scsi_dbf_event_common("abrt", tag, 1, |
816 | tag, 1, adapter, scsi_cmnd, new_fsf_req); | 811 | adapter, scsi_cmnd, new_fsf_req, old_fsf_req); |
817 | } | 812 | } |
818 | 813 | ||
819 | inline void | 814 | inline void |
@@ -823,7 +818,7 @@ zfcp_scsi_dbf_event_devreset(const char *tag, u8 flag, struct zfcp_unit *unit, | |||
823 | struct zfcp_adapter *adapter = unit->port->adapter; | 818 | struct zfcp_adapter *adapter = unit->port->adapter; |
824 | 819 | ||
825 | _zfcp_scsi_dbf_event_common(flag == FCP_TARGET_RESET ? "trst" : "lrst", | 820 | _zfcp_scsi_dbf_event_common(flag == FCP_TARGET_RESET ? "trst" : "lrst", |
826 | tag, 1, adapter, scsi_cmnd, NULL); | 821 | tag, 1, adapter, scsi_cmnd, NULL, NULL); |
827 | } | 822 | } |
828 | 823 | ||
829 | static int | 824 | static int |
@@ -856,6 +851,10 @@ zfcp_scsi_dbf_view_format(debug_info_t * id, struct debug_view *view, | |||
856 | rec->scsi_retries); | 851 | rec->scsi_retries); |
857 | len += zfcp_dbf_view(out_buf + len, "scsi_allowed", "0x%02x", | 852 | len += zfcp_dbf_view(out_buf + len, "scsi_allowed", "0x%02x", |
858 | rec->scsi_allowed); | 853 | rec->scsi_allowed); |
854 | if (strncmp(rec->tag, "abrt", ZFCP_DBF_TAG_SIZE) == 0) { | ||
855 | len += zfcp_dbf_view(out_buf + len, "old_fsf_reqid", "0x%0Lx", | ||
856 | rec->type.old_fsf_reqid); | ||
857 | } | ||
859 | len += zfcp_dbf_view(out_buf + len, "fsf_reqid", "0x%0Lx", | 858 | len += zfcp_dbf_view(out_buf + len, "fsf_reqid", "0x%0Lx", |
860 | rec->fsf_reqid); | 859 | rec->fsf_reqid); |
861 | len += zfcp_dbf_view(out_buf + len, "fsf_seqno", "0x%08x", | 860 | len += zfcp_dbf_view(out_buf + len, "fsf_seqno", "0x%08x", |
@@ -883,21 +882,6 @@ zfcp_scsi_dbf_view_format(debug_info_t * id, struct debug_view *view, | |||
883 | min((int)rec->type.fcp.sns_info_len, | 882 | min((int)rec->type.fcp.sns_info_len, |
884 | ZFCP_DBF_SCSI_FCP_SNS_INFO), 0, | 883 | ZFCP_DBF_SCSI_FCP_SNS_INFO), 0, |
885 | rec->type.fcp.sns_info_len); | 884 | rec->type.fcp.sns_info_len); |
886 | } else if (strncmp(rec->tag, "abrt", ZFCP_DBF_TAG_SIZE) == 0) { | ||
887 | len += zfcp_dbf_view(out_buf + len, "fsf_reqid_abort", "0x%0Lx", | ||
888 | rec->type.new_fsf_req.fsf_reqid); | ||
889 | len += zfcp_dbf_view(out_buf + len, "fsf_seqno_abort", "0x%08x", | ||
890 | rec->type.new_fsf_req.fsf_seqno); | ||
891 | len += zfcp_dbf_stck(out_buf + len, "fsf_issued", | ||
892 | rec->type.new_fsf_req.fsf_issued); | ||
893 | } else if ((strncmp(rec->tag, "trst", ZFCP_DBF_TAG_SIZE) == 0) || | ||
894 | (strncmp(rec->tag, "lrst", ZFCP_DBF_TAG_SIZE) == 0)) { | ||
895 | len += zfcp_dbf_view(out_buf + len, "fsf_reqid_reset", "0x%0Lx", | ||
896 | rec->type.new_fsf_req.fsf_reqid); | ||
897 | len += zfcp_dbf_view(out_buf + len, "fsf_seqno_reset", "0x%08x", | ||
898 | rec->type.new_fsf_req.fsf_seqno); | ||
899 | len += zfcp_dbf_stck(out_buf + len, "fsf_issued", | ||
900 | rec->type.new_fsf_req.fsf_issued); | ||
901 | } | 885 | } |
902 | 886 | ||
903 | len += sprintf(out_buf + len, "\n"); | 887 | len += sprintf(out_buf + len, "\n"); |
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index e260d19fa717..7f551d66f47f 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
@@ -152,11 +152,6 @@ typedef u32 scsi_lun_t; | |||
152 | #define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP 100 | 152 | #define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP 100 |
153 | #define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES 7 | 153 | #define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES 7 |
154 | 154 | ||
155 | /* Retry 5 times every 2 second, then every minute */ | ||
156 | #define ZFCP_EXCHANGE_PORT_DATA_SHORT_RETRIES 5 | ||
157 | #define ZFCP_EXCHANGE_PORT_DATA_SHORT_SLEEP 200 | ||
158 | #define ZFCP_EXCHANGE_PORT_DATA_LONG_SLEEP 6000 | ||
159 | |||
160 | /* timeout value for "default timer" for fsf requests */ | 155 | /* timeout value for "default timer" for fsf requests */ |
161 | #define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ); | 156 | #define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ); |
162 | 157 | ||
@@ -429,11 +424,7 @@ struct zfcp_scsi_dbf_record { | |||
429 | u32 fsf_seqno; | 424 | u32 fsf_seqno; |
430 | u64 fsf_issued; | 425 | u64 fsf_issued; |
431 | union { | 426 | union { |
432 | struct { | 427 | u64 old_fsf_reqid; |
433 | u64 fsf_reqid; | ||
434 | u32 fsf_seqno; | ||
435 | u64 fsf_issued; | ||
436 | } new_fsf_req; | ||
437 | struct { | 428 | struct { |
438 | u8 rsp_validity; | 429 | u8 rsp_validity; |
439 | u8 rsp_scsi_status; | 430 | u8 rsp_scsi_status; |
@@ -915,8 +906,6 @@ struct zfcp_adapter { | |||
915 | wwn_t peer_wwnn; /* P2P peer WWNN */ | 906 | wwn_t peer_wwnn; /* P2P peer WWNN */ |
916 | wwn_t peer_wwpn; /* P2P peer WWPN */ | 907 | wwn_t peer_wwpn; /* P2P peer WWPN */ |
917 | u32 peer_d_id; /* P2P peer D_ID */ | 908 | u32 peer_d_id; /* P2P peer D_ID */ |
918 | wwn_t physical_wwpn; /* WWPN of physical port */ | ||
919 | u32 physical_s_id; /* local FC port ID */ | ||
920 | struct ccw_device *ccw_device; /* S/390 ccw device */ | 909 | struct ccw_device *ccw_device; /* S/390 ccw device */ |
921 | u8 fc_service_class; | 910 | u8 fc_service_class; |
922 | u32 hydra_version; /* Hydra version */ | 911 | u32 hydra_version; /* Hydra version */ |
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index da947e662031..e3c4bdd29a60 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
@@ -2246,15 +2246,6 @@ zfcp_erp_adapter_strategy_open_fsf(struct zfcp_erp_action *erp_action) | |||
2246 | { | 2246 | { |
2247 | int retval; | 2247 | int retval; |
2248 | 2248 | ||
2249 | if ((atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | ||
2250 | &erp_action->adapter->status)) && | ||
2251 | (erp_action->adapter->adapter_features & | ||
2252 | FSF_FEATURE_HBAAPI_MANAGEMENT)) { | ||
2253 | zfcp_erp_adapter_strategy_open_fsf_xport(erp_action); | ||
2254 | atomic_set(&erp_action->adapter->erp_counter, 0); | ||
2255 | return ZFCP_ERP_FAILED; | ||
2256 | } | ||
2257 | |||
2258 | retval = zfcp_erp_adapter_strategy_open_fsf_xconfig(erp_action); | 2249 | retval = zfcp_erp_adapter_strategy_open_fsf_xconfig(erp_action); |
2259 | if (retval == ZFCP_ERP_FAILED) | 2250 | if (retval == ZFCP_ERP_FAILED) |
2260 | return ZFCP_ERP_FAILED; | 2251 | return ZFCP_ERP_FAILED; |
@@ -2266,13 +2257,6 @@ zfcp_erp_adapter_strategy_open_fsf(struct zfcp_erp_action *erp_action) | |||
2266 | return zfcp_erp_adapter_strategy_open_fsf_statusread(erp_action); | 2257 | return zfcp_erp_adapter_strategy_open_fsf_statusread(erp_action); |
2267 | } | 2258 | } |
2268 | 2259 | ||
2269 | /* | ||
2270 | * function: | ||
2271 | * | ||
2272 | * purpose: | ||
2273 | * | ||
2274 | * returns: | ||
2275 | */ | ||
2276 | static int | 2260 | static int |
2277 | zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action) | 2261 | zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action) |
2278 | { | 2262 | { |
@@ -2350,48 +2334,40 @@ static int | |||
2350 | zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action) | 2334 | zfcp_erp_adapter_strategy_open_fsf_xport(struct zfcp_erp_action *erp_action) |
2351 | { | 2335 | { |
2352 | int ret; | 2336 | int ret; |
2353 | int retries; | 2337 | struct zfcp_adapter *adapter; |
2354 | int sleep; | ||
2355 | struct zfcp_adapter *adapter = erp_action->adapter; | ||
2356 | 2338 | ||
2339 | adapter = erp_action->adapter; | ||
2357 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status); | 2340 | atomic_clear_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status); |
2358 | 2341 | ||
2359 | retries = 0; | 2342 | write_lock(&adapter->erp_lock); |
2360 | do { | 2343 | zfcp_erp_action_to_running(erp_action); |
2361 | write_lock(&adapter->erp_lock); | 2344 | write_unlock(&adapter->erp_lock); |
2362 | zfcp_erp_action_to_running(erp_action); | ||
2363 | write_unlock(&adapter->erp_lock); | ||
2364 | zfcp_erp_timeout_init(erp_action); | ||
2365 | ret = zfcp_fsf_exchange_port_data(erp_action, adapter, NULL); | ||
2366 | if (ret == -EOPNOTSUPP) { | ||
2367 | debug_text_event(adapter->erp_dbf, 3, "a_xport_notsupp"); | ||
2368 | return ZFCP_ERP_SUCCEEDED; | ||
2369 | } else if (ret) { | ||
2370 | debug_text_event(adapter->erp_dbf, 3, "a_xport_failed"); | ||
2371 | return ZFCP_ERP_FAILED; | ||
2372 | } | ||
2373 | debug_text_event(adapter->erp_dbf, 6, "a_xport_ok"); | ||
2374 | 2345 | ||
2375 | down(&adapter->erp_ready_sem); | 2346 | zfcp_erp_timeout_init(erp_action); |
2376 | if (erp_action->status & ZFCP_STATUS_ERP_TIMEDOUT) { | 2347 | ret = zfcp_fsf_exchange_port_data(erp_action, adapter, NULL); |
2377 | ZFCP_LOG_INFO("error: exchange of port data " | 2348 | if (ret == -EOPNOTSUPP) { |
2378 | "for adapter %s timed out\n", | 2349 | debug_text_event(adapter->erp_dbf, 3, "a_xport_notsupp"); |
2379 | zfcp_get_busid_by_adapter(adapter)); | 2350 | return ZFCP_ERP_SUCCEEDED; |
2380 | break; | 2351 | } else if (ret) { |
2381 | } | 2352 | debug_text_event(adapter->erp_dbf, 3, "a_xport_failed"); |
2382 | if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, | 2353 | return ZFCP_ERP_FAILED; |
2383 | &adapter->status)) | 2354 | } |
2384 | break; | 2355 | debug_text_event(adapter->erp_dbf, 6, "a_xport_ok"); |
2385 | 2356 | ||
2386 | if (retries < ZFCP_EXCHANGE_PORT_DATA_SHORT_RETRIES) { | 2357 | ret = ZFCP_ERP_SUCCEEDED; |
2387 | sleep = ZFCP_EXCHANGE_PORT_DATA_SHORT_SLEEP; | 2358 | down(&adapter->erp_ready_sem); |
2388 | retries++; | 2359 | if (erp_action->status & ZFCP_STATUS_ERP_TIMEDOUT) { |
2389 | } else | 2360 | ZFCP_LOG_INFO("error: exchange port data timed out (adapter " |
2390 | sleep = ZFCP_EXCHANGE_PORT_DATA_LONG_SLEEP; | 2361 | "%s)\n", zfcp_get_busid_by_adapter(adapter)); |
2391 | schedule_timeout(sleep); | 2362 | ret = ZFCP_ERP_FAILED; |
2392 | } while (1); | 2363 | } |
2364 | if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status)) { | ||
2365 | ZFCP_LOG_INFO("error: exchange port data failed (adapter " | ||
2366 | "%s\n", zfcp_get_busid_by_adapter(adapter)); | ||
2367 | ret = ZFCP_ERP_FAILED; | ||
2368 | } | ||
2393 | 2369 | ||
2394 | return ZFCP_ERP_SUCCEEDED; | 2370 | return ret; |
2395 | } | 2371 | } |
2396 | 2372 | ||
2397 | /* | 2373 | /* |
@@ -3439,6 +3415,8 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter, | |||
3439 | "(adapter %s, wwpn=0x%016Lx)\n", | 3415 | "(adapter %s, wwpn=0x%016Lx)\n", |
3440 | zfcp_get_busid_by_port(port), | 3416 | zfcp_get_busid_by_port(port), |
3441 | port->wwpn); | 3417 | port->wwpn); |
3418 | else | ||
3419 | scsi_flush_work(adapter->scsi_host); | ||
3442 | } | 3420 | } |
3443 | zfcp_port_put(port); | 3421 | zfcp_port_put(port); |
3444 | break; | 3422 | break; |
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index c1ba7cf1b496..700f5402a978 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h | |||
@@ -194,9 +194,10 @@ extern void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *); | |||
194 | extern void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *); | 194 | extern void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *); |
195 | 195 | ||
196 | extern void zfcp_scsi_dbf_event_result(const char *, int, struct zfcp_adapter *, | 196 | extern void zfcp_scsi_dbf_event_result(const char *, int, struct zfcp_adapter *, |
197 | struct scsi_cmnd *); | 197 | struct scsi_cmnd *, |
198 | struct zfcp_fsf_req *); | ||
198 | extern void zfcp_scsi_dbf_event_abort(const char *, struct zfcp_adapter *, | 199 | extern void zfcp_scsi_dbf_event_abort(const char *, struct zfcp_adapter *, |
199 | struct scsi_cmnd *, | 200 | struct scsi_cmnd *, struct zfcp_fsf_req *, |
200 | struct zfcp_fsf_req *); | 201 | struct zfcp_fsf_req *); |
201 | extern void zfcp_scsi_dbf_event_devreset(const char *, u8, struct zfcp_unit *, | 202 | extern void zfcp_scsi_dbf_event_devreset(const char *, u8, struct zfcp_unit *, |
202 | struct scsi_cmnd *); | 203 | struct scsi_cmnd *); |
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 9f0cb3d820c0..662ec571d73b 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
@@ -388,6 +388,7 @@ zfcp_fsf_protstatus_eval(struct zfcp_fsf_req *fsf_req) | |||
388 | case FSF_PROT_LINK_DOWN: | 388 | case FSF_PROT_LINK_DOWN: |
389 | zfcp_fsf_link_down_info_eval(adapter, | 389 | zfcp_fsf_link_down_info_eval(adapter, |
390 | &prot_status_qual->link_down_info); | 390 | &prot_status_qual->link_down_info); |
391 | zfcp_erp_adapter_reopen(adapter, 0); | ||
391 | fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR; | 392 | fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR; |
392 | break; | 393 | break; |
393 | 394 | ||
@@ -558,10 +559,8 @@ zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter, | |||
558 | 559 | ||
559 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status); | 560 | atomic_set_mask(ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED, &adapter->status); |
560 | 561 | ||
561 | if (link_down == NULL) { | 562 | if (link_down == NULL) |
562 | zfcp_erp_adapter_reopen(adapter, 0); | 563 | goto out; |
563 | return; | ||
564 | } | ||
565 | 564 | ||
566 | switch (link_down->error_code) { | 565 | switch (link_down->error_code) { |
567 | case FSF_PSQ_LINK_NO_LIGHT: | 566 | case FSF_PSQ_LINK_NO_LIGHT: |
@@ -643,16 +642,8 @@ zfcp_fsf_link_down_info_eval(struct zfcp_adapter *adapter, | |||
643 | link_down->explanation_code, | 642 | link_down->explanation_code, |
644 | link_down->vendor_specific_code); | 643 | link_down->vendor_specific_code); |
645 | 644 | ||
646 | switch (link_down->error_code) { | 645 | out: |
647 | case FSF_PSQ_LINK_NO_LIGHT: | 646 | zfcp_erp_adapter_failed(adapter); |
648 | case FSF_PSQ_LINK_WRAP_PLUG: | ||
649 | case FSF_PSQ_LINK_NO_FCP: | ||
650 | case FSF_PSQ_LINK_FIRMWARE_UPDATE: | ||
651 | zfcp_erp_adapter_reopen(adapter, 0); | ||
652 | break; | ||
653 | default: | ||
654 | zfcp_erp_adapter_failed(adapter); | ||
655 | } | ||
656 | } | 647 | } |
657 | 648 | ||
658 | /* | 649 | /* |
@@ -2304,6 +2295,35 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action, | |||
2304 | return retval; | 2295 | return retval; |
2305 | } | 2296 | } |
2306 | 2297 | ||
2298 | /** | ||
2299 | * zfcp_fsf_exchange_port_evaluate | ||
2300 | * @fsf_req: fsf_req which belongs to xchg port data request | ||
2301 | * @xchg_ok: specifies if xchg port data was incomplete or complete (0/1) | ||
2302 | */ | ||
2303 | static void | ||
2304 | zfcp_fsf_exchange_port_evaluate(struct zfcp_fsf_req *fsf_req, int xchg_ok) | ||
2305 | { | ||
2306 | struct zfcp_adapter *adapter; | ||
2307 | struct fsf_qtcb *qtcb; | ||
2308 | struct fsf_qtcb_bottom_port *bottom, *data; | ||
2309 | struct Scsi_Host *shost; | ||
2310 | |||
2311 | adapter = fsf_req->adapter; | ||
2312 | qtcb = fsf_req->qtcb; | ||
2313 | bottom = &qtcb->bottom.port; | ||
2314 | shost = adapter->scsi_host; | ||
2315 | |||
2316 | data = (struct fsf_qtcb_bottom_port*) fsf_req->data; | ||
2317 | if (data) | ||
2318 | memcpy(data, bottom, sizeof(struct fsf_qtcb_bottom_port)); | ||
2319 | |||
2320 | if (adapter->connection_features & FSF_FEATURE_NPIV_MODE) | ||
2321 | fc_host_permanent_port_name(shost) = bottom->wwpn; | ||
2322 | else | ||
2323 | fc_host_permanent_port_name(shost) = fc_host_port_name(shost); | ||
2324 | fc_host_maxframe_size(shost) = bottom->maximum_frame_size; | ||
2325 | fc_host_supported_speeds(shost) = bottom->supported_speed; | ||
2326 | } | ||
2307 | 2327 | ||
2308 | /** | 2328 | /** |
2309 | * zfcp_fsf_exchange_port_data_handler - handler for exchange_port_data request | 2329 | * zfcp_fsf_exchange_port_data_handler - handler for exchange_port_data request |
@@ -2312,38 +2332,26 @@ zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action, | |||
2312 | static void | 2332 | static void |
2313 | zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *fsf_req) | 2333 | zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *fsf_req) |
2314 | { | 2334 | { |
2315 | struct zfcp_adapter *adapter = fsf_req->adapter; | 2335 | struct zfcp_adapter *adapter; |
2316 | struct Scsi_Host *shost = adapter->scsi_host; | 2336 | struct fsf_qtcb *qtcb; |
2317 | struct fsf_qtcb *qtcb = fsf_req->qtcb; | 2337 | |
2318 | struct fsf_qtcb_bottom_port *bottom, *data; | 2338 | adapter = fsf_req->adapter; |
2339 | qtcb = fsf_req->qtcb; | ||
2319 | 2340 | ||
2320 | if (fsf_req->status & ZFCP_STATUS_FSFREQ_ERROR) | 2341 | if (fsf_req->status & ZFCP_STATUS_FSFREQ_ERROR) |
2321 | return; | 2342 | return; |
2322 | 2343 | ||
2323 | switch (qtcb->header.fsf_status) { | 2344 | switch (qtcb->header.fsf_status) { |
2324 | case FSF_GOOD: | 2345 | case FSF_GOOD: |
2346 | zfcp_fsf_exchange_port_evaluate(fsf_req, 1); | ||
2325 | atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status); | 2347 | atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status); |
2326 | |||
2327 | bottom = &qtcb->bottom.port; | ||
2328 | data = (struct fsf_qtcb_bottom_port*) fsf_req->data; | ||
2329 | if (data) | ||
2330 | memcpy(data, bottom, sizeof(struct fsf_qtcb_bottom_port)); | ||
2331 | if (adapter->connection_features & FSF_FEATURE_NPIV_MODE) | ||
2332 | fc_host_permanent_port_name(shost) = bottom->wwpn; | ||
2333 | else | ||
2334 | fc_host_permanent_port_name(shost) = | ||
2335 | fc_host_port_name(shost); | ||
2336 | fc_host_maxframe_size(shost) = bottom->maximum_frame_size; | ||
2337 | fc_host_supported_speeds(shost) = bottom->supported_speed; | ||
2338 | break; | 2348 | break; |
2339 | |||
2340 | case FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE: | 2349 | case FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE: |
2350 | zfcp_fsf_exchange_port_evaluate(fsf_req, 0); | ||
2341 | atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status); | 2351 | atomic_set_mask(ZFCP_STATUS_ADAPTER_XPORT_OK, &adapter->status); |
2342 | |||
2343 | zfcp_fsf_link_down_info_eval(adapter, | 2352 | zfcp_fsf_link_down_info_eval(adapter, |
2344 | &qtcb->header.fsf_status_qual.link_down_info); | 2353 | &qtcb->header.fsf_status_qual.link_down_info); |
2345 | break; | 2354 | break; |
2346 | |||
2347 | default: | 2355 | default: |
2348 | debug_text_event(adapter->erp_dbf, 0, "xchg-port-ng"); | 2356 | debug_text_event(adapter->erp_dbf, 0, "xchg-port-ng"); |
2349 | debug_event(adapter->erp_dbf, 0, | 2357 | debug_event(adapter->erp_dbf, 0, |
@@ -4203,11 +4211,11 @@ zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req) | |||
4203 | ZFCP_LOG_DEBUG("scpnt->result =0x%x\n", scpnt->result); | 4211 | ZFCP_LOG_DEBUG("scpnt->result =0x%x\n", scpnt->result); |
4204 | 4212 | ||
4205 | if (scpnt->result != 0) | 4213 | if (scpnt->result != 0) |
4206 | zfcp_scsi_dbf_event_result("erro", 3, fsf_req->adapter, scpnt); | 4214 | zfcp_scsi_dbf_event_result("erro", 3, fsf_req->adapter, scpnt, fsf_req); |
4207 | else if (scpnt->retries > 0) | 4215 | else if (scpnt->retries > 0) |
4208 | zfcp_scsi_dbf_event_result("retr", 4, fsf_req->adapter, scpnt); | 4216 | zfcp_scsi_dbf_event_result("retr", 4, fsf_req->adapter, scpnt, fsf_req); |
4209 | else | 4217 | else |
4210 | zfcp_scsi_dbf_event_result("norm", 6, fsf_req->adapter, scpnt); | 4218 | zfcp_scsi_dbf_event_result("norm", 6, fsf_req->adapter, scpnt, fsf_req); |
4211 | 4219 | ||
4212 | /* cleanup pointer (need this especially for abort) */ | 4220 | /* cleanup pointer (need this especially for abort) */ |
4213 | scpnt->host_scribble = NULL; | 4221 | scpnt->host_scribble = NULL; |
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index e0803757c0fa..9f6b4d7a46f3 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
@@ -242,7 +242,7 @@ zfcp_scsi_command_fail(struct scsi_cmnd *scpnt, int result) | |||
242 | if ((scpnt->device != NULL) && (scpnt->device->host != NULL)) | 242 | if ((scpnt->device != NULL) && (scpnt->device->host != NULL)) |
243 | zfcp_scsi_dbf_event_result("fail", 4, | 243 | zfcp_scsi_dbf_event_result("fail", 4, |
244 | (struct zfcp_adapter*) scpnt->device->host->hostdata[0], | 244 | (struct zfcp_adapter*) scpnt->device->host->hostdata[0], |
245 | scpnt); | 245 | scpnt, NULL); |
246 | /* return directly */ | 246 | /* return directly */ |
247 | scpnt->scsi_done(scpnt); | 247 | scpnt->scsi_done(scpnt); |
248 | } | 248 | } |
@@ -446,7 +446,7 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt) | |||
446 | old_fsf_req = (struct zfcp_fsf_req *) scpnt->host_scribble; | 446 | old_fsf_req = (struct zfcp_fsf_req *) scpnt->host_scribble; |
447 | if (!old_fsf_req) { | 447 | if (!old_fsf_req) { |
448 | write_unlock_irqrestore(&adapter->abort_lock, flags); | 448 | write_unlock_irqrestore(&adapter->abort_lock, flags); |
449 | zfcp_scsi_dbf_event_abort("lte1", adapter, scpnt, new_fsf_req); | 449 | zfcp_scsi_dbf_event_abort("lte1", adapter, scpnt, NULL, NULL); |
450 | retval = SUCCESS; | 450 | retval = SUCCESS; |
451 | goto out; | 451 | goto out; |
452 | } | 452 | } |
@@ -460,6 +460,8 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt) | |||
460 | adapter, unit, 0); | 460 | adapter, unit, 0); |
461 | if (!new_fsf_req) { | 461 | if (!new_fsf_req) { |
462 | ZFCP_LOG_INFO("error: initiation of Abort FCP Cmnd failed\n"); | 462 | ZFCP_LOG_INFO("error: initiation of Abort FCP Cmnd failed\n"); |
463 | zfcp_scsi_dbf_event_abort("nres", adapter, scpnt, NULL, | ||
464 | old_fsf_req); | ||
463 | retval = FAILED; | 465 | retval = FAILED; |
464 | goto out; | 466 | goto out; |
465 | } | 467 | } |
@@ -470,13 +472,16 @@ zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt) | |||
470 | 472 | ||
471 | /* status should be valid since signals were not permitted */ | 473 | /* status should be valid since signals were not permitted */ |
472 | if (new_fsf_req->status & ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED) { | 474 | if (new_fsf_req->status & ZFCP_STATUS_FSFREQ_ABORTSUCCEEDED) { |
473 | zfcp_scsi_dbf_event_abort("okay", adapter, scpnt, new_fsf_req); | 475 | zfcp_scsi_dbf_event_abort("okay", adapter, scpnt, new_fsf_req, |
476 | NULL); | ||
474 | retval = SUCCESS; | 477 | retval = SUCCESS; |
475 | } else if (new_fsf_req->status & ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED) { | 478 | } else if (new_fsf_req->status & ZFCP_STATUS_FSFREQ_ABORTNOTNEEDED) { |
476 | zfcp_scsi_dbf_event_abort("lte2", adapter, scpnt, new_fsf_req); | 479 | zfcp_scsi_dbf_event_abort("lte2", adapter, scpnt, new_fsf_req, |
480 | NULL); | ||
477 | retval = SUCCESS; | 481 | retval = SUCCESS; |
478 | } else { | 482 | } else { |
479 | zfcp_scsi_dbf_event_abort("fail", adapter, scpnt, new_fsf_req); | 483 | zfcp_scsi_dbf_event_abort("fail", adapter, scpnt, new_fsf_req, |
484 | NULL); | ||
480 | retval = FAILED; | 485 | retval = FAILED; |
481 | } | 486 | } |
482 | zfcp_fsf_req_free(new_fsf_req); | 487 | zfcp_fsf_req_free(new_fsf_req); |
diff --git a/drivers/s390/scsi/zfcp_sysfs_adapter.c b/drivers/s390/scsi/zfcp_sysfs_adapter.c index dfc07370f412..b29ac25e07f3 100644 --- a/drivers/s390/scsi/zfcp_sysfs_adapter.c +++ b/drivers/s390/scsi/zfcp_sysfs_adapter.c | |||
@@ -55,8 +55,6 @@ ZFCP_DEFINE_ADAPTER_ATTR(status, "0x%08x\n", atomic_read(&adapter->status)); | |||
55 | ZFCP_DEFINE_ADAPTER_ATTR(peer_wwnn, "0x%016llx\n", adapter->peer_wwnn); | 55 | ZFCP_DEFINE_ADAPTER_ATTR(peer_wwnn, "0x%016llx\n", adapter->peer_wwnn); |
56 | ZFCP_DEFINE_ADAPTER_ATTR(peer_wwpn, "0x%016llx\n", adapter->peer_wwpn); | 56 | ZFCP_DEFINE_ADAPTER_ATTR(peer_wwpn, "0x%016llx\n", adapter->peer_wwpn); |
57 | ZFCP_DEFINE_ADAPTER_ATTR(peer_d_id, "0x%06x\n", adapter->peer_d_id); | 57 | ZFCP_DEFINE_ADAPTER_ATTR(peer_d_id, "0x%06x\n", adapter->peer_d_id); |
58 | ZFCP_DEFINE_ADAPTER_ATTR(physical_wwpn, "0x%016llx\n", adapter->physical_wwpn); | ||
59 | ZFCP_DEFINE_ADAPTER_ATTR(physical_s_id, "0x%06x\n", adapter->physical_s_id); | ||
60 | ZFCP_DEFINE_ADAPTER_ATTR(card_version, "0x%04x\n", adapter->hydra_version); | 58 | ZFCP_DEFINE_ADAPTER_ATTR(card_version, "0x%04x\n", adapter->hydra_version); |
61 | ZFCP_DEFINE_ADAPTER_ATTR(lic_version, "0x%08x\n", adapter->fsf_lic_version); | 59 | ZFCP_DEFINE_ADAPTER_ATTR(lic_version, "0x%08x\n", adapter->fsf_lic_version); |
62 | ZFCP_DEFINE_ADAPTER_ATTR(hardware_version, "0x%08x\n", | 60 | ZFCP_DEFINE_ADAPTER_ATTR(hardware_version, "0x%08x\n", |
@@ -241,8 +239,6 @@ static struct attribute *zfcp_adapter_attrs[] = { | |||
241 | &dev_attr_peer_wwnn.attr, | 239 | &dev_attr_peer_wwnn.attr, |
242 | &dev_attr_peer_wwpn.attr, | 240 | &dev_attr_peer_wwpn.attr, |
243 | &dev_attr_peer_d_id.attr, | 241 | &dev_attr_peer_d_id.attr, |
244 | &dev_attr_physical_wwpn.attr, | ||
245 | &dev_attr_physical_s_id.attr, | ||
246 | &dev_attr_card_version.attr, | 242 | &dev_attr_card_version.attr, |
247 | &dev_attr_lic_version.attr, | 243 | &dev_attr_lic_version.attr, |
248 | &dev_attr_status.attr, | 244 | &dev_attr_status.attr, |
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 31c497542272..d9152d02088c 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c | |||
@@ -61,6 +61,7 @@ | |||
61 | Add support for embedded firmware error strings. | 61 | Add support for embedded firmware error strings. |
62 | 2.26.02.003 - Correctly handle single sgl's with use_sg=1. | 62 | 2.26.02.003 - Correctly handle single sgl's with use_sg=1. |
63 | 2.26.02.004 - Add support for 9550SX controllers. | 63 | 2.26.02.004 - Add support for 9550SX controllers. |
64 | 2.26.02.005 - Fix use_sg == 0 mapping on systems with 4GB or higher. | ||
64 | */ | 65 | */ |
65 | 66 | ||
66 | #include <linux/module.h> | 67 | #include <linux/module.h> |
@@ -84,7 +85,7 @@ | |||
84 | #include "3w-9xxx.h" | 85 | #include "3w-9xxx.h" |
85 | 86 | ||
86 | /* Globals */ | 87 | /* Globals */ |
87 | #define TW_DRIVER_VERSION "2.26.02.004" | 88 | #define TW_DRIVER_VERSION "2.26.02.005" |
88 | static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT]; | 89 | static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT]; |
89 | static unsigned int twa_device_extension_count; | 90 | static unsigned int twa_device_extension_count; |
90 | static int twa_major = -1; | 91 | static int twa_major = -1; |
@@ -1408,7 +1409,7 @@ static dma_addr_t twa_map_scsi_single_data(TW_Device_Extension *tw_dev, int requ | |||
1408 | dma_addr_t mapping; | 1409 | dma_addr_t mapping; |
1409 | struct scsi_cmnd *cmd = tw_dev->srb[request_id]; | 1410 | struct scsi_cmnd *cmd = tw_dev->srb[request_id]; |
1410 | struct pci_dev *pdev = tw_dev->tw_pci_dev; | 1411 | struct pci_dev *pdev = tw_dev->tw_pci_dev; |
1411 | int retval = 0; | 1412 | dma_addr_t retval = 0; |
1412 | 1413 | ||
1413 | if (cmd->request_bufflen == 0) { | 1414 | if (cmd->request_bufflen == 0) { |
1414 | retval = 0; | 1415 | retval = 0; |
@@ -1798,7 +1799,7 @@ static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, | |||
1798 | int i, sg_count; | 1799 | int i, sg_count; |
1799 | struct scsi_cmnd *srb = NULL; | 1800 | struct scsi_cmnd *srb = NULL; |
1800 | struct scatterlist *sglist = NULL; | 1801 | struct scatterlist *sglist = NULL; |
1801 | u32 buffaddr = 0x0; | 1802 | dma_addr_t buffaddr = 0x0; |
1802 | int retval = 1; | 1803 | int retval = 1; |
1803 | 1804 | ||
1804 | if (tw_dev->srb[request_id]) { | 1805 | if (tw_dev->srb[request_id]) { |
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index 7139659dd952..a16f8ded8f1d 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c | |||
@@ -173,10 +173,10 @@ int aac_get_config_status(struct aac_dev *dev) | |||
173 | int status = 0; | 173 | int status = 0; |
174 | struct fib * fibptr; | 174 | struct fib * fibptr; |
175 | 175 | ||
176 | if (!(fibptr = fib_alloc(dev))) | 176 | if (!(fibptr = aac_fib_alloc(dev))) |
177 | return -ENOMEM; | 177 | return -ENOMEM; |
178 | 178 | ||
179 | fib_init(fibptr); | 179 | aac_fib_init(fibptr); |
180 | { | 180 | { |
181 | struct aac_get_config_status *dinfo; | 181 | struct aac_get_config_status *dinfo; |
182 | dinfo = (struct aac_get_config_status *) fib_data(fibptr); | 182 | dinfo = (struct aac_get_config_status *) fib_data(fibptr); |
@@ -186,7 +186,7 @@ int aac_get_config_status(struct aac_dev *dev) | |||
186 | dinfo->count = cpu_to_le32(sizeof(((struct aac_get_config_status_resp *)NULL)->data)); | 186 | dinfo->count = cpu_to_le32(sizeof(((struct aac_get_config_status_resp *)NULL)->data)); |
187 | } | 187 | } |
188 | 188 | ||
189 | status = fib_send(ContainerCommand, | 189 | status = aac_fib_send(ContainerCommand, |
190 | fibptr, | 190 | fibptr, |
191 | sizeof (struct aac_get_config_status), | 191 | sizeof (struct aac_get_config_status), |
192 | FsaNormal, | 192 | FsaNormal, |
@@ -209,30 +209,30 @@ int aac_get_config_status(struct aac_dev *dev) | |||
209 | status = -EINVAL; | 209 | status = -EINVAL; |
210 | } | 210 | } |
211 | } | 211 | } |
212 | fib_complete(fibptr); | 212 | aac_fib_complete(fibptr); |
213 | /* Send a CT_COMMIT_CONFIG to enable discovery of devices */ | 213 | /* Send a CT_COMMIT_CONFIG to enable discovery of devices */ |
214 | if (status >= 0) { | 214 | if (status >= 0) { |
215 | if (commit == 1) { | 215 | if (commit == 1) { |
216 | struct aac_commit_config * dinfo; | 216 | struct aac_commit_config * dinfo; |
217 | fib_init(fibptr); | 217 | aac_fib_init(fibptr); |
218 | dinfo = (struct aac_commit_config *) fib_data(fibptr); | 218 | dinfo = (struct aac_commit_config *) fib_data(fibptr); |
219 | 219 | ||
220 | dinfo->command = cpu_to_le32(VM_ContainerConfig); | 220 | dinfo->command = cpu_to_le32(VM_ContainerConfig); |
221 | dinfo->type = cpu_to_le32(CT_COMMIT_CONFIG); | 221 | dinfo->type = cpu_to_le32(CT_COMMIT_CONFIG); |
222 | 222 | ||
223 | status = fib_send(ContainerCommand, | 223 | status = aac_fib_send(ContainerCommand, |
224 | fibptr, | 224 | fibptr, |
225 | sizeof (struct aac_commit_config), | 225 | sizeof (struct aac_commit_config), |
226 | FsaNormal, | 226 | FsaNormal, |
227 | 1, 1, | 227 | 1, 1, |
228 | NULL, NULL); | 228 | NULL, NULL); |
229 | fib_complete(fibptr); | 229 | aac_fib_complete(fibptr); |
230 | } else if (commit == 0) { | 230 | } else if (commit == 0) { |
231 | printk(KERN_WARNING | 231 | printk(KERN_WARNING |
232 | "aac_get_config_status: Foreign device configurations are being ignored\n"); | 232 | "aac_get_config_status: Foreign device configurations are being ignored\n"); |
233 | } | 233 | } |
234 | } | 234 | } |
235 | fib_free(fibptr); | 235 | aac_fib_free(fibptr); |
236 | return status; | 236 | return status; |
237 | } | 237 | } |
238 | 238 | ||
@@ -255,15 +255,15 @@ int aac_get_containers(struct aac_dev *dev) | |||
255 | 255 | ||
256 | instance = dev->scsi_host_ptr->unique_id; | 256 | instance = dev->scsi_host_ptr->unique_id; |
257 | 257 | ||
258 | if (!(fibptr = fib_alloc(dev))) | 258 | if (!(fibptr = aac_fib_alloc(dev))) |
259 | return -ENOMEM; | 259 | return -ENOMEM; |
260 | 260 | ||
261 | fib_init(fibptr); | 261 | aac_fib_init(fibptr); |
262 | dinfo = (struct aac_get_container_count *) fib_data(fibptr); | 262 | dinfo = (struct aac_get_container_count *) fib_data(fibptr); |
263 | dinfo->command = cpu_to_le32(VM_ContainerConfig); | 263 | dinfo->command = cpu_to_le32(VM_ContainerConfig); |
264 | dinfo->type = cpu_to_le32(CT_GET_CONTAINER_COUNT); | 264 | dinfo->type = cpu_to_le32(CT_GET_CONTAINER_COUNT); |
265 | 265 | ||
266 | status = fib_send(ContainerCommand, | 266 | status = aac_fib_send(ContainerCommand, |
267 | fibptr, | 267 | fibptr, |
268 | sizeof (struct aac_get_container_count), | 268 | sizeof (struct aac_get_container_count), |
269 | FsaNormal, | 269 | FsaNormal, |
@@ -272,7 +272,7 @@ int aac_get_containers(struct aac_dev *dev) | |||
272 | if (status >= 0) { | 272 | if (status >= 0) { |
273 | dresp = (struct aac_get_container_count_resp *)fib_data(fibptr); | 273 | dresp = (struct aac_get_container_count_resp *)fib_data(fibptr); |
274 | maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries); | 274 | maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries); |
275 | fib_complete(fibptr); | 275 | aac_fib_complete(fibptr); |
276 | } | 276 | } |
277 | 277 | ||
278 | if (maximum_num_containers < MAXIMUM_NUM_CONTAINERS) | 278 | if (maximum_num_containers < MAXIMUM_NUM_CONTAINERS) |
@@ -280,7 +280,7 @@ int aac_get_containers(struct aac_dev *dev) | |||
280 | fsa_dev_ptr = (struct fsa_dev_info *) kmalloc( | 280 | fsa_dev_ptr = (struct fsa_dev_info *) kmalloc( |
281 | sizeof(*fsa_dev_ptr) * maximum_num_containers, GFP_KERNEL); | 281 | sizeof(*fsa_dev_ptr) * maximum_num_containers, GFP_KERNEL); |
282 | if (!fsa_dev_ptr) { | 282 | if (!fsa_dev_ptr) { |
283 | fib_free(fibptr); | 283 | aac_fib_free(fibptr); |
284 | return -ENOMEM; | 284 | return -ENOMEM; |
285 | } | 285 | } |
286 | memset(fsa_dev_ptr, 0, sizeof(*fsa_dev_ptr) * maximum_num_containers); | 286 | memset(fsa_dev_ptr, 0, sizeof(*fsa_dev_ptr) * maximum_num_containers); |
@@ -294,14 +294,14 @@ int aac_get_containers(struct aac_dev *dev) | |||
294 | 294 | ||
295 | fsa_dev_ptr[index].devname[0] = '\0'; | 295 | fsa_dev_ptr[index].devname[0] = '\0'; |
296 | 296 | ||
297 | fib_init(fibptr); | 297 | aac_fib_init(fibptr); |
298 | dinfo = (struct aac_query_mount *) fib_data(fibptr); | 298 | dinfo = (struct aac_query_mount *) fib_data(fibptr); |
299 | 299 | ||
300 | dinfo->command = cpu_to_le32(VM_NameServe); | 300 | dinfo->command = cpu_to_le32(VM_NameServe); |
301 | dinfo->count = cpu_to_le32(index); | 301 | dinfo->count = cpu_to_le32(index); |
302 | dinfo->type = cpu_to_le32(FT_FILESYS); | 302 | dinfo->type = cpu_to_le32(FT_FILESYS); |
303 | 303 | ||
304 | status = fib_send(ContainerCommand, | 304 | status = aac_fib_send(ContainerCommand, |
305 | fibptr, | 305 | fibptr, |
306 | sizeof (struct aac_query_mount), | 306 | sizeof (struct aac_query_mount), |
307 | FsaNormal, | 307 | FsaNormal, |
@@ -319,7 +319,7 @@ int aac_get_containers(struct aac_dev *dev) | |||
319 | dinfo->count = cpu_to_le32(index); | 319 | dinfo->count = cpu_to_le32(index); |
320 | dinfo->type = cpu_to_le32(FT_FILESYS); | 320 | dinfo->type = cpu_to_le32(FT_FILESYS); |
321 | 321 | ||
322 | if (fib_send(ContainerCommand, | 322 | if (aac_fib_send(ContainerCommand, |
323 | fibptr, | 323 | fibptr, |
324 | sizeof(struct aac_query_mount), | 324 | sizeof(struct aac_query_mount), |
325 | FsaNormal, | 325 | FsaNormal, |
@@ -347,7 +347,7 @@ int aac_get_containers(struct aac_dev *dev) | |||
347 | if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY) | 347 | if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY) |
348 | fsa_dev_ptr[index].ro = 1; | 348 | fsa_dev_ptr[index].ro = 1; |
349 | } | 349 | } |
350 | fib_complete(fibptr); | 350 | aac_fib_complete(fibptr); |
351 | /* | 351 | /* |
352 | * If there are no more containers, then stop asking. | 352 | * If there are no more containers, then stop asking. |
353 | */ | 353 | */ |
@@ -355,7 +355,7 @@ int aac_get_containers(struct aac_dev *dev) | |||
355 | break; | 355 | break; |
356 | } | 356 | } |
357 | } | 357 | } |
358 | fib_free(fibptr); | 358 | aac_fib_free(fibptr); |
359 | return status; | 359 | return status; |
360 | } | 360 | } |
361 | 361 | ||
@@ -413,8 +413,8 @@ static void get_container_name_callback(void *context, struct fib * fibptr) | |||
413 | 413 | ||
414 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD; | 414 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD; |
415 | 415 | ||
416 | fib_complete(fibptr); | 416 | aac_fib_complete(fibptr); |
417 | fib_free(fibptr); | 417 | aac_fib_free(fibptr); |
418 | scsicmd->scsi_done(scsicmd); | 418 | scsicmd->scsi_done(scsicmd); |
419 | } | 419 | } |
420 | 420 | ||
@@ -430,10 +430,10 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid) | |||
430 | 430 | ||
431 | dev = (struct aac_dev *)scsicmd->device->host->hostdata; | 431 | dev = (struct aac_dev *)scsicmd->device->host->hostdata; |
432 | 432 | ||
433 | if (!(cmd_fibcontext = fib_alloc(dev))) | 433 | if (!(cmd_fibcontext = aac_fib_alloc(dev))) |
434 | return -ENOMEM; | 434 | return -ENOMEM; |
435 | 435 | ||
436 | fib_init(cmd_fibcontext); | 436 | aac_fib_init(cmd_fibcontext); |
437 | dinfo = (struct aac_get_name *) fib_data(cmd_fibcontext); | 437 | dinfo = (struct aac_get_name *) fib_data(cmd_fibcontext); |
438 | 438 | ||
439 | dinfo->command = cpu_to_le32(VM_ContainerConfig); | 439 | dinfo->command = cpu_to_le32(VM_ContainerConfig); |
@@ -441,7 +441,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid) | |||
441 | dinfo->cid = cpu_to_le32(cid); | 441 | dinfo->cid = cpu_to_le32(cid); |
442 | dinfo->count = cpu_to_le32(sizeof(((struct aac_get_name_resp *)NULL)->data)); | 442 | dinfo->count = cpu_to_le32(sizeof(((struct aac_get_name_resp *)NULL)->data)); |
443 | 443 | ||
444 | status = fib_send(ContainerCommand, | 444 | status = aac_fib_send(ContainerCommand, |
445 | cmd_fibcontext, | 445 | cmd_fibcontext, |
446 | sizeof (struct aac_get_name), | 446 | sizeof (struct aac_get_name), |
447 | FsaNormal, | 447 | FsaNormal, |
@@ -455,14 +455,14 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid) | |||
455 | if (status == -EINPROGRESS) | 455 | if (status == -EINPROGRESS) |
456 | return 0; | 456 | return 0; |
457 | 457 | ||
458 | printk(KERN_WARNING "aac_get_container_name: fib_send failed with status: %d.\n", status); | 458 | printk(KERN_WARNING "aac_get_container_name: aac_fib_send failed with status: %d.\n", status); |
459 | fib_complete(cmd_fibcontext); | 459 | aac_fib_complete(cmd_fibcontext); |
460 | fib_free(cmd_fibcontext); | 460 | aac_fib_free(cmd_fibcontext); |
461 | return -1; | 461 | return -1; |
462 | } | 462 | } |
463 | 463 | ||
464 | /** | 464 | /** |
465 | * probe_container - query a logical volume | 465 | * aac_probe_container - query a logical volume |
466 | * @dev: device to query | 466 | * @dev: device to query |
467 | * @cid: container identifier | 467 | * @cid: container identifier |
468 | * | 468 | * |
@@ -470,7 +470,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid) | |||
470 | * is updated in the struct fsa_dev_info structure rather than returned. | 470 | * is updated in the struct fsa_dev_info structure rather than returned. |
471 | */ | 471 | */ |
472 | 472 | ||
473 | int probe_container(struct aac_dev *dev, int cid) | 473 | int aac_probe_container(struct aac_dev *dev, int cid) |
474 | { | 474 | { |
475 | struct fsa_dev_info *fsa_dev_ptr; | 475 | struct fsa_dev_info *fsa_dev_ptr; |
476 | int status; | 476 | int status; |
@@ -482,10 +482,10 @@ int probe_container(struct aac_dev *dev, int cid) | |||
482 | fsa_dev_ptr = dev->fsa_dev; | 482 | fsa_dev_ptr = dev->fsa_dev; |
483 | instance = dev->scsi_host_ptr->unique_id; | 483 | instance = dev->scsi_host_ptr->unique_id; |
484 | 484 | ||
485 | if (!(fibptr = fib_alloc(dev))) | 485 | if (!(fibptr = aac_fib_alloc(dev))) |
486 | return -ENOMEM; | 486 | return -ENOMEM; |
487 | 487 | ||
488 | fib_init(fibptr); | 488 | aac_fib_init(fibptr); |
489 | 489 | ||
490 | dinfo = (struct aac_query_mount *)fib_data(fibptr); | 490 | dinfo = (struct aac_query_mount *)fib_data(fibptr); |
491 | 491 | ||
@@ -493,14 +493,14 @@ int probe_container(struct aac_dev *dev, int cid) | |||
493 | dinfo->count = cpu_to_le32(cid); | 493 | dinfo->count = cpu_to_le32(cid); |
494 | dinfo->type = cpu_to_le32(FT_FILESYS); | 494 | dinfo->type = cpu_to_le32(FT_FILESYS); |
495 | 495 | ||
496 | status = fib_send(ContainerCommand, | 496 | status = aac_fib_send(ContainerCommand, |
497 | fibptr, | 497 | fibptr, |
498 | sizeof(struct aac_query_mount), | 498 | sizeof(struct aac_query_mount), |
499 | FsaNormal, | 499 | FsaNormal, |
500 | 1, 1, | 500 | 1, 1, |
501 | NULL, NULL); | 501 | NULL, NULL); |
502 | if (status < 0) { | 502 | if (status < 0) { |
503 | printk(KERN_WARNING "aacraid: probe_container query failed.\n"); | 503 | printk(KERN_WARNING "aacraid: aac_probe_container query failed.\n"); |
504 | goto error; | 504 | goto error; |
505 | } | 505 | } |
506 | 506 | ||
@@ -512,7 +512,7 @@ int probe_container(struct aac_dev *dev, int cid) | |||
512 | dinfo->count = cpu_to_le32(cid); | 512 | dinfo->count = cpu_to_le32(cid); |
513 | dinfo->type = cpu_to_le32(FT_FILESYS); | 513 | dinfo->type = cpu_to_le32(FT_FILESYS); |
514 | 514 | ||
515 | if (fib_send(ContainerCommand, | 515 | if (aac_fib_send(ContainerCommand, |
516 | fibptr, | 516 | fibptr, |
517 | sizeof(struct aac_query_mount), | 517 | sizeof(struct aac_query_mount), |
518 | FsaNormal, | 518 | FsaNormal, |
@@ -535,8 +535,8 @@ int probe_container(struct aac_dev *dev, int cid) | |||
535 | } | 535 | } |
536 | 536 | ||
537 | error: | 537 | error: |
538 | fib_complete(fibptr); | 538 | aac_fib_complete(fibptr); |
539 | fib_free(fibptr); | 539 | aac_fib_free(fibptr); |
540 | 540 | ||
541 | return status; | 541 | return status; |
542 | } | 542 | } |
@@ -700,14 +700,14 @@ int aac_get_adapter_info(struct aac_dev* dev) | |||
700 | struct aac_bus_info *command; | 700 | struct aac_bus_info *command; |
701 | struct aac_bus_info_response *bus_info; | 701 | struct aac_bus_info_response *bus_info; |
702 | 702 | ||
703 | if (!(fibptr = fib_alloc(dev))) | 703 | if (!(fibptr = aac_fib_alloc(dev))) |
704 | return -ENOMEM; | 704 | return -ENOMEM; |
705 | 705 | ||
706 | fib_init(fibptr); | 706 | aac_fib_init(fibptr); |
707 | info = (struct aac_adapter_info *) fib_data(fibptr); | 707 | info = (struct aac_adapter_info *) fib_data(fibptr); |
708 | memset(info,0,sizeof(*info)); | 708 | memset(info,0,sizeof(*info)); |
709 | 709 | ||
710 | rcode = fib_send(RequestAdapterInfo, | 710 | rcode = aac_fib_send(RequestAdapterInfo, |
711 | fibptr, | 711 | fibptr, |
712 | sizeof(*info), | 712 | sizeof(*info), |
713 | FsaNormal, | 713 | FsaNormal, |
@@ -716,8 +716,8 @@ int aac_get_adapter_info(struct aac_dev* dev) | |||
716 | NULL); | 716 | NULL); |
717 | 717 | ||
718 | if (rcode < 0) { | 718 | if (rcode < 0) { |
719 | fib_complete(fibptr); | 719 | aac_fib_complete(fibptr); |
720 | fib_free(fibptr); | 720 | aac_fib_free(fibptr); |
721 | return rcode; | 721 | return rcode; |
722 | } | 722 | } |
723 | memcpy(&dev->adapter_info, info, sizeof(*info)); | 723 | memcpy(&dev->adapter_info, info, sizeof(*info)); |
@@ -725,13 +725,13 @@ int aac_get_adapter_info(struct aac_dev* dev) | |||
725 | if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) { | 725 | if (dev->adapter_info.options & AAC_OPT_SUPPLEMENT_ADAPTER_INFO) { |
726 | struct aac_supplement_adapter_info * info; | 726 | struct aac_supplement_adapter_info * info; |
727 | 727 | ||
728 | fib_init(fibptr); | 728 | aac_fib_init(fibptr); |
729 | 729 | ||
730 | info = (struct aac_supplement_adapter_info *) fib_data(fibptr); | 730 | info = (struct aac_supplement_adapter_info *) fib_data(fibptr); |
731 | 731 | ||
732 | memset(info,0,sizeof(*info)); | 732 | memset(info,0,sizeof(*info)); |
733 | 733 | ||
734 | rcode = fib_send(RequestSupplementAdapterInfo, | 734 | rcode = aac_fib_send(RequestSupplementAdapterInfo, |
735 | fibptr, | 735 | fibptr, |
736 | sizeof(*info), | 736 | sizeof(*info), |
737 | FsaNormal, | 737 | FsaNormal, |
@@ -748,7 +748,7 @@ int aac_get_adapter_info(struct aac_dev* dev) | |||
748 | * GetBusInfo | 748 | * GetBusInfo |
749 | */ | 749 | */ |
750 | 750 | ||
751 | fib_init(fibptr); | 751 | aac_fib_init(fibptr); |
752 | 752 | ||
753 | bus_info = (struct aac_bus_info_response *) fib_data(fibptr); | 753 | bus_info = (struct aac_bus_info_response *) fib_data(fibptr); |
754 | 754 | ||
@@ -761,7 +761,7 @@ int aac_get_adapter_info(struct aac_dev* dev) | |||
761 | command->MethodId = cpu_to_le32(1); | 761 | command->MethodId = cpu_to_le32(1); |
762 | command->CtlCmd = cpu_to_le32(GetBusInfo); | 762 | command->CtlCmd = cpu_to_le32(GetBusInfo); |
763 | 763 | ||
764 | rcode = fib_send(ContainerCommand, | 764 | rcode = aac_fib_send(ContainerCommand, |
765 | fibptr, | 765 | fibptr, |
766 | sizeof (*bus_info), | 766 | sizeof (*bus_info), |
767 | FsaNormal, | 767 | FsaNormal, |
@@ -891,8 +891,8 @@ int aac_get_adapter_info(struct aac_dev* dev) | |||
891 | } | 891 | } |
892 | } | 892 | } |
893 | 893 | ||
894 | fib_complete(fibptr); | 894 | aac_fib_complete(fibptr); |
895 | fib_free(fibptr); | 895 | aac_fib_free(fibptr); |
896 | 896 | ||
897 | return rcode; | 897 | return rcode; |
898 | } | 898 | } |
@@ -976,8 +976,8 @@ static void io_callback(void *context, struct fib * fibptr) | |||
976 | ? sizeof(scsicmd->sense_buffer) | 976 | ? sizeof(scsicmd->sense_buffer) |
977 | : sizeof(dev->fsa_dev[cid].sense_data)); | 977 | : sizeof(dev->fsa_dev[cid].sense_data)); |
978 | } | 978 | } |
979 | fib_complete(fibptr); | 979 | aac_fib_complete(fibptr); |
980 | fib_free(fibptr); | 980 | aac_fib_free(fibptr); |
981 | 981 | ||
982 | scsicmd->scsi_done(scsicmd); | 982 | scsicmd->scsi_done(scsicmd); |
983 | } | 983 | } |
@@ -1062,11 +1062,11 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid) | |||
1062 | /* | 1062 | /* |
1063 | * Alocate and initialize a Fib | 1063 | * Alocate and initialize a Fib |
1064 | */ | 1064 | */ |
1065 | if (!(cmd_fibcontext = fib_alloc(dev))) { | 1065 | if (!(cmd_fibcontext = aac_fib_alloc(dev))) { |
1066 | return -1; | 1066 | return -1; |
1067 | } | 1067 | } |
1068 | 1068 | ||
1069 | fib_init(cmd_fibcontext); | 1069 | aac_fib_init(cmd_fibcontext); |
1070 | 1070 | ||
1071 | if (dev->raw_io_interface) { | 1071 | if (dev->raw_io_interface) { |
1072 | struct aac_raw_io *readcmd; | 1072 | struct aac_raw_io *readcmd; |
@@ -1086,7 +1086,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid) | |||
1086 | /* | 1086 | /* |
1087 | * Now send the Fib to the adapter | 1087 | * Now send the Fib to the adapter |
1088 | */ | 1088 | */ |
1089 | status = fib_send(ContainerRawIo, | 1089 | status = aac_fib_send(ContainerRawIo, |
1090 | cmd_fibcontext, | 1090 | cmd_fibcontext, |
1091 | fibsize, | 1091 | fibsize, |
1092 | FsaNormal, | 1092 | FsaNormal, |
@@ -1112,7 +1112,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid) | |||
1112 | /* | 1112 | /* |
1113 | * Now send the Fib to the adapter | 1113 | * Now send the Fib to the adapter |
1114 | */ | 1114 | */ |
1115 | status = fib_send(ContainerCommand64, | 1115 | status = aac_fib_send(ContainerCommand64, |
1116 | cmd_fibcontext, | 1116 | cmd_fibcontext, |
1117 | fibsize, | 1117 | fibsize, |
1118 | FsaNormal, | 1118 | FsaNormal, |
@@ -1136,7 +1136,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid) | |||
1136 | /* | 1136 | /* |
1137 | * Now send the Fib to the adapter | 1137 | * Now send the Fib to the adapter |
1138 | */ | 1138 | */ |
1139 | status = fib_send(ContainerCommand, | 1139 | status = aac_fib_send(ContainerCommand, |
1140 | cmd_fibcontext, | 1140 | cmd_fibcontext, |
1141 | fibsize, | 1141 | fibsize, |
1142 | FsaNormal, | 1142 | FsaNormal, |
@@ -1153,14 +1153,14 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid) | |||
1153 | if (status == -EINPROGRESS) | 1153 | if (status == -EINPROGRESS) |
1154 | return 0; | 1154 | return 0; |
1155 | 1155 | ||
1156 | printk(KERN_WARNING "aac_read: fib_send failed with status: %d.\n", status); | 1156 | printk(KERN_WARNING "aac_read: aac_fib_send failed with status: %d.\n", status); |
1157 | /* | 1157 | /* |
1158 | * For some reason, the Fib didn't queue, return QUEUE_FULL | 1158 | * For some reason, the Fib didn't queue, return QUEUE_FULL |
1159 | */ | 1159 | */ |
1160 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_TASK_SET_FULL; | 1160 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_TASK_SET_FULL; |
1161 | scsicmd->scsi_done(scsicmd); | 1161 | scsicmd->scsi_done(scsicmd); |
1162 | fib_complete(cmd_fibcontext); | 1162 | aac_fib_complete(cmd_fibcontext); |
1163 | fib_free(cmd_fibcontext); | 1163 | aac_fib_free(cmd_fibcontext); |
1164 | return 0; | 1164 | return 0; |
1165 | } | 1165 | } |
1166 | 1166 | ||
@@ -1228,12 +1228,12 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid) | |||
1228 | /* | 1228 | /* |
1229 | * Allocate and initialize a Fib then setup a BlockWrite command | 1229 | * Allocate and initialize a Fib then setup a BlockWrite command |
1230 | */ | 1230 | */ |
1231 | if (!(cmd_fibcontext = fib_alloc(dev))) { | 1231 | if (!(cmd_fibcontext = aac_fib_alloc(dev))) { |
1232 | scsicmd->result = DID_ERROR << 16; | 1232 | scsicmd->result = DID_ERROR << 16; |
1233 | scsicmd->scsi_done(scsicmd); | 1233 | scsicmd->scsi_done(scsicmd); |
1234 | return 0; | 1234 | return 0; |
1235 | } | 1235 | } |
1236 | fib_init(cmd_fibcontext); | 1236 | aac_fib_init(cmd_fibcontext); |
1237 | 1237 | ||
1238 | if (dev->raw_io_interface) { | 1238 | if (dev->raw_io_interface) { |
1239 | struct aac_raw_io *writecmd; | 1239 | struct aac_raw_io *writecmd; |
@@ -1253,7 +1253,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid) | |||
1253 | /* | 1253 | /* |
1254 | * Now send the Fib to the adapter | 1254 | * Now send the Fib to the adapter |
1255 | */ | 1255 | */ |
1256 | status = fib_send(ContainerRawIo, | 1256 | status = aac_fib_send(ContainerRawIo, |
1257 | cmd_fibcontext, | 1257 | cmd_fibcontext, |
1258 | fibsize, | 1258 | fibsize, |
1259 | FsaNormal, | 1259 | FsaNormal, |
@@ -1279,7 +1279,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid) | |||
1279 | /* | 1279 | /* |
1280 | * Now send the Fib to the adapter | 1280 | * Now send the Fib to the adapter |
1281 | */ | 1281 | */ |
1282 | status = fib_send(ContainerCommand64, | 1282 | status = aac_fib_send(ContainerCommand64, |
1283 | cmd_fibcontext, | 1283 | cmd_fibcontext, |
1284 | fibsize, | 1284 | fibsize, |
1285 | FsaNormal, | 1285 | FsaNormal, |
@@ -1305,7 +1305,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid) | |||
1305 | /* | 1305 | /* |
1306 | * Now send the Fib to the adapter | 1306 | * Now send the Fib to the adapter |
1307 | */ | 1307 | */ |
1308 | status = fib_send(ContainerCommand, | 1308 | status = aac_fib_send(ContainerCommand, |
1309 | cmd_fibcontext, | 1309 | cmd_fibcontext, |
1310 | fibsize, | 1310 | fibsize, |
1311 | FsaNormal, | 1311 | FsaNormal, |
@@ -1322,15 +1322,15 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid) | |||
1322 | return 0; | 1322 | return 0; |
1323 | } | 1323 | } |
1324 | 1324 | ||
1325 | printk(KERN_WARNING "aac_write: fib_send failed with status: %d\n", status); | 1325 | printk(KERN_WARNING "aac_write: aac_fib_send failed with status: %d\n", status); |
1326 | /* | 1326 | /* |
1327 | * For some reason, the Fib didn't queue, return QUEUE_FULL | 1327 | * For some reason, the Fib didn't queue, return QUEUE_FULL |
1328 | */ | 1328 | */ |
1329 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_TASK_SET_FULL; | 1329 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_TASK_SET_FULL; |
1330 | scsicmd->scsi_done(scsicmd); | 1330 | scsicmd->scsi_done(scsicmd); |
1331 | 1331 | ||
1332 | fib_complete(cmd_fibcontext); | 1332 | aac_fib_complete(cmd_fibcontext); |
1333 | fib_free(cmd_fibcontext); | 1333 | aac_fib_free(cmd_fibcontext); |
1334 | return 0; | 1334 | return 0; |
1335 | } | 1335 | } |
1336 | 1336 | ||
@@ -1369,8 +1369,8 @@ static void synchronize_callback(void *context, struct fib *fibptr) | |||
1369 | sizeof(cmd->sense_buffer))); | 1369 | sizeof(cmd->sense_buffer))); |
1370 | } | 1370 | } |
1371 | 1371 | ||
1372 | fib_complete(fibptr); | 1372 | aac_fib_complete(fibptr); |
1373 | fib_free(fibptr); | 1373 | aac_fib_free(fibptr); |
1374 | cmd->scsi_done(cmd); | 1374 | cmd->scsi_done(cmd); |
1375 | } | 1375 | } |
1376 | 1376 | ||
@@ -1407,10 +1407,10 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid) | |||
1407 | * Allocate and initialize a Fib | 1407 | * Allocate and initialize a Fib |
1408 | */ | 1408 | */ |
1409 | if (!(cmd_fibcontext = | 1409 | if (!(cmd_fibcontext = |
1410 | fib_alloc((struct aac_dev *)scsicmd->device->host->hostdata))) | 1410 | aac_fib_alloc((struct aac_dev *)scsicmd->device->host->hostdata))) |
1411 | return SCSI_MLQUEUE_HOST_BUSY; | 1411 | return SCSI_MLQUEUE_HOST_BUSY; |
1412 | 1412 | ||
1413 | fib_init(cmd_fibcontext); | 1413 | aac_fib_init(cmd_fibcontext); |
1414 | 1414 | ||
1415 | synchronizecmd = fib_data(cmd_fibcontext); | 1415 | synchronizecmd = fib_data(cmd_fibcontext); |
1416 | synchronizecmd->command = cpu_to_le32(VM_ContainerConfig); | 1416 | synchronizecmd->command = cpu_to_le32(VM_ContainerConfig); |
@@ -1422,7 +1422,7 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid) | |||
1422 | /* | 1422 | /* |
1423 | * Now send the Fib to the adapter | 1423 | * Now send the Fib to the adapter |
1424 | */ | 1424 | */ |
1425 | status = fib_send(ContainerCommand, | 1425 | status = aac_fib_send(ContainerCommand, |
1426 | cmd_fibcontext, | 1426 | cmd_fibcontext, |
1427 | sizeof(struct aac_synchronize), | 1427 | sizeof(struct aac_synchronize), |
1428 | FsaNormal, | 1428 | FsaNormal, |
@@ -1437,9 +1437,9 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd, int cid) | |||
1437 | return 0; | 1437 | return 0; |
1438 | 1438 | ||
1439 | printk(KERN_WARNING | 1439 | printk(KERN_WARNING |
1440 | "aac_synchronize: fib_send failed with status: %d.\n", status); | 1440 | "aac_synchronize: aac_fib_send failed with status: %d.\n", status); |
1441 | fib_complete(cmd_fibcontext); | 1441 | aac_fib_complete(cmd_fibcontext); |
1442 | fib_free(cmd_fibcontext); | 1442 | aac_fib_free(cmd_fibcontext); |
1443 | return SCSI_MLQUEUE_HOST_BUSY; | 1443 | return SCSI_MLQUEUE_HOST_BUSY; |
1444 | } | 1444 | } |
1445 | 1445 | ||
@@ -1465,7 +1465,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) | |||
1465 | * itself. | 1465 | * itself. |
1466 | */ | 1466 | */ |
1467 | if (scmd_id(scsicmd) != host->this_id) { | 1467 | if (scmd_id(scsicmd) != host->this_id) { |
1468 | if ((scsicmd->device->channel == 0) ){ | 1468 | if ((scsicmd->device->channel == CONTAINER_CHANNEL)) { |
1469 | if( (scsicmd->device->id >= dev->maximum_num_containers) || (scsicmd->device->lun != 0)){ | 1469 | if( (scsicmd->device->id >= dev->maximum_num_containers) || (scsicmd->device->lun != 0)){ |
1470 | scsicmd->result = DID_NO_CONNECT << 16; | 1470 | scsicmd->result = DID_NO_CONNECT << 16; |
1471 | scsicmd->scsi_done(scsicmd); | 1471 | scsicmd->scsi_done(scsicmd); |
@@ -1488,7 +1488,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) | |||
1488 | case READ_CAPACITY: | 1488 | case READ_CAPACITY: |
1489 | case TEST_UNIT_READY: | 1489 | case TEST_UNIT_READY: |
1490 | spin_unlock_irq(host->host_lock); | 1490 | spin_unlock_irq(host->host_lock); |
1491 | probe_container(dev, cid); | 1491 | aac_probe_container(dev, cid); |
1492 | if ((fsa_dev_ptr[cid].valid & 1) == 0) | 1492 | if ((fsa_dev_ptr[cid].valid & 1) == 0) |
1493 | fsa_dev_ptr[cid].valid = 0; | 1493 | fsa_dev_ptr[cid].valid = 0; |
1494 | spin_lock_irq(host->host_lock); | 1494 | spin_lock_irq(host->host_lock); |
@@ -1935,33 +1935,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) | |||
1935 | case SRB_STATUS_ERROR_RECOVERY: | 1935 | case SRB_STATUS_ERROR_RECOVERY: |
1936 | case SRB_STATUS_PENDING: | 1936 | case SRB_STATUS_PENDING: |
1937 | case SRB_STATUS_SUCCESS: | 1937 | case SRB_STATUS_SUCCESS: |
1938 | if(scsicmd->cmnd[0] == INQUIRY ){ | 1938 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8; |
1939 | u8 b; | ||
1940 | u8 b1; | ||
1941 | /* We can't expose disk devices because we can't tell whether they | ||
1942 | * are the raw container drives or stand alone drives. If they have | ||
1943 | * the removable bit set then we should expose them though. | ||
1944 | */ | ||
1945 | b = (*(u8*)scsicmd->buffer)&0x1f; | ||
1946 | b1 = ((u8*)scsicmd->buffer)[1]; | ||
1947 | if( b==TYPE_TAPE || b==TYPE_WORM || b==TYPE_ROM || b==TYPE_MOD|| b==TYPE_MEDIUM_CHANGER | ||
1948 | || (b==TYPE_DISK && (b1&0x80)) ){ | ||
1949 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8; | ||
1950 | /* | ||
1951 | * We will allow disk devices if in RAID/SCSI mode and | ||
1952 | * the channel is 2 | ||
1953 | */ | ||
1954 | } else if ((dev->raid_scsi_mode) && | ||
1955 | (scmd_channel(scsicmd) == 2)) { | ||
1956 | scsicmd->result = DID_OK << 16 | | ||
1957 | COMMAND_COMPLETE << 8; | ||
1958 | } else { | ||
1959 | scsicmd->result = DID_NO_CONNECT << 16 | | ||
1960 | COMMAND_COMPLETE << 8; | ||
1961 | } | ||
1962 | } else { | ||
1963 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8; | ||
1964 | } | ||
1965 | break; | 1939 | break; |
1966 | case SRB_STATUS_DATA_OVERRUN: | 1940 | case SRB_STATUS_DATA_OVERRUN: |
1967 | switch(scsicmd->cmnd[0]){ | 1941 | switch(scsicmd->cmnd[0]){ |
@@ -1981,28 +1955,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) | |||
1981 | scsicmd->result = DID_ERROR << 16 | COMMAND_COMPLETE << 8; | 1955 | scsicmd->result = DID_ERROR << 16 | COMMAND_COMPLETE << 8; |
1982 | break; | 1956 | break; |
1983 | case INQUIRY: { | 1957 | case INQUIRY: { |
1984 | u8 b; | 1958 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8; |
1985 | u8 b1; | ||
1986 | /* We can't expose disk devices because we can't tell whether they | ||
1987 | * are the raw container drives or stand alone drives | ||
1988 | */ | ||
1989 | b = (*(u8*)scsicmd->buffer)&0x0f; | ||
1990 | b1 = ((u8*)scsicmd->buffer)[1]; | ||
1991 | if( b==TYPE_TAPE || b==TYPE_WORM || b==TYPE_ROM || b==TYPE_MOD|| b==TYPE_MEDIUM_CHANGER | ||
1992 | || (b==TYPE_DISK && (b1&0x80)) ){ | ||
1993 | scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8; | ||
1994 | /* | ||
1995 | * We will allow disk devices if in RAID/SCSI mode and | ||
1996 | * the channel is 2 | ||
1997 | */ | ||
1998 | } else if ((dev->raid_scsi_mode) && | ||
1999 | (scmd_channel(scsicmd) == 2)) { | ||
2000 | scsicmd->result = DID_OK << 16 | | ||
2001 | COMMAND_COMPLETE << 8; | ||
2002 | } else { | ||
2003 | scsicmd->result = DID_NO_CONNECT << 16 | | ||
2004 | COMMAND_COMPLETE << 8; | ||
2005 | } | ||
2006 | break; | 1959 | break; |
2007 | } | 1960 | } |
2008 | default: | 1961 | default: |
@@ -2089,8 +2042,8 @@ static void aac_srb_callback(void *context, struct fib * fibptr) | |||
2089 | */ | 2042 | */ |
2090 | scsicmd->result |= le32_to_cpu(srbreply->scsi_status); | 2043 | scsicmd->result |= le32_to_cpu(srbreply->scsi_status); |
2091 | 2044 | ||
2092 | fib_complete(fibptr); | 2045 | aac_fib_complete(fibptr); |
2093 | fib_free(fibptr); | 2046 | aac_fib_free(fibptr); |
2094 | scsicmd->scsi_done(scsicmd); | 2047 | scsicmd->scsi_done(scsicmd); |
2095 | } | 2048 | } |
2096 | 2049 | ||
@@ -2142,10 +2095,10 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd) | |||
2142 | /* | 2095 | /* |
2143 | * Allocate and initialize a Fib then setup a BlockWrite command | 2096 | * Allocate and initialize a Fib then setup a BlockWrite command |
2144 | */ | 2097 | */ |
2145 | if (!(cmd_fibcontext = fib_alloc(dev))) { | 2098 | if (!(cmd_fibcontext = aac_fib_alloc(dev))) { |
2146 | return -1; | 2099 | return -1; |
2147 | } | 2100 | } |
2148 | fib_init(cmd_fibcontext); | 2101 | aac_fib_init(cmd_fibcontext); |
2149 | 2102 | ||
2150 | srbcmd = (struct aac_srb*) fib_data(cmd_fibcontext); | 2103 | srbcmd = (struct aac_srb*) fib_data(cmd_fibcontext); |
2151 | srbcmd->function = cpu_to_le32(SRBF_ExecuteScsi); | 2104 | srbcmd->function = cpu_to_le32(SRBF_ExecuteScsi); |
@@ -2179,7 +2132,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd) | |||
2179 | /* | 2132 | /* |
2180 | * Now send the Fib to the adapter | 2133 | * Now send the Fib to the adapter |
2181 | */ | 2134 | */ |
2182 | status = fib_send(ScsiPortCommand64, cmd_fibcontext, | 2135 | status = aac_fib_send(ScsiPortCommand64, cmd_fibcontext, |
2183 | fibsize, FsaNormal, 0, 1, | 2136 | fibsize, FsaNormal, 0, 1, |
2184 | (fib_callback) aac_srb_callback, | 2137 | (fib_callback) aac_srb_callback, |
2185 | (void *) scsicmd); | 2138 | (void *) scsicmd); |
@@ -2201,7 +2154,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd) | |||
2201 | /* | 2154 | /* |
2202 | * Now send the Fib to the adapter | 2155 | * Now send the Fib to the adapter |
2203 | */ | 2156 | */ |
2204 | status = fib_send(ScsiPortCommand, cmd_fibcontext, fibsize, FsaNormal, 0, 1, | 2157 | status = aac_fib_send(ScsiPortCommand, cmd_fibcontext, fibsize, FsaNormal, 0, 1, |
2205 | (fib_callback) aac_srb_callback, (void *) scsicmd); | 2158 | (fib_callback) aac_srb_callback, (void *) scsicmd); |
2206 | } | 2159 | } |
2207 | /* | 2160 | /* |
@@ -2211,9 +2164,9 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd) | |||
2211 | return 0; | 2164 | return 0; |
2212 | } | 2165 | } |
2213 | 2166 | ||
2214 | printk(KERN_WARNING "aac_srb: fib_send failed with status: %d\n", status); | 2167 | printk(KERN_WARNING "aac_srb: aac_fib_send failed with status: %d\n", status); |
2215 | fib_complete(cmd_fibcontext); | 2168 | aac_fib_complete(cmd_fibcontext); |
2216 | fib_free(cmd_fibcontext); | 2169 | aac_fib_free(cmd_fibcontext); |
2217 | 2170 | ||
2218 | return -1; | 2171 | return -1; |
2219 | } | 2172 | } |
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 66dbb6d2c506..2d430b7e8cf4 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -1774,16 +1774,16 @@ static inline u32 cap_to_cyls(sector_t capacity, u32 divisor) | |||
1774 | struct scsi_cmnd; | 1774 | struct scsi_cmnd; |
1775 | 1775 | ||
1776 | const char *aac_driverinfo(struct Scsi_Host *); | 1776 | const char *aac_driverinfo(struct Scsi_Host *); |
1777 | struct fib *fib_alloc(struct aac_dev *dev); | 1777 | struct fib *aac_fib_alloc(struct aac_dev *dev); |
1778 | int fib_setup(struct aac_dev *dev); | 1778 | int aac_fib_setup(struct aac_dev *dev); |
1779 | void fib_map_free(struct aac_dev *dev); | 1779 | void aac_fib_map_free(struct aac_dev *dev); |
1780 | void fib_free(struct fib * context); | 1780 | void aac_fib_free(struct fib * context); |
1781 | void fib_init(struct fib * context); | 1781 | void aac_fib_init(struct fib * context); |
1782 | void aac_printf(struct aac_dev *dev, u32 val); | 1782 | void aac_printf(struct aac_dev *dev, u32 val); |
1783 | int fib_send(u16 command, struct fib * context, unsigned long size, int priority, int wait, int reply, fib_callback callback, void *ctxt); | 1783 | int aac_fib_send(u16 command, struct fib * context, unsigned long size, int priority, int wait, int reply, fib_callback callback, void *ctxt); |
1784 | int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry); | 1784 | int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry); |
1785 | void aac_consumer_free(struct aac_dev * dev, struct aac_queue * q, u32 qnum); | 1785 | void aac_consumer_free(struct aac_dev * dev, struct aac_queue * q, u32 qnum); |
1786 | int fib_complete(struct fib * context); | 1786 | int aac_fib_complete(struct fib * context); |
1787 | #define fib_data(fibctx) ((void *)(fibctx)->hw_fib->data) | 1787 | #define fib_data(fibctx) ((void *)(fibctx)->hw_fib->data) |
1788 | struct aac_dev *aac_init_adapter(struct aac_dev *dev); | 1788 | struct aac_dev *aac_init_adapter(struct aac_dev *dev); |
1789 | int aac_get_config_status(struct aac_dev *dev); | 1789 | int aac_get_config_status(struct aac_dev *dev); |
@@ -1799,11 +1799,11 @@ unsigned int aac_command_normal(struct aac_queue * q); | |||
1799 | unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index); | 1799 | unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index); |
1800 | int aac_command_thread(struct aac_dev * dev); | 1800 | int aac_command_thread(struct aac_dev * dev); |
1801 | int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx); | 1801 | int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx); |
1802 | int fib_adapter_complete(struct fib * fibptr, unsigned short size); | 1802 | int aac_fib_adapter_complete(struct fib * fibptr, unsigned short size); |
1803 | struct aac_driver_ident* aac_get_driver_ident(int devtype); | 1803 | struct aac_driver_ident* aac_get_driver_ident(int devtype); |
1804 | int aac_get_adapter_info(struct aac_dev* dev); | 1804 | int aac_get_adapter_info(struct aac_dev* dev); |
1805 | int aac_send_shutdown(struct aac_dev *dev); | 1805 | int aac_send_shutdown(struct aac_dev *dev); |
1806 | int probe_container(struct aac_dev *dev, int cid); | 1806 | int aac_probe_container(struct aac_dev *dev, int cid); |
1807 | extern int numacb; | 1807 | extern int numacb; |
1808 | extern int acbsize; | 1808 | extern int acbsize; |
1809 | extern char aac_driver_version[]; | 1809 | extern char aac_driver_version[]; |
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index 4fe79cd7c957..47fefca72695 100644 --- a/drivers/scsi/aacraid/commctrl.c +++ b/drivers/scsi/aacraid/commctrl.c | |||
@@ -63,7 +63,7 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg) | |||
63 | unsigned size; | 63 | unsigned size; |
64 | int retval; | 64 | int retval; |
65 | 65 | ||
66 | fibptr = fib_alloc(dev); | 66 | fibptr = aac_fib_alloc(dev); |
67 | if(fibptr == NULL) { | 67 | if(fibptr == NULL) { |
68 | return -ENOMEM; | 68 | return -ENOMEM; |
69 | } | 69 | } |
@@ -73,7 +73,7 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg) | |||
73 | * First copy in the header so that we can check the size field. | 73 | * First copy in the header so that we can check the size field. |
74 | */ | 74 | */ |
75 | if (copy_from_user((void *)kfib, arg, sizeof(struct aac_fibhdr))) { | 75 | if (copy_from_user((void *)kfib, arg, sizeof(struct aac_fibhdr))) { |
76 | fib_free(fibptr); | 76 | aac_fib_free(fibptr); |
77 | return -EFAULT; | 77 | return -EFAULT; |
78 | } | 78 | } |
79 | /* | 79 | /* |
@@ -110,13 +110,13 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg) | |||
110 | */ | 110 | */ |
111 | kfib->header.XferState = 0; | 111 | kfib->header.XferState = 0; |
112 | } else { | 112 | } else { |
113 | retval = fib_send(le16_to_cpu(kfib->header.Command), fibptr, | 113 | retval = aac_fib_send(le16_to_cpu(kfib->header.Command), fibptr, |
114 | le16_to_cpu(kfib->header.Size) , FsaNormal, | 114 | le16_to_cpu(kfib->header.Size) , FsaNormal, |
115 | 1, 1, NULL, NULL); | 115 | 1, 1, NULL, NULL); |
116 | if (retval) { | 116 | if (retval) { |
117 | goto cleanup; | 117 | goto cleanup; |
118 | } | 118 | } |
119 | if (fib_complete(fibptr) != 0) { | 119 | if (aac_fib_complete(fibptr) != 0) { |
120 | retval = -EINVAL; | 120 | retval = -EINVAL; |
121 | goto cleanup; | 121 | goto cleanup; |
122 | } | 122 | } |
@@ -138,7 +138,7 @@ cleanup: | |||
138 | fibptr->hw_fib_pa = hw_fib_pa; | 138 | fibptr->hw_fib_pa = hw_fib_pa; |
139 | fibptr->hw_fib = hw_fib; | 139 | fibptr->hw_fib = hw_fib; |
140 | } | 140 | } |
141 | fib_free(fibptr); | 141 | aac_fib_free(fibptr); |
142 | return retval; | 142 | return retval; |
143 | } | 143 | } |
144 | 144 | ||
@@ -464,10 +464,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) | |||
464 | /* | 464 | /* |
465 | * Allocate and initialize a Fib then setup a BlockWrite command | 465 | * Allocate and initialize a Fib then setup a BlockWrite command |
466 | */ | 466 | */ |
467 | if (!(srbfib = fib_alloc(dev))) { | 467 | if (!(srbfib = aac_fib_alloc(dev))) { |
468 | return -ENOMEM; | 468 | return -ENOMEM; |
469 | } | 469 | } |
470 | fib_init(srbfib); | 470 | aac_fib_init(srbfib); |
471 | 471 | ||
472 | srbcmd = (struct aac_srb*) fib_data(srbfib); | 472 | srbcmd = (struct aac_srb*) fib_data(srbfib); |
473 | 473 | ||
@@ -601,7 +601,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) | |||
601 | 601 | ||
602 | srbcmd->count = cpu_to_le32(byte_count); | 602 | srbcmd->count = cpu_to_le32(byte_count); |
603 | psg->count = cpu_to_le32(sg_indx+1); | 603 | psg->count = cpu_to_le32(sg_indx+1); |
604 | status = fib_send(ScsiPortCommand64, srbfib, actual_fibsize, FsaNormal, 1, 1,NULL,NULL); | 604 | status = aac_fib_send(ScsiPortCommand64, srbfib, actual_fibsize, FsaNormal, 1, 1,NULL,NULL); |
605 | } else { | 605 | } else { |
606 | struct user_sgmap* upsg = &user_srbcmd->sg; | 606 | struct user_sgmap* upsg = &user_srbcmd->sg; |
607 | struct sgmap* psg = &srbcmd->sg; | 607 | struct sgmap* psg = &srbcmd->sg; |
@@ -649,7 +649,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) | |||
649 | } | 649 | } |
650 | srbcmd->count = cpu_to_le32(byte_count); | 650 | srbcmd->count = cpu_to_le32(byte_count); |
651 | psg->count = cpu_to_le32(sg_indx+1); | 651 | psg->count = cpu_to_le32(sg_indx+1); |
652 | status = fib_send(ScsiPortCommand, srbfib, actual_fibsize, FsaNormal, 1, 1, NULL, NULL); | 652 | status = aac_fib_send(ScsiPortCommand, srbfib, actual_fibsize, FsaNormal, 1, 1, NULL, NULL); |
653 | } | 653 | } |
654 | 654 | ||
655 | if (status != 0){ | 655 | if (status != 0){ |
@@ -684,8 +684,8 @@ cleanup: | |||
684 | for(i=0; i <= sg_indx; i++){ | 684 | for(i=0; i <= sg_indx; i++){ |
685 | kfree(sg_list[i]); | 685 | kfree(sg_list[i]); |
686 | } | 686 | } |
687 | fib_complete(srbfib); | 687 | aac_fib_complete(srbfib); |
688 | fib_free(srbfib); | 688 | aac_fib_free(srbfib); |
689 | 689 | ||
690 | return rcode; | 690 | return rcode; |
691 | } | 691 | } |
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index 82821d331c07..1628d094943d 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c | |||
@@ -185,17 +185,17 @@ int aac_send_shutdown(struct aac_dev * dev) | |||
185 | struct aac_close *cmd; | 185 | struct aac_close *cmd; |
186 | int status; | 186 | int status; |
187 | 187 | ||
188 | fibctx = fib_alloc(dev); | 188 | fibctx = aac_fib_alloc(dev); |
189 | if (!fibctx) | 189 | if (!fibctx) |
190 | return -ENOMEM; | 190 | return -ENOMEM; |
191 | fib_init(fibctx); | 191 | aac_fib_init(fibctx); |
192 | 192 | ||
193 | cmd = (struct aac_close *) fib_data(fibctx); | 193 | cmd = (struct aac_close *) fib_data(fibctx); |
194 | 194 | ||
195 | cmd->command = cpu_to_le32(VM_CloseAll); | 195 | cmd->command = cpu_to_le32(VM_CloseAll); |
196 | cmd->cid = cpu_to_le32(0xffffffff); | 196 | cmd->cid = cpu_to_le32(0xffffffff); |
197 | 197 | ||
198 | status = fib_send(ContainerCommand, | 198 | status = aac_fib_send(ContainerCommand, |
199 | fibctx, | 199 | fibctx, |
200 | sizeof(struct aac_close), | 200 | sizeof(struct aac_close), |
201 | FsaNormal, | 201 | FsaNormal, |
@@ -203,8 +203,8 @@ int aac_send_shutdown(struct aac_dev * dev) | |||
203 | NULL, NULL); | 203 | NULL, NULL); |
204 | 204 | ||
205 | if (status == 0) | 205 | if (status == 0) |
206 | fib_complete(fibctx); | 206 | aac_fib_complete(fibctx); |
207 | fib_free(fibctx); | 207 | aac_fib_free(fibctx); |
208 | return status; | 208 | return status; |
209 | } | 209 | } |
210 | 210 | ||
@@ -427,7 +427,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) | |||
427 | /* | 427 | /* |
428 | * Initialize the list of fibs | 428 | * Initialize the list of fibs |
429 | */ | 429 | */ |
430 | if(fib_setup(dev)<0){ | 430 | if (aac_fib_setup(dev) < 0) { |
431 | kfree(dev->queues); | 431 | kfree(dev->queues); |
432 | return NULL; | 432 | return NULL; |
433 | } | 433 | } |
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 014cc8d54a9f..609fd19b1844 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c | |||
@@ -67,27 +67,27 @@ static int fib_map_alloc(struct aac_dev *dev) | |||
67 | } | 67 | } |
68 | 68 | ||
69 | /** | 69 | /** |
70 | * fib_map_free - free the fib objects | 70 | * aac_fib_map_free - free the fib objects |
71 | * @dev: Adapter to free | 71 | * @dev: Adapter to free |
72 | * | 72 | * |
73 | * Free the PCI mappings and the memory allocated for FIB blocks | 73 | * Free the PCI mappings and the memory allocated for FIB blocks |
74 | * on this adapter. | 74 | * on this adapter. |
75 | */ | 75 | */ |
76 | 76 | ||
77 | void fib_map_free(struct aac_dev *dev) | 77 | void aac_fib_map_free(struct aac_dev *dev) |
78 | { | 78 | { |
79 | pci_free_consistent(dev->pdev, dev->max_fib_size * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB), dev->hw_fib_va, dev->hw_fib_pa); | 79 | pci_free_consistent(dev->pdev, dev->max_fib_size * (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB), dev->hw_fib_va, dev->hw_fib_pa); |
80 | } | 80 | } |
81 | 81 | ||
82 | /** | 82 | /** |
83 | * fib_setup - setup the fibs | 83 | * aac_fib_setup - setup the fibs |
84 | * @dev: Adapter to set up | 84 | * @dev: Adapter to set up |
85 | * | 85 | * |
86 | * Allocate the PCI space for the fibs, map it and then intialise the | 86 | * Allocate the PCI space for the fibs, map it and then intialise the |
87 | * fib area, the unmapped fib data and also the free list | 87 | * fib area, the unmapped fib data and also the free list |
88 | */ | 88 | */ |
89 | 89 | ||
90 | int fib_setup(struct aac_dev * dev) | 90 | int aac_fib_setup(struct aac_dev * dev) |
91 | { | 91 | { |
92 | struct fib *fibptr; | 92 | struct fib *fibptr; |
93 | struct hw_fib *hw_fib_va; | 93 | struct hw_fib *hw_fib_va; |
@@ -134,14 +134,14 @@ int fib_setup(struct aac_dev * dev) | |||
134 | } | 134 | } |
135 | 135 | ||
136 | /** | 136 | /** |
137 | * fib_alloc - allocate a fib | 137 | * aac_fib_alloc - allocate a fib |
138 | * @dev: Adapter to allocate the fib for | 138 | * @dev: Adapter to allocate the fib for |
139 | * | 139 | * |
140 | * Allocate a fib from the adapter fib pool. If the pool is empty we | 140 | * Allocate a fib from the adapter fib pool. If the pool is empty we |
141 | * return NULL. | 141 | * return NULL. |
142 | */ | 142 | */ |
143 | 143 | ||
144 | struct fib * fib_alloc(struct aac_dev *dev) | 144 | struct fib *aac_fib_alloc(struct aac_dev *dev) |
145 | { | 145 | { |
146 | struct fib * fibptr; | 146 | struct fib * fibptr; |
147 | unsigned long flags; | 147 | unsigned long flags; |
@@ -170,14 +170,14 @@ struct fib * fib_alloc(struct aac_dev *dev) | |||
170 | } | 170 | } |
171 | 171 | ||
172 | /** | 172 | /** |
173 | * fib_free - free a fib | 173 | * aac_fib_free - free a fib |
174 | * @fibptr: fib to free up | 174 | * @fibptr: fib to free up |
175 | * | 175 | * |
176 | * Frees up a fib and places it on the appropriate queue | 176 | * Frees up a fib and places it on the appropriate queue |
177 | * (either free or timed out) | 177 | * (either free or timed out) |
178 | */ | 178 | */ |
179 | 179 | ||
180 | void fib_free(struct fib * fibptr) | 180 | void aac_fib_free(struct fib *fibptr) |
181 | { | 181 | { |
182 | unsigned long flags; | 182 | unsigned long flags; |
183 | 183 | ||
@@ -188,7 +188,7 @@ void fib_free(struct fib * fibptr) | |||
188 | fibptr->dev->timeout_fib = fibptr; | 188 | fibptr->dev->timeout_fib = fibptr; |
189 | } else { | 189 | } else { |
190 | if (fibptr->hw_fib->header.XferState != 0) { | 190 | if (fibptr->hw_fib->header.XferState != 0) { |
191 | printk(KERN_WARNING "fib_free, XferState != 0, fibptr = 0x%p, XferState = 0x%x\n", | 191 | printk(KERN_WARNING "aac_fib_free, XferState != 0, fibptr = 0x%p, XferState = 0x%x\n", |
192 | (void*)fibptr, | 192 | (void*)fibptr, |
193 | le32_to_cpu(fibptr->hw_fib->header.XferState)); | 193 | le32_to_cpu(fibptr->hw_fib->header.XferState)); |
194 | } | 194 | } |
@@ -199,13 +199,13 @@ void fib_free(struct fib * fibptr) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | /** | 201 | /** |
202 | * fib_init - initialise a fib | 202 | * aac_fib_init - initialise a fib |
203 | * @fibptr: The fib to initialize | 203 | * @fibptr: The fib to initialize |
204 | * | 204 | * |
205 | * Set up the generic fib fields ready for use | 205 | * Set up the generic fib fields ready for use |
206 | */ | 206 | */ |
207 | 207 | ||
208 | void fib_init(struct fib *fibptr) | 208 | void aac_fib_init(struct fib *fibptr) |
209 | { | 209 | { |
210 | struct hw_fib *hw_fib = fibptr->hw_fib; | 210 | struct hw_fib *hw_fib = fibptr->hw_fib; |
211 | 211 | ||
@@ -362,7 +362,7 @@ static int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_f | |||
362 | */ | 362 | */ |
363 | 363 | ||
364 | /** | 364 | /** |
365 | * fib_send - send a fib to the adapter | 365 | * aac_fib_send - send a fib to the adapter |
366 | * @command: Command to send | 366 | * @command: Command to send |
367 | * @fibptr: The fib | 367 | * @fibptr: The fib |
368 | * @size: Size of fib data area | 368 | * @size: Size of fib data area |
@@ -378,7 +378,9 @@ static int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_f | |||
378 | * response FIB is received from the adapter. | 378 | * response FIB is received from the adapter. |
379 | */ | 379 | */ |
380 | 380 | ||
381 | int fib_send(u16 command, struct fib * fibptr, unsigned long size, int priority, int wait, int reply, fib_callback callback, void * callback_data) | 381 | int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, |
382 | int priority, int wait, int reply, fib_callback callback, | ||
383 | void *callback_data) | ||
382 | { | 384 | { |
383 | struct aac_dev * dev = fibptr->dev; | 385 | struct aac_dev * dev = fibptr->dev; |
384 | struct hw_fib * hw_fib = fibptr->hw_fib; | 386 | struct hw_fib * hw_fib = fibptr->hw_fib; |
@@ -493,7 +495,7 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size, int priority | |||
493 | q->numpending++; | 495 | q->numpending++; |
494 | *(q->headers.producer) = cpu_to_le32(index + 1); | 496 | *(q->headers.producer) = cpu_to_le32(index + 1); |
495 | spin_unlock_irqrestore(q->lock, qflags); | 497 | spin_unlock_irqrestore(q->lock, qflags); |
496 | dprintk((KERN_DEBUG "fib_send: inserting a queue entry at index %d.\n",index)); | 498 | dprintk((KERN_DEBUG "aac_fib_send: inserting a queue entry at index %d.\n",index)); |
497 | if (!(nointr & aac_config.irq_mod)) | 499 | if (!(nointr & aac_config.irq_mod)) |
498 | aac_adapter_notify(dev, AdapNormCmdQueue); | 500 | aac_adapter_notify(dev, AdapNormCmdQueue); |
499 | } | 501 | } |
@@ -520,7 +522,7 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size, int priority | |||
520 | list_del(&fibptr->queue); | 522 | list_del(&fibptr->queue); |
521 | spin_unlock_irqrestore(q->lock, qflags); | 523 | spin_unlock_irqrestore(q->lock, qflags); |
522 | if (wait == -1) { | 524 | if (wait == -1) { |
523 | printk(KERN_ERR "aacraid: fib_send: first asynchronous command timed out.\n" | 525 | printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n" |
524 | "Usually a result of a PCI interrupt routing problem;\n" | 526 | "Usually a result of a PCI interrupt routing problem;\n" |
525 | "update mother board BIOS or consider utilizing one of\n" | 527 | "update mother board BIOS or consider utilizing one of\n" |
526 | "the SAFE mode kernel options (acpi, apic etc)\n"); | 528 | "the SAFE mode kernel options (acpi, apic etc)\n"); |
@@ -624,7 +626,7 @@ void aac_consumer_free(struct aac_dev * dev, struct aac_queue *q, u32 qid) | |||
624 | } | 626 | } |
625 | 627 | ||
626 | /** | 628 | /** |
627 | * fib_adapter_complete - complete adapter issued fib | 629 | * aac_fib_adapter_complete - complete adapter issued fib |
628 | * @fibptr: fib to complete | 630 | * @fibptr: fib to complete |
629 | * @size: size of fib | 631 | * @size: size of fib |
630 | * | 632 | * |
@@ -632,7 +634,7 @@ void aac_consumer_free(struct aac_dev * dev, struct aac_queue *q, u32 qid) | |||
632 | * the adapter. | 634 | * the adapter. |
633 | */ | 635 | */ |
634 | 636 | ||
635 | int fib_adapter_complete(struct fib * fibptr, unsigned short size) | 637 | int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size) |
636 | { | 638 | { |
637 | struct hw_fib * hw_fib = fibptr->hw_fib; | 639 | struct hw_fib * hw_fib = fibptr->hw_fib; |
638 | struct aac_dev * dev = fibptr->dev; | 640 | struct aac_dev * dev = fibptr->dev; |
@@ -683,20 +685,20 @@ int fib_adapter_complete(struct fib * fibptr, unsigned short size) | |||
683 | } | 685 | } |
684 | else | 686 | else |
685 | { | 687 | { |
686 | printk(KERN_WARNING "fib_adapter_complete: Unknown xferstate detected.\n"); | 688 | printk(KERN_WARNING "aac_fib_adapter_complete: Unknown xferstate detected.\n"); |
687 | BUG(); | 689 | BUG(); |
688 | } | 690 | } |
689 | return 0; | 691 | return 0; |
690 | } | 692 | } |
691 | 693 | ||
692 | /** | 694 | /** |
693 | * fib_complete - fib completion handler | 695 | * aac_fib_complete - fib completion handler |
694 | * @fib: FIB to complete | 696 | * @fib: FIB to complete |
695 | * | 697 | * |
696 | * Will do all necessary work to complete a FIB. | 698 | * Will do all necessary work to complete a FIB. |
697 | */ | 699 | */ |
698 | 700 | ||
699 | int fib_complete(struct fib * fibptr) | 701 | int aac_fib_complete(struct fib *fibptr) |
700 | { | 702 | { |
701 | struct hw_fib * hw_fib = fibptr->hw_fib; | 703 | struct hw_fib * hw_fib = fibptr->hw_fib; |
702 | 704 | ||
@@ -995,14 +997,14 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) | |||
995 | if (!dev || !dev->scsi_host_ptr) | 997 | if (!dev || !dev->scsi_host_ptr) |
996 | return; | 998 | return; |
997 | /* | 999 | /* |
998 | * force reload of disk info via probe_container | 1000 | * force reload of disk info via aac_probe_container |
999 | */ | 1001 | */ |
1000 | if ((device_config_needed == CHANGE) | 1002 | if ((device_config_needed == CHANGE) |
1001 | && (dev->fsa_dev[container].valid == 1)) | 1003 | && (dev->fsa_dev[container].valid == 1)) |
1002 | dev->fsa_dev[container].valid = 2; | 1004 | dev->fsa_dev[container].valid = 2; |
1003 | if ((device_config_needed == CHANGE) || | 1005 | if ((device_config_needed == CHANGE) || |
1004 | (device_config_needed == ADD)) | 1006 | (device_config_needed == ADD)) |
1005 | probe_container(dev, container); | 1007 | aac_probe_container(dev, container); |
1006 | device = scsi_device_lookup(dev->scsi_host_ptr, | 1008 | device = scsi_device_lookup(dev->scsi_host_ptr, |
1007 | CONTAINER_TO_CHANNEL(container), | 1009 | CONTAINER_TO_CHANNEL(container), |
1008 | CONTAINER_TO_ID(container), | 1010 | CONTAINER_TO_ID(container), |
@@ -1104,7 +1106,7 @@ int aac_command_thread(struct aac_dev * dev) | |||
1104 | /* Handle Driver Notify Events */ | 1106 | /* Handle Driver Notify Events */ |
1105 | aac_handle_aif(dev, fib); | 1107 | aac_handle_aif(dev, fib); |
1106 | *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK); | 1108 | *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK); |
1107 | fib_adapter_complete(fib, (u16)sizeof(u32)); | 1109 | aac_fib_adapter_complete(fib, (u16)sizeof(u32)); |
1108 | } else { | 1110 | } else { |
1109 | struct list_head *entry; | 1111 | struct list_head *entry; |
1110 | /* The u32 here is important and intended. We are using | 1112 | /* The u32 here is important and intended. We are using |
@@ -1241,7 +1243,7 @@ int aac_command_thread(struct aac_dev * dev) | |||
1241 | * Set the status of this FIB | 1243 | * Set the status of this FIB |
1242 | */ | 1244 | */ |
1243 | *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK); | 1245 | *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK); |
1244 | fib_adapter_complete(fib, sizeof(u32)); | 1246 | aac_fib_adapter_complete(fib, sizeof(u32)); |
1245 | spin_unlock_irqrestore(&dev->fib_lock, flagv); | 1247 | spin_unlock_irqrestore(&dev->fib_lock, flagv); |
1246 | /* Free up the remaining resources */ | 1248 | /* Free up the remaining resources */ |
1247 | hw_fib_p = hw_fib_pool; | 1249 | hw_fib_p = hw_fib_pool; |
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c index 439948ef8251..f6bcb9486f85 100644 --- a/drivers/scsi/aacraid/dpcsup.c +++ b/drivers/scsi/aacraid/dpcsup.c | |||
@@ -206,7 +206,7 @@ unsigned int aac_command_normal(struct aac_queue *q) | |||
206 | * Set the status of this FIB | 206 | * Set the status of this FIB |
207 | */ | 207 | */ |
208 | *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK); | 208 | *(__le32 *)hw_fib->data = cpu_to_le32(ST_OK); |
209 | fib_adapter_complete(fib, sizeof(u32)); | 209 | aac_fib_adapter_complete(fib, sizeof(u32)); |
210 | spin_lock_irqsave(q->lock, flags); | 210 | spin_lock_irqsave(q->lock, flags); |
211 | } | 211 | } |
212 | } | 212 | } |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 0bf5f9a943e8..271617890562 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -385,17 +385,45 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev, | |||
385 | 385 | ||
386 | static int aac_slave_configure(struct scsi_device *sdev) | 386 | static int aac_slave_configure(struct scsi_device *sdev) |
387 | { | 387 | { |
388 | struct Scsi_Host *host = sdev->host; | 388 | if (sdev_channel(sdev) == CONTAINER_CHANNEL) { |
389 | sdev->skip_ms_page_8 = 1; | ||
390 | sdev->skip_ms_page_3f = 1; | ||
391 | } | ||
392 | if ((sdev->type == TYPE_DISK) && | ||
393 | (sdev_channel(sdev) != CONTAINER_CHANNEL)) { | ||
394 | struct aac_dev *aac = (struct aac_dev *)sdev->host->hostdata; | ||
395 | if (!aac->raid_scsi_mode || (sdev_channel(sdev) != 2)) | ||
396 | sdev->no_uld_attach = 1; | ||
397 | } | ||
398 | if (sdev->tagged_supported && (sdev->type == TYPE_DISK) && | ||
399 | (sdev_channel(sdev) == CONTAINER_CHANNEL)) { | ||
400 | struct scsi_device * dev; | ||
401 | struct Scsi_Host *host = sdev->host; | ||
402 | unsigned num_lsu = 0; | ||
403 | unsigned num_one = 0; | ||
404 | unsigned depth; | ||
389 | 405 | ||
390 | if (sdev->tagged_supported) | 406 | __shost_for_each_device(dev, host) { |
391 | scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, 128); | 407 | if (dev->tagged_supported && (dev->type == TYPE_DISK) && |
392 | else | 408 | (sdev_channel(dev) == CONTAINER_CHANNEL)) |
409 | ++num_lsu; | ||
410 | else | ||
411 | ++num_one; | ||
412 | } | ||
413 | if (num_lsu == 0) | ||
414 | ++num_lsu; | ||
415 | depth = (host->can_queue - num_one) / num_lsu; | ||
416 | if (depth > 256) | ||
417 | depth = 256; | ||
418 | else if (depth < 2) | ||
419 | depth = 2; | ||
420 | scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, depth); | ||
421 | if (!(((struct aac_dev *)host->hostdata)->adapter_info.options & | ||
422 | AAC_OPT_NEW_COMM)) | ||
423 | blk_queue_max_segment_size(sdev->request_queue, 65536); | ||
424 | } else | ||
393 | scsi_adjust_queue_depth(sdev, 0, 1); | 425 | scsi_adjust_queue_depth(sdev, 0, 1); |
394 | 426 | ||
395 | if (!(((struct aac_dev *)host->hostdata)->adapter_info.options | ||
396 | & AAC_OPT_NEW_COMM)) | ||
397 | blk_queue_max_segment_size(sdev->request_queue, 65536); | ||
398 | |||
399 | return 0; | 427 | return 0; |
400 | } | 428 | } |
401 | 429 | ||
@@ -870,7 +898,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, | |||
870 | 898 | ||
871 | /* | 899 | /* |
872 | * max channel will be the physical channels plus 1 virtual channel | 900 | * max channel will be the physical channels plus 1 virtual channel |
873 | * all containers are on the virtual channel 0 | 901 | * all containers are on the virtual channel 0 (CONTAINER_CHANNEL) |
874 | * physical channels are address by their actual physical number+1 | 902 | * physical channels are address by their actual physical number+1 |
875 | */ | 903 | */ |
876 | if (aac->nondasd_support == 1) | 904 | if (aac->nondasd_support == 1) |
@@ -913,7 +941,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, | |||
913 | aac_adapter_disable_int(aac); | 941 | aac_adapter_disable_int(aac); |
914 | free_irq(pdev->irq, aac); | 942 | free_irq(pdev->irq, aac); |
915 | out_unmap: | 943 | out_unmap: |
916 | fib_map_free(aac); | 944 | aac_fib_map_free(aac); |
917 | pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys); | 945 | pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys); |
918 | kfree(aac->queues); | 946 | kfree(aac->queues); |
919 | iounmap(aac->regs.sa); | 947 | iounmap(aac->regs.sa); |
@@ -947,7 +975,7 @@ static void __devexit aac_remove_one(struct pci_dev *pdev) | |||
947 | 975 | ||
948 | aac_send_shutdown(aac); | 976 | aac_send_shutdown(aac); |
949 | aac_adapter_disable_int(aac); | 977 | aac_adapter_disable_int(aac); |
950 | fib_map_free(aac); | 978 | aac_fib_map_free(aac); |
951 | pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, | 979 | pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, |
952 | aac->comm_phys); | 980 | aac->comm_phys); |
953 | kfree(aac->queues); | 981 | kfree(aac->queues); |
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index f6900538be90..87a8c3d2072c 100644 --- a/drivers/scsi/esp.c +++ b/drivers/scsi/esp.c | |||
@@ -2068,14 +2068,12 @@ static int esp_reset(struct scsi_cmnd *SCptr) | |||
2068 | { | 2068 | { |
2069 | struct esp *esp = (struct esp *) SCptr->device->host->hostdata; | 2069 | struct esp *esp = (struct esp *) SCptr->device->host->hostdata; |
2070 | 2070 | ||
2071 | spin_lock_irq(esp->ehost->host_lock); | ||
2071 | (void) esp_do_resetbus(esp); | 2072 | (void) esp_do_resetbus(esp); |
2072 | |||
2073 | spin_unlock_irq(esp->ehost->host_lock); | 2073 | spin_unlock_irq(esp->ehost->host_lock); |
2074 | 2074 | ||
2075 | wait_event(esp->reset_queue, (esp->resetting_bus == 0)); | 2075 | wait_event(esp->reset_queue, (esp->resetting_bus == 0)); |
2076 | 2076 | ||
2077 | spin_lock_irq(esp->ehost->host_lock); | ||
2078 | |||
2079 | return SUCCESS; | 2077 | return SUCCESS; |
2080 | } | 2078 | } |
2081 | 2079 | ||
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index bd3ffdf6c800..62e3cda859af 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c | |||
@@ -2816,7 +2816,7 @@ static int gdth_fill_cache_cmd(int hanum,Scsi_Cmnd *scp,ushort hdrive) | |||
2816 | } | 2816 | } |
2817 | #endif | 2817 | #endif |
2818 | 2818 | ||
2819 | } else { | 2819 | } else if (scp->request_bufflen) { |
2820 | scp->SCp.Status = GDTH_MAP_SINGLE; | 2820 | scp->SCp.Status = GDTH_MAP_SINGLE; |
2821 | scp->SCp.Message = (read_write == 1 ? | 2821 | scp->SCp.Message = (read_write == 1 ? |
2822 | PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); | 2822 | PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 27acf78cf8d8..2bba5e55d7bc 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -4236,35 +4236,6 @@ static void ipr_scsi_done(struct ipr_cmnd *ipr_cmd) | |||
4236 | } | 4236 | } |
4237 | 4237 | ||
4238 | /** | 4238 | /** |
4239 | * ipr_save_ioafp_mode_select - Save adapters mode select data | ||
4240 | * @ioa_cfg: ioa config struct | ||
4241 | * @scsi_cmd: scsi command struct | ||
4242 | * | ||
4243 | * This function saves mode select data for the adapter to | ||
4244 | * use following an adapter reset. | ||
4245 | * | ||
4246 | * Return value: | ||
4247 | * 0 on success / SCSI_MLQUEUE_HOST_BUSY on failure | ||
4248 | **/ | ||
4249 | static int ipr_save_ioafp_mode_select(struct ipr_ioa_cfg *ioa_cfg, | ||
4250 | struct scsi_cmnd *scsi_cmd) | ||
4251 | { | ||
4252 | if (!ioa_cfg->saved_mode_pages) { | ||
4253 | ioa_cfg->saved_mode_pages = kmalloc(sizeof(struct ipr_mode_pages), | ||
4254 | GFP_ATOMIC); | ||
4255 | if (!ioa_cfg->saved_mode_pages) { | ||
4256 | dev_err(&ioa_cfg->pdev->dev, | ||
4257 | "IOA mode select buffer allocation failed\n"); | ||
4258 | return SCSI_MLQUEUE_HOST_BUSY; | ||
4259 | } | ||
4260 | } | ||
4261 | |||
4262 | memcpy(ioa_cfg->saved_mode_pages, scsi_cmd->buffer, scsi_cmd->cmnd[4]); | ||
4263 | ioa_cfg->saved_mode_page_len = scsi_cmd->cmnd[4]; | ||
4264 | return 0; | ||
4265 | } | ||
4266 | |||
4267 | /** | ||
4268 | * ipr_queuecommand - Queue a mid-layer request | 4239 | * ipr_queuecommand - Queue a mid-layer request |
4269 | * @scsi_cmd: scsi command struct | 4240 | * @scsi_cmd: scsi command struct |
4270 | * @done: done function | 4241 | * @done: done function |
@@ -4338,9 +4309,6 @@ static int ipr_queuecommand(struct scsi_cmnd *scsi_cmd, | |||
4338 | (!ipr_is_gscsi(res) || scsi_cmd->cmnd[0] == IPR_QUERY_RSRC_STATE)) | 4309 | (!ipr_is_gscsi(res) || scsi_cmd->cmnd[0] == IPR_QUERY_RSRC_STATE)) |
4339 | ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD; | 4310 | ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD; |
4340 | 4311 | ||
4341 | if (ipr_is_ioa_resource(res) && scsi_cmd->cmnd[0] == MODE_SELECT) | ||
4342 | rc = ipr_save_ioafp_mode_select(ioa_cfg, scsi_cmd); | ||
4343 | |||
4344 | if (likely(rc == 0)) | 4312 | if (likely(rc == 0)) |
4345 | rc = ipr_build_ioadl(ioa_cfg, ipr_cmd); | 4313 | rc = ipr_build_ioadl(ioa_cfg, ipr_cmd); |
4346 | 4314 | ||
@@ -4829,17 +4797,11 @@ static int ipr_ioafp_mode_select_page28(struct ipr_cmnd *ipr_cmd) | |||
4829 | int length; | 4797 | int length; |
4830 | 4798 | ||
4831 | ENTER; | 4799 | ENTER; |
4832 | if (ioa_cfg->saved_mode_pages) { | 4800 | ipr_scsi_bus_speed_limit(ioa_cfg); |
4833 | memcpy(mode_pages, ioa_cfg->saved_mode_pages, | 4801 | ipr_check_term_power(ioa_cfg, mode_pages); |
4834 | ioa_cfg->saved_mode_page_len); | 4802 | ipr_modify_ioafp_mode_page_28(ioa_cfg, mode_pages); |
4835 | length = ioa_cfg->saved_mode_page_len; | 4803 | length = mode_pages->hdr.length + 1; |
4836 | } else { | 4804 | mode_pages->hdr.length = 0; |
4837 | ipr_scsi_bus_speed_limit(ioa_cfg); | ||
4838 | ipr_check_term_power(ioa_cfg, mode_pages); | ||
4839 | ipr_modify_ioafp_mode_page_28(ioa_cfg, mode_pages); | ||
4840 | length = mode_pages->hdr.length + 1; | ||
4841 | mode_pages->hdr.length = 0; | ||
4842 | } | ||
4843 | 4805 | ||
4844 | ipr_build_mode_select(ipr_cmd, cpu_to_be32(IPR_IOA_RES_HANDLE), 0x11, | 4806 | ipr_build_mode_select(ipr_cmd, cpu_to_be32(IPR_IOA_RES_HANDLE), 0x11, |
4845 | ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, mode_pages), | 4807 | ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, mode_pages), |
@@ -5969,7 +5931,6 @@ static void ipr_free_mem(struct ipr_ioa_cfg *ioa_cfg) | |||
5969 | } | 5931 | } |
5970 | 5932 | ||
5971 | ipr_free_dump(ioa_cfg); | 5933 | ipr_free_dump(ioa_cfg); |
5972 | kfree(ioa_cfg->saved_mode_pages); | ||
5973 | kfree(ioa_cfg->trace); | 5934 | kfree(ioa_cfg->trace); |
5974 | } | 5935 | } |
5975 | 5936 | ||
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index b639332131f1..fd360bfe56dd 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h | |||
@@ -36,8 +36,8 @@ | |||
36 | /* | 36 | /* |
37 | * Literals | 37 | * Literals |
38 | */ | 38 | */ |
39 | #define IPR_DRIVER_VERSION "2.1.1" | 39 | #define IPR_DRIVER_VERSION "2.1.2" |
40 | #define IPR_DRIVER_DATE "(November 15, 2005)" | 40 | #define IPR_DRIVER_DATE "(February 8, 2006)" |
41 | 41 | ||
42 | /* | 42 | /* |
43 | * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding | 43 | * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding |
@@ -1000,7 +1000,6 @@ struct ipr_ioa_cfg { | |||
1000 | struct Scsi_Host *host; | 1000 | struct Scsi_Host *host; |
1001 | struct pci_dev *pdev; | 1001 | struct pci_dev *pdev; |
1002 | struct ipr_sglist *ucode_sglist; | 1002 | struct ipr_sglist *ucode_sglist; |
1003 | struct ipr_mode_pages *saved_mode_pages; | ||
1004 | u8 saved_mode_page_len; | 1003 | u8 saved_mode_page_len; |
1005 | 1004 | ||
1006 | struct work_struct work_q; | 1005 | struct work_struct work_q; |
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 780bfcc67096..ff79e68b347c 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -146,7 +146,7 @@ iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err) | |||
146 | spin_unlock_irqrestore(&session->lock, flags); | 146 | spin_unlock_irqrestore(&session->lock, flags); |
147 | set_bit(SUSPEND_BIT, &conn->suspend_tx); | 147 | set_bit(SUSPEND_BIT, &conn->suspend_tx); |
148 | set_bit(SUSPEND_BIT, &conn->suspend_rx); | 148 | set_bit(SUSPEND_BIT, &conn->suspend_rx); |
149 | iscsi_conn_error(iscsi_handle(conn), err); | 149 | iscsi_conn_error(conn->cls_conn, err); |
150 | } | 150 | } |
151 | 151 | ||
152 | static inline int | 152 | static inline int |
@@ -244,12 +244,10 @@ iscsi_ctask_cleanup(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask) | |||
244 | if (sc->sc_data_direction == DMA_TO_DEVICE) { | 244 | if (sc->sc_data_direction == DMA_TO_DEVICE) { |
245 | struct iscsi_data_task *dtask, *n; | 245 | struct iscsi_data_task *dtask, *n; |
246 | /* WRITE: cleanup Data-Out's if any */ | 246 | /* WRITE: cleanup Data-Out's if any */ |
247 | spin_lock(&conn->lock); | ||
248 | list_for_each_entry_safe(dtask, n, &ctask->dataqueue, item) { | 247 | list_for_each_entry_safe(dtask, n, &ctask->dataqueue, item) { |
249 | list_del(&dtask->item); | 248 | list_del(&dtask->item); |
250 | mempool_free(dtask, ctask->datapool); | 249 | mempool_free(dtask, ctask->datapool); |
251 | } | 250 | } |
252 | spin_unlock(&conn->lock); | ||
253 | } | 251 | } |
254 | ctask->xmstate = XMSTATE_IDLE; | 252 | ctask->xmstate = XMSTATE_IDLE; |
255 | ctask->r2t = NULL; | 253 | ctask->r2t = NULL; |
@@ -689,7 +687,7 @@ iscsi_hdr_recv(struct iscsi_conn *conn) | |||
689 | break; | 687 | break; |
690 | 688 | ||
691 | if (!conn->in.datalen) { | 689 | if (!conn->in.datalen) { |
692 | rc = iscsi_recv_pdu(iscsi_handle(conn), hdr, | 690 | rc = iscsi_recv_pdu(conn->cls_conn, hdr, |
693 | NULL, 0); | 691 | NULL, 0); |
694 | if (conn->login_mtask != mtask) { | 692 | if (conn->login_mtask != mtask) { |
695 | spin_lock(&session->lock); | 693 | spin_lock(&session->lock); |
@@ -737,7 +735,7 @@ iscsi_hdr_recv(struct iscsi_conn *conn) | |||
737 | if (!conn->in.datalen) { | 735 | if (!conn->in.datalen) { |
738 | struct iscsi_mgmt_task *mtask; | 736 | struct iscsi_mgmt_task *mtask; |
739 | 737 | ||
740 | rc = iscsi_recv_pdu(iscsi_handle(conn), hdr, | 738 | rc = iscsi_recv_pdu(conn->cls_conn, hdr, |
741 | NULL, 0); | 739 | NULL, 0); |
742 | mtask = (struct iscsi_mgmt_task *) | 740 | mtask = (struct iscsi_mgmt_task *) |
743 | session->mgmt_cmds[conn->in.itt - | 741 | session->mgmt_cmds[conn->in.itt - |
@@ -761,7 +759,7 @@ iscsi_hdr_recv(struct iscsi_conn *conn) | |||
761 | rc = iscsi_check_assign_cmdsn(session, | 759 | rc = iscsi_check_assign_cmdsn(session, |
762 | (struct iscsi_nopin*)hdr); | 760 | (struct iscsi_nopin*)hdr); |
763 | if (!rc && hdr->ttt != ISCSI_RESERVED_TAG) | 761 | if (!rc && hdr->ttt != ISCSI_RESERVED_TAG) |
764 | rc = iscsi_recv_pdu(iscsi_handle(conn), | 762 | rc = iscsi_recv_pdu(conn->cls_conn, |
765 | hdr, NULL, 0); | 763 | hdr, NULL, 0); |
766 | } else | 764 | } else |
767 | rc = ISCSI_ERR_PROTO; | 765 | rc = ISCSI_ERR_PROTO; |
@@ -1044,7 +1042,7 @@ iscsi_data_recv(struct iscsi_conn *conn) | |||
1044 | goto exit; | 1042 | goto exit; |
1045 | } | 1043 | } |
1046 | 1044 | ||
1047 | rc = iscsi_recv_pdu(iscsi_handle(conn), conn->in.hdr, | 1045 | rc = iscsi_recv_pdu(conn->cls_conn, conn->in.hdr, |
1048 | conn->data, conn->in.datalen); | 1046 | conn->data, conn->in.datalen); |
1049 | 1047 | ||
1050 | if (!rc && conn->datadgst_en && | 1048 | if (!rc && conn->datadgst_en && |
@@ -2428,19 +2426,20 @@ iscsi_pool_free(struct iscsi_queue *q, void **items) | |||
2428 | } | 2426 | } |
2429 | 2427 | ||
2430 | static struct iscsi_cls_conn * | 2428 | static struct iscsi_cls_conn * |
2431 | iscsi_conn_create(struct Scsi_Host *shost, uint32_t conn_idx) | 2429 | iscsi_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx) |
2432 | { | 2430 | { |
2431 | struct Scsi_Host *shost = iscsi_session_to_shost(cls_session); | ||
2433 | struct iscsi_session *session = iscsi_hostdata(shost->hostdata); | 2432 | struct iscsi_session *session = iscsi_hostdata(shost->hostdata); |
2434 | struct iscsi_conn *conn; | 2433 | struct iscsi_conn *conn; |
2435 | struct iscsi_cls_conn *cls_conn; | 2434 | struct iscsi_cls_conn *cls_conn; |
2436 | 2435 | ||
2437 | cls_conn = iscsi_create_conn(hostdata_session(shost->hostdata), | 2436 | cls_conn = iscsi_create_conn(cls_session, conn_idx); |
2438 | conn_idx); | ||
2439 | if (!cls_conn) | 2437 | if (!cls_conn) |
2440 | return NULL; | 2438 | return NULL; |
2441 | conn = cls_conn->dd_data; | 2439 | conn = cls_conn->dd_data; |
2440 | memset(conn, 0, sizeof(*conn)); | ||
2442 | 2441 | ||
2443 | memset(conn, 0, sizeof(struct iscsi_conn)); | 2442 | conn->cls_conn = cls_conn; |
2444 | conn->c_stage = ISCSI_CONN_INITIAL_STAGE; | 2443 | conn->c_stage = ISCSI_CONN_INITIAL_STAGE; |
2445 | conn->in_progress = IN_PROGRESS_WAIT_HEADER; | 2444 | conn->in_progress = IN_PROGRESS_WAIT_HEADER; |
2446 | conn->id = conn_idx; | 2445 | conn->id = conn_idx; |
@@ -2452,8 +2451,6 @@ iscsi_conn_create(struct Scsi_Host *shost, uint32_t conn_idx) | |||
2452 | conn->data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH; | 2451 | conn->data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH; |
2453 | conn->max_recv_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH; | 2452 | conn->max_recv_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH; |
2454 | 2453 | ||
2455 | spin_lock_init(&conn->lock); | ||
2456 | |||
2457 | /* initialize general xmit PDU commands queue */ | 2454 | /* initialize general xmit PDU commands queue */ |
2458 | conn->xmitqueue = kfifo_alloc(session->cmds_max * sizeof(void*), | 2455 | conn->xmitqueue = kfifo_alloc(session->cmds_max * sizeof(void*), |
2459 | GFP_KERNEL, NULL); | 2456 | GFP_KERNEL, NULL); |
@@ -2625,11 +2622,13 @@ iscsi_conn_destroy(struct iscsi_cls_conn *cls_conn) | |||
2625 | } | 2622 | } |
2626 | 2623 | ||
2627 | static int | 2624 | static int |
2628 | iscsi_conn_bind(iscsi_sessionh_t sessionh, iscsi_connh_t connh, | 2625 | iscsi_conn_bind(struct iscsi_cls_session *cls_session, |
2629 | uint32_t transport_fd, int is_leading) | 2626 | struct iscsi_cls_conn *cls_conn, uint32_t transport_fd, |
2627 | int is_leading) | ||
2630 | { | 2628 | { |
2631 | struct iscsi_session *session = iscsi_ptr(sessionh); | 2629 | struct Scsi_Host *shost = iscsi_session_to_shost(cls_session); |
2632 | struct iscsi_conn *tmp = ERR_PTR(-EEXIST), *conn = iscsi_ptr(connh); | 2630 | struct iscsi_session *session = iscsi_hostdata(shost->hostdata); |
2631 | struct iscsi_conn *tmp = ERR_PTR(-EEXIST), *conn = cls_conn->dd_data; | ||
2633 | struct sock *sk; | 2632 | struct sock *sk; |
2634 | struct socket *sock; | 2633 | struct socket *sock; |
2635 | int err; | 2634 | int err; |
@@ -2703,9 +2702,9 @@ iscsi_conn_bind(iscsi_sessionh_t sessionh, iscsi_connh_t connh, | |||
2703 | } | 2702 | } |
2704 | 2703 | ||
2705 | static int | 2704 | static int |
2706 | iscsi_conn_start(iscsi_connh_t connh) | 2705 | iscsi_conn_start(struct iscsi_cls_conn *cls_conn) |
2707 | { | 2706 | { |
2708 | struct iscsi_conn *conn = iscsi_ptr(connh); | 2707 | struct iscsi_conn *conn = cls_conn->dd_data; |
2709 | struct iscsi_session *session = conn->session; | 2708 | struct iscsi_session *session = conn->session; |
2710 | struct sock *sk; | 2709 | struct sock *sk; |
2711 | 2710 | ||
@@ -2754,9 +2753,9 @@ iscsi_conn_start(iscsi_connh_t connh) | |||
2754 | } | 2753 | } |
2755 | 2754 | ||
2756 | static void | 2755 | static void |
2757 | iscsi_conn_stop(iscsi_connh_t connh, int flag) | 2756 | iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag) |
2758 | { | 2757 | { |
2759 | struct iscsi_conn *conn = iscsi_ptr(connh); | 2758 | struct iscsi_conn *conn = cls_conn->dd_data; |
2760 | struct iscsi_session *session = conn->session; | 2759 | struct iscsi_session *session = conn->session; |
2761 | struct sock *sk; | 2760 | struct sock *sk; |
2762 | unsigned long flags; | 2761 | unsigned long flags; |
@@ -3253,9 +3252,9 @@ static struct scsi_host_template iscsi_sht = { | |||
3253 | 3252 | ||
3254 | static struct iscsi_transport iscsi_tcp_transport; | 3253 | static struct iscsi_transport iscsi_tcp_transport; |
3255 | 3254 | ||
3256 | static struct Scsi_Host * | 3255 | static struct iscsi_cls_session * |
3257 | iscsi_session_create(struct scsi_transport_template *scsit, | 3256 | iscsi_session_create(struct scsi_transport_template *scsit, |
3258 | uint32_t initial_cmdsn) | 3257 | uint32_t initial_cmdsn, uint32_t *sid) |
3259 | { | 3258 | { |
3260 | struct Scsi_Host *shost; | 3259 | struct Scsi_Host *shost; |
3261 | struct iscsi_session *session; | 3260 | struct iscsi_session *session; |
@@ -3268,13 +3267,14 @@ iscsi_session_create(struct scsi_transport_template *scsit, | |||
3268 | session = iscsi_hostdata(shost->hostdata); | 3267 | session = iscsi_hostdata(shost->hostdata); |
3269 | memset(session, 0, sizeof(struct iscsi_session)); | 3268 | memset(session, 0, sizeof(struct iscsi_session)); |
3270 | session->host = shost; | 3269 | session->host = shost; |
3271 | session->state = ISCSI_STATE_LOGGED_IN; | 3270 | session->state = ISCSI_STATE_FREE; |
3272 | session->mgmtpool_max = ISCSI_MGMT_CMDS_MAX; | 3271 | session->mgmtpool_max = ISCSI_MGMT_CMDS_MAX; |
3273 | session->cmds_max = ISCSI_XMIT_CMDS_MAX; | 3272 | session->cmds_max = ISCSI_XMIT_CMDS_MAX; |
3274 | session->cmdsn = initial_cmdsn; | 3273 | session->cmdsn = initial_cmdsn; |
3275 | session->exp_cmdsn = initial_cmdsn + 1; | 3274 | session->exp_cmdsn = initial_cmdsn + 1; |
3276 | session->max_cmdsn = initial_cmdsn + 1; | 3275 | session->max_cmdsn = initial_cmdsn + 1; |
3277 | session->max_r2t = 1; | 3276 | session->max_r2t = 1; |
3277 | *sid = shost->host_no; | ||
3278 | 3278 | ||
3279 | /* initialize SCSI PDU commands pool */ | 3279 | /* initialize SCSI PDU commands pool */ |
3280 | if (iscsi_pool_init(&session->cmdpool, session->cmds_max, | 3280 | if (iscsi_pool_init(&session->cmdpool, session->cmds_max, |
@@ -3311,22 +3311,24 @@ iscsi_session_create(struct scsi_transport_template *scsit, | |||
3311 | if (iscsi_r2tpool_alloc(session)) | 3311 | if (iscsi_r2tpool_alloc(session)) |
3312 | goto r2tpool_alloc_fail; | 3312 | goto r2tpool_alloc_fail; |
3313 | 3313 | ||
3314 | return shost; | 3314 | return hostdata_session(shost->hostdata); |
3315 | 3315 | ||
3316 | r2tpool_alloc_fail: | 3316 | r2tpool_alloc_fail: |
3317 | for (cmd_i = 0; cmd_i < session->mgmtpool_max; cmd_i++) | 3317 | for (cmd_i = 0; cmd_i < session->mgmtpool_max; cmd_i++) |
3318 | kfree(session->mgmt_cmds[cmd_i]->data); | 3318 | kfree(session->mgmt_cmds[cmd_i]->data); |
3319 | iscsi_pool_free(&session->mgmtpool, (void**)session->mgmt_cmds); | ||
3320 | immdata_alloc_fail: | 3319 | immdata_alloc_fail: |
3320 | iscsi_pool_free(&session->mgmtpool, (void**)session->mgmt_cmds); | ||
3321 | mgmtpool_alloc_fail: | 3321 | mgmtpool_alloc_fail: |
3322 | iscsi_pool_free(&session->cmdpool, (void**)session->cmds); | 3322 | iscsi_pool_free(&session->cmdpool, (void**)session->cmds); |
3323 | cmdpool_alloc_fail: | 3323 | cmdpool_alloc_fail: |
3324 | iscsi_transport_destroy_session(shost); | ||
3324 | return NULL; | 3325 | return NULL; |
3325 | } | 3326 | } |
3326 | 3327 | ||
3327 | static void | 3328 | static void |
3328 | iscsi_session_destroy(struct Scsi_Host *shost) | 3329 | iscsi_session_destroy(struct iscsi_cls_session *cls_session) |
3329 | { | 3330 | { |
3331 | struct Scsi_Host *shost = iscsi_session_to_shost(cls_session); | ||
3330 | struct iscsi_session *session = iscsi_hostdata(shost->hostdata); | 3332 | struct iscsi_session *session = iscsi_hostdata(shost->hostdata); |
3331 | int cmd_i; | 3333 | int cmd_i; |
3332 | struct iscsi_data_task *dtask, *n; | 3334 | struct iscsi_data_task *dtask, *n; |
@@ -3350,10 +3352,10 @@ iscsi_session_destroy(struct Scsi_Host *shost) | |||
3350 | } | 3352 | } |
3351 | 3353 | ||
3352 | static int | 3354 | static int |
3353 | iscsi_conn_set_param(iscsi_connh_t connh, enum iscsi_param param, | 3355 | iscsi_conn_set_param(struct iscsi_cls_conn *cls_conn, enum iscsi_param param, |
3354 | uint32_t value) | 3356 | uint32_t value) |
3355 | { | 3357 | { |
3356 | struct iscsi_conn *conn = iscsi_ptr(connh); | 3358 | struct iscsi_conn *conn = cls_conn->dd_data; |
3357 | struct iscsi_session *session = conn->session; | 3359 | struct iscsi_session *session = conn->session; |
3358 | 3360 | ||
3359 | spin_lock_bh(&session->lock); | 3361 | spin_lock_bh(&session->lock); |
@@ -3495,9 +3497,10 @@ iscsi_conn_set_param(iscsi_connh_t connh, enum iscsi_param param, | |||
3495 | } | 3497 | } |
3496 | 3498 | ||
3497 | static int | 3499 | static int |
3498 | iscsi_session_get_param(struct Scsi_Host *shost, | 3500 | iscsi_session_get_param(struct iscsi_cls_session *cls_session, |
3499 | enum iscsi_param param, uint32_t *value) | 3501 | enum iscsi_param param, uint32_t *value) |
3500 | { | 3502 | { |
3503 | struct Scsi_Host *shost = iscsi_session_to_shost(cls_session); | ||
3501 | struct iscsi_session *session = iscsi_hostdata(shost->hostdata); | 3504 | struct iscsi_session *session = iscsi_hostdata(shost->hostdata); |
3502 | 3505 | ||
3503 | switch(param) { | 3506 | switch(param) { |
@@ -3539,9 +3542,10 @@ iscsi_session_get_param(struct Scsi_Host *shost, | |||
3539 | } | 3542 | } |
3540 | 3543 | ||
3541 | static int | 3544 | static int |
3542 | iscsi_conn_get_param(void *data, enum iscsi_param param, uint32_t *value) | 3545 | iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn, |
3546 | enum iscsi_param param, uint32_t *value) | ||
3543 | { | 3547 | { |
3544 | struct iscsi_conn *conn = data; | 3548 | struct iscsi_conn *conn = cls_conn->dd_data; |
3545 | 3549 | ||
3546 | switch(param) { | 3550 | switch(param) { |
3547 | case ISCSI_PARAM_MAX_RECV_DLENGTH: | 3551 | case ISCSI_PARAM_MAX_RECV_DLENGTH: |
@@ -3564,9 +3568,9 @@ iscsi_conn_get_param(void *data, enum iscsi_param param, uint32_t *value) | |||
3564 | } | 3568 | } |
3565 | 3569 | ||
3566 | static void | 3570 | static void |
3567 | iscsi_conn_get_stats(iscsi_connh_t connh, struct iscsi_stats *stats) | 3571 | iscsi_conn_get_stats(struct iscsi_cls_conn *cls_conn, struct iscsi_stats *stats) |
3568 | { | 3572 | { |
3569 | struct iscsi_conn *conn = iscsi_ptr(connh); | 3573 | struct iscsi_conn *conn = cls_conn->dd_data; |
3570 | 3574 | ||
3571 | stats->txdata_octets = conn->txdata_octets; | 3575 | stats->txdata_octets = conn->txdata_octets; |
3572 | stats->rxdata_octets = conn->rxdata_octets; | 3576 | stats->rxdata_octets = conn->rxdata_octets; |
@@ -3587,10 +3591,10 @@ iscsi_conn_get_stats(iscsi_connh_t connh, struct iscsi_stats *stats) | |||
3587 | } | 3591 | } |
3588 | 3592 | ||
3589 | static int | 3593 | static int |
3590 | iscsi_conn_send_pdu(iscsi_connh_t connh, struct iscsi_hdr *hdr, char *data, | 3594 | iscsi_conn_send_pdu(struct iscsi_cls_conn *cls_conn, struct iscsi_hdr *hdr, |
3591 | uint32_t data_size) | 3595 | char *data, uint32_t data_size) |
3592 | { | 3596 | { |
3593 | struct iscsi_conn *conn = iscsi_ptr(connh); | 3597 | struct iscsi_conn *conn = cls_conn->dd_data; |
3594 | int rc; | 3598 | int rc; |
3595 | 3599 | ||
3596 | mutex_lock(&conn->xmitmutex); | 3600 | mutex_lock(&conn->xmitmutex); |
diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h index f95e61b76f70..ba26741ac154 100644 --- a/drivers/scsi/iscsi_tcp.h +++ b/drivers/scsi/iscsi_tcp.h | |||
@@ -113,7 +113,10 @@ struct iscsi_tcp_recv { | |||
113 | int datadgst; | 113 | int datadgst; |
114 | }; | 114 | }; |
115 | 115 | ||
116 | struct iscsi_cls_conn; | ||
117 | |||
116 | struct iscsi_conn { | 118 | struct iscsi_conn { |
119 | struct iscsi_cls_conn *cls_conn; /* ptr to class connection */ | ||
117 | struct iscsi_hdr hdr; /* header placeholder */ | 120 | struct iscsi_hdr hdr; /* header placeholder */ |
118 | char hdrext[4*sizeof(__u16) + | 121 | char hdrext[4*sizeof(__u16) + |
119 | sizeof(__u32)]; | 122 | sizeof(__u32)]; |
@@ -143,7 +146,6 @@ struct iscsi_conn { | |||
143 | struct iscsi_mgmt_task *login_mtask; /* mtask used for login/text */ | 146 | struct iscsi_mgmt_task *login_mtask; /* mtask used for login/text */ |
144 | struct iscsi_mgmt_task *mtask; /* xmit mtask in progress */ | 147 | struct iscsi_mgmt_task *mtask; /* xmit mtask in progress */ |
145 | struct iscsi_cmd_task *ctask; /* xmit ctask in progress */ | 148 | struct iscsi_cmd_task *ctask; /* xmit ctask in progress */ |
146 | spinlock_t lock; /* FIXME: to be removed */ | ||
147 | 149 | ||
148 | /* old values for socket callbacks */ | 150 | /* old values for socket callbacks */ |
149 | void (*old_data_ready)(struct sock *, int); | 151 | void (*old_data_ready)(struct sock *, int); |
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 46c4cdbaee86..5f1d7580218d 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
@@ -614,7 +614,7 @@ int ata_rwcmd_protocol(struct ata_queued_cmd *qc) | |||
614 | } else if (lba48 && (qc->ap->flags & ATA_FLAG_PIO_LBA48)) { | 614 | } else if (lba48 && (qc->ap->flags & ATA_FLAG_PIO_LBA48)) { |
615 | /* Unable to use DMA due to host limitation */ | 615 | /* Unable to use DMA due to host limitation */ |
616 | tf->protocol = ATA_PROT_PIO; | 616 | tf->protocol = ATA_PROT_PIO; |
617 | index = dev->multi_count ? 0 : 4; | 617 | index = dev->multi_count ? 0 : 8; |
618 | } else { | 618 | } else { |
619 | tf->protocol = ATA_PROT_DMA; | 619 | tf->protocol = ATA_PROT_DMA; |
620 | index = 16; | 620 | index = 16; |
@@ -2514,7 +2514,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc) | |||
2514 | assert(sg != NULL); | 2514 | assert(sg != NULL); |
2515 | 2515 | ||
2516 | if (qc->flags & ATA_QCFLAG_SINGLE) | 2516 | if (qc->flags & ATA_QCFLAG_SINGLE) |
2517 | assert(qc->n_elem == 1); | 2517 | assert(qc->n_elem <= 1); |
2518 | 2518 | ||
2519 | VPRINTK("unmapping %u sg elements\n", qc->n_elem); | 2519 | VPRINTK("unmapping %u sg elements\n", qc->n_elem); |
2520 | 2520 | ||
@@ -2537,7 +2537,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc) | |||
2537 | kunmap_atomic(addr, KM_IRQ0); | 2537 | kunmap_atomic(addr, KM_IRQ0); |
2538 | } | 2538 | } |
2539 | } else { | 2539 | } else { |
2540 | if (sg_dma_len(&sg[0]) > 0) | 2540 | if (qc->n_elem) |
2541 | dma_unmap_single(ap->host_set->dev, | 2541 | dma_unmap_single(ap->host_set->dev, |
2542 | sg_dma_address(&sg[0]), sg_dma_len(&sg[0]), | 2542 | sg_dma_address(&sg[0]), sg_dma_len(&sg[0]), |
2543 | dir); | 2543 | dir); |
@@ -2570,7 +2570,7 @@ static void ata_fill_sg(struct ata_queued_cmd *qc) | |||
2570 | unsigned int idx; | 2570 | unsigned int idx; |
2571 | 2571 | ||
2572 | assert(qc->__sg != NULL); | 2572 | assert(qc->__sg != NULL); |
2573 | assert(qc->n_elem > 0); | 2573 | assert(qc->n_elem > 0 || qc->pad_len > 0); |
2574 | 2574 | ||
2575 | idx = 0; | 2575 | idx = 0; |
2576 | ata_for_each_sg(sg, qc) { | 2576 | ata_for_each_sg(sg, qc) { |
@@ -2715,6 +2715,7 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc) | |||
2715 | int dir = qc->dma_dir; | 2715 | int dir = qc->dma_dir; |
2716 | struct scatterlist *sg = qc->__sg; | 2716 | struct scatterlist *sg = qc->__sg; |
2717 | dma_addr_t dma_address; | 2717 | dma_addr_t dma_address; |
2718 | int trim_sg = 0; | ||
2718 | 2719 | ||
2719 | /* we must lengthen transfers to end on a 32-bit boundary */ | 2720 | /* we must lengthen transfers to end on a 32-bit boundary */ |
2720 | qc->pad_len = sg->length & 3; | 2721 | qc->pad_len = sg->length & 3; |
@@ -2734,13 +2735,15 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc) | |||
2734 | sg_dma_len(psg) = ATA_DMA_PAD_SZ; | 2735 | sg_dma_len(psg) = ATA_DMA_PAD_SZ; |
2735 | /* trim sg */ | 2736 | /* trim sg */ |
2736 | sg->length -= qc->pad_len; | 2737 | sg->length -= qc->pad_len; |
2738 | if (sg->length == 0) | ||
2739 | trim_sg = 1; | ||
2737 | 2740 | ||
2738 | DPRINTK("padding done, sg->length=%u pad_len=%u\n", | 2741 | DPRINTK("padding done, sg->length=%u pad_len=%u\n", |
2739 | sg->length, qc->pad_len); | 2742 | sg->length, qc->pad_len); |
2740 | } | 2743 | } |
2741 | 2744 | ||
2742 | if (!sg->length) { | 2745 | if (trim_sg) { |
2743 | sg_dma_address(sg) = 0; | 2746 | qc->n_elem--; |
2744 | goto skip_map; | 2747 | goto skip_map; |
2745 | } | 2748 | } |
2746 | 2749 | ||
@@ -2753,9 +2756,9 @@ static int ata_sg_setup_one(struct ata_queued_cmd *qc) | |||
2753 | } | 2756 | } |
2754 | 2757 | ||
2755 | sg_dma_address(sg) = dma_address; | 2758 | sg_dma_address(sg) = dma_address; |
2756 | skip_map: | ||
2757 | sg_dma_len(sg) = sg->length; | 2759 | sg_dma_len(sg) = sg->length; |
2758 | 2760 | ||
2761 | skip_map: | ||
2759 | DPRINTK("mapped buffer of %d bytes for %s\n", sg_dma_len(sg), | 2762 | DPRINTK("mapped buffer of %d bytes for %s\n", sg_dma_len(sg), |
2760 | qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read"); | 2763 | qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read"); |
2761 | 2764 | ||
@@ -3357,11 +3360,12 @@ static void ata_pio_error(struct ata_port *ap) | |||
3357 | { | 3360 | { |
3358 | struct ata_queued_cmd *qc; | 3361 | struct ata_queued_cmd *qc; |
3359 | 3362 | ||
3360 | printk(KERN_WARNING "ata%u: PIO error\n", ap->id); | ||
3361 | |||
3362 | qc = ata_qc_from_tag(ap, ap->active_tag); | 3363 | qc = ata_qc_from_tag(ap, ap->active_tag); |
3363 | assert(qc != NULL); | 3364 | assert(qc != NULL); |
3364 | 3365 | ||
3366 | if (qc->tf.command != ATA_CMD_PACKET) | ||
3367 | printk(KERN_WARNING "ata%u: PIO error\n", ap->id); | ||
3368 | |||
3365 | /* make sure qc->err_mask is available to | 3369 | /* make sure qc->err_mask is available to |
3366 | * know what's wrong and recover | 3370 | * know what's wrong and recover |
3367 | */ | 3371 | */ |
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index d101a8a6f4e8..7144674bc8e6 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
@@ -5049,7 +5049,7 @@ static struct pci_device_id megaraid_pci_tbl[] = { | |||
5049 | MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl); | 5049 | MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl); |
5050 | 5050 | ||
5051 | static struct pci_driver megaraid_pci_driver = { | 5051 | static struct pci_driver megaraid_pci_driver = { |
5052 | .name = "megaraid", | 5052 | .name = "megaraid_legacy", |
5053 | .id_table = megaraid_pci_tbl, | 5053 | .id_table = megaraid_pci_tbl, |
5054 | .probe = megaraid_probe_one, | 5054 | .probe = megaraid_probe_one, |
5055 | .remove = __devexit_p(megaraid_remove_one), | 5055 | .remove = __devexit_p(megaraid_remove_one), |
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 4b3e0d6e5afa..4b75fe619d9c 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <linux/mutex.h> | 5 | #include <linux/mutex.h> |
6 | 6 | ||
7 | #define MEGARAID_VERSION \ | 7 | #define MEGARAID_VERSION \ |
8 | "v2.00.3 (Release Date: Wed Feb 19 08:51:30 EST 2003)\n" | 8 | "v2.00.4 (Release Date: Thu Feb 9 08:51:30 EST 2006)\n" |
9 | 9 | ||
10 | /* | 10 | /* |
11 | * Driver features - change the values to enable or disable features in the | 11 | * Driver features - change the values to enable or disable features in the |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index a487f414960e..7de267e14458 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * 2 of the License, or (at your option) any later version. | 10 | * 2 of the License, or (at your option) any later version. |
11 | * | 11 | * |
12 | * FILE : megaraid_sas.c | 12 | * FILE : megaraid_sas.c |
13 | * Version : v00.00.02.02 | 13 | * Version : v00.00.02.04 |
14 | * | 14 | * |
15 | * Authors: | 15 | * Authors: |
16 | * Sreenivas Bagalkote <Sreenivas.Bagalkote@lsil.com> | 16 | * Sreenivas Bagalkote <Sreenivas.Bagalkote@lsil.com> |
@@ -60,6 +60,12 @@ static struct pci_device_id megasas_pci_table[] = { | |||
60 | PCI_ANY_ID, | 60 | PCI_ANY_ID, |
61 | }, | 61 | }, |
62 | { | 62 | { |
63 | PCI_VENDOR_ID_LSI_LOGIC, | ||
64 | PCI_DEVICE_ID_LSI_SAS1078R, // ppc IOP | ||
65 | PCI_ANY_ID, | ||
66 | PCI_ANY_ID, | ||
67 | }, | ||
68 | { | ||
63 | PCI_VENDOR_ID_DELL, | 69 | PCI_VENDOR_ID_DELL, |
64 | PCI_DEVICE_ID_DELL_PERC5, // xscale IOP | 70 | PCI_DEVICE_ID_DELL_PERC5, // xscale IOP |
65 | PCI_ANY_ID, | 71 | PCI_ANY_ID, |
@@ -199,6 +205,86 @@ static struct megasas_instance_template megasas_instance_template_xscale = { | |||
199 | */ | 205 | */ |
200 | 206 | ||
201 | /** | 207 | /** |
208 | * The following functions are defined for ppc (deviceid : 0x60) | ||
209 | * controllers | ||
210 | */ | ||
211 | |||
212 | /** | ||
213 | * megasas_enable_intr_ppc - Enables interrupts | ||
214 | * @regs: MFI register set | ||
215 | */ | ||
216 | static inline void | ||
217 | megasas_enable_intr_ppc(struct megasas_register_set __iomem * regs) | ||
218 | { | ||
219 | writel(0xFFFFFFFF, &(regs)->outbound_doorbell_clear); | ||
220 | |||
221 | writel(~0x80000004, &(regs)->outbound_intr_mask); | ||
222 | |||
223 | /* Dummy readl to force pci flush */ | ||
224 | readl(®s->outbound_intr_mask); | ||
225 | } | ||
226 | |||
227 | /** | ||
228 | * megasas_read_fw_status_reg_ppc - returns the current FW status value | ||
229 | * @regs: MFI register set | ||
230 | */ | ||
231 | static u32 | ||
232 | megasas_read_fw_status_reg_ppc(struct megasas_register_set __iomem * regs) | ||
233 | { | ||
234 | return readl(&(regs)->outbound_scratch_pad); | ||
235 | } | ||
236 | |||
237 | /** | ||
238 | * megasas_clear_interrupt_ppc - Check & clear interrupt | ||
239 | * @regs: MFI register set | ||
240 | */ | ||
241 | static int | ||
242 | megasas_clear_intr_ppc(struct megasas_register_set __iomem * regs) | ||
243 | { | ||
244 | u32 status; | ||
245 | /* | ||
246 | * Check if it is our interrupt | ||
247 | */ | ||
248 | status = readl(®s->outbound_intr_status); | ||
249 | |||
250 | if (!(status & MFI_REPLY_1078_MESSAGE_INTERRUPT)) { | ||
251 | return 1; | ||
252 | } | ||
253 | |||
254 | /* | ||
255 | * Clear the interrupt by writing back the same value | ||
256 | */ | ||
257 | writel(status, ®s->outbound_doorbell_clear); | ||
258 | |||
259 | return 0; | ||
260 | } | ||
261 | /** | ||
262 | * megasas_fire_cmd_ppc - Sends command to the FW | ||
263 | * @frame_phys_addr : Physical address of cmd | ||
264 | * @frame_count : Number of frames for the command | ||
265 | * @regs : MFI register set | ||
266 | */ | ||
267 | static inline void | ||
268 | megasas_fire_cmd_ppc(dma_addr_t frame_phys_addr, u32 frame_count, struct megasas_register_set __iomem *regs) | ||
269 | { | ||
270 | writel((frame_phys_addr | (frame_count<<1))|1, | ||
271 | &(regs)->inbound_queue_port); | ||
272 | } | ||
273 | |||
274 | static struct megasas_instance_template megasas_instance_template_ppc = { | ||
275 | |||
276 | .fire_cmd = megasas_fire_cmd_ppc, | ||
277 | .enable_intr = megasas_enable_intr_ppc, | ||
278 | .clear_intr = megasas_clear_intr_ppc, | ||
279 | .read_fw_status_reg = megasas_read_fw_status_reg_ppc, | ||
280 | }; | ||
281 | |||
282 | /** | ||
283 | * This is the end of set of functions & definitions | ||
284 | * specific to ppc (deviceid : 0x60) controllers | ||
285 | */ | ||
286 | |||
287 | /** | ||
202 | * megasas_disable_intr - Disables interrupts | 288 | * megasas_disable_intr - Disables interrupts |
203 | * @regs: MFI register set | 289 | * @regs: MFI register set |
204 | */ | 290 | */ |
@@ -1607,7 +1693,17 @@ static int megasas_init_mfi(struct megasas_instance *instance) | |||
1607 | 1693 | ||
1608 | reg_set = instance->reg_set; | 1694 | reg_set = instance->reg_set; |
1609 | 1695 | ||
1610 | instance->instancet = &megasas_instance_template_xscale; | 1696 | switch(instance->pdev->device) |
1697 | { | ||
1698 | case PCI_DEVICE_ID_LSI_SAS1078R: | ||
1699 | instance->instancet = &megasas_instance_template_ppc; | ||
1700 | break; | ||
1701 | case PCI_DEVICE_ID_LSI_SAS1064R: | ||
1702 | case PCI_DEVICE_ID_DELL_PERC5: | ||
1703 | default: | ||
1704 | instance->instancet = &megasas_instance_template_xscale; | ||
1705 | break; | ||
1706 | } | ||
1611 | 1707 | ||
1612 | /* | 1708 | /* |
1613 | * We expect the FW state to be READY | 1709 | * We expect the FW state to be READY |
@@ -1983,6 +2079,7 @@ static int megasas_io_attach(struct megasas_instance *instance) | |||
1983 | host->max_channel = MEGASAS_MAX_CHANNELS - 1; | 2079 | host->max_channel = MEGASAS_MAX_CHANNELS - 1; |
1984 | host->max_id = MEGASAS_MAX_DEV_PER_CHANNEL; | 2080 | host->max_id = MEGASAS_MAX_DEV_PER_CHANNEL; |
1985 | host->max_lun = MEGASAS_MAX_LUN; | 2081 | host->max_lun = MEGASAS_MAX_LUN; |
2082 | host->max_cmd_len = 16; | ||
1986 | 2083 | ||
1987 | /* | 2084 | /* |
1988 | * Notify the mid-layer about the new controller | 2085 | * Notify the mid-layer about the new controller |
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index d6d166c0663f..89639f0c38ef 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h | |||
@@ -18,9 +18,9 @@ | |||
18 | /** | 18 | /** |
19 | * MegaRAID SAS Driver meta data | 19 | * MegaRAID SAS Driver meta data |
20 | */ | 20 | */ |
21 | #define MEGASAS_VERSION "00.00.02.02" | 21 | #define MEGASAS_VERSION "00.00.02.04" |
22 | #define MEGASAS_RELDATE "Jan 23, 2006" | 22 | #define MEGASAS_RELDATE "Feb 03, 2006" |
23 | #define MEGASAS_EXT_VERSION "Mon Jan 23 14:09:01 PST 2006" | 23 | #define MEGASAS_EXT_VERSION "Fri Feb 03 14:31:44 PST 2006" |
24 | /* | 24 | /* |
25 | * ===================================== | 25 | * ===================================== |
26 | * MegaRAID SAS MFI firmware definitions | 26 | * MegaRAID SAS MFI firmware definitions |
@@ -553,31 +553,46 @@ struct megasas_ctrl_info { | |||
553 | #define MFI_OB_INTR_STATUS_MASK 0x00000002 | 553 | #define MFI_OB_INTR_STATUS_MASK 0x00000002 |
554 | #define MFI_POLL_TIMEOUT_SECS 10 | 554 | #define MFI_POLL_TIMEOUT_SECS 10 |
555 | 555 | ||
556 | #define MFI_REPLY_1078_MESSAGE_INTERRUPT 0x80000000 | ||
557 | #define PCI_DEVICE_ID_LSI_SAS1078R 0x00000060 | ||
558 | |||
556 | struct megasas_register_set { | 559 | struct megasas_register_set { |
560 | u32 reserved_0[4]; /*0000h*/ | ||
557 | 561 | ||
558 | u32 reserved_0[4]; /*0000h */ | 562 | u32 inbound_msg_0; /*0010h*/ |
563 | u32 inbound_msg_1; /*0014h*/ | ||
564 | u32 outbound_msg_0; /*0018h*/ | ||
565 | u32 outbound_msg_1; /*001Ch*/ | ||
559 | 566 | ||
560 | u32 inbound_msg_0; /*0010h */ | 567 | u32 inbound_doorbell; /*0020h*/ |
561 | u32 inbound_msg_1; /*0014h */ | 568 | u32 inbound_intr_status; /*0024h*/ |
562 | u32 outbound_msg_0; /*0018h */ | 569 | u32 inbound_intr_mask; /*0028h*/ |
563 | u32 outbound_msg_1; /*001Ch */ | ||
564 | 570 | ||
565 | u32 inbound_doorbell; /*0020h */ | 571 | u32 outbound_doorbell; /*002Ch*/ |
566 | u32 inbound_intr_status; /*0024h */ | 572 | u32 outbound_intr_status; /*0030h*/ |
567 | u32 inbound_intr_mask; /*0028h */ | 573 | u32 outbound_intr_mask; /*0034h*/ |
568 | 574 | ||
569 | u32 outbound_doorbell; /*002Ch */ | 575 | u32 reserved_1[2]; /*0038h*/ |
570 | u32 outbound_intr_status; /*0030h */ | ||
571 | u32 outbound_intr_mask; /*0034h */ | ||
572 | 576 | ||
573 | u32 reserved_1[2]; /*0038h */ | 577 | u32 inbound_queue_port; /*0040h*/ |
578 | u32 outbound_queue_port; /*0044h*/ | ||
574 | 579 | ||
575 | u32 inbound_queue_port; /*0040h */ | 580 | u32 reserved_2[22]; /*0048h*/ |
576 | u32 outbound_queue_port; /*0044h */ | ||
577 | 581 | ||
578 | u32 reserved_2; /*004Ch */ | 582 | u32 outbound_doorbell_clear; /*00A0h*/ |
579 | 583 | ||
580 | u32 index_registers[1004]; /*0050h */ | 584 | u32 reserved_3[3]; /*00A4h*/ |
585 | |||
586 | u32 outbound_scratch_pad ; /*00B0h*/ | ||
587 | |||
588 | u32 reserved_4[3]; /*00B4h*/ | ||
589 | |||
590 | u32 inbound_low_queue_port ; /*00C0h*/ | ||
591 | |||
592 | u32 inbound_high_queue_port ; /*00C4h*/ | ||
593 | |||
594 | u32 reserved_5; /*00C8h*/ | ||
595 | u32 index_registers[820]; /*00CCh*/ | ||
581 | 596 | ||
582 | } __attribute__ ((packed)); | 597 | } __attribute__ ((packed)); |
583 | 598 | ||
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index b17ee62dd1a9..92b3e13e9061 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include "qla_def.h" | 7 | #include "qla_def.h" |
8 | 8 | ||
9 | #include <linux/vmalloc.h> | 9 | #include <linux/vmalloc.h> |
10 | #include <scsi/scsi_transport_fc.h> | ||
11 | 10 | ||
12 | /* SYSFS attributes --------------------------------------------------------- */ | 11 | /* SYSFS attributes --------------------------------------------------------- */ |
13 | 12 | ||
@@ -114,7 +113,7 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj, char *buf, loff_t off, | |||
114 | struct device, kobj))); | 113 | struct device, kobj))); |
115 | unsigned long flags; | 114 | unsigned long flags; |
116 | 115 | ||
117 | if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->nvram_size) | 116 | if (!capable(CAP_SYS_ADMIN) || off != 0) |
118 | return 0; | 117 | return 0; |
119 | 118 | ||
120 | /* Read NVRAM. */ | 119 | /* Read NVRAM. */ |
@@ -123,7 +122,7 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj, char *buf, loff_t off, | |||
123 | ha->nvram_size); | 122 | ha->nvram_size); |
124 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | 123 | spin_unlock_irqrestore(&ha->hardware_lock, flags); |
125 | 124 | ||
126 | return (count); | 125 | return ha->nvram_size; |
127 | } | 126 | } |
128 | 127 | ||
129 | static ssize_t | 128 | static ssize_t |
@@ -175,19 +174,150 @@ static struct bin_attribute sysfs_nvram_attr = { | |||
175 | .mode = S_IRUSR | S_IWUSR, | 174 | .mode = S_IRUSR | S_IWUSR, |
176 | .owner = THIS_MODULE, | 175 | .owner = THIS_MODULE, |
177 | }, | 176 | }, |
178 | .size = 0, | 177 | .size = 512, |
179 | .read = qla2x00_sysfs_read_nvram, | 178 | .read = qla2x00_sysfs_read_nvram, |
180 | .write = qla2x00_sysfs_write_nvram, | 179 | .write = qla2x00_sysfs_write_nvram, |
181 | }; | 180 | }; |
182 | 181 | ||
182 | static ssize_t | ||
183 | qla2x00_sysfs_read_optrom(struct kobject *kobj, char *buf, loff_t off, | ||
184 | size_t count) | ||
185 | { | ||
186 | struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj, | ||
187 | struct device, kobj))); | ||
188 | |||
189 | if (ha->optrom_state != QLA_SREADING) | ||
190 | return 0; | ||
191 | if (off > ha->optrom_size) | ||
192 | return 0; | ||
193 | if (off + count > ha->optrom_size) | ||
194 | count = ha->optrom_size - off; | ||
195 | |||
196 | memcpy(buf, &ha->optrom_buffer[off], count); | ||
197 | |||
198 | return count; | ||
199 | } | ||
200 | |||
201 | static ssize_t | ||
202 | qla2x00_sysfs_write_optrom(struct kobject *kobj, char *buf, loff_t off, | ||
203 | size_t count) | ||
204 | { | ||
205 | struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj, | ||
206 | struct device, kobj))); | ||
207 | |||
208 | if (ha->optrom_state != QLA_SWRITING) | ||
209 | return -EINVAL; | ||
210 | if (off > ha->optrom_size) | ||
211 | return -ERANGE; | ||
212 | if (off + count > ha->optrom_size) | ||
213 | count = ha->optrom_size - off; | ||
214 | |||
215 | memcpy(&ha->optrom_buffer[off], buf, count); | ||
216 | |||
217 | return count; | ||
218 | } | ||
219 | |||
220 | static struct bin_attribute sysfs_optrom_attr = { | ||
221 | .attr = { | ||
222 | .name = "optrom", | ||
223 | .mode = S_IRUSR | S_IWUSR, | ||
224 | .owner = THIS_MODULE, | ||
225 | }, | ||
226 | .size = OPTROM_SIZE_24XX, | ||
227 | .read = qla2x00_sysfs_read_optrom, | ||
228 | .write = qla2x00_sysfs_write_optrom, | ||
229 | }; | ||
230 | |||
231 | static ssize_t | ||
232 | qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj, char *buf, loff_t off, | ||
233 | size_t count) | ||
234 | { | ||
235 | struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj, | ||
236 | struct device, kobj))); | ||
237 | int val; | ||
238 | |||
239 | if (off) | ||
240 | return 0; | ||
241 | |||
242 | if (sscanf(buf, "%d", &val) != 1) | ||
243 | return -EINVAL; | ||
244 | |||
245 | switch (val) { | ||
246 | case 0: | ||
247 | if (ha->optrom_state != QLA_SREADING && | ||
248 | ha->optrom_state != QLA_SWRITING) | ||
249 | break; | ||
250 | |||
251 | ha->optrom_state = QLA_SWAITING; | ||
252 | vfree(ha->optrom_buffer); | ||
253 | ha->optrom_buffer = NULL; | ||
254 | break; | ||
255 | case 1: | ||
256 | if (ha->optrom_state != QLA_SWAITING) | ||
257 | break; | ||
258 | |||
259 | ha->optrom_state = QLA_SREADING; | ||
260 | ha->optrom_buffer = (uint8_t *)vmalloc(ha->optrom_size); | ||
261 | if (ha->optrom_buffer == NULL) { | ||
262 | qla_printk(KERN_WARNING, ha, | ||
263 | "Unable to allocate memory for optrom retrieval " | ||
264 | "(%x).\n", ha->optrom_size); | ||
265 | |||
266 | ha->optrom_state = QLA_SWAITING; | ||
267 | return count; | ||
268 | } | ||
269 | |||
270 | memset(ha->optrom_buffer, 0, ha->optrom_size); | ||
271 | ha->isp_ops.read_optrom(ha, ha->optrom_buffer, 0, | ||
272 | ha->optrom_size); | ||
273 | break; | ||
274 | case 2: | ||
275 | if (ha->optrom_state != QLA_SWAITING) | ||
276 | break; | ||
277 | |||
278 | ha->optrom_state = QLA_SWRITING; | ||
279 | ha->optrom_buffer = (uint8_t *)vmalloc(ha->optrom_size); | ||
280 | if (ha->optrom_buffer == NULL) { | ||
281 | qla_printk(KERN_WARNING, ha, | ||
282 | "Unable to allocate memory for optrom update " | ||
283 | "(%x).\n", ha->optrom_size); | ||
284 | |||
285 | ha->optrom_state = QLA_SWAITING; | ||
286 | return count; | ||
287 | } | ||
288 | memset(ha->optrom_buffer, 0, ha->optrom_size); | ||
289 | break; | ||
290 | case 3: | ||
291 | if (ha->optrom_state != QLA_SWRITING) | ||
292 | break; | ||
293 | |||
294 | ha->isp_ops.write_optrom(ha, ha->optrom_buffer, 0, | ||
295 | ha->optrom_size); | ||
296 | break; | ||
297 | } | ||
298 | return count; | ||
299 | } | ||
300 | |||
301 | static struct bin_attribute sysfs_optrom_ctl_attr = { | ||
302 | .attr = { | ||
303 | .name = "optrom_ctl", | ||
304 | .mode = S_IWUSR, | ||
305 | .owner = THIS_MODULE, | ||
306 | }, | ||
307 | .size = 0, | ||
308 | .write = qla2x00_sysfs_write_optrom_ctl, | ||
309 | }; | ||
310 | |||
183 | void | 311 | void |
184 | qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha) | 312 | qla2x00_alloc_sysfs_attr(scsi_qla_host_t *ha) |
185 | { | 313 | { |
186 | struct Scsi_Host *host = ha->host; | 314 | struct Scsi_Host *host = ha->host; |
187 | 315 | ||
188 | sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_fw_dump_attr); | 316 | sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_fw_dump_attr); |
189 | sysfs_nvram_attr.size = ha->nvram_size; | ||
190 | sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr); | 317 | sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr); |
318 | sysfs_create_bin_file(&host->shost_gendev.kobj, &sysfs_optrom_attr); | ||
319 | sysfs_create_bin_file(&host->shost_gendev.kobj, | ||
320 | &sysfs_optrom_ctl_attr); | ||
191 | } | 321 | } |
192 | 322 | ||
193 | void | 323 | void |
@@ -197,6 +327,12 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *ha) | |||
197 | 327 | ||
198 | sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_fw_dump_attr); | 328 | sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_fw_dump_attr); |
199 | sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr); | 329 | sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr); |
330 | sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_optrom_attr); | ||
331 | sysfs_remove_bin_file(&host->shost_gendev.kobj, | ||
332 | &sysfs_optrom_ctl_attr); | ||
333 | |||
334 | if (ha->beacon_blink_led == 1) | ||
335 | ha->isp_ops.beacon_off(ha); | ||
200 | } | 336 | } |
201 | 337 | ||
202 | /* Scsi_Host attributes. */ | 338 | /* Scsi_Host attributes. */ |
@@ -384,6 +520,50 @@ qla2x00_zio_timer_store(struct class_device *cdev, const char *buf, | |||
384 | return strlen(buf); | 520 | return strlen(buf); |
385 | } | 521 | } |
386 | 522 | ||
523 | static ssize_t | ||
524 | qla2x00_beacon_show(struct class_device *cdev, char *buf) | ||
525 | { | ||
526 | scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev)); | ||
527 | int len = 0; | ||
528 | |||
529 | if (ha->beacon_blink_led) | ||
530 | len += snprintf(buf + len, PAGE_SIZE-len, "Enabled\n"); | ||
531 | else | ||
532 | len += snprintf(buf + len, PAGE_SIZE-len, "Disabled\n"); | ||
533 | return len; | ||
534 | } | ||
535 | |||
536 | static ssize_t | ||
537 | qla2x00_beacon_store(struct class_device *cdev, const char *buf, | ||
538 | size_t count) | ||
539 | { | ||
540 | scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev)); | ||
541 | int val = 0; | ||
542 | int rval; | ||
543 | |||
544 | if (IS_QLA2100(ha) || IS_QLA2200(ha)) | ||
545 | return -EPERM; | ||
546 | |||
547 | if (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) { | ||
548 | qla_printk(KERN_WARNING, ha, | ||
549 | "Abort ISP active -- ignoring beacon request.\n"); | ||
550 | return -EBUSY; | ||
551 | } | ||
552 | |||
553 | if (sscanf(buf, "%d", &val) != 1) | ||
554 | return -EINVAL; | ||
555 | |||
556 | if (val) | ||
557 | rval = ha->isp_ops.beacon_on(ha); | ||
558 | else | ||
559 | rval = ha->isp_ops.beacon_off(ha); | ||
560 | |||
561 | if (rval != QLA_SUCCESS) | ||
562 | count = 0; | ||
563 | |||
564 | return count; | ||
565 | } | ||
566 | |||
387 | static CLASS_DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show, | 567 | static CLASS_DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show, |
388 | NULL); | 568 | NULL); |
389 | static CLASS_DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL); | 569 | static CLASS_DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL); |
@@ -398,6 +578,8 @@ static CLASS_DEVICE_ATTR(zio, S_IRUGO | S_IWUSR, qla2x00_zio_show, | |||
398 | qla2x00_zio_store); | 578 | qla2x00_zio_store); |
399 | static CLASS_DEVICE_ATTR(zio_timer, S_IRUGO | S_IWUSR, qla2x00_zio_timer_show, | 579 | static CLASS_DEVICE_ATTR(zio_timer, S_IRUGO | S_IWUSR, qla2x00_zio_timer_show, |
400 | qla2x00_zio_timer_store); | 580 | qla2x00_zio_timer_store); |
581 | static CLASS_DEVICE_ATTR(beacon, S_IRUGO | S_IWUSR, qla2x00_beacon_show, | ||
582 | qla2x00_beacon_store); | ||
401 | 583 | ||
402 | struct class_device_attribute *qla2x00_host_attrs[] = { | 584 | struct class_device_attribute *qla2x00_host_attrs[] = { |
403 | &class_device_attr_driver_version, | 585 | &class_device_attr_driver_version, |
@@ -411,6 +593,7 @@ struct class_device_attribute *qla2x00_host_attrs[] = { | |||
411 | &class_device_attr_state, | 593 | &class_device_attr_state, |
412 | &class_device_attr_zio, | 594 | &class_device_attr_zio, |
413 | &class_device_attr_zio_timer, | 595 | &class_device_attr_zio_timer, |
596 | &class_device_attr_beacon, | ||
414 | NULL, | 597 | NULL, |
415 | }; | 598 | }; |
416 | 599 | ||
@@ -426,6 +609,49 @@ qla2x00_get_host_port_id(struct Scsi_Host *shost) | |||
426 | } | 609 | } |
427 | 610 | ||
428 | static void | 611 | static void |
612 | qla2x00_get_host_speed(struct Scsi_Host *shost) | ||
613 | { | ||
614 | scsi_qla_host_t *ha = to_qla_host(shost); | ||
615 | uint32_t speed = 0; | ||
616 | |||
617 | switch (ha->link_data_rate) { | ||
618 | case LDR_1GB: | ||
619 | speed = 1; | ||
620 | break; | ||
621 | case LDR_2GB: | ||
622 | speed = 2; | ||
623 | break; | ||
624 | case LDR_4GB: | ||
625 | speed = 4; | ||
626 | break; | ||
627 | } | ||
628 | fc_host_speed(shost) = speed; | ||
629 | } | ||
630 | |||
631 | static void | ||
632 | qla2x00_get_host_port_type(struct Scsi_Host *shost) | ||
633 | { | ||
634 | scsi_qla_host_t *ha = to_qla_host(shost); | ||
635 | uint32_t port_type = FC_PORTTYPE_UNKNOWN; | ||
636 | |||
637 | switch (ha->current_topology) { | ||
638 | case ISP_CFG_NL: | ||
639 | port_type = FC_PORTTYPE_LPORT; | ||
640 | break; | ||
641 | case ISP_CFG_FL: | ||
642 | port_type = FC_PORTTYPE_NLPORT; | ||
643 | break; | ||
644 | case ISP_CFG_N: | ||
645 | port_type = FC_PORTTYPE_PTP; | ||
646 | break; | ||
647 | case ISP_CFG_F: | ||
648 | port_type = FC_PORTTYPE_NPORT; | ||
649 | break; | ||
650 | } | ||
651 | fc_host_port_type(shost) = port_type; | ||
652 | } | ||
653 | |||
654 | static void | ||
429 | qla2x00_get_starget_node_name(struct scsi_target *starget) | 655 | qla2x00_get_starget_node_name(struct scsi_target *starget) |
430 | { | 656 | { |
431 | struct Scsi_Host *host = dev_to_shost(starget->dev.parent); | 657 | struct Scsi_Host *host = dev_to_shost(starget->dev.parent); |
@@ -512,6 +738,41 @@ qla2x00_issue_lip(struct Scsi_Host *shost) | |||
512 | return 0; | 738 | return 0; |
513 | } | 739 | } |
514 | 740 | ||
741 | static struct fc_host_statistics * | ||
742 | qla2x00_get_fc_host_stats(struct Scsi_Host *shost) | ||
743 | { | ||
744 | scsi_qla_host_t *ha = to_qla_host(shost); | ||
745 | int rval; | ||
746 | uint16_t mb_stat[1]; | ||
747 | link_stat_t stat_buf; | ||
748 | struct fc_host_statistics *pfc_host_stat; | ||
749 | |||
750 | pfc_host_stat = &ha->fc_host_stat; | ||
751 | memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics)); | ||
752 | |||
753 | if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) { | ||
754 | rval = qla24xx_get_isp_stats(ha, (uint32_t *)&stat_buf, | ||
755 | sizeof(stat_buf) / 4, mb_stat); | ||
756 | } else { | ||
757 | rval = qla2x00_get_link_status(ha, ha->loop_id, &stat_buf, | ||
758 | mb_stat); | ||
759 | } | ||
760 | if (rval != 0) { | ||
761 | qla_printk(KERN_WARNING, ha, | ||
762 | "Unable to retrieve host statistics (%d).\n", mb_stat[0]); | ||
763 | return pfc_host_stat; | ||
764 | } | ||
765 | |||
766 | pfc_host_stat->link_failure_count = stat_buf.link_fail_cnt; | ||
767 | pfc_host_stat->loss_of_sync_count = stat_buf.loss_sync_cnt; | ||
768 | pfc_host_stat->loss_of_signal_count = stat_buf.loss_sig_cnt; | ||
769 | pfc_host_stat->prim_seq_protocol_err_count = stat_buf.prim_seq_err_cnt; | ||
770 | pfc_host_stat->invalid_tx_word_count = stat_buf.inval_xmit_word_cnt; | ||
771 | pfc_host_stat->invalid_crc_count = stat_buf.inval_crc_cnt; | ||
772 | |||
773 | return pfc_host_stat; | ||
774 | } | ||
775 | |||
515 | struct fc_function_template qla2xxx_transport_functions = { | 776 | struct fc_function_template qla2xxx_transport_functions = { |
516 | 777 | ||
517 | .show_host_node_name = 1, | 778 | .show_host_node_name = 1, |
@@ -520,6 +781,10 @@ struct fc_function_template qla2xxx_transport_functions = { | |||
520 | 781 | ||
521 | .get_host_port_id = qla2x00_get_host_port_id, | 782 | .get_host_port_id = qla2x00_get_host_port_id, |
522 | .show_host_port_id = 1, | 783 | .show_host_port_id = 1, |
784 | .get_host_speed = qla2x00_get_host_speed, | ||
785 | .show_host_speed = 1, | ||
786 | .get_host_port_type = qla2x00_get_host_port_type, | ||
787 | .show_host_port_type = 1, | ||
523 | 788 | ||
524 | .dd_fcrport_size = sizeof(struct fc_port *), | 789 | .dd_fcrport_size = sizeof(struct fc_port *), |
525 | .show_rport_supported_classes = 1, | 790 | .show_rport_supported_classes = 1, |
@@ -536,6 +801,7 @@ struct fc_function_template qla2xxx_transport_functions = { | |||
536 | .show_rport_dev_loss_tmo = 1, | 801 | .show_rport_dev_loss_tmo = 1, |
537 | 802 | ||
538 | .issue_fc_host_lip = qla2x00_issue_lip, | 803 | .issue_fc_host_lip = qla2x00_issue_lip, |
804 | .get_fc_host_stats = qla2x00_get_fc_host_stats, | ||
539 | }; | 805 | }; |
540 | 806 | ||
541 | void | 807 | void |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index bad066e5772a..b31a03bbd14f 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <scsi/scsi_host.h> | 29 | #include <scsi/scsi_host.h> |
30 | #include <scsi/scsi_device.h> | 30 | #include <scsi/scsi_device.h> |
31 | #include <scsi/scsi_cmnd.h> | 31 | #include <scsi/scsi_cmnd.h> |
32 | #include <scsi/scsi_transport_fc.h> | ||
32 | 33 | ||
33 | #if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE) | 34 | #if defined(CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE) |
34 | #if defined(CONFIG_SCSI_QLA21XX) || defined(CONFIG_SCSI_QLA21XX_MODULE) | 35 | #if defined(CONFIG_SCSI_QLA21XX) || defined(CONFIG_SCSI_QLA21XX_MODULE) |
@@ -181,6 +182,13 @@ | |||
181 | #define WRT_REG_DWORD(addr, data) writel(data,addr) | 182 | #define WRT_REG_DWORD(addr, data) writel(data,addr) |
182 | 183 | ||
183 | /* | 184 | /* |
185 | * The ISP2312 v2 chip cannot access the FLASH/GPIO registers via MMIO in an | ||
186 | * 133Mhz slot. | ||
187 | */ | ||
188 | #define RD_REG_WORD_PIO(addr) (inw((unsigned long)addr)) | ||
189 | #define WRT_REG_WORD_PIO(addr, data) (outw(data,(unsigned long)addr)) | ||
190 | |||
191 | /* | ||
184 | * Fibre Channel device definitions. | 192 | * Fibre Channel device definitions. |
185 | */ | 193 | */ |
186 | #define WWN_SIZE 8 /* Size of WWPN, WWN & WWNN */ | 194 | #define WWN_SIZE 8 /* Size of WWPN, WWN & WWNN */ |
@@ -432,6 +440,9 @@ struct device_reg_2xxx { | |||
432 | #define GPIO_LED_GREEN_ON_AMBER_OFF 0x0040 | 440 | #define GPIO_LED_GREEN_ON_AMBER_OFF 0x0040 |
433 | #define GPIO_LED_GREEN_OFF_AMBER_ON 0x0080 | 441 | #define GPIO_LED_GREEN_OFF_AMBER_ON 0x0080 |
434 | #define GPIO_LED_GREEN_ON_AMBER_ON 0x00C0 | 442 | #define GPIO_LED_GREEN_ON_AMBER_ON 0x00C0 |
443 | #define GPIO_LED_ALL_OFF 0x0000 | ||
444 | #define GPIO_LED_RED_ON_OTHER_OFF 0x0001 /* isp2322 */ | ||
445 | #define GPIO_LED_RGA_ON 0x00C1 /* isp2322: red green amber */ | ||
435 | 446 | ||
436 | union { | 447 | union { |
437 | struct { | 448 | struct { |
@@ -2199,6 +2210,15 @@ struct isp_operations { | |||
2199 | 2210 | ||
2200 | void (*fw_dump) (struct scsi_qla_host *, int); | 2211 | void (*fw_dump) (struct scsi_qla_host *, int); |
2201 | void (*ascii_fw_dump) (struct scsi_qla_host *); | 2212 | void (*ascii_fw_dump) (struct scsi_qla_host *); |
2213 | |||
2214 | int (*beacon_on) (struct scsi_qla_host *); | ||
2215 | int (*beacon_off) (struct scsi_qla_host *); | ||
2216 | void (*beacon_blink) (struct scsi_qla_host *); | ||
2217 | |||
2218 | uint8_t * (*read_optrom) (struct scsi_qla_host *, uint8_t *, | ||
2219 | uint32_t, uint32_t); | ||
2220 | int (*write_optrom) (struct scsi_qla_host *, uint8_t *, uint32_t, | ||
2221 | uint32_t); | ||
2202 | }; | 2222 | }; |
2203 | 2223 | ||
2204 | /* | 2224 | /* |
@@ -2331,6 +2351,10 @@ typedef struct scsi_qla_host { | |||
2331 | uint16_t min_external_loopid; /* First external loop Id */ | 2351 | uint16_t min_external_loopid; /* First external loop Id */ |
2332 | 2352 | ||
2333 | uint16_t link_data_rate; /* F/W operating speed */ | 2353 | uint16_t link_data_rate; /* F/W operating speed */ |
2354 | #define LDR_1GB 0 | ||
2355 | #define LDR_2GB 1 | ||
2356 | #define LDR_4GB 3 | ||
2357 | #define LDR_UNKNOWN 0xFFFF | ||
2334 | 2358 | ||
2335 | uint8_t current_topology; | 2359 | uint8_t current_topology; |
2336 | uint8_t prev_topology; | 2360 | uint8_t prev_topology; |
@@ -2486,12 +2510,26 @@ typedef struct scsi_qla_host { | |||
2486 | uint8_t *port_name; | 2510 | uint8_t *port_name; |
2487 | uint32_t isp_abort_cnt; | 2511 | uint32_t isp_abort_cnt; |
2488 | 2512 | ||
2513 | /* Option ROM information. */ | ||
2514 | char *optrom_buffer; | ||
2515 | uint32_t optrom_size; | ||
2516 | int optrom_state; | ||
2517 | #define QLA_SWAITING 0 | ||
2518 | #define QLA_SREADING 1 | ||
2519 | #define QLA_SWRITING 2 | ||
2520 | |||
2489 | /* Needed for BEACON */ | 2521 | /* Needed for BEACON */ |
2490 | uint16_t beacon_blink_led; | 2522 | uint16_t beacon_blink_led; |
2491 | uint16_t beacon_green_on; | 2523 | uint8_t beacon_color_state; |
2524 | #define QLA_LED_GRN_ON 0x01 | ||
2525 | #define QLA_LED_YLW_ON 0x02 | ||
2526 | #define QLA_LED_ABR_ON 0x04 | ||
2527 | #define QLA_LED_ALL_ON 0x07 /* yellow, green, amber. */ | ||
2528 | /* ISP2322: red, green, amber. */ | ||
2492 | 2529 | ||
2493 | uint16_t zio_mode; | 2530 | uint16_t zio_mode; |
2494 | uint16_t zio_timer; | 2531 | uint16_t zio_timer; |
2532 | struct fc_host_statistics fc_host_stat; | ||
2495 | } scsi_qla_host_t; | 2533 | } scsi_qla_host_t; |
2496 | 2534 | ||
2497 | 2535 | ||
@@ -2557,7 +2595,9 @@ struct _qla2x00stats { | |||
2557 | /* | 2595 | /* |
2558 | * Flash support definitions | 2596 | * Flash support definitions |
2559 | */ | 2597 | */ |
2560 | #define FLASH_IMAGE_SIZE 131072 | 2598 | #define OPTROM_SIZE_2300 0x20000 |
2599 | #define OPTROM_SIZE_2322 0x100000 | ||
2600 | #define OPTROM_SIZE_24XX 0x100000 | ||
2561 | 2601 | ||
2562 | #include "qla_gbl.h" | 2602 | #include "qla_gbl.h" |
2563 | #include "qla_dbg.h" | 2603 | #include "qla_dbg.h" |
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 35266bd5d538..ffdc2680f049 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h | |||
@@ -75,12 +75,12 @@ extern void qla2x00_cmd_timeout(srb_t *); | |||
75 | extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int); | 75 | extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int); |
76 | extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int); | 76 | extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int); |
77 | 77 | ||
78 | extern void qla2x00_blink_led(scsi_qla_host_t *); | ||
79 | |||
80 | extern int qla2x00_down_timeout(struct semaphore *, unsigned long); | 78 | extern int qla2x00_down_timeout(struct semaphore *, unsigned long); |
81 | 79 | ||
82 | extern struct fw_blob *qla2x00_request_firmware(scsi_qla_host_t *); | 80 | extern struct fw_blob *qla2x00_request_firmware(scsi_qla_host_t *); |
83 | 81 | ||
82 | extern int qla2x00_wait_for_hba_online(scsi_qla_host_t *); | ||
83 | |||
84 | /* | 84 | /* |
85 | * Global Function Prototypes in qla_iocb.c source file. | 85 | * Global Function Prototypes in qla_iocb.c source file. |
86 | */ | 86 | */ |
@@ -185,6 +185,13 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *, uint16_t *, uint16_t *, uint16_t *, | |||
185 | extern int | 185 | extern int |
186 | qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map); | 186 | qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map); |
187 | 187 | ||
188 | extern int | ||
189 | qla2x00_get_link_status(scsi_qla_host_t *, uint16_t, link_stat_t *, | ||
190 | uint16_t *); | ||
191 | |||
192 | extern int | ||
193 | qla24xx_get_isp_stats(scsi_qla_host_t *, uint32_t *, uint32_t, uint16_t *); | ||
194 | |||
188 | extern int qla24xx_abort_command(scsi_qla_host_t *, srb_t *); | 195 | extern int qla24xx_abort_command(scsi_qla_host_t *, srb_t *); |
189 | extern int qla24xx_abort_target(fc_port_t *); | 196 | extern int qla24xx_abort_target(fc_port_t *); |
190 | 197 | ||
@@ -228,6 +235,22 @@ extern int qla2x00_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t, | |||
228 | extern int qla24xx_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t, | 235 | extern int qla24xx_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t, |
229 | uint32_t); | 236 | uint32_t); |
230 | 237 | ||
238 | extern int qla2x00_beacon_on(struct scsi_qla_host *); | ||
239 | extern int qla2x00_beacon_off(struct scsi_qla_host *); | ||
240 | extern void qla2x00_beacon_blink(struct scsi_qla_host *); | ||
241 | extern int qla24xx_beacon_on(struct scsi_qla_host *); | ||
242 | extern int qla24xx_beacon_off(struct scsi_qla_host *); | ||
243 | extern void qla24xx_beacon_blink(struct scsi_qla_host *); | ||
244 | |||
245 | extern uint8_t *qla2x00_read_optrom_data(struct scsi_qla_host *, uint8_t *, | ||
246 | uint32_t, uint32_t); | ||
247 | extern int qla2x00_write_optrom_data(struct scsi_qla_host *, uint8_t *, | ||
248 | uint32_t, uint32_t); | ||
249 | extern uint8_t *qla24xx_read_optrom_data(struct scsi_qla_host *, uint8_t *, | ||
250 | uint32_t, uint32_t); | ||
251 | extern int qla24xx_write_optrom_data(struct scsi_qla_host *, uint8_t *, | ||
252 | uint32_t, uint32_t); | ||
253 | |||
231 | /* | 254 | /* |
232 | * Global Function Prototypes in qla_dbg.c source file. | 255 | * Global Function Prototypes in qla_dbg.c source file. |
233 | */ | 256 | */ |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index e67bb0997818..634ee174bff2 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -8,7 +8,6 @@ | |||
8 | 8 | ||
9 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
10 | #include <linux/vmalloc.h> | 10 | #include <linux/vmalloc.h> |
11 | #include <scsi/scsi_transport_fc.h> | ||
12 | 11 | ||
13 | #include "qla_devtbl.h" | 12 | #include "qla_devtbl.h" |
14 | 13 | ||
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 7ec0b8d6f07b..6544b6d0891d 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c | |||
@@ -814,6 +814,7 @@ qla24xx_start_scsi(srb_t *sp) | |||
814 | cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain; | 814 | cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain; |
815 | 815 | ||
816 | int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun); | 816 | int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun); |
817 | host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun)); | ||
817 | 818 | ||
818 | /* Load SCSI command packet. */ | 819 | /* Load SCSI command packet. */ |
819 | memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len); | 820 | memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len); |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 71a46fcee8cc..42aa7a7c1a73 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
@@ -402,9 +402,9 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb) | |||
402 | break; | 402 | break; |
403 | 403 | ||
404 | case MBA_LOOP_UP: /* Loop Up Event */ | 404 | case MBA_LOOP_UP: /* Loop Up Event */ |
405 | ha->link_data_rate = 0; | ||
406 | if (IS_QLA2100(ha) || IS_QLA2200(ha)) { | 405 | if (IS_QLA2100(ha) || IS_QLA2200(ha)) { |
407 | link_speed = link_speeds[0]; | 406 | link_speed = link_speeds[0]; |
407 | ha->link_data_rate = LDR_1GB; | ||
408 | } else { | 408 | } else { |
409 | link_speed = link_speeds[LS_UNKNOWN]; | 409 | link_speed = link_speeds[LS_UNKNOWN]; |
410 | if (mb[1] < 5) | 410 | if (mb[1] < 5) |
@@ -436,7 +436,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb) | |||
436 | } | 436 | } |
437 | 437 | ||
438 | ha->flags.management_server_logged_in = 0; | 438 | ha->flags.management_server_logged_in = 0; |
439 | ha->link_data_rate = 0; | 439 | ha->link_data_rate = LDR_UNKNOWN; |
440 | if (ql2xfdmienable) | 440 | if (ql2xfdmienable) |
441 | set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags); | 441 | set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags); |
442 | 442 | ||
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 3099b379de9d..363dfdd042b0 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include "qla_def.h" | 7 | #include "qla_def.h" |
8 | 8 | ||
9 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
10 | #include <scsi/scsi_transport_fc.h> | ||
11 | 10 | ||
12 | static void | 11 | static void |
13 | qla2x00_mbx_sem_timeout(unsigned long data) | 12 | qla2x00_mbx_sem_timeout(unsigned long data) |
@@ -1874,7 +1873,8 @@ qla2x00_get_id_list(scsi_qla_host_t *ha, void *id_list, dma_addr_t id_list_dma, | |||
1874 | mcp->mb[3] = LSW(id_list_dma); | 1873 | mcp->mb[3] = LSW(id_list_dma); |
1875 | mcp->mb[6] = MSW(MSD(id_list_dma)); | 1874 | mcp->mb[6] = MSW(MSD(id_list_dma)); |
1876 | mcp->mb[7] = LSW(MSD(id_list_dma)); | 1875 | mcp->mb[7] = LSW(MSD(id_list_dma)); |
1877 | mcp->out_mb |= MBX_7|MBX_6|MBX_3|MBX_2; | 1876 | mcp->mb[8] = 0; |
1877 | mcp->out_mb |= MBX_8|MBX_7|MBX_6|MBX_3|MBX_2; | ||
1878 | } else { | 1878 | } else { |
1879 | mcp->mb[1] = MSW(id_list_dma); | 1879 | mcp->mb[1] = MSW(id_list_dma); |
1880 | mcp->mb[2] = LSW(id_list_dma); | 1880 | mcp->mb[2] = LSW(id_list_dma); |
@@ -2017,8 +2017,109 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map) | |||
2017 | 2017 | ||
2018 | return rval; | 2018 | return rval; |
2019 | } | 2019 | } |
2020 | #endif | ||
2021 | |||
2022 | /* | ||
2023 | * qla2x00_get_link_status | ||
2024 | * | ||
2025 | * Input: | ||
2026 | * ha = adapter block pointer. | ||
2027 | * loop_id = device loop ID. | ||
2028 | * ret_buf = pointer to link status return buffer. | ||
2029 | * | ||
2030 | * Returns: | ||
2031 | * 0 = success. | ||
2032 | * BIT_0 = mem alloc error. | ||
2033 | * BIT_1 = mailbox error. | ||
2034 | */ | ||
2035 | int | ||
2036 | qla2x00_get_link_status(scsi_qla_host_t *ha, uint16_t loop_id, | ||
2037 | link_stat_t *ret_buf, uint16_t *status) | ||
2038 | { | ||
2039 | int rval; | ||
2040 | mbx_cmd_t mc; | ||
2041 | mbx_cmd_t *mcp = &mc; | ||
2042 | link_stat_t *stat_buf; | ||
2043 | dma_addr_t stat_buf_dma; | ||
2044 | |||
2045 | DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no);) | ||
2046 | |||
2047 | stat_buf = dma_pool_alloc(ha->s_dma_pool, GFP_ATOMIC, &stat_buf_dma); | ||
2048 | if (stat_buf == NULL) { | ||
2049 | DEBUG2_3_11(printk("%s(%ld): Failed to allocate memory.\n", | ||
2050 | __func__, ha->host_no)); | ||
2051 | return BIT_0; | ||
2052 | } | ||
2053 | memset(stat_buf, 0, sizeof(link_stat_t)); | ||
2054 | |||
2055 | mcp->mb[0] = MBC_GET_LINK_STATUS; | ||
2056 | mcp->mb[2] = MSW(stat_buf_dma); | ||
2057 | mcp->mb[3] = LSW(stat_buf_dma); | ||
2058 | mcp->mb[6] = MSW(MSD(stat_buf_dma)); | ||
2059 | mcp->mb[7] = LSW(MSD(stat_buf_dma)); | ||
2060 | mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_0; | ||
2061 | mcp->in_mb = MBX_0; | ||
2062 | if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) { | ||
2063 | mcp->mb[1] = loop_id; | ||
2064 | mcp->mb[4] = 0; | ||
2065 | mcp->mb[10] = 0; | ||
2066 | mcp->out_mb |= MBX_10|MBX_4|MBX_1; | ||
2067 | mcp->in_mb |= MBX_1; | ||
2068 | } else if (HAS_EXTENDED_IDS(ha)) { | ||
2069 | mcp->mb[1] = loop_id; | ||
2070 | mcp->mb[10] = 0; | ||
2071 | mcp->out_mb |= MBX_10|MBX_1; | ||
2072 | } else { | ||
2073 | mcp->mb[1] = loop_id << 8; | ||
2074 | mcp->out_mb |= MBX_1; | ||
2075 | } | ||
2076 | mcp->tov = 30; | ||
2077 | mcp->flags = IOCTL_CMD; | ||
2078 | rval = qla2x00_mailbox_command(ha, mcp); | ||
2079 | |||
2080 | if (rval == QLA_SUCCESS) { | ||
2081 | if (mcp->mb[0] != MBS_COMMAND_COMPLETE) { | ||
2082 | DEBUG2_3_11(printk("%s(%ld): cmd failed. mbx0=%x.\n", | ||
2083 | __func__, ha->host_no, mcp->mb[0]);) | ||
2084 | status[0] = mcp->mb[0]; | ||
2085 | rval = BIT_1; | ||
2086 | } else { | ||
2087 | /* copy over data -- firmware data is LE. */ | ||
2088 | ret_buf->link_fail_cnt = | ||
2089 | le32_to_cpu(stat_buf->link_fail_cnt); | ||
2090 | ret_buf->loss_sync_cnt = | ||
2091 | le32_to_cpu(stat_buf->loss_sync_cnt); | ||
2092 | ret_buf->loss_sig_cnt = | ||
2093 | le32_to_cpu(stat_buf->loss_sig_cnt); | ||
2094 | ret_buf->prim_seq_err_cnt = | ||
2095 | le32_to_cpu(stat_buf->prim_seq_err_cnt); | ||
2096 | ret_buf->inval_xmit_word_cnt = | ||
2097 | le32_to_cpu(stat_buf->inval_xmit_word_cnt); | ||
2098 | ret_buf->inval_crc_cnt = | ||
2099 | le32_to_cpu(stat_buf->inval_crc_cnt); | ||
2100 | |||
2101 | DEBUG11(printk("%s(%ld): stat dump: fail_cnt=%d " | ||
2102 | "loss_sync=%d loss_sig=%d seq_err=%d " | ||
2103 | "inval_xmt_word=%d inval_crc=%d.\n", __func__, | ||
2104 | ha->host_no, stat_buf->link_fail_cnt, | ||
2105 | stat_buf->loss_sync_cnt, stat_buf->loss_sig_cnt, | ||
2106 | stat_buf->prim_seq_err_cnt, | ||
2107 | stat_buf->inval_xmit_word_cnt, | ||
2108 | stat_buf->inval_crc_cnt);) | ||
2109 | } | ||
2110 | } else { | ||
2111 | /* Failed. */ | ||
2112 | DEBUG2_3_11(printk("%s(%ld): failed=%x.\n", __func__, | ||
2113 | ha->host_no, rval);) | ||
2114 | rval = BIT_1; | ||
2115 | } | ||
2116 | |||
2117 | dma_pool_free(ha->s_dma_pool, stat_buf, stat_buf_dma); | ||
2020 | 2118 | ||
2021 | uint8_t | 2119 | return rval; |
2120 | } | ||
2121 | |||
2122 | int | ||
2022 | qla24xx_get_isp_stats(scsi_qla_host_t *ha, uint32_t *dwbuf, uint32_t dwords, | 2123 | qla24xx_get_isp_stats(scsi_qla_host_t *ha, uint32_t *dwbuf, uint32_t dwords, |
2023 | uint16_t *status) | 2124 | uint16_t *status) |
2024 | { | 2125 | { |
@@ -2080,7 +2181,6 @@ qla24xx_get_isp_stats(scsi_qla_host_t *ha, uint32_t *dwbuf, uint32_t dwords, | |||
2080 | 2181 | ||
2081 | return rval; | 2182 | return rval; |
2082 | } | 2183 | } |
2083 | #endif | ||
2084 | 2184 | ||
2085 | int | 2185 | int |
2086 | qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp) | 2186 | qla24xx_abort_command(scsi_qla_host_t *ha, srb_t *sp) |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 5866a7c706a8..9f91f1a20542 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -366,6 +366,12 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) | |||
366 | goto qc_fail_command; | 366 | goto qc_fail_command; |
367 | } | 367 | } |
368 | 368 | ||
369 | /* Close window on fcport/rport state-transitioning. */ | ||
370 | if (!*(fc_port_t **)rport->dd_data) { | ||
371 | cmd->result = DID_IMM_RETRY << 16; | ||
372 | goto qc_fail_command; | ||
373 | } | ||
374 | |||
369 | if (atomic_read(&fcport->state) != FCS_ONLINE) { | 375 | if (atomic_read(&fcport->state) != FCS_ONLINE) { |
370 | if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD || | 376 | if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD || |
371 | atomic_read(&ha->loop_state) == LOOP_DEAD) { | 377 | atomic_read(&ha->loop_state) == LOOP_DEAD) { |
@@ -421,6 +427,12 @@ qla24xx_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) | |||
421 | goto qc24_fail_command; | 427 | goto qc24_fail_command; |
422 | } | 428 | } |
423 | 429 | ||
430 | /* Close window on fcport/rport state-transitioning. */ | ||
431 | if (!*(fc_port_t **)rport->dd_data) { | ||
432 | cmd->result = DID_IMM_RETRY << 16; | ||
433 | goto qc24_fail_command; | ||
434 | } | ||
435 | |||
424 | if (atomic_read(&fcport->state) != FCS_ONLINE) { | 436 | if (atomic_read(&fcport->state) != FCS_ONLINE) { |
425 | if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD || | 437 | if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD || |
426 | atomic_read(&ha->loop_state) == LOOP_DEAD) { | 438 | atomic_read(&ha->loop_state) == LOOP_DEAD) { |
@@ -513,7 +525,7 @@ qla2x00_eh_wait_on_command(scsi_qla_host_t *ha, struct scsi_cmnd *cmd) | |||
513 | * Success (Adapter is online) : 0 | 525 | * Success (Adapter is online) : 0 |
514 | * Failed (Adapter is offline/disabled) : 1 | 526 | * Failed (Adapter is offline/disabled) : 1 |
515 | */ | 527 | */ |
516 | static int | 528 | int |
517 | qla2x00_wait_for_hba_online(scsi_qla_host_t *ha) | 529 | qla2x00_wait_for_hba_online(scsi_qla_host_t *ha) |
518 | { | 530 | { |
519 | int return_status; | 531 | int return_status; |
@@ -1312,6 +1324,8 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | |||
1312 | ha->ports = MAX_BUSES; | 1324 | ha->ports = MAX_BUSES; |
1313 | ha->init_cb_size = sizeof(init_cb_t); | 1325 | ha->init_cb_size = sizeof(init_cb_t); |
1314 | ha->mgmt_svr_loop_id = MANAGEMENT_SERVER; | 1326 | ha->mgmt_svr_loop_id = MANAGEMENT_SERVER; |
1327 | ha->link_data_rate = LDR_UNKNOWN; | ||
1328 | ha->optrom_size = OPTROM_SIZE_2300; | ||
1315 | 1329 | ||
1316 | /* Assign ISP specific operations. */ | 1330 | /* Assign ISP specific operations. */ |
1317 | ha->isp_ops.pci_config = qla2100_pci_config; | 1331 | ha->isp_ops.pci_config = qla2100_pci_config; |
@@ -1339,6 +1353,8 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | |||
1339 | ha->isp_ops.write_nvram = qla2x00_write_nvram_data; | 1353 | ha->isp_ops.write_nvram = qla2x00_write_nvram_data; |
1340 | ha->isp_ops.fw_dump = qla2100_fw_dump; | 1354 | ha->isp_ops.fw_dump = qla2100_fw_dump; |
1341 | ha->isp_ops.ascii_fw_dump = qla2100_ascii_fw_dump; | 1355 | ha->isp_ops.ascii_fw_dump = qla2100_ascii_fw_dump; |
1356 | ha->isp_ops.read_optrom = qla2x00_read_optrom_data; | ||
1357 | ha->isp_ops.write_optrom = qla2x00_write_optrom_data; | ||
1342 | if (IS_QLA2100(ha)) { | 1358 | if (IS_QLA2100(ha)) { |
1343 | host->max_id = MAX_TARGETS_2100; | 1359 | host->max_id = MAX_TARGETS_2100; |
1344 | ha->mbx_count = MAILBOX_REGISTER_COUNT_2100; | 1360 | ha->mbx_count = MAILBOX_REGISTER_COUNT_2100; |
@@ -1364,7 +1380,12 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | |||
1364 | ha->isp_ops.intr_handler = qla2300_intr_handler; | 1380 | ha->isp_ops.intr_handler = qla2300_intr_handler; |
1365 | ha->isp_ops.fw_dump = qla2300_fw_dump; | 1381 | ha->isp_ops.fw_dump = qla2300_fw_dump; |
1366 | ha->isp_ops.ascii_fw_dump = qla2300_ascii_fw_dump; | 1382 | ha->isp_ops.ascii_fw_dump = qla2300_ascii_fw_dump; |
1383 | ha->isp_ops.beacon_on = qla2x00_beacon_on; | ||
1384 | ha->isp_ops.beacon_off = qla2x00_beacon_off; | ||
1385 | ha->isp_ops.beacon_blink = qla2x00_beacon_blink; | ||
1367 | ha->gid_list_info_size = 6; | 1386 | ha->gid_list_info_size = 6; |
1387 | if (IS_QLA2322(ha) || IS_QLA6322(ha)) | ||
1388 | ha->optrom_size = OPTROM_SIZE_2322; | ||
1368 | } else if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) { | 1389 | } else if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) { |
1369 | host->max_id = MAX_TARGETS_2200; | 1390 | host->max_id = MAX_TARGETS_2200; |
1370 | ha->mbx_count = MAILBOX_REGISTER_COUNT; | 1391 | ha->mbx_count = MAILBOX_REGISTER_COUNT; |
@@ -1400,7 +1421,13 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) | |||
1400 | ha->isp_ops.write_nvram = qla24xx_write_nvram_data; | 1421 | ha->isp_ops.write_nvram = qla24xx_write_nvram_data; |
1401 | ha->isp_ops.fw_dump = qla24xx_fw_dump; | 1422 | ha->isp_ops.fw_dump = qla24xx_fw_dump; |
1402 | ha->isp_ops.ascii_fw_dump = qla24xx_ascii_fw_dump; | 1423 | ha->isp_ops.ascii_fw_dump = qla24xx_ascii_fw_dump; |
1424 | ha->isp_ops.read_optrom = qla24xx_read_optrom_data; | ||
1425 | ha->isp_ops.write_optrom = qla24xx_write_optrom_data; | ||
1426 | ha->isp_ops.beacon_on = qla24xx_beacon_on; | ||
1427 | ha->isp_ops.beacon_off = qla24xx_beacon_off; | ||
1428 | ha->isp_ops.beacon_blink = qla24xx_beacon_blink; | ||
1403 | ha->gid_list_info_size = 8; | 1429 | ha->gid_list_info_size = 8; |
1430 | ha->optrom_size = OPTROM_SIZE_24XX; | ||
1404 | } | 1431 | } |
1405 | host->can_queue = ha->request_q_length + 128; | 1432 | host->can_queue = ha->request_q_length + 128; |
1406 | 1433 | ||
@@ -1657,11 +1684,13 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *ha, fc_port_t *fcport, | |||
1657 | spin_lock_irqsave(&fcport->rport_lock, flags); | 1684 | spin_lock_irqsave(&fcport->rport_lock, flags); |
1658 | fcport->drport = rport; | 1685 | fcport->drport = rport; |
1659 | fcport->rport = NULL; | 1686 | fcport->rport = NULL; |
1687 | *(fc_port_t **)rport->dd_data = NULL; | ||
1660 | spin_unlock_irqrestore(&fcport->rport_lock, flags); | 1688 | spin_unlock_irqrestore(&fcport->rport_lock, flags); |
1661 | set_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags); | 1689 | set_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags); |
1662 | } else { | 1690 | } else { |
1663 | spin_lock_irqsave(&fcport->rport_lock, flags); | 1691 | spin_lock_irqsave(&fcport->rport_lock, flags); |
1664 | fcport->rport = NULL; | 1692 | fcport->rport = NULL; |
1693 | *(fc_port_t **)rport->dd_data = NULL; | ||
1665 | spin_unlock_irqrestore(&fcport->rport_lock, flags); | 1694 | spin_unlock_irqrestore(&fcport->rport_lock, flags); |
1666 | fc_remote_port_delete(rport); | 1695 | fc_remote_port_delete(rport); |
1667 | } | 1696 | } |
@@ -2066,6 +2095,8 @@ qla2x00_mem_free(scsi_qla_host_t *ha) | |||
2066 | ha->fw_dumped = 0; | 2095 | ha->fw_dumped = 0; |
2067 | ha->fw_dump_reading = 0; | 2096 | ha->fw_dump_reading = 0; |
2068 | ha->fw_dump_buffer = NULL; | 2097 | ha->fw_dump_buffer = NULL; |
2098 | |||
2099 | vfree(ha->optrom_buffer); | ||
2069 | } | 2100 | } |
2070 | 2101 | ||
2071 | /* | 2102 | /* |
@@ -2314,6 +2345,9 @@ qla2x00_do_dpc(void *data) | |||
2314 | if (!ha->interrupts_on) | 2345 | if (!ha->interrupts_on) |
2315 | ha->isp_ops.enable_intrs(ha); | 2346 | ha->isp_ops.enable_intrs(ha); |
2316 | 2347 | ||
2348 | if (test_and_clear_bit(BEACON_BLINK_NEEDED, &ha->dpc_flags)) | ||
2349 | ha->isp_ops.beacon_blink(ha); | ||
2350 | |||
2317 | ha->dpc_active = 0; | 2351 | ha->dpc_active = 0; |
2318 | } /* End of while(1) */ | 2352 | } /* End of while(1) */ |
2319 | 2353 | ||
@@ -2491,6 +2525,12 @@ qla2x00_timer(scsi_qla_host_t *ha) | |||
2491 | atomic_read(&ha->loop_down_timer))); | 2525 | atomic_read(&ha->loop_down_timer))); |
2492 | } | 2526 | } |
2493 | 2527 | ||
2528 | /* Check if beacon LED needs to be blinked */ | ||
2529 | if (ha->beacon_blink_led == 1) { | ||
2530 | set_bit(BEACON_BLINK_NEEDED, &ha->dpc_flags); | ||
2531 | start_dpc++; | ||
2532 | } | ||
2533 | |||
2494 | /* Schedule the DPC routine if needed */ | 2534 | /* Schedule the DPC routine if needed */ |
2495 | if ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || | 2535 | if ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || |
2496 | test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || | 2536 | test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || |
@@ -2499,6 +2539,7 @@ qla2x00_timer(scsi_qla_host_t *ha) | |||
2499 | start_dpc || | 2539 | start_dpc || |
2500 | test_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags) || | 2540 | test_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags) || |
2501 | test_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) || | 2541 | test_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) || |
2542 | test_bit(BEACON_BLINK_NEEDED, &ha->dpc_flags) || | ||
2502 | test_bit(RELOGIN_NEEDED, &ha->dpc_flags)) && | 2543 | test_bit(RELOGIN_NEEDED, &ha->dpc_flags)) && |
2503 | ha->dpc_wait && !ha->dpc_active) { | 2544 | ha->dpc_wait && !ha->dpc_active) { |
2504 | 2545 | ||
diff --git a/drivers/scsi/qla2xxx/qla_rscn.c b/drivers/scsi/qla2xxx/qla_rscn.c index 2c3342108dd8..b70bebe18c01 100644 --- a/drivers/scsi/qla2xxx/qla_rscn.c +++ b/drivers/scsi/qla2xxx/qla_rscn.c | |||
@@ -6,8 +6,6 @@ | |||
6 | */ | 6 | */ |
7 | #include "qla_def.h" | 7 | #include "qla_def.h" |
8 | 8 | ||
9 | #include <scsi/scsi_transport_fc.h> | ||
10 | |||
11 | /** | 9 | /** |
12 | * IO descriptor handle definitions. | 10 | * IO descriptor handle definitions. |
13 | * | 11 | * |
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index f4d755a643e4..3866a5760f15 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c | |||
@@ -695,3 +695,966 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr, | |||
695 | 695 | ||
696 | return ret; | 696 | return ret; |
697 | } | 697 | } |
698 | |||
699 | |||
700 | static inline void | ||
701 | qla2x00_flip_colors(scsi_qla_host_t *ha, uint16_t *pflags) | ||
702 | { | ||
703 | if (IS_QLA2322(ha)) { | ||
704 | /* Flip all colors. */ | ||
705 | if (ha->beacon_color_state == QLA_LED_ALL_ON) { | ||
706 | /* Turn off. */ | ||
707 | ha->beacon_color_state = 0; | ||
708 | *pflags = GPIO_LED_ALL_OFF; | ||
709 | } else { | ||
710 | /* Turn on. */ | ||
711 | ha->beacon_color_state = QLA_LED_ALL_ON; | ||
712 | *pflags = GPIO_LED_RGA_ON; | ||
713 | } | ||
714 | } else { | ||
715 | /* Flip green led only. */ | ||
716 | if (ha->beacon_color_state == QLA_LED_GRN_ON) { | ||
717 | /* Turn off. */ | ||
718 | ha->beacon_color_state = 0; | ||
719 | *pflags = GPIO_LED_GREEN_OFF_AMBER_OFF; | ||
720 | } else { | ||
721 | /* Turn on. */ | ||
722 | ha->beacon_color_state = QLA_LED_GRN_ON; | ||
723 | *pflags = GPIO_LED_GREEN_ON_AMBER_OFF; | ||
724 | } | ||
725 | } | ||
726 | } | ||
727 | |||
728 | void | ||
729 | qla2x00_beacon_blink(struct scsi_qla_host *ha) | ||
730 | { | ||
731 | uint16_t gpio_enable; | ||
732 | uint16_t gpio_data; | ||
733 | uint16_t led_color = 0; | ||
734 | unsigned long flags; | ||
735 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
736 | |||
737 | if (ha->pio_address) | ||
738 | reg = (struct device_reg_2xxx __iomem *)ha->pio_address; | ||
739 | |||
740 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
741 | |||
742 | /* Save the Original GPIOE. */ | ||
743 | if (ha->pio_address) { | ||
744 | gpio_enable = RD_REG_WORD_PIO(®->gpioe); | ||
745 | gpio_data = RD_REG_WORD_PIO(®->gpiod); | ||
746 | } else { | ||
747 | gpio_enable = RD_REG_WORD(®->gpioe); | ||
748 | gpio_data = RD_REG_WORD(®->gpiod); | ||
749 | } | ||
750 | |||
751 | /* Set the modified gpio_enable values */ | ||
752 | gpio_enable |= GPIO_LED_MASK; | ||
753 | |||
754 | if (ha->pio_address) { | ||
755 | WRT_REG_WORD_PIO(®->gpioe, gpio_enable); | ||
756 | } else { | ||
757 | WRT_REG_WORD(®->gpioe, gpio_enable); | ||
758 | RD_REG_WORD(®->gpioe); | ||
759 | } | ||
760 | |||
761 | qla2x00_flip_colors(ha, &led_color); | ||
762 | |||
763 | /* Clear out any previously set LED color. */ | ||
764 | gpio_data &= ~GPIO_LED_MASK; | ||
765 | |||
766 | /* Set the new input LED color to GPIOD. */ | ||
767 | gpio_data |= led_color; | ||
768 | |||
769 | /* Set the modified gpio_data values */ | ||
770 | if (ha->pio_address) { | ||
771 | WRT_REG_WORD_PIO(®->gpiod, gpio_data); | ||
772 | } else { | ||
773 | WRT_REG_WORD(®->gpiod, gpio_data); | ||
774 | RD_REG_WORD(®->gpiod); | ||
775 | } | ||
776 | |||
777 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
778 | } | ||
779 | |||
780 | int | ||
781 | qla2x00_beacon_on(struct scsi_qla_host *ha) | ||
782 | { | ||
783 | uint16_t gpio_enable; | ||
784 | uint16_t gpio_data; | ||
785 | unsigned long flags; | ||
786 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
787 | |||
788 | ha->fw_options[1] &= ~FO1_SET_EMPHASIS_SWING; | ||
789 | ha->fw_options[1] |= FO1_DISABLE_GPIO6_7; | ||
790 | |||
791 | if (qla2x00_set_fw_options(ha, ha->fw_options) != QLA_SUCCESS) { | ||
792 | qla_printk(KERN_WARNING, ha, | ||
793 | "Unable to update fw options (beacon on).\n"); | ||
794 | return QLA_FUNCTION_FAILED; | ||
795 | } | ||
796 | |||
797 | if (ha->pio_address) | ||
798 | reg = (struct device_reg_2xxx __iomem *)ha->pio_address; | ||
799 | |||
800 | /* Turn off LEDs. */ | ||
801 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
802 | if (ha->pio_address) { | ||
803 | gpio_enable = RD_REG_WORD_PIO(®->gpioe); | ||
804 | gpio_data = RD_REG_WORD_PIO(®->gpiod); | ||
805 | } else { | ||
806 | gpio_enable = RD_REG_WORD(®->gpioe); | ||
807 | gpio_data = RD_REG_WORD(®->gpiod); | ||
808 | } | ||
809 | gpio_enable |= GPIO_LED_MASK; | ||
810 | |||
811 | /* Set the modified gpio_enable values. */ | ||
812 | if (ha->pio_address) { | ||
813 | WRT_REG_WORD_PIO(®->gpioe, gpio_enable); | ||
814 | } else { | ||
815 | WRT_REG_WORD(®->gpioe, gpio_enable); | ||
816 | RD_REG_WORD(®->gpioe); | ||
817 | } | ||
818 | |||
819 | /* Clear out previously set LED colour. */ | ||
820 | gpio_data &= ~GPIO_LED_MASK; | ||
821 | if (ha->pio_address) { | ||
822 | WRT_REG_WORD_PIO(®->gpiod, gpio_data); | ||
823 | } else { | ||
824 | WRT_REG_WORD(®->gpiod, gpio_data); | ||
825 | RD_REG_WORD(®->gpiod); | ||
826 | } | ||
827 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
828 | |||
829 | /* | ||
830 | * Let the per HBA timer kick off the blinking process based on | ||
831 | * the following flags. No need to do anything else now. | ||
832 | */ | ||
833 | ha->beacon_blink_led = 1; | ||
834 | ha->beacon_color_state = 0; | ||
835 | |||
836 | return QLA_SUCCESS; | ||
837 | } | ||
838 | |||
839 | int | ||
840 | qla2x00_beacon_off(struct scsi_qla_host *ha) | ||
841 | { | ||
842 | int rval = QLA_SUCCESS; | ||
843 | |||
844 | ha->beacon_blink_led = 0; | ||
845 | |||
846 | /* Set the on flag so when it gets flipped it will be off. */ | ||
847 | if (IS_QLA2322(ha)) | ||
848 | ha->beacon_color_state = QLA_LED_ALL_ON; | ||
849 | else | ||
850 | ha->beacon_color_state = QLA_LED_GRN_ON; | ||
851 | |||
852 | ha->isp_ops.beacon_blink(ha); /* This turns green LED off */ | ||
853 | |||
854 | ha->fw_options[1] &= ~FO1_SET_EMPHASIS_SWING; | ||
855 | ha->fw_options[1] &= ~FO1_DISABLE_GPIO6_7; | ||
856 | |||
857 | rval = qla2x00_set_fw_options(ha, ha->fw_options); | ||
858 | if (rval != QLA_SUCCESS) | ||
859 | qla_printk(KERN_WARNING, ha, | ||
860 | "Unable to update fw options (beacon off).\n"); | ||
861 | return rval; | ||
862 | } | ||
863 | |||
864 | |||
865 | static inline void | ||
866 | qla24xx_flip_colors(scsi_qla_host_t *ha, uint16_t *pflags) | ||
867 | { | ||
868 | /* Flip all colors. */ | ||
869 | if (ha->beacon_color_state == QLA_LED_ALL_ON) { | ||
870 | /* Turn off. */ | ||
871 | ha->beacon_color_state = 0; | ||
872 | *pflags = 0; | ||
873 | } else { | ||
874 | /* Turn on. */ | ||
875 | ha->beacon_color_state = QLA_LED_ALL_ON; | ||
876 | *pflags = GPDX_LED_YELLOW_ON | GPDX_LED_AMBER_ON; | ||
877 | } | ||
878 | } | ||
879 | |||
880 | void | ||
881 | qla24xx_beacon_blink(struct scsi_qla_host *ha) | ||
882 | { | ||
883 | uint16_t led_color = 0; | ||
884 | uint32_t gpio_data; | ||
885 | unsigned long flags; | ||
886 | struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; | ||
887 | |||
888 | /* Save the Original GPIOD. */ | ||
889 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
890 | gpio_data = RD_REG_DWORD(®->gpiod); | ||
891 | |||
892 | /* Enable the gpio_data reg for update. */ | ||
893 | gpio_data |= GPDX_LED_UPDATE_MASK; | ||
894 | |||
895 | WRT_REG_DWORD(®->gpiod, gpio_data); | ||
896 | gpio_data = RD_REG_DWORD(®->gpiod); | ||
897 | |||
898 | /* Set the color bits. */ | ||
899 | qla24xx_flip_colors(ha, &led_color); | ||
900 | |||
901 | /* Clear out any previously set LED color. */ | ||
902 | gpio_data &= ~GPDX_LED_COLOR_MASK; | ||
903 | |||
904 | /* Set the new input LED color to GPIOD. */ | ||
905 | gpio_data |= led_color; | ||
906 | |||
907 | /* Set the modified gpio_data values. */ | ||
908 | WRT_REG_DWORD(®->gpiod, gpio_data); | ||
909 | gpio_data = RD_REG_DWORD(®->gpiod); | ||
910 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
911 | } | ||
912 | |||
913 | int | ||
914 | qla24xx_beacon_on(struct scsi_qla_host *ha) | ||
915 | { | ||
916 | uint32_t gpio_data; | ||
917 | unsigned long flags; | ||
918 | struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; | ||
919 | |||
920 | if (ha->beacon_blink_led == 0) { | ||
921 | /* Enable firmware for update */ | ||
922 | ha->fw_options[1] |= ADD_FO1_DISABLE_GPIO_LED_CTRL; | ||
923 | |||
924 | if (qla2x00_set_fw_options(ha, ha->fw_options) != QLA_SUCCESS) | ||
925 | return QLA_FUNCTION_FAILED; | ||
926 | |||
927 | if (qla2x00_get_fw_options(ha, ha->fw_options) != | ||
928 | QLA_SUCCESS) { | ||
929 | qla_printk(KERN_WARNING, ha, | ||
930 | "Unable to update fw options (beacon on).\n"); | ||
931 | return QLA_FUNCTION_FAILED; | ||
932 | } | ||
933 | |||
934 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
935 | gpio_data = RD_REG_DWORD(®->gpiod); | ||
936 | |||
937 | /* Enable the gpio_data reg for update. */ | ||
938 | gpio_data |= GPDX_LED_UPDATE_MASK; | ||
939 | WRT_REG_DWORD(®->gpiod, gpio_data); | ||
940 | RD_REG_DWORD(®->gpiod); | ||
941 | |||
942 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
943 | } | ||
944 | |||
945 | /* So all colors blink together. */ | ||
946 | ha->beacon_color_state = 0; | ||
947 | |||
948 | /* Let the per HBA timer kick off the blinking process. */ | ||
949 | ha->beacon_blink_led = 1; | ||
950 | |||
951 | return QLA_SUCCESS; | ||
952 | } | ||
953 | |||
954 | int | ||
955 | qla24xx_beacon_off(struct scsi_qla_host *ha) | ||
956 | { | ||
957 | uint32_t gpio_data; | ||
958 | unsigned long flags; | ||
959 | struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; | ||
960 | |||
961 | ha->beacon_blink_led = 0; | ||
962 | ha->beacon_color_state = QLA_LED_ALL_ON; | ||
963 | |||
964 | ha->isp_ops.beacon_blink(ha); /* Will flip to all off. */ | ||
965 | |||
966 | /* Give control back to firmware. */ | ||
967 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
968 | gpio_data = RD_REG_DWORD(®->gpiod); | ||
969 | |||
970 | /* Disable the gpio_data reg for update. */ | ||
971 | gpio_data &= ~GPDX_LED_UPDATE_MASK; | ||
972 | WRT_REG_DWORD(®->gpiod, gpio_data); | ||
973 | RD_REG_DWORD(®->gpiod); | ||
974 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
975 | |||
976 | ha->fw_options[1] &= ~ADD_FO1_DISABLE_GPIO_LED_CTRL; | ||
977 | |||
978 | if (qla2x00_set_fw_options(ha, ha->fw_options) != QLA_SUCCESS) { | ||
979 | qla_printk(KERN_WARNING, ha, | ||
980 | "Unable to update fw options (beacon off).\n"); | ||
981 | return QLA_FUNCTION_FAILED; | ||
982 | } | ||
983 | |||
984 | if (qla2x00_get_fw_options(ha, ha->fw_options) != QLA_SUCCESS) { | ||
985 | qla_printk(KERN_WARNING, ha, | ||
986 | "Unable to get fw options (beacon off).\n"); | ||
987 | return QLA_FUNCTION_FAILED; | ||
988 | } | ||
989 | |||
990 | return QLA_SUCCESS; | ||
991 | } | ||
992 | |||
993 | |||
994 | /* | ||
995 | * Flash support routines | ||
996 | */ | ||
997 | |||
998 | /** | ||
999 | * qla2x00_flash_enable() - Setup flash for reading and writing. | ||
1000 | * @ha: HA context | ||
1001 | */ | ||
1002 | static void | ||
1003 | qla2x00_flash_enable(scsi_qla_host_t *ha) | ||
1004 | { | ||
1005 | uint16_t data; | ||
1006 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
1007 | |||
1008 | data = RD_REG_WORD(®->ctrl_status); | ||
1009 | data |= CSR_FLASH_ENABLE; | ||
1010 | WRT_REG_WORD(®->ctrl_status, data); | ||
1011 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1012 | } | ||
1013 | |||
1014 | /** | ||
1015 | * qla2x00_flash_disable() - Disable flash and allow RISC to run. | ||
1016 | * @ha: HA context | ||
1017 | */ | ||
1018 | static void | ||
1019 | qla2x00_flash_disable(scsi_qla_host_t *ha) | ||
1020 | { | ||
1021 | uint16_t data; | ||
1022 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
1023 | |||
1024 | data = RD_REG_WORD(®->ctrl_status); | ||
1025 | data &= ~(CSR_FLASH_ENABLE); | ||
1026 | WRT_REG_WORD(®->ctrl_status, data); | ||
1027 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1028 | } | ||
1029 | |||
1030 | /** | ||
1031 | * qla2x00_read_flash_byte() - Reads a byte from flash | ||
1032 | * @ha: HA context | ||
1033 | * @addr: Address in flash to read | ||
1034 | * | ||
1035 | * A word is read from the chip, but, only the lower byte is valid. | ||
1036 | * | ||
1037 | * Returns the byte read from flash @addr. | ||
1038 | */ | ||
1039 | static uint8_t | ||
1040 | qla2x00_read_flash_byte(scsi_qla_host_t *ha, uint32_t addr) | ||
1041 | { | ||
1042 | uint16_t data; | ||
1043 | uint16_t bank_select; | ||
1044 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
1045 | |||
1046 | bank_select = RD_REG_WORD(®->ctrl_status); | ||
1047 | |||
1048 | if (IS_QLA2322(ha) || IS_QLA6322(ha)) { | ||
1049 | /* Specify 64K address range: */ | ||
1050 | /* clear out Module Select and Flash Address bits [19:16]. */ | ||
1051 | bank_select &= ~0xf8; | ||
1052 | bank_select |= addr >> 12 & 0xf0; | ||
1053 | bank_select |= CSR_FLASH_64K_BANK; | ||
1054 | WRT_REG_WORD(®->ctrl_status, bank_select); | ||
1055 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1056 | |||
1057 | WRT_REG_WORD(®->flash_address, (uint16_t)addr); | ||
1058 | data = RD_REG_WORD(®->flash_data); | ||
1059 | |||
1060 | return (uint8_t)data; | ||
1061 | } | ||
1062 | |||
1063 | /* Setup bit 16 of flash address. */ | ||
1064 | if ((addr & BIT_16) && ((bank_select & CSR_FLASH_64K_BANK) == 0)) { | ||
1065 | bank_select |= CSR_FLASH_64K_BANK; | ||
1066 | WRT_REG_WORD(®->ctrl_status, bank_select); | ||
1067 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1068 | } else if (((addr & BIT_16) == 0) && | ||
1069 | (bank_select & CSR_FLASH_64K_BANK)) { | ||
1070 | bank_select &= ~(CSR_FLASH_64K_BANK); | ||
1071 | WRT_REG_WORD(®->ctrl_status, bank_select); | ||
1072 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1073 | } | ||
1074 | |||
1075 | /* Always perform IO mapped accesses to the FLASH registers. */ | ||
1076 | if (ha->pio_address) { | ||
1077 | uint16_t data2; | ||
1078 | |||
1079 | reg = (struct device_reg_2xxx __iomem *)ha->pio_address; | ||
1080 | WRT_REG_WORD_PIO(®->flash_address, (uint16_t)addr); | ||
1081 | do { | ||
1082 | data = RD_REG_WORD_PIO(®->flash_data); | ||
1083 | barrier(); | ||
1084 | cpu_relax(); | ||
1085 | data2 = RD_REG_WORD_PIO(®->flash_data); | ||
1086 | } while (data != data2); | ||
1087 | } else { | ||
1088 | WRT_REG_WORD(®->flash_address, (uint16_t)addr); | ||
1089 | data = qla2x00_debounce_register(®->flash_data); | ||
1090 | } | ||
1091 | |||
1092 | return (uint8_t)data; | ||
1093 | } | ||
1094 | |||
1095 | /** | ||
1096 | * qla2x00_write_flash_byte() - Write a byte to flash | ||
1097 | * @ha: HA context | ||
1098 | * @addr: Address in flash to write | ||
1099 | * @data: Data to write | ||
1100 | */ | ||
1101 | static void | ||
1102 | qla2x00_write_flash_byte(scsi_qla_host_t *ha, uint32_t addr, uint8_t data) | ||
1103 | { | ||
1104 | uint16_t bank_select; | ||
1105 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
1106 | |||
1107 | bank_select = RD_REG_WORD(®->ctrl_status); | ||
1108 | if (IS_QLA2322(ha) || IS_QLA6322(ha)) { | ||
1109 | /* Specify 64K address range: */ | ||
1110 | /* clear out Module Select and Flash Address bits [19:16]. */ | ||
1111 | bank_select &= ~0xf8; | ||
1112 | bank_select |= addr >> 12 & 0xf0; | ||
1113 | bank_select |= CSR_FLASH_64K_BANK; | ||
1114 | WRT_REG_WORD(®->ctrl_status, bank_select); | ||
1115 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1116 | |||
1117 | WRT_REG_WORD(®->flash_address, (uint16_t)addr); | ||
1118 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1119 | WRT_REG_WORD(®->flash_data, (uint16_t)data); | ||
1120 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1121 | |||
1122 | return; | ||
1123 | } | ||
1124 | |||
1125 | /* Setup bit 16 of flash address. */ | ||
1126 | if ((addr & BIT_16) && ((bank_select & CSR_FLASH_64K_BANK) == 0)) { | ||
1127 | bank_select |= CSR_FLASH_64K_BANK; | ||
1128 | WRT_REG_WORD(®->ctrl_status, bank_select); | ||
1129 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1130 | } else if (((addr & BIT_16) == 0) && | ||
1131 | (bank_select & CSR_FLASH_64K_BANK)) { | ||
1132 | bank_select &= ~(CSR_FLASH_64K_BANK); | ||
1133 | WRT_REG_WORD(®->ctrl_status, bank_select); | ||
1134 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1135 | } | ||
1136 | |||
1137 | /* Always perform IO mapped accesses to the FLASH registers. */ | ||
1138 | if (ha->pio_address) { | ||
1139 | reg = (struct device_reg_2xxx __iomem *)ha->pio_address; | ||
1140 | WRT_REG_WORD_PIO(®->flash_address, (uint16_t)addr); | ||
1141 | WRT_REG_WORD_PIO(®->flash_data, (uint16_t)data); | ||
1142 | } else { | ||
1143 | WRT_REG_WORD(®->flash_address, (uint16_t)addr); | ||
1144 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1145 | WRT_REG_WORD(®->flash_data, (uint16_t)data); | ||
1146 | RD_REG_WORD(®->ctrl_status); /* PCI Posting. */ | ||
1147 | } | ||
1148 | } | ||
1149 | |||
1150 | /** | ||
1151 | * qla2x00_poll_flash() - Polls flash for completion. | ||
1152 | * @ha: HA context | ||
1153 | * @addr: Address in flash to poll | ||
1154 | * @poll_data: Data to be polled | ||
1155 | * @man_id: Flash manufacturer ID | ||
1156 | * @flash_id: Flash ID | ||
1157 | * | ||
1158 | * This function polls the device until bit 7 of what is read matches data | ||
1159 | * bit 7 or until data bit 5 becomes a 1. If that hapens, the flash ROM timed | ||
1160 | * out (a fatal error). The flash book recommeds reading bit 7 again after | ||
1161 | * reading bit 5 as a 1. | ||
1162 | * | ||
1163 | * Returns 0 on success, else non-zero. | ||
1164 | */ | ||
1165 | static int | ||
1166 | qla2x00_poll_flash(scsi_qla_host_t *ha, uint32_t addr, uint8_t poll_data, | ||
1167 | uint8_t man_id, uint8_t flash_id) | ||
1168 | { | ||
1169 | int status; | ||
1170 | uint8_t flash_data; | ||
1171 | uint32_t cnt; | ||
1172 | |||
1173 | status = 1; | ||
1174 | |||
1175 | /* Wait for 30 seconds for command to finish. */ | ||
1176 | poll_data &= BIT_7; | ||
1177 | for (cnt = 3000000; cnt; cnt--) { | ||
1178 | flash_data = qla2x00_read_flash_byte(ha, addr); | ||
1179 | if ((flash_data & BIT_7) == poll_data) { | ||
1180 | status = 0; | ||
1181 | break; | ||
1182 | } | ||
1183 | |||
1184 | if (man_id != 0x40 && man_id != 0xda) { | ||
1185 | if ((flash_data & BIT_5) && cnt > 2) | ||
1186 | cnt = 2; | ||
1187 | } | ||
1188 | udelay(10); | ||
1189 | barrier(); | ||
1190 | } | ||
1191 | return status; | ||
1192 | } | ||
1193 | |||
1194 | #define IS_OEM_001(ha) \ | ||
1195 | ((ha)->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2322 && \ | ||
1196 | (ha)->pdev->subsystem_vendor == 0x1028 && \ | ||
1197 | (ha)->pdev->subsystem_device == 0x0170) | ||
1198 | |||
1199 | /** | ||
1200 | * qla2x00_program_flash_address() - Programs a flash address | ||
1201 | * @ha: HA context | ||
1202 | * @addr: Address in flash to program | ||
1203 | * @data: Data to be written in flash | ||
1204 | * @man_id: Flash manufacturer ID | ||
1205 | * @flash_id: Flash ID | ||
1206 | * | ||
1207 | * Returns 0 on success, else non-zero. | ||
1208 | */ | ||
1209 | static int | ||
1210 | qla2x00_program_flash_address(scsi_qla_host_t *ha, uint32_t addr, uint8_t data, | ||
1211 | uint8_t man_id, uint8_t flash_id) | ||
1212 | { | ||
1213 | /* Write Program Command Sequence. */ | ||
1214 | if (IS_OEM_001(ha)) { | ||
1215 | qla2x00_write_flash_byte(ha, 0xaaa, 0xaa); | ||
1216 | qla2x00_write_flash_byte(ha, 0x555, 0x55); | ||
1217 | qla2x00_write_flash_byte(ha, 0xaaa, 0xa0); | ||
1218 | qla2x00_write_flash_byte(ha, addr, data); | ||
1219 | } else { | ||
1220 | if (man_id == 0xda && flash_id == 0xc1) { | ||
1221 | qla2x00_write_flash_byte(ha, addr, data); | ||
1222 | if (addr & 0x7e) | ||
1223 | return 0; | ||
1224 | } else { | ||
1225 | qla2x00_write_flash_byte(ha, 0x5555, 0xaa); | ||
1226 | qla2x00_write_flash_byte(ha, 0x2aaa, 0x55); | ||
1227 | qla2x00_write_flash_byte(ha, 0x5555, 0xa0); | ||
1228 | qla2x00_write_flash_byte(ha, addr, data); | ||
1229 | } | ||
1230 | } | ||
1231 | |||
1232 | udelay(150); | ||
1233 | |||
1234 | /* Wait for write to complete. */ | ||
1235 | return qla2x00_poll_flash(ha, addr, data, man_id, flash_id); | ||
1236 | } | ||
1237 | |||
1238 | /** | ||
1239 | * qla2x00_erase_flash() - Erase the flash. | ||
1240 | * @ha: HA context | ||
1241 | * @man_id: Flash manufacturer ID | ||
1242 | * @flash_id: Flash ID | ||
1243 | * | ||
1244 | * Returns 0 on success, else non-zero. | ||
1245 | */ | ||
1246 | static int | ||
1247 | qla2x00_erase_flash(scsi_qla_host_t *ha, uint8_t man_id, uint8_t flash_id) | ||
1248 | { | ||
1249 | /* Individual Sector Erase Command Sequence */ | ||
1250 | if (IS_OEM_001(ha)) { | ||
1251 | qla2x00_write_flash_byte(ha, 0xaaa, 0xaa); | ||
1252 | qla2x00_write_flash_byte(ha, 0x555, 0x55); | ||
1253 | qla2x00_write_flash_byte(ha, 0xaaa, 0x80); | ||
1254 | qla2x00_write_flash_byte(ha, 0xaaa, 0xaa); | ||
1255 | qla2x00_write_flash_byte(ha, 0x555, 0x55); | ||
1256 | qla2x00_write_flash_byte(ha, 0xaaa, 0x10); | ||
1257 | } else { | ||
1258 | qla2x00_write_flash_byte(ha, 0x5555, 0xaa); | ||
1259 | qla2x00_write_flash_byte(ha, 0x2aaa, 0x55); | ||
1260 | qla2x00_write_flash_byte(ha, 0x5555, 0x80); | ||
1261 | qla2x00_write_flash_byte(ha, 0x5555, 0xaa); | ||
1262 | qla2x00_write_flash_byte(ha, 0x2aaa, 0x55); | ||
1263 | qla2x00_write_flash_byte(ha, 0x5555, 0x10); | ||
1264 | } | ||
1265 | |||
1266 | udelay(150); | ||
1267 | |||
1268 | /* Wait for erase to complete. */ | ||
1269 | return qla2x00_poll_flash(ha, 0x00, 0x80, man_id, flash_id); | ||
1270 | } | ||
1271 | |||
1272 | /** | ||
1273 | * qla2x00_erase_flash_sector() - Erase a flash sector. | ||
1274 | * @ha: HA context | ||
1275 | * @addr: Flash sector to erase | ||
1276 | * @sec_mask: Sector address mask | ||
1277 | * @man_id: Flash manufacturer ID | ||
1278 | * @flash_id: Flash ID | ||
1279 | * | ||
1280 | * Returns 0 on success, else non-zero. | ||
1281 | */ | ||
1282 | static int | ||
1283 | qla2x00_erase_flash_sector(scsi_qla_host_t *ha, uint32_t addr, | ||
1284 | uint32_t sec_mask, uint8_t man_id, uint8_t flash_id) | ||
1285 | { | ||
1286 | /* Individual Sector Erase Command Sequence */ | ||
1287 | qla2x00_write_flash_byte(ha, 0x5555, 0xaa); | ||
1288 | qla2x00_write_flash_byte(ha, 0x2aaa, 0x55); | ||
1289 | qla2x00_write_flash_byte(ha, 0x5555, 0x80); | ||
1290 | qla2x00_write_flash_byte(ha, 0x5555, 0xaa); | ||
1291 | qla2x00_write_flash_byte(ha, 0x2aaa, 0x55); | ||
1292 | if (man_id == 0x1f && flash_id == 0x13) | ||
1293 | qla2x00_write_flash_byte(ha, addr & sec_mask, 0x10); | ||
1294 | else | ||
1295 | qla2x00_write_flash_byte(ha, addr & sec_mask, 0x30); | ||
1296 | |||
1297 | udelay(150); | ||
1298 | |||
1299 | /* Wait for erase to complete. */ | ||
1300 | return qla2x00_poll_flash(ha, addr, 0x80, man_id, flash_id); | ||
1301 | } | ||
1302 | |||
1303 | /** | ||
1304 | * qla2x00_get_flash_manufacturer() - Read manufacturer ID from flash chip. | ||
1305 | * @man_id: Flash manufacturer ID | ||
1306 | * @flash_id: Flash ID | ||
1307 | */ | ||
1308 | static void | ||
1309 | qla2x00_get_flash_manufacturer(scsi_qla_host_t *ha, uint8_t *man_id, | ||
1310 | uint8_t *flash_id) | ||
1311 | { | ||
1312 | qla2x00_write_flash_byte(ha, 0x5555, 0xaa); | ||
1313 | qla2x00_write_flash_byte(ha, 0x2aaa, 0x55); | ||
1314 | qla2x00_write_flash_byte(ha, 0x5555, 0x90); | ||
1315 | *man_id = qla2x00_read_flash_byte(ha, 0x0000); | ||
1316 | *flash_id = qla2x00_read_flash_byte(ha, 0x0001); | ||
1317 | qla2x00_write_flash_byte(ha, 0x5555, 0xaa); | ||
1318 | qla2x00_write_flash_byte(ha, 0x2aaa, 0x55); | ||
1319 | qla2x00_write_flash_byte(ha, 0x5555, 0xf0); | ||
1320 | } | ||
1321 | |||
1322 | |||
1323 | static inline void | ||
1324 | qla2x00_suspend_hba(struct scsi_qla_host *ha) | ||
1325 | { | ||
1326 | int cnt; | ||
1327 | unsigned long flags; | ||
1328 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
1329 | |||
1330 | /* Suspend HBA. */ | ||
1331 | scsi_block_requests(ha->host); | ||
1332 | ha->isp_ops.disable_intrs(ha); | ||
1333 | set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); | ||
1334 | |||
1335 | /* Pause RISC. */ | ||
1336 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
1337 | WRT_REG_WORD(®->hccr, HCCR_PAUSE_RISC); | ||
1338 | RD_REG_WORD(®->hccr); | ||
1339 | if (IS_QLA2100(ha) || IS_QLA2200(ha) || IS_QLA2300(ha)) { | ||
1340 | for (cnt = 0; cnt < 30000; cnt++) { | ||
1341 | if ((RD_REG_WORD(®->hccr) & HCCR_RISC_PAUSE) != 0) | ||
1342 | break; | ||
1343 | udelay(100); | ||
1344 | } | ||
1345 | } else { | ||
1346 | udelay(10); | ||
1347 | } | ||
1348 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
1349 | } | ||
1350 | |||
1351 | static inline void | ||
1352 | qla2x00_resume_hba(struct scsi_qla_host *ha) | ||
1353 | { | ||
1354 | /* Resume HBA. */ | ||
1355 | clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); | ||
1356 | set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); | ||
1357 | up(ha->dpc_wait); | ||
1358 | qla2x00_wait_for_hba_online(ha); | ||
1359 | scsi_unblock_requests(ha->host); | ||
1360 | } | ||
1361 | |||
1362 | uint8_t * | ||
1363 | qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf, | ||
1364 | uint32_t offset, uint32_t length) | ||
1365 | { | ||
1366 | unsigned long flags; | ||
1367 | uint32_t addr, midpoint; | ||
1368 | uint8_t *data; | ||
1369 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
1370 | |||
1371 | /* Suspend HBA. */ | ||
1372 | qla2x00_suspend_hba(ha); | ||
1373 | |||
1374 | /* Go with read. */ | ||
1375 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
1376 | midpoint = ha->optrom_size / 2; | ||
1377 | |||
1378 | qla2x00_flash_enable(ha); | ||
1379 | WRT_REG_WORD(®->nvram, 0); | ||
1380 | RD_REG_WORD(®->nvram); /* PCI Posting. */ | ||
1381 | for (addr = offset, data = buf; addr < length; addr++, data++) { | ||
1382 | if (addr == midpoint) { | ||
1383 | WRT_REG_WORD(®->nvram, NVR_SELECT); | ||
1384 | RD_REG_WORD(®->nvram); /* PCI Posting. */ | ||
1385 | } | ||
1386 | |||
1387 | *data = qla2x00_read_flash_byte(ha, addr); | ||
1388 | } | ||
1389 | qla2x00_flash_disable(ha); | ||
1390 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
1391 | |||
1392 | /* Resume HBA. */ | ||
1393 | qla2x00_resume_hba(ha); | ||
1394 | |||
1395 | return buf; | ||
1396 | } | ||
1397 | |||
1398 | int | ||
1399 | qla2x00_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf, | ||
1400 | uint32_t offset, uint32_t length) | ||
1401 | { | ||
1402 | |||
1403 | int rval; | ||
1404 | unsigned long flags; | ||
1405 | uint8_t man_id, flash_id, sec_number, data; | ||
1406 | uint16_t wd; | ||
1407 | uint32_t addr, liter, sec_mask, rest_addr; | ||
1408 | struct device_reg_2xxx __iomem *reg = &ha->iobase->isp; | ||
1409 | |||
1410 | /* Suspend HBA. */ | ||
1411 | qla2x00_suspend_hba(ha); | ||
1412 | |||
1413 | rval = QLA_SUCCESS; | ||
1414 | sec_number = 0; | ||
1415 | |||
1416 | /* Reset ISP chip. */ | ||
1417 | spin_lock_irqsave(&ha->hardware_lock, flags); | ||
1418 | WRT_REG_WORD(®->ctrl_status, CSR_ISP_SOFT_RESET); | ||
1419 | pci_read_config_word(ha->pdev, PCI_COMMAND, &wd); | ||
1420 | |||
1421 | /* Go with write. */ | ||
1422 | qla2x00_flash_enable(ha); | ||
1423 | do { /* Loop once to provide quick error exit */ | ||
1424 | /* Structure of flash memory based on manufacturer */ | ||
1425 | if (IS_OEM_001(ha)) { | ||
1426 | /* OEM variant with special flash part. */ | ||
1427 | man_id = flash_id = 0; | ||
1428 | rest_addr = 0xffff; | ||
1429 | sec_mask = 0x10000; | ||
1430 | goto update_flash; | ||
1431 | } | ||
1432 | qla2x00_get_flash_manufacturer(ha, &man_id, &flash_id); | ||
1433 | switch (man_id) { | ||
1434 | case 0x20: /* ST flash. */ | ||
1435 | if (flash_id == 0xd2 || flash_id == 0xe3) { | ||
1436 | /* | ||
1437 | * ST m29w008at part - 64kb sector size with | ||
1438 | * 32kb,8kb,8kb,16kb sectors at memory address | ||
1439 | * 0xf0000. | ||
1440 | */ | ||
1441 | rest_addr = 0xffff; | ||
1442 | sec_mask = 0x10000; | ||
1443 | break; | ||
1444 | } | ||
1445 | /* | ||
1446 | * ST m29w010b part - 16kb sector size | ||
1447 | * Default to 16kb sectors | ||
1448 | */ | ||
1449 | rest_addr = 0x3fff; | ||
1450 | sec_mask = 0x1c000; | ||
1451 | break; | ||
1452 | case 0x40: /* Mostel flash. */ | ||
1453 | /* Mostel v29c51001 part - 512 byte sector size. */ | ||
1454 | rest_addr = 0x1ff; | ||
1455 | sec_mask = 0x1fe00; | ||
1456 | break; | ||
1457 | case 0xbf: /* SST flash. */ | ||
1458 | /* SST39sf10 part - 4kb sector size. */ | ||
1459 | rest_addr = 0xfff; | ||
1460 | sec_mask = 0x1f000; | ||
1461 | break; | ||
1462 | case 0xda: /* Winbond flash. */ | ||
1463 | /* Winbond W29EE011 part - 256 byte sector size. */ | ||
1464 | rest_addr = 0x7f; | ||
1465 | sec_mask = 0x1ff80; | ||
1466 | break; | ||
1467 | case 0xc2: /* Macronix flash. */ | ||
1468 | /* 64k sector size. */ | ||
1469 | if (flash_id == 0x38 || flash_id == 0x4f) { | ||
1470 | rest_addr = 0xffff; | ||
1471 | sec_mask = 0x10000; | ||
1472 | break; | ||
1473 | } | ||
1474 | /* Fall through... */ | ||
1475 | |||
1476 | case 0x1f: /* Atmel flash. */ | ||
1477 | /* 512k sector size. */ | ||
1478 | if (flash_id == 0x13) { | ||
1479 | rest_addr = 0x7fffffff; | ||
1480 | sec_mask = 0x80000000; | ||
1481 | break; | ||
1482 | } | ||
1483 | /* Fall through... */ | ||
1484 | |||
1485 | case 0x01: /* AMD flash. */ | ||
1486 | if (flash_id == 0x38 || flash_id == 0x40 || | ||
1487 | flash_id == 0x4f) { | ||
1488 | /* Am29LV081 part - 64kb sector size. */ | ||
1489 | /* Am29LV002BT part - 64kb sector size. */ | ||
1490 | rest_addr = 0xffff; | ||
1491 | sec_mask = 0x10000; | ||
1492 | break; | ||
1493 | } else if (flash_id == 0x3e) { | ||
1494 | /* | ||
1495 | * Am29LV008b part - 64kb sector size with | ||
1496 | * 32kb,8kb,8kb,16kb sector at memory address | ||
1497 | * h0xf0000. | ||
1498 | */ | ||
1499 | rest_addr = 0xffff; | ||
1500 | sec_mask = 0x10000; | ||
1501 | break; | ||
1502 | } else if (flash_id == 0x20 || flash_id == 0x6e) { | ||
1503 | /* | ||
1504 | * Am29LV010 part or AM29f010 - 16kb sector | ||
1505 | * size. | ||
1506 | */ | ||
1507 | rest_addr = 0x3fff; | ||
1508 | sec_mask = 0x1c000; | ||
1509 | break; | ||
1510 | } else if (flash_id == 0x6d) { | ||
1511 | /* Am29LV001 part - 8kb sector size. */ | ||
1512 | rest_addr = 0x1fff; | ||
1513 | sec_mask = 0x1e000; | ||
1514 | break; | ||
1515 | } | ||
1516 | default: | ||
1517 | /* Default to 16 kb sector size. */ | ||
1518 | rest_addr = 0x3fff; | ||
1519 | sec_mask = 0x1c000; | ||
1520 | break; | ||
1521 | } | ||
1522 | |||
1523 | update_flash: | ||
1524 | if (IS_QLA2322(ha) || IS_QLA6322(ha)) { | ||
1525 | if (qla2x00_erase_flash(ha, man_id, flash_id)) { | ||
1526 | rval = QLA_FUNCTION_FAILED; | ||
1527 | break; | ||
1528 | } | ||
1529 | } | ||
1530 | |||
1531 | for (addr = offset, liter = 0; liter < length; liter++, | ||
1532 | addr++) { | ||
1533 | data = buf[liter]; | ||
1534 | /* Are we at the beginning of a sector? */ | ||
1535 | if ((addr & rest_addr) == 0) { | ||
1536 | if (IS_QLA2322(ha) || IS_QLA6322(ha)) { | ||
1537 | if (addr >= 0x10000UL) { | ||
1538 | if (((addr >> 12) & 0xf0) && | ||
1539 | ((man_id == 0x01 && | ||
1540 | flash_id == 0x3e) || | ||
1541 | (man_id == 0x20 && | ||
1542 | flash_id == 0xd2))) { | ||
1543 | sec_number++; | ||
1544 | if (sec_number == 1) { | ||
1545 | rest_addr = | ||
1546 | 0x7fff; | ||
1547 | sec_mask = | ||
1548 | 0x18000; | ||
1549 | } else if ( | ||
1550 | sec_number == 2 || | ||
1551 | sec_number == 3) { | ||
1552 | rest_addr = | ||
1553 | 0x1fff; | ||
1554 | sec_mask = | ||
1555 | 0x1e000; | ||
1556 | } else if ( | ||
1557 | sec_number == 4) { | ||
1558 | rest_addr = | ||
1559 | 0x3fff; | ||
1560 | sec_mask = | ||
1561 | 0x1c000; | ||
1562 | } | ||
1563 | } | ||
1564 | } | ||
1565 | } else if (addr == ha->optrom_size / 2) { | ||
1566 | WRT_REG_WORD(®->nvram, NVR_SELECT); | ||
1567 | RD_REG_WORD(®->nvram); | ||
1568 | } | ||
1569 | |||
1570 | if (flash_id == 0xda && man_id == 0xc1) { | ||
1571 | qla2x00_write_flash_byte(ha, 0x5555, | ||
1572 | 0xaa); | ||
1573 | qla2x00_write_flash_byte(ha, 0x2aaa, | ||
1574 | 0x55); | ||
1575 | qla2x00_write_flash_byte(ha, 0x5555, | ||
1576 | 0xa0); | ||
1577 | } else if (!IS_QLA2322(ha) && !IS_QLA6322(ha)) { | ||
1578 | /* Then erase it */ | ||
1579 | if (qla2x00_erase_flash_sector(ha, | ||
1580 | addr, sec_mask, man_id, | ||
1581 | flash_id)) { | ||
1582 | rval = QLA_FUNCTION_FAILED; | ||
1583 | break; | ||
1584 | } | ||
1585 | if (man_id == 0x01 && flash_id == 0x6d) | ||
1586 | sec_number++; | ||
1587 | } | ||
1588 | } | ||
1589 | |||
1590 | if (man_id == 0x01 && flash_id == 0x6d) { | ||
1591 | if (sec_number == 1 && | ||
1592 | addr == (rest_addr - 1)) { | ||
1593 | rest_addr = 0x0fff; | ||
1594 | sec_mask = 0x1f000; | ||
1595 | } else if (sec_number == 3 && (addr & 0x7ffe)) { | ||
1596 | rest_addr = 0x3fff; | ||
1597 | sec_mask = 0x1c000; | ||
1598 | } | ||
1599 | } | ||
1600 | |||
1601 | if (qla2x00_program_flash_address(ha, addr, data, | ||
1602 | man_id, flash_id)) { | ||
1603 | rval = QLA_FUNCTION_FAILED; | ||
1604 | break; | ||
1605 | } | ||
1606 | } | ||
1607 | } while (0); | ||
1608 | qla2x00_flash_disable(ha); | ||
1609 | spin_unlock_irqrestore(&ha->hardware_lock, flags); | ||
1610 | |||
1611 | /* Resume HBA. */ | ||
1612 | qla2x00_resume_hba(ha); | ||
1613 | |||
1614 | return rval; | ||
1615 | } | ||
1616 | |||
1617 | uint8_t * | ||
1618 | qla24xx_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf, | ||
1619 | uint32_t offset, uint32_t length) | ||
1620 | { | ||
1621 | /* Suspend HBA. */ | ||
1622 | scsi_block_requests(ha->host); | ||
1623 | ha->isp_ops.disable_intrs(ha); | ||
1624 | set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); | ||
1625 | |||
1626 | /* Go with read. */ | ||
1627 | qla24xx_read_flash_data(ha, (uint32_t *)buf, offset >> 2, length >> 2); | ||
1628 | |||
1629 | /* Resume HBA. */ | ||
1630 | clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); | ||
1631 | ha->isp_ops.enable_intrs(ha); | ||
1632 | scsi_unblock_requests(ha->host); | ||
1633 | |||
1634 | return buf; | ||
1635 | } | ||
1636 | |||
1637 | int | ||
1638 | qla24xx_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf, | ||
1639 | uint32_t offset, uint32_t length) | ||
1640 | { | ||
1641 | int rval; | ||
1642 | |||
1643 | /* Suspend HBA. */ | ||
1644 | scsi_block_requests(ha->host); | ||
1645 | ha->isp_ops.disable_intrs(ha); | ||
1646 | set_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); | ||
1647 | |||
1648 | /* Go with write. */ | ||
1649 | rval = qla24xx_write_flash_data(ha, (uint32_t *)buf, offset >> 2, | ||
1650 | length >> 2); | ||
1651 | |||
1652 | /* Resume HBA -- RISC reset needed. */ | ||
1653 | clear_bit(MBX_UPDATE_FLASH_ACTIVE, &ha->mbx_cmd_flags); | ||
1654 | set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags); | ||
1655 | up(ha->dpc_wait); | ||
1656 | qla2x00_wait_for_hba_online(ha); | ||
1657 | scsi_unblock_requests(ha->host); | ||
1658 | |||
1659 | return rval; | ||
1660 | } | ||
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index 6fddf17a3b70..2770005324b4 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
@@ -997,6 +997,7 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) | |||
997 | case ATA_CMD_READ_EXT: | 997 | case ATA_CMD_READ_EXT: |
998 | case ATA_CMD_WRITE: | 998 | case ATA_CMD_WRITE: |
999 | case ATA_CMD_WRITE_EXT: | 999 | case ATA_CMD_WRITE_EXT: |
1000 | case ATA_CMD_WRITE_FUA_EXT: | ||
1000 | mv_crqb_pack_cmd(cw++, tf->hob_nsect, ATA_REG_NSECT, 0); | 1001 | mv_crqb_pack_cmd(cw++, tf->hob_nsect, ATA_REG_NSECT, 0); |
1001 | break; | 1002 | break; |
1002 | #ifdef LIBATA_NCQ /* FIXME: remove this line when NCQ added */ | 1003 | #ifdef LIBATA_NCQ /* FIXME: remove this line when NCQ added */ |
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c index de05e2883f9c..80480f0fb2b8 100644 --- a/drivers/scsi/sata_qstor.c +++ b/drivers/scsi/sata_qstor.c | |||
@@ -277,7 +277,7 @@ static unsigned int qs_fill_sg(struct ata_queued_cmd *qc) | |||
277 | u8 *prd = pp->pkt + QS_CPB_BYTES; | 277 | u8 *prd = pp->pkt + QS_CPB_BYTES; |
278 | 278 | ||
279 | assert(qc->__sg != NULL); | 279 | assert(qc->__sg != NULL); |
280 | assert(qc->n_elem > 0); | 280 | assert(qc->n_elem > 0 || qc->pad_len > 0); |
281 | 281 | ||
282 | nelem = 0; | 282 | nelem = 0; |
283 | ata_for_each_sg(sg, qc) { | 283 | ata_for_each_sg(sg, qc) { |
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index 2e2c3b7acb0c..e484e8db6810 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c | |||
@@ -81,6 +81,19 @@ | |||
81 | /* Port stride */ | 81 | /* Port stride */ |
82 | #define VSC_SATA_PORT_OFFSET 0x200 | 82 | #define VSC_SATA_PORT_OFFSET 0x200 |
83 | 83 | ||
84 | /* Error interrupt status bit offsets */ | ||
85 | #define VSC_SATA_INT_ERROR_E_OFFSET 2 | ||
86 | #define VSC_SATA_INT_ERROR_P_OFFSET 4 | ||
87 | #define VSC_SATA_INT_ERROR_T_OFFSET 5 | ||
88 | #define VSC_SATA_INT_ERROR_M_OFFSET 1 | ||
89 | #define is_vsc_sata_int_err(port_idx, int_status) \ | ||
90 | (int_status & ((1 << (VSC_SATA_INT_ERROR_E_OFFSET + (8 * port_idx))) | \ | ||
91 | (1 << (VSC_SATA_INT_ERROR_P_OFFSET + (8 * port_idx))) | \ | ||
92 | (1 << (VSC_SATA_INT_ERROR_T_OFFSET + (8 * port_idx))) | \ | ||
93 | (1 << (VSC_SATA_INT_ERROR_M_OFFSET + (8 * port_idx))) \ | ||
94 | )\ | ||
95 | ) | ||
96 | |||
84 | 97 | ||
85 | static u32 vsc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg) | 98 | static u32 vsc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg) |
86 | { | 99 | { |
@@ -201,13 +214,28 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance, | |||
201 | struct ata_port *ap; | 214 | struct ata_port *ap; |
202 | 215 | ||
203 | ap = host_set->ports[i]; | 216 | ap = host_set->ports[i]; |
217 | |||
218 | if (is_vsc_sata_int_err(i, int_status)) { | ||
219 | u32 err_status; | ||
220 | printk(KERN_DEBUG "%s: ignoring interrupt(s)\n", __FUNCTION__); | ||
221 | err_status = ap ? vsc_sata_scr_read(ap, SCR_ERROR) : 0; | ||
222 | vsc_sata_scr_write(ap, SCR_ERROR, err_status); | ||
223 | handled++; | ||
224 | } | ||
225 | |||
204 | if (ap && !(ap->flags & | 226 | if (ap && !(ap->flags & |
205 | (ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) { | 227 | (ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) { |
206 | struct ata_queued_cmd *qc; | 228 | struct ata_queued_cmd *qc; |
207 | 229 | ||
208 | qc = ata_qc_from_tag(ap, ap->active_tag); | 230 | qc = ata_qc_from_tag(ap, ap->active_tag); |
209 | if (qc && (!(qc->tf.ctl & ATA_NIEN))) | 231 | if (qc && (!(qc->tf.ctl & ATA_NIEN))) { |
210 | handled += ata_host_intr(ap, qc); | 232 | handled += ata_host_intr(ap, qc); |
233 | } else { | ||
234 | printk(KERN_DEBUG "%s: ignoring interrupt(s)\n", __FUNCTION__); | ||
235 | ata_chk_status(ap); | ||
236 | handled++; | ||
237 | } | ||
238 | |||
211 | } | 239 | } |
212 | } | 240 | } |
213 | } | 241 | } |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 4a602853a98e..4362dcde74af 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
19 | #include <linux/hardirq.h> | ||
19 | 20 | ||
20 | #include <scsi/scsi.h> | 21 | #include <scsi/scsi.h> |
21 | #include <scsi/scsi_dbg.h> | 22 | #include <scsi/scsi_dbg.h> |
@@ -2248,3 +2249,61 @@ scsi_target_unblock(struct device *dev) | |||
2248 | device_for_each_child(dev, NULL, target_unblock); | 2249 | device_for_each_child(dev, NULL, target_unblock); |
2249 | } | 2250 | } |
2250 | EXPORT_SYMBOL_GPL(scsi_target_unblock); | 2251 | EXPORT_SYMBOL_GPL(scsi_target_unblock); |
2252 | |||
2253 | |||
2254 | struct work_queue_work { | ||
2255 | struct work_struct work; | ||
2256 | void (*fn)(void *); | ||
2257 | void *data; | ||
2258 | }; | ||
2259 | |||
2260 | static void execute_in_process_context_work(void *data) | ||
2261 | { | ||
2262 | void (*fn)(void *data); | ||
2263 | struct work_queue_work *wqw = data; | ||
2264 | |||
2265 | fn = wqw->fn; | ||
2266 | data = wqw->data; | ||
2267 | |||
2268 | kfree(wqw); | ||
2269 | |||
2270 | fn(data); | ||
2271 | } | ||
2272 | |||
2273 | /** | ||
2274 | * scsi_execute_in_process_context - reliably execute the routine with user context | ||
2275 | * @fn: the function to execute | ||
2276 | * @data: data to pass to the function | ||
2277 | * | ||
2278 | * Executes the function immediately if process context is available, | ||
2279 | * otherwise schedules the function for delayed execution. | ||
2280 | * | ||
2281 | * Returns: 0 - function was executed | ||
2282 | * 1 - function was scheduled for execution | ||
2283 | * <0 - error | ||
2284 | */ | ||
2285 | int scsi_execute_in_process_context(void (*fn)(void *data), void *data) | ||
2286 | { | ||
2287 | struct work_queue_work *wqw; | ||
2288 | |||
2289 | if (!in_interrupt()) { | ||
2290 | fn(data); | ||
2291 | return 0; | ||
2292 | } | ||
2293 | |||
2294 | wqw = kmalloc(sizeof(struct work_queue_work), GFP_ATOMIC); | ||
2295 | |||
2296 | if (unlikely(!wqw)) { | ||
2297 | printk(KERN_ERR "Failed to allocate memory\n"); | ||
2298 | WARN_ON(1); | ||
2299 | return -ENOMEM; | ||
2300 | } | ||
2301 | |||
2302 | INIT_WORK(&wqw->work, execute_in_process_context_work, wqw); | ||
2303 | wqw->fn = fn; | ||
2304 | wqw->data = data; | ||
2305 | schedule_work(&wqw->work); | ||
2306 | |||
2307 | return 1; | ||
2308 | } | ||
2309 | EXPORT_SYMBOL_GPL(scsi_execute_in_process_context); | ||
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 752fb5da3de4..5acb83ca5ae5 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
@@ -387,19 +387,12 @@ static struct scsi_target *scsi_alloc_target(struct device *parent, | |||
387 | return found_target; | 387 | return found_target; |
388 | } | 388 | } |
389 | 389 | ||
390 | struct work_queue_wrapper { | 390 | static void scsi_target_reap_usercontext(void *data) |
391 | struct work_struct work; | 391 | { |
392 | struct scsi_target *starget; | 392 | struct scsi_target *starget = data; |
393 | }; | ||
394 | |||
395 | static void scsi_target_reap_work(void *data) { | ||
396 | struct work_queue_wrapper *wqw = (struct work_queue_wrapper *)data; | ||
397 | struct scsi_target *starget = wqw->starget; | ||
398 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); | 393 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); |
399 | unsigned long flags; | 394 | unsigned long flags; |
400 | 395 | ||
401 | kfree(wqw); | ||
402 | |||
403 | spin_lock_irqsave(shost->host_lock, flags); | 396 | spin_lock_irqsave(shost->host_lock, flags); |
404 | 397 | ||
405 | if (--starget->reap_ref == 0 && list_empty(&starget->devices)) { | 398 | if (--starget->reap_ref == 0 && list_empty(&starget->devices)) { |
@@ -428,18 +421,7 @@ static void scsi_target_reap_work(void *data) { | |||
428 | */ | 421 | */ |
429 | void scsi_target_reap(struct scsi_target *starget) | 422 | void scsi_target_reap(struct scsi_target *starget) |
430 | { | 423 | { |
431 | struct work_queue_wrapper *wqw = | 424 | scsi_execute_in_process_context(scsi_target_reap_usercontext, starget); |
432 | kzalloc(sizeof(struct work_queue_wrapper), GFP_ATOMIC); | ||
433 | |||
434 | if (!wqw) { | ||
435 | starget_printk(KERN_ERR, starget, | ||
436 | "Failed to allocate memory in scsi_reap_target()\n"); | ||
437 | return; | ||
438 | } | ||
439 | |||
440 | INIT_WORK(&wqw->work, scsi_target_reap_work, wqw); | ||
441 | wqw->starget = starget; | ||
442 | schedule_work(&wqw->work); | ||
443 | } | 425 | } |
444 | 426 | ||
445 | /** | 427 | /** |
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index a77b32deaf8f..902a5def8e62 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
@@ -217,8 +217,9 @@ static void scsi_device_cls_release(struct class_device *class_dev) | |||
217 | put_device(&sdev->sdev_gendev); | 217 | put_device(&sdev->sdev_gendev); |
218 | } | 218 | } |
219 | 219 | ||
220 | static void scsi_device_dev_release(struct device *dev) | 220 | static void scsi_device_dev_release_usercontext(void *data) |
221 | { | 221 | { |
222 | struct device *dev = data; | ||
222 | struct scsi_device *sdev; | 223 | struct scsi_device *sdev; |
223 | struct device *parent; | 224 | struct device *parent; |
224 | struct scsi_target *starget; | 225 | struct scsi_target *starget; |
@@ -237,6 +238,7 @@ static void scsi_device_dev_release(struct device *dev) | |||
237 | 238 | ||
238 | if (sdev->request_queue) { | 239 | if (sdev->request_queue) { |
239 | sdev->request_queue->queuedata = NULL; | 240 | sdev->request_queue->queuedata = NULL; |
241 | /* user context needed to free queue */ | ||
240 | scsi_free_queue(sdev->request_queue); | 242 | scsi_free_queue(sdev->request_queue); |
241 | /* temporary expedient, try to catch use of queue lock | 243 | /* temporary expedient, try to catch use of queue lock |
242 | * after free of sdev */ | 244 | * after free of sdev */ |
@@ -252,6 +254,11 @@ static void scsi_device_dev_release(struct device *dev) | |||
252 | put_device(parent); | 254 | put_device(parent); |
253 | } | 255 | } |
254 | 256 | ||
257 | static void scsi_device_dev_release(struct device *dev) | ||
258 | { | ||
259 | scsi_execute_in_process_context(scsi_device_dev_release_usercontext, dev); | ||
260 | } | ||
261 | |||
255 | static struct class sdev_class = { | 262 | static struct class sdev_class = { |
256 | .name = "scsi_device", | 263 | .name = "scsi_device", |
257 | .release = scsi_device_cls_release, | 264 | .release = scsi_device_cls_release, |
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 723f7acbeb12..71e54a64adca 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
@@ -39,10 +39,6 @@ struct iscsi_internal { | |||
39 | struct iscsi_transport *iscsi_transport; | 39 | struct iscsi_transport *iscsi_transport; |
40 | struct list_head list; | 40 | struct list_head list; |
41 | /* | 41 | /* |
42 | * List of sessions for this transport | ||
43 | */ | ||
44 | struct list_head sessions; | ||
45 | /* | ||
46 | * based on transport capabilities, at register time we set these | 42 | * based on transport capabilities, at register time we set these |
47 | * bits to tell the transport class it wants attributes displayed | 43 | * bits to tell the transport class it wants attributes displayed |
48 | * in sysfs or that it can support different iSCSI Data-Path | 44 | * in sysfs or that it can support different iSCSI Data-Path |
@@ -164,9 +160,43 @@ static struct mempool_zone *z_reply; | |||
164 | #define Z_MAX_ERROR 16 | 160 | #define Z_MAX_ERROR 16 |
165 | #define Z_HIWAT_ERROR 12 | 161 | #define Z_HIWAT_ERROR 12 |
166 | 162 | ||
163 | static LIST_HEAD(sesslist); | ||
164 | static DEFINE_SPINLOCK(sesslock); | ||
167 | static LIST_HEAD(connlist); | 165 | static LIST_HEAD(connlist); |
168 | static DEFINE_SPINLOCK(connlock); | 166 | static DEFINE_SPINLOCK(connlock); |
169 | 167 | ||
168 | static struct iscsi_cls_session *iscsi_session_lookup(uint64_t handle) | ||
169 | { | ||
170 | unsigned long flags; | ||
171 | struct iscsi_cls_session *sess; | ||
172 | |||
173 | spin_lock_irqsave(&sesslock, flags); | ||
174 | list_for_each_entry(sess, &sesslist, sess_list) { | ||
175 | if (sess == iscsi_ptr(handle)) { | ||
176 | spin_unlock_irqrestore(&sesslock, flags); | ||
177 | return sess; | ||
178 | } | ||
179 | } | ||
180 | spin_unlock_irqrestore(&sesslock, flags); | ||
181 | return NULL; | ||
182 | } | ||
183 | |||
184 | static struct iscsi_cls_conn *iscsi_conn_lookup(uint64_t handle) | ||
185 | { | ||
186 | unsigned long flags; | ||
187 | struct iscsi_cls_conn *conn; | ||
188 | |||
189 | spin_lock_irqsave(&connlock, flags); | ||
190 | list_for_each_entry(conn, &connlist, conn_list) { | ||
191 | if (conn == iscsi_ptr(handle)) { | ||
192 | spin_unlock_irqrestore(&connlock, flags); | ||
193 | return conn; | ||
194 | } | ||
195 | } | ||
196 | spin_unlock_irqrestore(&connlock, flags); | ||
197 | return NULL; | ||
198 | } | ||
199 | |||
170 | /* | 200 | /* |
171 | * The following functions can be used by LLDs that allocate | 201 | * The following functions can be used by LLDs that allocate |
172 | * their own scsi_hosts or by software iscsi LLDs | 202 | * their own scsi_hosts or by software iscsi LLDs |
@@ -365,6 +395,7 @@ iscsi_transport_create_session(struct scsi_transport_template *scsit, | |||
365 | { | 395 | { |
366 | struct iscsi_cls_session *session; | 396 | struct iscsi_cls_session *session; |
367 | struct Scsi_Host *shost; | 397 | struct Scsi_Host *shost; |
398 | unsigned long flags; | ||
368 | 399 | ||
369 | shost = scsi_host_alloc(transport->host_template, | 400 | shost = scsi_host_alloc(transport->host_template, |
370 | hostdata_privsize(transport)); | 401 | hostdata_privsize(transport)); |
@@ -389,6 +420,9 @@ iscsi_transport_create_session(struct scsi_transport_template *scsit, | |||
389 | goto remove_host; | 420 | goto remove_host; |
390 | 421 | ||
391 | *(unsigned long*)shost->hostdata = (unsigned long)session; | 422 | *(unsigned long*)shost->hostdata = (unsigned long)session; |
423 | spin_lock_irqsave(&sesslock, flags); | ||
424 | list_add(&session->sess_list, &sesslist); | ||
425 | spin_unlock_irqrestore(&sesslock, flags); | ||
392 | return shost; | 426 | return shost; |
393 | 427 | ||
394 | remove_host: | 428 | remove_host: |
@@ -410,9 +444,13 @@ EXPORT_SYMBOL_GPL(iscsi_transport_create_session); | |||
410 | int iscsi_transport_destroy_session(struct Scsi_Host *shost) | 444 | int iscsi_transport_destroy_session(struct Scsi_Host *shost) |
411 | { | 445 | { |
412 | struct iscsi_cls_session *session; | 446 | struct iscsi_cls_session *session; |
447 | unsigned long flags; | ||
413 | 448 | ||
414 | scsi_remove_host(shost); | 449 | scsi_remove_host(shost); |
415 | session = hostdata_session(shost->hostdata); | 450 | session = hostdata_session(shost->hostdata); |
451 | spin_lock_irqsave(&sesslock, flags); | ||
452 | list_del(&session->sess_list); | ||
453 | spin_unlock_irqrestore(&sesslock, flags); | ||
416 | iscsi_destroy_session(session); | 454 | iscsi_destroy_session(session); |
417 | /* ref from host alloc */ | 455 | /* ref from host alloc */ |
418 | scsi_host_put(shost); | 456 | scsi_host_put(shost); |
@@ -424,22 +462,6 @@ EXPORT_SYMBOL_GPL(iscsi_transport_destroy_session); | |||
424 | /* | 462 | /* |
425 | * iscsi interface functions | 463 | * iscsi interface functions |
426 | */ | 464 | */ |
427 | static struct iscsi_cls_conn* | ||
428 | iscsi_if_find_conn(uint64_t key) | ||
429 | { | ||
430 | unsigned long flags; | ||
431 | struct iscsi_cls_conn *conn; | ||
432 | |||
433 | spin_lock_irqsave(&connlock, flags); | ||
434 | list_for_each_entry(conn, &connlist, conn_list) | ||
435 | if (conn->connh == key) { | ||
436 | spin_unlock_irqrestore(&connlock, flags); | ||
437 | return conn; | ||
438 | } | ||
439 | spin_unlock_irqrestore(&connlock, flags); | ||
440 | return NULL; | ||
441 | } | ||
442 | |||
443 | static struct iscsi_internal * | 465 | static struct iscsi_internal * |
444 | iscsi_if_transport_lookup(struct iscsi_transport *tt) | 466 | iscsi_if_transport_lookup(struct iscsi_transport *tt) |
445 | { | 467 | { |
@@ -504,6 +526,12 @@ mempool_zone_init(unsigned max, unsigned size, unsigned hiwat) | |||
504 | if (!zp) | 526 | if (!zp) |
505 | return NULL; | 527 | return NULL; |
506 | 528 | ||
529 | zp->size = size; | ||
530 | zp->hiwat = hiwat; | ||
531 | INIT_LIST_HEAD(&zp->freequeue); | ||
532 | spin_lock_init(&zp->freelock); | ||
533 | atomic_set(&zp->allocated, 0); | ||
534 | |||
507 | zp->pool = mempool_create(max, mempool_zone_alloc_skb, | 535 | zp->pool = mempool_create(max, mempool_zone_alloc_skb, |
508 | mempool_zone_free_skb, zp); | 536 | mempool_zone_free_skb, zp); |
509 | if (!zp->pool) { | 537 | if (!zp->pool) { |
@@ -511,13 +539,6 @@ mempool_zone_init(unsigned max, unsigned size, unsigned hiwat) | |||
511 | return NULL; | 539 | return NULL; |
512 | } | 540 | } |
513 | 541 | ||
514 | zp->size = size; | ||
515 | zp->hiwat = hiwat; | ||
516 | |||
517 | INIT_LIST_HEAD(&zp->freequeue); | ||
518 | spin_lock_init(&zp->freelock); | ||
519 | atomic_set(&zp->allocated, 0); | ||
520 | |||
521 | return zp; | 542 | return zp; |
522 | } | 543 | } |
523 | 544 | ||
@@ -559,25 +580,21 @@ iscsi_unicast_skb(struct mempool_zone *zone, struct sk_buff *skb) | |||
559 | return 0; | 580 | return 0; |
560 | } | 581 | } |
561 | 582 | ||
562 | int iscsi_recv_pdu(iscsi_connh_t connh, struct iscsi_hdr *hdr, | 583 | int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr, |
563 | char *data, uint32_t data_size) | 584 | char *data, uint32_t data_size) |
564 | { | 585 | { |
565 | struct nlmsghdr *nlh; | 586 | struct nlmsghdr *nlh; |
566 | struct sk_buff *skb; | 587 | struct sk_buff *skb; |
567 | struct iscsi_uevent *ev; | 588 | struct iscsi_uevent *ev; |
568 | struct iscsi_cls_conn *conn; | ||
569 | char *pdu; | 589 | char *pdu; |
570 | int len = NLMSG_SPACE(sizeof(*ev) + sizeof(struct iscsi_hdr) + | 590 | int len = NLMSG_SPACE(sizeof(*ev) + sizeof(struct iscsi_hdr) + |
571 | data_size); | 591 | data_size); |
572 | 592 | ||
573 | conn = iscsi_if_find_conn(connh); | ||
574 | BUG_ON(!conn); | ||
575 | |||
576 | mempool_zone_complete(conn->z_pdu); | 593 | mempool_zone_complete(conn->z_pdu); |
577 | 594 | ||
578 | skb = mempool_zone_get_skb(conn->z_pdu); | 595 | skb = mempool_zone_get_skb(conn->z_pdu); |
579 | if (!skb) { | 596 | if (!skb) { |
580 | iscsi_conn_error(connh, ISCSI_ERR_CONN_FAILED); | 597 | iscsi_conn_error(conn, ISCSI_ERR_CONN_FAILED); |
581 | dev_printk(KERN_ERR, &conn->dev, "iscsi: can not deliver " | 598 | dev_printk(KERN_ERR, &conn->dev, "iscsi: can not deliver " |
582 | "control PDU: OOM\n"); | 599 | "control PDU: OOM\n"); |
583 | return -ENOMEM; | 600 | return -ENOMEM; |
@@ -590,7 +607,7 @@ int iscsi_recv_pdu(iscsi_connh_t connh, struct iscsi_hdr *hdr, | |||
590 | ev->type = ISCSI_KEVENT_RECV_PDU; | 607 | ev->type = ISCSI_KEVENT_RECV_PDU; |
591 | if (atomic_read(&conn->z_pdu->allocated) >= conn->z_pdu->hiwat) | 608 | if (atomic_read(&conn->z_pdu->allocated) >= conn->z_pdu->hiwat) |
592 | ev->iferror = -ENOMEM; | 609 | ev->iferror = -ENOMEM; |
593 | ev->r.recv_req.conn_handle = connh; | 610 | ev->r.recv_req.conn_handle = iscsi_handle(conn); |
594 | pdu = (char*)ev + sizeof(*ev); | 611 | pdu = (char*)ev + sizeof(*ev); |
595 | memcpy(pdu, hdr, sizeof(struct iscsi_hdr)); | 612 | memcpy(pdu, hdr, sizeof(struct iscsi_hdr)); |
596 | memcpy(pdu + sizeof(struct iscsi_hdr), data, data_size); | 613 | memcpy(pdu + sizeof(struct iscsi_hdr), data, data_size); |
@@ -599,17 +616,13 @@ int iscsi_recv_pdu(iscsi_connh_t connh, struct iscsi_hdr *hdr, | |||
599 | } | 616 | } |
600 | EXPORT_SYMBOL_GPL(iscsi_recv_pdu); | 617 | EXPORT_SYMBOL_GPL(iscsi_recv_pdu); |
601 | 618 | ||
602 | void iscsi_conn_error(iscsi_connh_t connh, enum iscsi_err error) | 619 | void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error) |
603 | { | 620 | { |
604 | struct nlmsghdr *nlh; | 621 | struct nlmsghdr *nlh; |
605 | struct sk_buff *skb; | 622 | struct sk_buff *skb; |
606 | struct iscsi_uevent *ev; | 623 | struct iscsi_uevent *ev; |
607 | struct iscsi_cls_conn *conn; | ||
608 | int len = NLMSG_SPACE(sizeof(*ev)); | 624 | int len = NLMSG_SPACE(sizeof(*ev)); |
609 | 625 | ||
610 | conn = iscsi_if_find_conn(connh); | ||
611 | BUG_ON(!conn); | ||
612 | |||
613 | mempool_zone_complete(conn->z_error); | 626 | mempool_zone_complete(conn->z_error); |
614 | 627 | ||
615 | skb = mempool_zone_get_skb(conn->z_error); | 628 | skb = mempool_zone_get_skb(conn->z_error); |
@@ -626,7 +639,7 @@ void iscsi_conn_error(iscsi_connh_t connh, enum iscsi_err error) | |||
626 | if (atomic_read(&conn->z_error->allocated) >= conn->z_error->hiwat) | 639 | if (atomic_read(&conn->z_error->allocated) >= conn->z_error->hiwat) |
627 | ev->iferror = -ENOMEM; | 640 | ev->iferror = -ENOMEM; |
628 | ev->r.connerror.error = error; | 641 | ev->r.connerror.error = error; |
629 | ev->r.connerror.conn_handle = connh; | 642 | ev->r.connerror.conn_handle = iscsi_handle(conn); |
630 | 643 | ||
631 | iscsi_unicast_skb(conn->z_error, skb); | 644 | iscsi_unicast_skb(conn->z_error, skb); |
632 | 645 | ||
@@ -662,8 +675,7 @@ iscsi_if_send_reply(int pid, int seq, int type, int done, int multi, | |||
662 | } | 675 | } |
663 | 676 | ||
664 | static int | 677 | static int |
665 | iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb, | 678 | iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh) |
666 | struct nlmsghdr *nlh) | ||
667 | { | 679 | { |
668 | struct iscsi_uevent *ev = NLMSG_DATA(nlh); | 680 | struct iscsi_uevent *ev = NLMSG_DATA(nlh); |
669 | struct iscsi_stats *stats; | 681 | struct iscsi_stats *stats; |
@@ -677,7 +689,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb, | |||
677 | ISCSI_STATS_CUSTOM_MAX); | 689 | ISCSI_STATS_CUSTOM_MAX); |
678 | int err = 0; | 690 | int err = 0; |
679 | 691 | ||
680 | conn = iscsi_if_find_conn(ev->u.get_stats.conn_handle); | 692 | conn = iscsi_conn_lookup(ev->u.get_stats.conn_handle); |
681 | if (!conn) | 693 | if (!conn) |
682 | return -EEXIST; | 694 | return -EEXIST; |
683 | 695 | ||
@@ -707,14 +719,14 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb, | |||
707 | ((char*)evstat + sizeof(*evstat)); | 719 | ((char*)evstat + sizeof(*evstat)); |
708 | memset(stats, 0, sizeof(*stats)); | 720 | memset(stats, 0, sizeof(*stats)); |
709 | 721 | ||
710 | transport->get_stats(ev->u.get_stats.conn_handle, stats); | 722 | transport->get_stats(conn, stats); |
711 | actual_size = NLMSG_SPACE(sizeof(struct iscsi_uevent) + | 723 | actual_size = NLMSG_SPACE(sizeof(struct iscsi_uevent) + |
712 | sizeof(struct iscsi_stats) + | 724 | sizeof(struct iscsi_stats) + |
713 | sizeof(struct iscsi_stats_custom) * | 725 | sizeof(struct iscsi_stats_custom) * |
714 | stats->custom_length); | 726 | stats->custom_length); |
715 | actual_size -= sizeof(*nlhstat); | 727 | actual_size -= sizeof(*nlhstat); |
716 | actual_size = NLMSG_LENGTH(actual_size); | 728 | actual_size = NLMSG_LENGTH(actual_size); |
717 | skb_trim(skb, NLMSG_ALIGN(actual_size)); | 729 | skb_trim(skbstat, NLMSG_ALIGN(actual_size)); |
718 | nlhstat->nlmsg_len = actual_size; | 730 | nlhstat->nlmsg_len = actual_size; |
719 | 731 | ||
720 | err = iscsi_unicast_skb(conn->z_pdu, skbstat); | 732 | err = iscsi_unicast_skb(conn->z_pdu, skbstat); |
@@ -727,58 +739,34 @@ static int | |||
727 | iscsi_if_create_session(struct iscsi_internal *priv, struct iscsi_uevent *ev) | 739 | iscsi_if_create_session(struct iscsi_internal *priv, struct iscsi_uevent *ev) |
728 | { | 740 | { |
729 | struct iscsi_transport *transport = priv->iscsi_transport; | 741 | struct iscsi_transport *transport = priv->iscsi_transport; |
730 | struct Scsi_Host *shost; | 742 | struct iscsi_cls_session *session; |
731 | 743 | uint32_t sid; | |
732 | if (!transport->create_session) | ||
733 | return -EINVAL; | ||
734 | 744 | ||
735 | shost = transport->create_session(&priv->t, | 745 | session = transport->create_session(&priv->t, |
736 | ev->u.c_session.initial_cmdsn); | 746 | ev->u.c_session.initial_cmdsn, |
737 | if (!shost) | 747 | &sid); |
748 | if (!session) | ||
738 | return -ENOMEM; | 749 | return -ENOMEM; |
739 | 750 | ||
740 | ev->r.c_session_ret.session_handle = iscsi_handle(iscsi_hostdata(shost->hostdata)); | 751 | ev->r.c_session_ret.session_handle = iscsi_handle(session); |
741 | ev->r.c_session_ret.sid = shost->host_no; | 752 | ev->r.c_session_ret.sid = sid; |
742 | return 0; | 753 | return 0; |
743 | } | 754 | } |
744 | 755 | ||
745 | static int | 756 | static int |
746 | iscsi_if_destroy_session(struct iscsi_internal *priv, struct iscsi_uevent *ev) | 757 | iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev) |
747 | { | 758 | { |
748 | struct iscsi_transport *transport = priv->iscsi_transport; | ||
749 | |||
750 | struct Scsi_Host *shost; | ||
751 | |||
752 | if (!transport->destroy_session) | ||
753 | return -EINVAL; | ||
754 | |||
755 | shost = scsi_host_lookup(ev->u.d_session.sid); | ||
756 | if (shost == ERR_PTR(-ENXIO)) | ||
757 | return -EEXIST; | ||
758 | |||
759 | if (transport->destroy_session) | ||
760 | transport->destroy_session(shost); | ||
761 | /* ref from host lookup */ | ||
762 | scsi_host_put(shost); | ||
763 | return 0; | ||
764 | } | ||
765 | |||
766 | static int | ||
767 | iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev){ | ||
768 | struct Scsi_Host *shost; | ||
769 | struct iscsi_cls_conn *conn; | 759 | struct iscsi_cls_conn *conn; |
760 | struct iscsi_cls_session *session; | ||
770 | unsigned long flags; | 761 | unsigned long flags; |
771 | 762 | ||
772 | if (!transport->create_conn) | 763 | session = iscsi_session_lookup(ev->u.c_conn.session_handle); |
764 | if (!session) | ||
773 | return -EINVAL; | 765 | return -EINVAL; |
774 | 766 | ||
775 | shost = scsi_host_lookup(ev->u.c_conn.sid); | 767 | conn = transport->create_conn(session, ev->u.c_conn.cid); |
776 | if (shost == ERR_PTR(-ENXIO)) | ||
777 | return -EEXIST; | ||
778 | |||
779 | conn = transport->create_conn(shost, ev->u.c_conn.cid); | ||
780 | if (!conn) | 768 | if (!conn) |
781 | goto release_ref; | 769 | return -ENOMEM; |
782 | 770 | ||
783 | conn->z_pdu = mempool_zone_init(Z_MAX_PDU, | 771 | conn->z_pdu = mempool_zone_init(Z_MAX_PDU, |
784 | NLMSG_SPACE(sizeof(struct iscsi_uevent) + | 772 | NLMSG_SPACE(sizeof(struct iscsi_uevent) + |
@@ -800,14 +788,13 @@ iscsi_if_create_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev) | |||
800 | goto free_pdu_pool; | 788 | goto free_pdu_pool; |
801 | } | 789 | } |
802 | 790 | ||
803 | ev->r.handle = conn->connh = iscsi_handle(conn->dd_data); | 791 | ev->r.handle = iscsi_handle(conn); |
804 | 792 | ||
805 | spin_lock_irqsave(&connlock, flags); | 793 | spin_lock_irqsave(&connlock, flags); |
806 | list_add(&conn->conn_list, &connlist); | 794 | list_add(&conn->conn_list, &connlist); |
807 | conn->active = 1; | 795 | conn->active = 1; |
808 | spin_unlock_irqrestore(&connlock, flags); | 796 | spin_unlock_irqrestore(&connlock, flags); |
809 | 797 | ||
810 | scsi_host_put(shost); | ||
811 | return 0; | 798 | return 0; |
812 | 799 | ||
813 | free_pdu_pool: | 800 | free_pdu_pool: |
@@ -815,8 +802,6 @@ free_pdu_pool: | |||
815 | destroy_conn: | 802 | destroy_conn: |
816 | if (transport->destroy_conn) | 803 | if (transport->destroy_conn) |
817 | transport->destroy_conn(conn->dd_data); | 804 | transport->destroy_conn(conn->dd_data); |
818 | release_ref: | ||
819 | scsi_host_put(shost); | ||
820 | return -ENOMEM; | 805 | return -ENOMEM; |
821 | } | 806 | } |
822 | 807 | ||
@@ -827,13 +812,9 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev | |||
827 | struct iscsi_cls_conn *conn; | 812 | struct iscsi_cls_conn *conn; |
828 | struct mempool_zone *z_error, *z_pdu; | 813 | struct mempool_zone *z_error, *z_pdu; |
829 | 814 | ||
830 | conn = iscsi_if_find_conn(ev->u.d_conn.conn_handle); | 815 | conn = iscsi_conn_lookup(ev->u.d_conn.conn_handle); |
831 | if (!conn) | 816 | if (!conn) |
832 | return -EEXIST; | ||
833 | |||
834 | if (!transport->destroy_conn) | ||
835 | return -EINVAL; | 817 | return -EINVAL; |
836 | |||
837 | spin_lock_irqsave(&connlock, flags); | 818 | spin_lock_irqsave(&connlock, flags); |
838 | conn->active = 0; | 819 | conn->active = 0; |
839 | list_del(&conn->conn_list); | 820 | list_del(&conn->conn_list); |
@@ -858,23 +839,27 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
858 | struct iscsi_uevent *ev = NLMSG_DATA(nlh); | 839 | struct iscsi_uevent *ev = NLMSG_DATA(nlh); |
859 | struct iscsi_transport *transport = NULL; | 840 | struct iscsi_transport *transport = NULL; |
860 | struct iscsi_internal *priv; | 841 | struct iscsi_internal *priv; |
861 | 842 | struct iscsi_cls_session *session; | |
862 | if (NETLINK_CREDS(skb)->uid) | 843 | struct iscsi_cls_conn *conn; |
863 | return -EPERM; | ||
864 | 844 | ||
865 | priv = iscsi_if_transport_lookup(iscsi_ptr(ev->transport_handle)); | 845 | priv = iscsi_if_transport_lookup(iscsi_ptr(ev->transport_handle)); |
866 | if (!priv) | 846 | if (!priv) |
867 | return -EINVAL; | 847 | return -EINVAL; |
868 | transport = priv->iscsi_transport; | 848 | transport = priv->iscsi_transport; |
869 | 849 | ||
870 | daemon_pid = NETLINK_CREDS(skb)->pid; | 850 | if (!try_module_get(transport->owner)) |
851 | return -EINVAL; | ||
871 | 852 | ||
872 | switch (nlh->nlmsg_type) { | 853 | switch (nlh->nlmsg_type) { |
873 | case ISCSI_UEVENT_CREATE_SESSION: | 854 | case ISCSI_UEVENT_CREATE_SESSION: |
874 | err = iscsi_if_create_session(priv, ev); | 855 | err = iscsi_if_create_session(priv, ev); |
875 | break; | 856 | break; |
876 | case ISCSI_UEVENT_DESTROY_SESSION: | 857 | case ISCSI_UEVENT_DESTROY_SESSION: |
877 | err = iscsi_if_destroy_session(priv, ev); | 858 | session = iscsi_session_lookup(ev->u.d_session.session_handle); |
859 | if (session) | ||
860 | transport->destroy_session(session); | ||
861 | else | ||
862 | err = -EINVAL; | ||
878 | break; | 863 | break; |
879 | case ISCSI_UEVENT_CREATE_CONN: | 864 | case ISCSI_UEVENT_CREATE_CONN: |
880 | err = iscsi_if_create_conn(transport, ev); | 865 | err = iscsi_if_create_conn(transport, ev); |
@@ -883,56 +868,64 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
883 | err = iscsi_if_destroy_conn(transport, ev); | 868 | err = iscsi_if_destroy_conn(transport, ev); |
884 | break; | 869 | break; |
885 | case ISCSI_UEVENT_BIND_CONN: | 870 | case ISCSI_UEVENT_BIND_CONN: |
886 | if (!iscsi_if_find_conn(ev->u.b_conn.conn_handle)) | 871 | session = iscsi_session_lookup(ev->u.b_conn.session_handle); |
887 | return -EEXIST; | 872 | conn = iscsi_conn_lookup(ev->u.b_conn.conn_handle); |
888 | ev->r.retcode = transport->bind_conn( | 873 | |
889 | ev->u.b_conn.session_handle, | 874 | if (session && conn) |
890 | ev->u.b_conn.conn_handle, | 875 | ev->r.retcode = transport->bind_conn(session, conn, |
891 | ev->u.b_conn.transport_fd, | 876 | ev->u.b_conn.transport_fd, |
892 | ev->u.b_conn.is_leading); | 877 | ev->u.b_conn.is_leading); |
878 | else | ||
879 | err = -EINVAL; | ||
893 | break; | 880 | break; |
894 | case ISCSI_UEVENT_SET_PARAM: | 881 | case ISCSI_UEVENT_SET_PARAM: |
895 | if (!iscsi_if_find_conn(ev->u.set_param.conn_handle)) | 882 | conn = iscsi_conn_lookup(ev->u.set_param.conn_handle); |
896 | return -EEXIST; | 883 | if (conn) |
897 | ev->r.retcode = transport->set_param( | 884 | ev->r.retcode = transport->set_param(conn, |
898 | ev->u.set_param.conn_handle, | 885 | ev->u.set_param.param, ev->u.set_param.value); |
899 | ev->u.set_param.param, ev->u.set_param.value); | 886 | else |
887 | err = -EINVAL; | ||
900 | break; | 888 | break; |
901 | case ISCSI_UEVENT_START_CONN: | 889 | case ISCSI_UEVENT_START_CONN: |
902 | if (!iscsi_if_find_conn(ev->u.start_conn.conn_handle)) | 890 | conn = iscsi_conn_lookup(ev->u.start_conn.conn_handle); |
903 | return -EEXIST; | 891 | if (conn) |
904 | ev->r.retcode = transport->start_conn( | 892 | ev->r.retcode = transport->start_conn(conn); |
905 | ev->u.start_conn.conn_handle); | 893 | else |
894 | err = -EINVAL; | ||
895 | |||
906 | break; | 896 | break; |
907 | case ISCSI_UEVENT_STOP_CONN: | 897 | case ISCSI_UEVENT_STOP_CONN: |
908 | if (!iscsi_if_find_conn(ev->u.stop_conn.conn_handle)) | 898 | conn = iscsi_conn_lookup(ev->u.stop_conn.conn_handle); |
909 | return -EEXIST; | 899 | if (conn) |
910 | transport->stop_conn(ev->u.stop_conn.conn_handle, | 900 | transport->stop_conn(conn, ev->u.stop_conn.flag); |
911 | ev->u.stop_conn.flag); | 901 | else |
902 | err = -EINVAL; | ||
912 | break; | 903 | break; |
913 | case ISCSI_UEVENT_SEND_PDU: | 904 | case ISCSI_UEVENT_SEND_PDU: |
914 | if (!iscsi_if_find_conn(ev->u.send_pdu.conn_handle)) | 905 | conn = iscsi_conn_lookup(ev->u.send_pdu.conn_handle); |
915 | return -EEXIST; | 906 | if (conn) |
916 | ev->r.retcode = transport->send_pdu( | 907 | ev->r.retcode = transport->send_pdu(conn, |
917 | ev->u.send_pdu.conn_handle, | 908 | (struct iscsi_hdr*)((char*)ev + sizeof(*ev)), |
918 | (struct iscsi_hdr*)((char*)ev + sizeof(*ev)), | 909 | (char*)ev + sizeof(*ev) + ev->u.send_pdu.hdr_size, |
919 | (char*)ev + sizeof(*ev) + ev->u.send_pdu.hdr_size, | 910 | ev->u.send_pdu.data_size); |
920 | ev->u.send_pdu.data_size); | 911 | else |
912 | err = -EINVAL; | ||
921 | break; | 913 | break; |
922 | case ISCSI_UEVENT_GET_STATS: | 914 | case ISCSI_UEVENT_GET_STATS: |
923 | err = iscsi_if_get_stats(transport, skb, nlh); | 915 | err = iscsi_if_get_stats(transport, nlh); |
924 | break; | 916 | break; |
925 | default: | 917 | default: |
926 | err = -EINVAL; | 918 | err = -EINVAL; |
927 | break; | 919 | break; |
928 | } | 920 | } |
929 | 921 | ||
922 | module_put(transport->owner); | ||
930 | return err; | 923 | return err; |
931 | } | 924 | } |
932 | 925 | ||
933 | /* Get message from skb (based on rtnetlink_rcv_skb). Each message is | 926 | /* Get message from skb (based on rtnetlink_rcv_skb). Each message is |
934 | * processed by iscsi_if_recv_msg. Malformed skbs with wrong length are | 927 | * processed by iscsi_if_recv_msg. Malformed skbs with wrong length are |
935 | * discarded silently. */ | 928 | * or invalid creds discarded silently. */ |
936 | static void | 929 | static void |
937 | iscsi_if_rx(struct sock *sk, int len) | 930 | iscsi_if_rx(struct sock *sk, int len) |
938 | { | 931 | { |
@@ -940,6 +933,12 @@ iscsi_if_rx(struct sock *sk, int len) | |||
940 | 933 | ||
941 | mutex_lock(&rx_queue_mutex); | 934 | mutex_lock(&rx_queue_mutex); |
942 | while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) { | 935 | while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) { |
936 | if (NETLINK_CREDS(skb)->uid) { | ||
937 | skb_pull(skb, skb->len); | ||
938 | goto free_skb; | ||
939 | } | ||
940 | daemon_pid = NETLINK_CREDS(skb)->pid; | ||
941 | |||
943 | while (skb->len >= NLMSG_SPACE(0)) { | 942 | while (skb->len >= NLMSG_SPACE(0)) { |
944 | int err; | 943 | int err; |
945 | uint32_t rlen; | 944 | uint32_t rlen; |
@@ -951,10 +950,12 @@ iscsi_if_rx(struct sock *sk, int len) | |||
951 | skb->len < nlh->nlmsg_len) { | 950 | skb->len < nlh->nlmsg_len) { |
952 | break; | 951 | break; |
953 | } | 952 | } |
953 | |||
954 | ev = NLMSG_DATA(nlh); | 954 | ev = NLMSG_DATA(nlh); |
955 | rlen = NLMSG_ALIGN(nlh->nlmsg_len); | 955 | rlen = NLMSG_ALIGN(nlh->nlmsg_len); |
956 | if (rlen > skb->len) | 956 | if (rlen > skb->len) |
957 | rlen = skb->len; | 957 | rlen = skb->len; |
958 | |||
958 | err = iscsi_if_recv_msg(skb, nlh); | 959 | err = iscsi_if_recv_msg(skb, nlh); |
959 | if (err) { | 960 | if (err) { |
960 | ev->type = ISCSI_KEVENT_IF_ERROR; | 961 | ev->type = ISCSI_KEVENT_IF_ERROR; |
@@ -978,6 +979,7 @@ iscsi_if_rx(struct sock *sk, int len) | |||
978 | } while (err < 0 && err != -ECONNREFUSED); | 979 | } while (err < 0 && err != -ECONNREFUSED); |
979 | skb_pull(skb, rlen); | 980 | skb_pull(skb, rlen); |
980 | } | 981 | } |
982 | free_skb: | ||
981 | kfree_skb(skb); | 983 | kfree_skb(skb); |
982 | } | 984 | } |
983 | mutex_unlock(&rx_queue_mutex); | 985 | mutex_unlock(&rx_queue_mutex); |
@@ -997,7 +999,7 @@ show_conn_int_param_##param(struct class_device *cdev, char *buf) \ | |||
997 | struct iscsi_cls_conn *conn = iscsi_cdev_to_conn(cdev); \ | 999 | struct iscsi_cls_conn *conn = iscsi_cdev_to_conn(cdev); \ |
998 | struct iscsi_transport *t = conn->transport; \ | 1000 | struct iscsi_transport *t = conn->transport; \ |
999 | \ | 1001 | \ |
1000 | t->get_conn_param(conn->dd_data, param, &value); \ | 1002 | t->get_conn_param(conn, param, &value); \ |
1001 | return snprintf(buf, 20, format"\n", value); \ | 1003 | return snprintf(buf, 20, format"\n", value); \ |
1002 | } | 1004 | } |
1003 | 1005 | ||
@@ -1024,10 +1026,9 @@ show_session_int_param_##param(struct class_device *cdev, char *buf) \ | |||
1024 | { \ | 1026 | { \ |
1025 | uint32_t value = 0; \ | 1027 | uint32_t value = 0; \ |
1026 | struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev); \ | 1028 | struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev); \ |
1027 | struct Scsi_Host *shost = iscsi_session_to_shost(session); \ | ||
1028 | struct iscsi_transport *t = session->transport; \ | 1029 | struct iscsi_transport *t = session->transport; \ |
1029 | \ | 1030 | \ |
1030 | t->get_session_param(shost, param, &value); \ | 1031 | t->get_session_param(session, param, &value); \ |
1031 | return snprintf(buf, 20, format"\n", value); \ | 1032 | return snprintf(buf, 20, format"\n", value); \ |
1032 | } | 1033 | } |
1033 | 1034 | ||
@@ -1121,7 +1122,6 @@ iscsi_register_transport(struct iscsi_transport *tt) | |||
1121 | return NULL; | 1122 | return NULL; |
1122 | memset(priv, 0, sizeof(*priv)); | 1123 | memset(priv, 0, sizeof(*priv)); |
1123 | INIT_LIST_HEAD(&priv->list); | 1124 | INIT_LIST_HEAD(&priv->list); |
1124 | INIT_LIST_HEAD(&priv->sessions); | ||
1125 | priv->iscsi_transport = tt; | 1125 | priv->iscsi_transport = tt; |
1126 | 1126 | ||
1127 | priv->cdev.class = &iscsi_transport_class; | 1127 | priv->cdev.class = &iscsi_transport_class; |
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index 8260f040d39c..f4854c33f48d 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c | |||
@@ -3588,7 +3588,7 @@ static int sym_evaluate_dp(struct sym_hcb *np, struct sym_ccb *cp, u32 scr, int | |||
3588 | 3588 | ||
3589 | if (pm) { | 3589 | if (pm) { |
3590 | dp_scr = scr_to_cpu(pm->ret); | 3590 | dp_scr = scr_to_cpu(pm->ret); |
3591 | dp_ofs -= scr_to_cpu(pm->sg.size); | 3591 | dp_ofs -= scr_to_cpu(pm->sg.size) & 0x00ffffff; |
3592 | } | 3592 | } |
3593 | 3593 | ||
3594 | /* | 3594 | /* |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index b1fc97d5f643..244e8ff11977 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -2198,7 +2198,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count) | |||
2198 | touch_nmi_watchdog(); | 2198 | touch_nmi_watchdog(); |
2199 | 2199 | ||
2200 | /* | 2200 | /* |
2201 | * First save the UER then disable the interrupts | 2201 | * First save the IER then disable the interrupts |
2202 | */ | 2202 | */ |
2203 | ier = serial_in(up, UART_IER); | 2203 | ier = serial_in(up, UART_IER); |
2204 | 2204 | ||
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 0f4361c8466b..b3c561abe3f6 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -902,8 +902,8 @@ config SERIAL_JSM | |||
902 | something like this to connect more than two modems to your Linux | 902 | something like this to connect more than two modems to your Linux |
903 | box, for instance in order to become a dial-in server. This driver | 903 | box, for instance in order to become a dial-in server. This driver |
904 | supports PCI boards only. | 904 | supports PCI boards only. |
905 | If you have a card like this, say Y here and read the file | 905 | |
906 | <file:Documentation/jsm.txt>. | 906 | If you have a card like this, say Y here, otherwise say N. |
907 | 907 | ||
908 | To compile this driver as a module, choose M here: the | 908 | To compile this driver as a module, choose M here: the |
909 | module will be called jsm. | 909 | module will be called jsm. |
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c index 1d85533d46d2..f3763d2ccb86 100644 --- a/drivers/serial/ioc4_serial.c +++ b/drivers/serial/ioc4_serial.c | |||
@@ -1717,11 +1717,9 @@ ioc4_change_speed(struct uart_port *the_port, | |||
1717 | } | 1717 | } |
1718 | 1718 | ||
1719 | if (cflag & CRTSCTS) { | 1719 | if (cflag & CRTSCTS) { |
1720 | info->flags |= ASYNC_CTS_FLOW; | ||
1721 | port->ip_sscr |= IOC4_SSCR_HFC_EN; | 1720 | port->ip_sscr |= IOC4_SSCR_HFC_EN; |
1722 | } | 1721 | } |
1723 | else { | 1722 | else { |
1724 | info->flags &= ~ASYNC_CTS_FLOW; | ||
1725 | port->ip_sscr &= ~IOC4_SSCR_HFC_EN; | 1723 | port->ip_sscr &= ~IOC4_SSCR_HFC_EN; |
1726 | } | 1724 | } |
1727 | writel(port->ip_sscr, &port->ip_serial_regs->sscr); | 1725 | writel(port->ip_sscr, &port->ip_serial_regs->sscr); |
@@ -1760,18 +1758,6 @@ static inline int ic4_startup_local(struct uart_port *the_port) | |||
1760 | 1758 | ||
1761 | info = the_port->info; | 1759 | info = the_port->info; |
1762 | 1760 | ||
1763 | if (info->tty) { | ||
1764 | set_bit(TTY_IO_ERROR, &info->tty->flags); | ||
1765 | clear_bit(TTY_IO_ERROR, &info->tty->flags); | ||
1766 | if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) | ||
1767 | info->tty->alt_speed = 57600; | ||
1768 | if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI) | ||
1769 | info->tty->alt_speed = 115200; | ||
1770 | if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI) | ||
1771 | info->tty->alt_speed = 230400; | ||
1772 | if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP) | ||
1773 | info->tty->alt_speed = 460800; | ||
1774 | } | ||
1775 | local_open(port); | 1761 | local_open(port); |
1776 | 1762 | ||
1777 | /* set the speed of the serial port */ | 1763 | /* set the speed of the serial port */ |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 791c4dc550ae..94f5e8ed83a7 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -90,7 +90,7 @@ static int spi_suspend(struct device *dev, pm_message_t message) | |||
90 | int value; | 90 | int value; |
91 | struct spi_driver *drv = to_spi_driver(dev->driver); | 91 | struct spi_driver *drv = to_spi_driver(dev->driver); |
92 | 92 | ||
93 | if (!drv->suspend) | 93 | if (!drv || !drv->suspend) |
94 | return 0; | 94 | return 0; |
95 | 95 | ||
96 | /* suspend will stop irqs and dma; no more i/o */ | 96 | /* suspend will stop irqs and dma; no more i/o */ |
@@ -105,7 +105,7 @@ static int spi_resume(struct device *dev) | |||
105 | int value; | 105 | int value; |
106 | struct spi_driver *drv = to_spi_driver(dev->driver); | 106 | struct spi_driver *drv = to_spi_driver(dev->driver); |
107 | 107 | ||
108 | if (!drv->resume) | 108 | if (!drv || !drv->resume) |
109 | return 0; | 109 | return 0; |
110 | 110 | ||
111 | /* resume may restart the i/o queue */ | 111 | /* resume may restart the i/o queue */ |
@@ -449,7 +449,6 @@ void spi_unregister_master(struct spi_master *master) | |||
449 | { | 449 | { |
450 | (void) device_for_each_child(master->cdev.dev, NULL, __unregister); | 450 | (void) device_for_each_child(master->cdev.dev, NULL, __unregister); |
451 | class_device_unregister(&master->cdev); | 451 | class_device_unregister(&master->cdev); |
452 | master->cdev.dev = NULL; | ||
453 | } | 452 | } |
454 | EXPORT_SYMBOL_GPL(spi_unregister_master); | 453 | EXPORT_SYMBOL_GPL(spi_unregister_master); |
455 | 454 | ||
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index e9e5bc178cef..118288d94423 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c | |||
@@ -191,8 +191,9 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev) | |||
191 | } | 191 | } |
192 | if (wait_time <= 0) | 192 | if (wait_time <= 0) |
193 | printk(KERN_WARNING "%s %s: BIOS handoff " | 193 | printk(KERN_WARNING "%s %s: BIOS handoff " |
194 | "failed (BIOS bug ?)\n", | 194 | "failed (BIOS bug ?) %08x\n", |
195 | pdev->dev.bus_id, "OHCI"); | 195 | pdev->dev.bus_id, "OHCI", |
196 | readl(base + OHCI_CONTROL)); | ||
196 | 197 | ||
197 | /* reset controller, preserving RWC */ | 198 | /* reset controller, preserving RWC */ |
198 | writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL); | 199 | writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL); |
@@ -243,6 +244,12 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
243 | pr_debug("%s %s: BIOS handoff\n", | 244 | pr_debug("%s %s: BIOS handoff\n", |
244 | pdev->dev.bus_id, "EHCI"); | 245 | pdev->dev.bus_id, "EHCI"); |
245 | 246 | ||
247 | #if 0 | ||
248 | /* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on, | ||
249 | * but that seems dubious in general (the BIOS left it off intentionally) | ||
250 | * and is known to prevent some systems from booting. so we won't do this | ||
251 | * unless maybe we can determine when we're on a system that needs SMI forced. | ||
252 | */ | ||
246 | /* BIOS workaround (?): be sure the | 253 | /* BIOS workaround (?): be sure the |
247 | * pre-Linux code receives the SMI | 254 | * pre-Linux code receives the SMI |
248 | */ | 255 | */ |
@@ -252,6 +259,7 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
252 | pci_write_config_dword(pdev, | 259 | pci_write_config_dword(pdev, |
253 | offset + EHCI_USBLEGCTLSTS, | 260 | offset + EHCI_USBLEGCTLSTS, |
254 | val | EHCI_USBLEGCTLSTS_SOOE); | 261 | val | EHCI_USBLEGCTLSTS_SOOE); |
262 | #endif | ||
255 | } | 263 | } |
256 | 264 | ||
257 | /* always say Linux will own the hardware | 265 | /* always say Linux will own the hardware |
@@ -274,8 +282,8 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) | |||
274 | * it down, and hope nothing goes too wrong | 282 | * it down, and hope nothing goes too wrong |
275 | */ | 283 | */ |
276 | printk(KERN_WARNING "%s %s: BIOS handoff " | 284 | printk(KERN_WARNING "%s %s: BIOS handoff " |
277 | "failed (BIOS bug ?)\n", | 285 | "failed (BIOS bug ?) %08x\n", |
278 | pdev->dev.bus_id, "EHCI"); | 286 | pdev->dev.bus_id, "EHCI", cap); |
279 | pci_write_config_byte(pdev, offset + 2, 0); | 287 | pci_write_config_byte(pdev, offset + 2, 0); |
280 | } | 288 | } |
281 | 289 | ||
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c index 466384d7c79f..134d2000128a 100644 --- a/drivers/usb/host/sl811_cs.c +++ b/drivers/usb/host/sl811_cs.c | |||
@@ -101,7 +101,7 @@ static struct resource resources[] = { | |||
101 | }, | 101 | }, |
102 | }; | 102 | }; |
103 | 103 | ||
104 | extern struct device_driver sl811h_driver; | 104 | extern struct platform_driver sl811h_driver; |
105 | 105 | ||
106 | static struct platform_device platform_dev = { | 106 | static struct platform_device platform_dev = { |
107 | .id = -1, | 107 | .id = -1, |
@@ -132,7 +132,7 @@ static int sl811_hc_init(struct device *parent, ioaddr_t base_addr, int irq) | |||
132 | * initialized already because of the link order dependency created | 132 | * initialized already because of the link order dependency created |
133 | * by referencing "sl811h_driver". | 133 | * by referencing "sl811h_driver". |
134 | */ | 134 | */ |
135 | platform_dev.name = sl811h_driver.name; | 135 | platform_dev.name = sl811h_driver.driver.name; |
136 | return platform_device_register(&platform_dev); | 136 | return platform_device_register(&platform_dev); |
137 | } | 137 | } |
138 | 138 | ||
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 6f7a684c3e07..772478086bd3 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1435,17 +1435,20 @@ void hid_init_reports(struct hid_device *hid) | |||
1435 | #define USB_DEVICE_ID_VERNIER_CYCLOPS 0x0004 | 1435 | #define USB_DEVICE_ID_VERNIER_CYCLOPS 0x0004 |
1436 | 1436 | ||
1437 | #define USB_VENDOR_ID_LD 0x0f11 | 1437 | #define USB_VENDOR_ID_LD 0x0f11 |
1438 | #define USB_DEVICE_ID_CASSY 0x1000 | 1438 | #define USB_DEVICE_ID_LD_CASSY 0x1000 |
1439 | #define USB_DEVICE_ID_POCKETCASSY 0x1010 | 1439 | #define USB_DEVICE_ID_LD_POCKETCASSY 0x1010 |
1440 | #define USB_DEVICE_ID_MOBILECASSY 0x1020 | 1440 | #define USB_DEVICE_ID_LD_MOBILECASSY 0x1020 |
1441 | #define USB_DEVICE_ID_JWM 0x1080 | 1441 | #define USB_DEVICE_ID_LD_JWM 0x1080 |
1442 | #define USB_DEVICE_ID_DMMP 0x1081 | 1442 | #define USB_DEVICE_ID_LD_DMMP 0x1081 |
1443 | #define USB_DEVICE_ID_UMIP 0x1090 | 1443 | #define USB_DEVICE_ID_LD_UMIP 0x1090 |
1444 | #define USB_DEVICE_ID_VIDEOCOM 0x1200 | 1444 | #define USB_DEVICE_ID_LD_XRAY1 0x1100 |
1445 | #define USB_DEVICE_ID_COM3LAB 0x2000 | 1445 | #define USB_DEVICE_ID_LD_XRAY2 0x1101 |
1446 | #define USB_DEVICE_ID_TELEPORT 0x2010 | 1446 | #define USB_DEVICE_ID_LD_VIDEOCOM 0x1200 |
1447 | #define USB_DEVICE_ID_NETWORKANALYSER 0x2020 | 1447 | #define USB_DEVICE_ID_LD_COM3LAB 0x2000 |
1448 | #define USB_DEVICE_ID_POWERCONTROL 0x2030 | 1448 | #define USB_DEVICE_ID_LD_TELEPORT 0x2010 |
1449 | #define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020 | ||
1450 | #define USB_DEVICE_ID_LD_POWERCONTROL 0x2030 | ||
1451 | #define USB_DEVICE_ID_LD_MACHINETEST 0x2040 | ||
1449 | 1452 | ||
1450 | #define USB_VENDOR_ID_APPLE 0x05ac | 1453 | #define USB_VENDOR_ID_APPLE 0x05ac |
1451 | #define USB_DEVICE_ID_APPLE_POWERMOUSE 0x0304 | 1454 | #define USB_DEVICE_ID_APPLE_POWERMOUSE 0x0304 |
@@ -1491,17 +1494,20 @@ static const struct hid_blacklist { | |||
1491 | { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE }, | 1494 | { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE }, |
1492 | { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE }, | 1495 | { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE }, |
1493 | { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE }, | 1496 | { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE }, |
1494 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_CASSY, HID_QUIRK_IGNORE }, | 1497 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE }, |
1495 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_POCKETCASSY, HID_QUIRK_IGNORE }, | 1498 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE }, |
1496 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_MOBILECASSY, HID_QUIRK_IGNORE }, | 1499 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY, HID_QUIRK_IGNORE }, |
1497 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_JWM, HID_QUIRK_IGNORE }, | 1500 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM, HID_QUIRK_IGNORE }, |
1498 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_DMMP, HID_QUIRK_IGNORE }, | 1501 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP, HID_QUIRK_IGNORE }, |
1499 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_UMIP, HID_QUIRK_IGNORE }, | 1502 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP, HID_QUIRK_IGNORE }, |
1500 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_VIDEOCOM, HID_QUIRK_IGNORE }, | 1503 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1, HID_QUIRK_IGNORE }, |
1501 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_COM3LAB, HID_QUIRK_IGNORE }, | 1504 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2, HID_QUIRK_IGNORE }, |
1502 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_TELEPORT, HID_QUIRK_IGNORE }, | 1505 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM, HID_QUIRK_IGNORE }, |
1503 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_NETWORKANALYSER, HID_QUIRK_IGNORE }, | 1506 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB, HID_QUIRK_IGNORE }, |
1504 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_POWERCONTROL, HID_QUIRK_IGNORE }, | 1507 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT, HID_QUIRK_IGNORE }, |
1508 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER, HID_QUIRK_IGNORE }, | ||
1509 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL, HID_QUIRK_IGNORE }, | ||
1510 | { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST, HID_QUIRK_IGNORE }, | ||
1505 | { USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS, HID_QUIRK_IGNORE }, | 1511 | { USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS, HID_QUIRK_IGNORE }, |
1506 | { USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS, HID_QUIRK_IGNORE }, | 1512 | { USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS, HID_QUIRK_IGNORE }, |
1507 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_IGNORE }, | 1513 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_IGNORE }, |
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index 6649531fa824..8ba6a701e9c1 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
@@ -141,7 +141,7 @@ source "drivers/usb/misc/sisusbvga/Kconfig" | |||
141 | 141 | ||
142 | config USB_LD | 142 | config USB_LD |
143 | tristate "USB LD driver" | 143 | tristate "USB LD driver" |
144 | depends on USB && EXPERIMENTAL | 144 | depends on USB |
145 | help | 145 | help |
146 | This driver is for generic USB devices that use interrupt transfers, | 146 | This driver is for generic USB devices that use interrupt transfers, |
147 | like LD Didactic's USB devices. | 147 | like LD Didactic's USB devices. |
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index 331d4ae949ed..e2d1198623eb 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c | |||
@@ -24,6 +24,7 @@ | |||
24 | * V0.1 (mh) Initial version | 24 | * V0.1 (mh) Initial version |
25 | * V0.11 (mh) Added raw support for HID 1.0 devices (no interrupt out endpoint) | 25 | * V0.11 (mh) Added raw support for HID 1.0 devices (no interrupt out endpoint) |
26 | * V0.12 (mh) Added kmalloc check for string buffer | 26 | * V0.12 (mh) Added kmalloc check for string buffer |
27 | * V0.13 (mh) Added support for LD X-Ray and Machine Test System | ||
27 | */ | 28 | */ |
28 | 29 | ||
29 | #include <linux/config.h> | 30 | #include <linux/config.h> |
@@ -40,17 +41,20 @@ | |||
40 | 41 | ||
41 | /* Define these values to match your devices */ | 42 | /* Define these values to match your devices */ |
42 | #define USB_VENDOR_ID_LD 0x0f11 /* USB Vendor ID of LD Didactic GmbH */ | 43 | #define USB_VENDOR_ID_LD 0x0f11 /* USB Vendor ID of LD Didactic GmbH */ |
43 | #define USB_DEVICE_ID_CASSY 0x1000 /* USB Product ID for all CASSY-S modules */ | 44 | #define USB_DEVICE_ID_LD_CASSY 0x1000 /* USB Product ID of CASSY-S */ |
44 | #define USB_DEVICE_ID_POCKETCASSY 0x1010 /* USB Product ID for Pocket-CASSY */ | 45 | #define USB_DEVICE_ID_LD_POCKETCASSY 0x1010 /* USB Product ID of Pocket-CASSY */ |
45 | #define USB_DEVICE_ID_MOBILECASSY 0x1020 /* USB Product ID for Mobile-CASSY */ | 46 | #define USB_DEVICE_ID_LD_MOBILECASSY 0x1020 /* USB Product ID of Mobile-CASSY */ |
46 | #define USB_DEVICE_ID_JWM 0x1080 /* USB Product ID for Joule and Wattmeter */ | 47 | #define USB_DEVICE_ID_LD_JWM 0x1080 /* USB Product ID of Joule and Wattmeter */ |
47 | #define USB_DEVICE_ID_DMMP 0x1081 /* USB Product ID for Digital Multimeter P (reserved) */ | 48 | #define USB_DEVICE_ID_LD_DMMP 0x1081 /* USB Product ID of Digital Multimeter P (reserved) */ |
48 | #define USB_DEVICE_ID_UMIP 0x1090 /* USB Product ID for UMI P */ | 49 | #define USB_DEVICE_ID_LD_UMIP 0x1090 /* USB Product ID of UMI P */ |
49 | #define USB_DEVICE_ID_VIDEOCOM 0x1200 /* USB Product ID for VideoCom */ | 50 | #define USB_DEVICE_ID_LD_XRAY1 0x1100 /* USB Product ID of X-Ray Apparatus */ |
50 | #define USB_DEVICE_ID_COM3LAB 0x2000 /* USB Product ID for COM3LAB */ | 51 | #define USB_DEVICE_ID_LD_XRAY2 0x1101 /* USB Product ID of X-Ray Apparatus */ |
51 | #define USB_DEVICE_ID_TELEPORT 0x2010 /* USB Product ID for Terminal Adapter */ | 52 | #define USB_DEVICE_ID_LD_VIDEOCOM 0x1200 /* USB Product ID of VideoCom */ |
52 | #define USB_DEVICE_ID_NETWORKANALYSER 0x2020 /* USB Product ID for Network Analyser */ | 53 | #define USB_DEVICE_ID_LD_COM3LAB 0x2000 /* USB Product ID of COM3LAB */ |
53 | #define USB_DEVICE_ID_POWERCONTROL 0x2030 /* USB Product ID for Controlling device for Power Electronics */ | 54 | #define USB_DEVICE_ID_LD_TELEPORT 0x2010 /* USB Product ID of Terminal Adapter */ |
55 | #define USB_DEVICE_ID_LD_NETWORKANALYSER 0x2020 /* USB Product ID of Network Analyser */ | ||
56 | #define USB_DEVICE_ID_LD_POWERCONTROL 0x2030 /* USB Product ID of Converter Control Unit */ | ||
57 | #define USB_DEVICE_ID_LD_MACHINETEST 0x2040 /* USB Product ID of Machine Test System */ | ||
54 | 58 | ||
55 | #define USB_VENDOR_ID_VERNIER 0x08f7 | 59 | #define USB_VENDOR_ID_VERNIER 0x08f7 |
56 | #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 | 60 | #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 |
@@ -67,17 +71,20 @@ | |||
67 | 71 | ||
68 | /* table of devices that work with this driver */ | 72 | /* table of devices that work with this driver */ |
69 | static struct usb_device_id ld_usb_table [] = { | 73 | static struct usb_device_id ld_usb_table [] = { |
70 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_CASSY) }, | 74 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) }, |
71 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_POCKETCASSY) }, | 75 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) }, |
72 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_MOBILECASSY) }, | 76 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) }, |
73 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_JWM) }, | 77 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) }, |
74 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_DMMP) }, | 78 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) }, |
75 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_UMIP) }, | 79 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) }, |
76 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_VIDEOCOM) }, | 80 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1) }, |
77 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_COM3LAB) }, | 81 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) }, |
78 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_TELEPORT) }, | 82 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) }, |
79 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_NETWORKANALYSER) }, | 83 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) }, |
80 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_POWERCONTROL) }, | 84 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) }, |
85 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) }, | ||
86 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) }, | ||
87 | { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) }, | ||
81 | { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) }, | 88 | { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) }, |
82 | { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) }, | 89 | { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) }, |
83 | { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) }, | 90 | { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) }, |
@@ -85,7 +92,7 @@ static struct usb_device_id ld_usb_table [] = { | |||
85 | { } /* Terminating entry */ | 92 | { } /* Terminating entry */ |
86 | }; | 93 | }; |
87 | MODULE_DEVICE_TABLE(usb, ld_usb_table); | 94 | MODULE_DEVICE_TABLE(usb, ld_usb_table); |
88 | MODULE_VERSION("V0.12"); | 95 | MODULE_VERSION("V0.13"); |
89 | MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>"); | 96 | MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>"); |
90 | MODULE_DESCRIPTION("LD USB Driver"); | 97 | MODULE_DESCRIPTION("LD USB Driver"); |
91 | MODULE_LICENSE("GPL"); | 98 | MODULE_LICENSE("GPL"); |
@@ -632,8 +639,8 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * | |||
632 | 639 | ||
633 | /* workaround for early firmware versions on fast computers */ | 640 | /* workaround for early firmware versions on fast computers */ |
634 | if ((le16_to_cpu(udev->descriptor.idVendor) == USB_VENDOR_ID_LD) && | 641 | if ((le16_to_cpu(udev->descriptor.idVendor) == USB_VENDOR_ID_LD) && |
635 | ((le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_CASSY) || | 642 | ((le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_LD_CASSY) || |
636 | (le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_COM3LAB)) && | 643 | (le16_to_cpu(udev->descriptor.idProduct) == USB_DEVICE_ID_LD_COM3LAB)) && |
637 | (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x103)) { | 644 | (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x103)) { |
638 | buffer = kmalloc(256, GFP_KERNEL); | 645 | buffer = kmalloc(256, GFP_KERNEL); |
639 | if (buffer == NULL) { | 646 | if (buffer == NULL) { |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index e8e575e037c1..37c81c08faad 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -73,9 +73,10 @@ static struct usb_device_id id_table [] = { | |||
73 | { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) }, | 73 | { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) }, |
74 | { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) }, | 74 | { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) }, |
75 | { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) }, | 75 | { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) }, |
76 | { USB_DEVICE(NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID ) }, | 76 | { USB_DEVICE(NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID) }, |
77 | { USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID ) }, | 77 | { USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID) }, |
78 | { USB_DEVICE(SAGEM_VENDOR_ID, SAGEM_PRODUCT_ID) }, | 78 | { USB_DEVICE(SAGEM_VENDOR_ID, SAGEM_PRODUCT_ID) }, |
79 | { USB_DEVICE(LEADTEK_VENDOR_ID, LEADTEK_9531_PRODUCT_ID) }, | ||
79 | { } /* Terminating entry */ | 80 | { } /* Terminating entry */ |
80 | }; | 81 | }; |
81 | 82 | ||
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index 1807087a76e3..9bc4755162ad 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
@@ -71,3 +71,7 @@ | |||
71 | 71 | ||
72 | #define SAGEM_VENDOR_ID 0x079b | 72 | #define SAGEM_VENDOR_ID 0x079b |
73 | #define SAGEM_PRODUCT_ID 0x0027 | 73 | #define SAGEM_PRODUCT_ID 0x0027 |
74 | |||
75 | /* Leadtek GPS 9531 (ID 0413:2101) */ | ||
76 | #define LEADTEK_VENDOR_ID 0x0413 | ||
77 | #define LEADTEK_9531_PRODUCT_ID 0x2101 | ||
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index ee958f986eb8..e71c5ca1a07b 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
@@ -106,6 +106,13 @@ UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x0113, | |||
106 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 106 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
107 | US_FL_FIX_INQUIRY ), | 107 | US_FL_FIX_INQUIRY ), |
108 | 108 | ||
109 | /* Reported by Christian Leber <christian@leber.de> */ | ||
110 | UNUSUAL_DEV( 0x0419, 0xaaf5, 0x0100, 0x0100, | ||
111 | "TrekStor", | ||
112 | "i.Beat 115 2.0", | ||
113 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
114 | US_FL_IGNORE_RESIDUE | US_FL_NOT_LOCKABLE ), | ||
115 | |||
109 | /* Reported by Stefan Werner <dustbln@gmx.de> */ | 116 | /* Reported by Stefan Werner <dustbln@gmx.de> */ |
110 | UNUSUAL_DEV( 0x0419, 0xaaf6, 0x0100, 0x0100, | 117 | UNUSUAL_DEV( 0x0419, 0xaaf6, 0x0100, 0x0100, |
111 | "TrekStor", | 118 | "TrekStor", |
@@ -127,6 +134,14 @@ UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100, | |||
127 | US_SC_SCSI, US_PR_DPCM_USB, NULL, 0 ), | 134 | US_SC_SCSI, US_PR_DPCM_USB, NULL, 0 ), |
128 | #endif | 135 | #endif |
129 | 136 | ||
137 | /* Patch submitted by Daniel Drake <dsd@gentoo.org> | ||
138 | * Device reports nonsense bInterfaceProtocol 6 when connected over USB2 */ | ||
139 | UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x0100, | ||
140 | "Neuros Audio", | ||
141 | "USB 2.0 HD 2.5", | ||
142 | US_SC_DEVICE, US_PR_BULK, NULL, | ||
143 | US_FL_NEED_OVERRIDE ), | ||
144 | |||
130 | /* | 145 | /* |
131 | * Pete Zaitcev <zaitcev@yahoo.com>, from Patrick C. F. Ernzer, bz#162559. | 146 | * Pete Zaitcev <zaitcev@yahoo.com>, from Patrick C. F. Ernzer, bz#162559. |
132 | * The key does not actually break, but it returns zero sense which | 147 | * The key does not actually break, but it returns zero sense which |
@@ -137,13 +152,16 @@ UNUSUAL_DEV( 0x0457, 0x0150, 0x0100, 0x0100, | |||
137 | "USB Mass Storage Device", | 152 | "USB Mass Storage Device", |
138 | US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), | 153 | US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), |
139 | 154 | ||
140 | /* Patch submitted by Daniel Drake <dsd@gentoo.org> | 155 | /* |
141 | * Device reports nonsense bInterfaceProtocol 6 when connected over USB2 */ | 156 | * Bohdan Linda <bohdan.linda@gmail.com> |
142 | UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x0100, | 157 | * 1GB USB sticks MyFlash High Speed. I have restricted |
143 | "Neuros Audio", | 158 | * the revision to my model only |
144 | "USB 2.0 HD 2.5", | 159 | */ |
145 | US_SC_DEVICE, US_PR_BULK, NULL, | 160 | UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100, |
146 | US_FL_NEED_OVERRIDE ), | 161 | "USB 2.0", |
162 | "Flash Disk", | ||
163 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
164 | US_FL_NOT_LOCKABLE ), | ||
147 | 165 | ||
148 | UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101, | 166 | UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101, |
149 | "Rio", | 167 | "Rio", |
@@ -946,6 +964,12 @@ UNUSUAL_DEV( 0x084d, 0x0011, 0x0110, 0x0110, | |||
946 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 964 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
947 | US_FL_BULK32), | 965 | US_FL_BULK32), |
948 | 966 | ||
967 | /* Submitted by Jan De Luyck <lkml@kcore.org> */ | ||
968 | UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000, | ||
969 | "CITIZEN", | ||
970 | "X1DE-USB", | ||
971 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
972 | US_FL_SINGLE_LUN), | ||
949 | 973 | ||
950 | /* Entry needed for flags. Moreover, all devices with this ID use | 974 | /* Entry needed for flags. Moreover, all devices with this ID use |
951 | * bulk-only transport, but _some_ falsely report Control/Bulk instead. | 975 | * bulk-only transport, but _some_ falsely report Control/Bulk instead. |
@@ -1085,6 +1109,13 @@ UNUSUAL_DEV( 0x0dda, 0x0301, 0x0012, 0x0012, | |||
1085 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1109 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
1086 | US_FL_IGNORE_RESIDUE ), | 1110 | US_FL_IGNORE_RESIDUE ), |
1087 | 1111 | ||
1112 | /* Reported by Jim McCloskey <mcclosk@ucsc.edu> */ | ||
1113 | UNUSUAL_DEV( 0x0e21, 0x0520, 0x0100, 0x0100, | ||
1114 | "Cowon Systems", | ||
1115 | "iAUDIO M5", | ||
1116 | US_SC_DEVICE, US_PR_BULK, NULL, | ||
1117 | 0 ), | ||
1118 | |||
1088 | /* Submitted by Antoine Mairesse <antoine.mairesse@free.fr> */ | 1119 | /* Submitted by Antoine Mairesse <antoine.mairesse@free.fr> */ |
1089 | UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300, | 1120 | UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300, |
1090 | "USB", | 1121 | "USB", |
@@ -1162,6 +1193,13 @@ UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x9999, | |||
1162 | US_FL_SINGLE_LUN), | 1193 | US_FL_SINGLE_LUN), |
1163 | #endif | 1194 | #endif |
1164 | 1195 | ||
1196 | /* Reported by Andrew Simmons <andrew.simmons@gmail.com> */ | ||
1197 | UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x0001, | ||
1198 | "DataStor", | ||
1199 | "USB4500 FW1.04", | ||
1200 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
1201 | US_FL_FIX_CAPACITY), | ||
1202 | |||
1165 | /* Control/Bulk transport for all SubClass values */ | 1203 | /* Control/Bulk transport for all SubClass values */ |
1166 | USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR), | 1204 | USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR), |
1167 | USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR), | 1205 | USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR), |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3e153d313bb0..e64ed16bd42f 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -525,11 +525,6 @@ config FB_GBE_MEM | |||
525 | This is the amount of memory reserved for the framebuffer, | 525 | This is the amount of memory reserved for the framebuffer, |
526 | which can be any value between 1MB and 8MB. | 526 | which can be any value between 1MB and 8MB. |
527 | 527 | ||
528 | config BUS_I2C | ||
529 | bool | ||
530 | depends on (FB = y) && VISWS | ||
531 | default y | ||
532 | |||
533 | config FB_SUN3 | 528 | config FB_SUN3 |
534 | bool "Sun3 framebuffer support" | 529 | bool "Sun3 framebuffer support" |
535 | depends on (FB = y) && (SUN3 || SUN3X) && BROKEN | 530 | depends on (FB = y) && (SUN3 || SUN3X) && BROKEN |
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index 556895e99645..1f8d805c61e5 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c | |||
@@ -1321,8 +1321,6 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo) | |||
1321 | mdelay( 15); | 1321 | mdelay( 15); |
1322 | } | 1322 | } |
1323 | 1323 | ||
1324 | #ifdef CONFIG_PPC_OF | ||
1325 | |||
1326 | static void radeon_pm_reset_pad_ctlr_strength(struct radeonfb_info *rinfo) | 1324 | static void radeon_pm_reset_pad_ctlr_strength(struct radeonfb_info *rinfo) |
1327 | { | 1325 | { |
1328 | u32 tmp, tmp2; | 1326 | u32 tmp, tmp2; |
@@ -1836,6 +1834,8 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo) | |||
1836 | radeon_pm_m10_enable_lvds_spread_spectrum(rinfo); | 1834 | radeon_pm_m10_enable_lvds_spread_spectrum(rinfo); |
1837 | } | 1835 | } |
1838 | 1836 | ||
1837 | #ifdef CONFIG_PPC_OF | ||
1838 | |||
1839 | static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo) | 1839 | static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo) |
1840 | { | 1840 | { |
1841 | OUTREG(MC_CNTL, rinfo->save_regs[46]); | 1841 | OUTREG(MC_CNTL, rinfo->save_regs[46]); |
@@ -2728,13 +2728,23 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk) | |||
2728 | printk("radeonfb: Dynamic Clock Power Management disabled\n"); | 2728 | printk("radeonfb: Dynamic Clock Power Management disabled\n"); |
2729 | } | 2729 | } |
2730 | 2730 | ||
2731 | #if defined(CONFIG_PM) | ||
2731 | /* Check if we can power manage on suspend/resume. We can do | 2732 | /* Check if we can power manage on suspend/resume. We can do |
2732 | * D2 on M6, M7 and M9, and we can resume from D3 cold a few other | 2733 | * D2 on M6, M7 and M9, and we can resume from D3 cold a few other |
2733 | * "Mac" cards, but that's all. We need more infos about what the | 2734 | * "Mac" cards, but that's all. We need more infos about what the |
2734 | * BIOS does tho. Right now, all this PM stuff is pmac-only for that | 2735 | * BIOS does tho. Right now, all this PM stuff is pmac-only for that |
2735 | * reason. --BenH | 2736 | * reason. --BenH |
2736 | */ | 2737 | */ |
2737 | #if defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) | 2738 | /* Special case for Samsung P35 laptops |
2739 | */ | ||
2740 | if ((rinfo->pdev->vendor == PCI_VENDOR_ID_ATI) && | ||
2741 | (rinfo->pdev->device == PCI_CHIP_RV350_NP) && | ||
2742 | (rinfo->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG) && | ||
2743 | (rinfo->pdev->subsystem_device == 0xc00c)) { | ||
2744 | rinfo->reinit_func = radeon_reinitialize_M10; | ||
2745 | rinfo->pm_mode |= radeon_pm_off; | ||
2746 | } | ||
2747 | #if defined(CONFIG_PPC_PMAC) | ||
2738 | if (_machine == _MACH_Pmac && rinfo->of_node) { | 2748 | if (_machine == _MACH_Pmac && rinfo->of_node) { |
2739 | if (rinfo->is_mobility && rinfo->pm_reg && | 2749 | if (rinfo->is_mobility && rinfo->pm_reg && |
2740 | rinfo->family <= CHIP_FAMILY_RV250) | 2750 | rinfo->family <= CHIP_FAMILY_RV250) |
@@ -2778,7 +2788,8 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk) | |||
2778 | OUTREG(TV_DAC_CNTL, INREG(TV_DAC_CNTL) | 0x07000000); | 2788 | OUTREG(TV_DAC_CNTL, INREG(TV_DAC_CNTL) | 0x07000000); |
2779 | #endif | 2789 | #endif |
2780 | } | 2790 | } |
2781 | #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) */ | 2791 | #endif /* defined(CONFIG_PPC_PMAC) */ |
2792 | #endif /* defined(CONFIG_PM) */ | ||
2782 | } | 2793 | } |
2783 | 2794 | ||
2784 | void radeonfb_pm_exit(struct radeonfb_info *rinfo) | 2795 | void radeonfb_pm_exit(struct radeonfb_info *rinfo) |
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index d2dede6ed3e5..996c7b58564e 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
@@ -1550,6 +1550,7 @@ int fb_get_options(char *name, char **option) | |||
1550 | return retval; | 1550 | return retval; |
1551 | } | 1551 | } |
1552 | 1552 | ||
1553 | #ifndef MODULE | ||
1553 | /** | 1554 | /** |
1554 | * video_setup - process command line options | 1555 | * video_setup - process command line options |
1555 | * @options: string of options | 1556 | * @options: string of options |
@@ -1593,6 +1594,7 @@ static int __init video_setup(char *options) | |||
1593 | return 0; | 1594 | return 0; |
1594 | } | 1595 | } |
1595 | __setup("video=", video_setup); | 1596 | __setup("video=", video_setup); |
1597 | #endif | ||
1596 | 1598 | ||
1597 | /* | 1599 | /* |
1598 | * Visible symbols for modules | 1600 | * Visible symbols for modules |
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index 38d22729b129..c9a7cdf6d543 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
@@ -1243,7 +1243,7 @@ static int __devexit gbefb_remove(struct platform_device* p_dev) | |||
1243 | (void *)gbe_tiles.cpu, gbe_tiles.dma); | 1243 | (void *)gbe_tiles.cpu, gbe_tiles.dma); |
1244 | release_mem_region(GBE_BASE, sizeof(struct sgi_gbe)); | 1244 | release_mem_region(GBE_BASE, sizeof(struct sgi_gbe)); |
1245 | iounmap(gbe); | 1245 | iounmap(gbe); |
1246 | gbefb_remove_sysfs(dev); | 1246 | gbefb_remove_sysfs(&p_dev->dev); |
1247 | framebuffer_release(info); | 1247 | framebuffer_release(info); |
1248 | 1248 | ||
1249 | return 0; | 1249 | return 0; |
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c index 747602aa5615..a2e201dc40f7 100644 --- a/drivers/video/neofb.c +++ b/drivers/video/neofb.c | |||
@@ -843,6 +843,9 @@ static int neofb_set_par(struct fb_info *info) | |||
843 | 843 | ||
844 | par->SysIfaceCntl2 = 0xc0; /* VESA Bios sets this to 0x80! */ | 844 | par->SysIfaceCntl2 = 0xc0; /* VESA Bios sets this to 0x80! */ |
845 | 845 | ||
846 | /* Initialize: by default, we want display config register to be read */ | ||
847 | par->PanelDispCntlRegRead = 1; | ||
848 | |||
846 | /* Enable any user specified display devices. */ | 849 | /* Enable any user specified display devices. */ |
847 | par->PanelDispCntlReg1 = 0x00; | 850 | par->PanelDispCntlReg1 = 0x00; |
848 | if (par->internal_display) | 851 | if (par->internal_display) |
@@ -1334,6 +1337,18 @@ static int neofb_blank(int blank_mode, struct fb_info *info) | |||
1334 | struct neofb_par *par = info->par; | 1337 | struct neofb_par *par = info->par; |
1335 | int seqflags, lcdflags, dpmsflags, reg; | 1338 | int seqflags, lcdflags, dpmsflags, reg; |
1336 | 1339 | ||
1340 | |||
1341 | /* | ||
1342 | * Reload the value stored in the register, if sensible. It might have | ||
1343 | * been changed via FN keystroke. | ||
1344 | */ | ||
1345 | if (par->PanelDispCntlRegRead) { | ||
1346 | neoUnlock(); | ||
1347 | par->PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) & 0x03; | ||
1348 | neoLock(&par->state); | ||
1349 | } | ||
1350 | par->PanelDispCntlRegRead = !blank_mode; | ||
1351 | |||
1337 | switch (blank_mode) { | 1352 | switch (blank_mode) { |
1338 | case FB_BLANK_POWERDOWN: /* powerdown - both sync lines down */ | 1353 | case FB_BLANK_POWERDOWN: /* powerdown - both sync lines down */ |
1339 | seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */ | 1354 | seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */ |
@@ -1366,7 +1381,7 @@ static int neofb_blank(int blank_mode, struct fb_info *info) | |||
1366 | case FB_BLANK_NORMAL: /* just blank screen (backlight stays on) */ | 1381 | case FB_BLANK_NORMAL: /* just blank screen (backlight stays on) */ |
1367 | seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */ | 1382 | seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */ |
1368 | lcdflags = par->PanelDispCntlReg1 & 0x02; /* LCD normal */ | 1383 | lcdflags = par->PanelDispCntlReg1 & 0x02; /* LCD normal */ |
1369 | dpmsflags = 0; /* no hsync/vsync suppression */ | 1384 | dpmsflags = 0x00; /* no hsync/vsync suppression */ |
1370 | break; | 1385 | break; |
1371 | case FB_BLANK_UNBLANK: /* unblank */ | 1386 | case FB_BLANK_UNBLANK: /* unblank */ |
1372 | seqflags = 0; /* Enable sequencer */ | 1387 | seqflags = 0; /* Enable sequencer */ |
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index dbcb8962e57d..a7c4e5e8ead6 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
@@ -138,6 +138,8 @@ static struct pci_device_id nvidiafb_pci_tbl[] = { | |||
138 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 138 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
139 | {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X, | 139 | {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X, |
140 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 140 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
141 | {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_4000, | ||
142 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
141 | {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO, | 143 | {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO, |
142 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 144 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
143 | {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO, | 145 | {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO, |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index d574dd3c9c8a..9451932fbaf2 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -82,7 +82,6 @@ | |||
82 | #include <linux/fb.h> | 82 | #include <linux/fb.h> |
83 | #include <linux/init.h> | 83 | #include <linux/init.h> |
84 | #include <linux/dma-mapping.h> | 84 | #include <linux/dma-mapping.h> |
85 | #include <linux/string.h> | ||
86 | #include <linux/interrupt.h> | 85 | #include <linux/interrupt.h> |
87 | #include <linux/workqueue.h> | 86 | #include <linux/workqueue.h> |
88 | #include <linux/wait.h> | 87 | #include <linux/wait.h> |