Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

1 files changed, 21 insertions, 3 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index b3b2e2237eb3..5f586140e057 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -39,9 +39,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#69 $
- *
- * $FreeBSD$
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#79 $
  */
 
 #ifdef __linux__
@@ -393,6 +391,12 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
                 "Adaptec aic7892 Ultra160 SCSI adapter (ARO)",
                 ahc_aic7892_setup
         },
+        {
+                ID_AHA_2915_30LP,
+                ID_ALL_MASK,
+                "Adaptec 2915/30LP Ultra160 SCSI adapter",
+                ahc_aic7892_setup
+        },
         /* aic7895 based controllers */ 
         {
                 ID_AHA_2940U_DUAL,
@@ -1193,9 +1197,19 @@ ahc_pci_test_register_access(struct ahc_softc *ahc)
          * use for this test.
          */
         hcntrl = ahc_inb(ahc, HCNTRL);
+
         if (hcntrl == 0xFF)
                 goto fail;
 
+        if ((hcntrl & CHIPRST) != 0) {
+                /*
+                 * The chip has not been initialized since
+                 * PCI/EISA/VLB bus reset.  Don't trust
+                 * "left over BIOS data".
+                 */
+                ahc->flags |= AHC_NO_BIOS_INIT;
+        }
+
         /*
          * Next create a situation where write combining
          * or read prefetching could be initiated by the
@@ -1307,6 +1321,10 @@ check_extport(struct ahc_softc *ahc, u_int *sxfrctl1)
                         sd.sd_chip = C56_66;
                 }
                 ahc_release_seeprom(&sd);
+
+                /* Remember the SEEPROM type for later */
+                if (sd.sd_chip == C56_66)
+                        ahc->flags |= AHC_LARGE_SEEPROM;
         }
 
         if (!have_seeprom) {