Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cciss: correct the non-resettable board list

The hpsa driver carries a more recent version,
copy the table from there.

Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Acked-by: Don Brace <Don.Brace@pmcs.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

authored by

Tomas Henzl and committed by
James Bottomley
b9ea9dcd c854c385

+21 -2
+21 -2
drivers/block/cciss.c
··· 582 582 0x3215103C, /* Smart Array E200i */ 583 583 0x3237103C, /* Smart Array E500 */ 584 584 0x323D103C, /* Smart Array P700m */ 585 + 0x40800E11, /* Smart Array 5i */ 585 586 0x409C0E11, /* Smart Array 6400 */ 586 587 0x409D0E11, /* Smart Array 6400 EM */ 588 + 0x40700E11, /* Smart Array 5300 */ 589 + 0x40820E11, /* Smart Array 532 */ 590 + 0x40830E11, /* Smart Array 5312 */ 591 + 0x409A0E11, /* Smart Array 641 */ 592 + 0x409B0E11, /* Smart Array 642 */ 593 + 0x40910E11, /* Smart Array 6i */ 587 594 }; 588 595 589 596 /* List of controllers which cannot even be soft reset */ 590 597 static u32 soft_unresettable_controller[] = { 598 + 0x40800E11, /* Smart Array 5i */ 599 + 0x40700E11, /* Smart Array 5300 */ 600 + 0x40820E11, /* Smart Array 532 */ 601 + 0x40830E11, /* Smart Array 5312 */ 602 + 0x409A0E11, /* Smart Array 641 */ 603 + 0x409B0E11, /* Smart Array 642 */ 604 + 0x40910E11, /* Smart Array 6i */ 605 + /* Exclude 640x boards. These are two pci devices in one slot 606 + * which share a battery backed cache module. One controls the 607 + * cache, the other accesses the cache through the one that controls 608 + * it. If we reset the one controlling the cache, the other will 609 + * likely not be happy. Just forbid resetting this conjoined mess. 610 + */ 591 611 0x409C0E11, /* Smart Array 6400 */ 592 612 0x409D0E11, /* Smart Array 6400 EM */ 593 613 }; ··· 4683 4663 */ 4684 4664 cciss_lookup_board_id(pdev, &board_id); 4685 4665 if (!ctlr_is_resettable(board_id)) { 4686 - dev_warn(&pdev->dev, "Cannot reset Smart Array 640x " 4687 - "due to shared cache module."); 4666 + dev_warn(&pdev->dev, "Controller not resettable\n"); 4688 4667 return -ENODEV; 4689 4668 } 4690 4669