aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/aacraid/aachba.c6
-rw-r--r--drivers/scsi/aacraid/aacraid.h19
2 files changed, 23 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index fc16fe0dfa84..31ac9f56cd1f 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1194,6 +1194,12 @@ int aac_get_adapter_info(struct aac_dev* dev)
1194 printk(KERN_INFO "%s%d: serial %x\n", 1194 printk(KERN_INFO "%s%d: serial %x\n",
1195 dev->name, dev->id, 1195 dev->name, dev->id,
1196 le32_to_cpu(dev->adapter_info.serial[0])); 1196 le32_to_cpu(dev->adapter_info.serial[0]));
1197 if (dev->supplement_adapter_info.VpdInfo.Tsid[0]) {
1198 printk(KERN_INFO "%s%d: TSID %.*s\n",
1199 dev->name, dev->id,
1200 (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),
1201 dev->supplement_adapter_info.VpdInfo.Tsid);
1202 }
1197 } 1203 }
1198 1204
1199 dev->nondasd_support = 0; 1205 dev->nondasd_support = 0;
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 12cad1f3020a..45ca3e801619 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -843,10 +843,25 @@ struct aac_supplement_adapter_info
843 __le32 Version; 843 __le32 Version;
844 __le32 FeatureBits; 844 __le32 FeatureBits;
845 u8 SlotNumber; 845 u8 SlotNumber;
846 u8 ReservedPad0[0]; 846 u8 ReservedPad0[3];
847 u8 BuildDate[12]; 847 u8 BuildDate[12];
848 __le32 CurrentNumberPorts; 848 __le32 CurrentNumberPorts;
849 __le32 ReservedGrowth[24]; 849 struct {
850 u8 AssemblyPn[8];
851 u8 FruPn[8];
852 u8 BatteryFruPn[8];
853 u8 EcVersionString[8];
854 u8 Tsid[12];
855 } VpdInfo;
856 __le32 FlashFirmwareRevision;
857 __le32 FlashFirmwareBuild;
858 __le32 RaidTypeMorphOptions;
859 __le32 FlashFirmwareBootRevision;
860 __le32 FlashFirmwareBootBuild;
861 u8 MfgPcbaSerialNo[12];
862 u8 MfgWWNName[8];
863 __le32 MoreFeatureBits;
864 __le32 ReservedGrowth[1];
850}; 865};
851#define AAC_FEATURE_FALCON 0x00000010 866#define AAC_FEATURE_FALCON 0x00000010
852#define AAC_SIS_VERSION_V3 3 867#define AAC_SIS_VERSION_V3 3