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

Commit 5b5ef4f6 authored by Moore, Eric's avatar Moore, Eric Committed by
Browse files

[SCSI] fusion - mptctl - Event Log Fix 



Use the hard coded value MPTCTL_EVENT_LOG_SIZE to fix
bug where in certain cases, the ioc->eventLogSize was
initialized.

Signed-off-by: default avatarEric Moore <Eric.Moore@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 86a7dcaa

drivers/message/fusion/mptbase.c

+1 −1
Original line number Diff line number Diff line
@@ -6142,7 +6142,7 @@ ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply 
	if (ioc->events && (ioc->eventTypes & ( 1 << event))) {

		int idx;



		idx = ioc->eventContext % ioc->eventLogSize;

		idx = ioc->eventContext % MPTCTL_EVENT_LOG_SIZE;



		ioc->events[idx].event = event;

		ioc->events[idx].eventContext = ioc->eventContext;

drivers/message/fusion/mptctl.c

+2 −3
Original line number Diff line number Diff line
@@ -1501,7 +1501,7 @@ mptctl_eventquery (unsigned long arg) 
		return -ENODEV;

	}



	karg.eventEntries = ioc->eventLogSize;

	karg.eventEntries = MPTCTL_EVENT_LOG_SIZE;

	karg.eventTypes = ioc->eventTypes;



	/* Copy the data from kernel memory to user memory
@@ -1551,7 +1551,6 @@ mptctl_eventenable (unsigned long arg) 
		memset(ioc->events, 0, sz);

		ioc->alloc_total += sz;



		ioc->eventLogSize = MPTCTL_EVENT_LOG_SIZE;

		ioc->eventContext = 0;

        }
@@ -1591,7 +1590,7 @@ mptctl_eventreport (unsigned long arg) 
	maxEvents = numBytes/sizeof(MPT_IOCTL_EVENTS);





	max = ioc->eventLogSize < maxEvents ? ioc->eventLogSize : maxEvents;

	max = MPTCTL_EVENT_LOG_SIZE < maxEvents ? MPTCTL_EVENT_LOG_SIZE : maxEvents;



	/* If fewer than 1 event is requested, there must have

	 * been some type of error.

drivers/message/fusion/mptscsih.c

+1 −1
Original line number Diff line number Diff line
@@ -2489,7 +2489,7 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR 
				int idx;

				MPT_ADAPTER *ioc = hd->ioc;



				idx = ioc->eventContext % ioc->eventLogSize;

				idx = ioc->eventContext % MPTCTL_EVENT_LOG_SIZE;

				ioc->events[idx].event = MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE;

				ioc->events[idx].eventContext = ioc->eventContext;