Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45c863f authored by Salyzyn, Mark's avatar Salyzyn, Mark Committed by James Bottomley
Browse files

[SCSI] aacraid: fix print of Firmware Build Date and add TSID 



The Adapter build date that is to be printed on instantiation was not
displayed as a result of the supplemental adapter information structure
not being in sync with the Firmware; the driver took an early test cycle
version that had a miss-sized padded region at the head and the
structure was not re-checked at the end of qualification. The Build Date
was not a priority and is merely a cosmetic enhancement, and the wrong
location for the start of the structure member would not induce any
side-effect problems. We updated the structure to match the actual
format, and added the TSID (Tech Support Identification) value print,
should it be present, to the adapter instantiation announcements during
driver load.

This later enhancement should improve the relationship between Service
folk & Tech Support if the printed value of the TSID found it's way into
the circular file labeled G...

Neither of these values show in sysfs (yet).

Signed-off-by: default avatarMark Salyzyn <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 74ee9d52

drivers/scsi/aacraid/aachba.c

+6 −0
Original line number Diff line number Diff line
@@ -1194,6 +1194,12 @@ int aac_get_adapter_info(struct aac_dev* dev) 
			printk(KERN_INFO "%s%d: serial %x\n",

				dev->name, dev->id,

				le32_to_cpu(dev->adapter_info.serial[0]));

		if (dev->supplement_adapter_info.VpdInfo.Tsid[0]) {

			printk(KERN_INFO "%s%d: TSID %.*s\n",

			  dev->name, dev->id,

			  (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),

			  dev->supplement_adapter_info.VpdInfo.Tsid);

		}

	}



	dev->nondasd_support = 0;

drivers/scsi/aacraid/aacraid.h

+17 −2
Original line number Diff line number Diff line
@@ -843,10 +843,25 @@ struct aac_supplement_adapter_info 
	__le32	Version;

	__le32	FeatureBits;

	u8	SlotNumber;

	u8	ReservedPad0[0];

	u8	ReservedPad0[3];

	u8	BuildDate[12];

	__le32	CurrentNumberPorts;

	__le32	ReservedGrowth[24];

	struct {

		u8	AssemblyPn[8];

		u8	FruPn[8];

		u8	BatteryFruPn[8];

		u8	EcVersionString[8];

		u8	Tsid[12];

	}	VpdInfo;

	__le32	FlashFirmwareRevision;

	__le32	FlashFirmwareBuild;

	__le32	RaidTypeMorphOptions;

	__le32	FlashFirmwareBootRevision;

	__le32	FlashFirmwareBootBuild;

	u8	MfgPcbaSerialNo[12];

	u8	MfgWWNName[8];

	__le32	MoreFeatureBits;

	__le32	ReservedGrowth[1];

};

#define AAC_FEATURE_FALCON	0x00000010

#define AAC_SIS_VERSION_V3	3