diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2011-06-09 00:27:07 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-06-29 13:14:25 -0400 |
commit | 2a350cab9daf9a46322d83b091bb05cf54ccf6ab (patch) | |
tree | 086520b795dd7dab8b8dfdb62edf9a354965b113 /drivers | |
parent | 545a876e4b4f261218be2c09b46dfff4ee95be31 (diff) |
[SCSI] ses: requesting a fault indication
Noticed that when the sysfs interface of the SCSI SES
driver was used to request a fault indication the LED
flashed but the buzzer didn't sound. So it was doing
what REQUEST IDENT (locate) should do.
Changelog:
- fix the setting of REQUEST FAULT for the device slot
and array device slot elements in the enclosure control
diagnostic page
- note the potentially defective code that reads the
FAULT SENSED and FAULT REQUESTED bits from the enclosure
status diagnostic page
The attached patch is against git/scsi-misc-2.6
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
Cc: stable@kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/ses.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index eb7a3e85304f..eba183c428cf 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c | |||
@@ -160,6 +160,10 @@ static unsigned char *ses_get_page2_descriptor(struct enclosure_device *edev, | |||
160 | return NULL; | 160 | return NULL; |
161 | } | 161 | } |
162 | 162 | ||
163 | /* For device slot and array device slot elements, byte 3 bit 6 | ||
164 | * is "fault sensed" while byte 3 bit 5 is "fault reqstd". As this | ||
165 | * code stands these bits are shifted 4 positions right so in | ||
166 | * sysfs they will appear as bits 2 and 1 respectively. Strange. */ | ||
163 | static void ses_get_fault(struct enclosure_device *edev, | 167 | static void ses_get_fault(struct enclosure_device *edev, |
164 | struct enclosure_component *ecomp) | 168 | struct enclosure_component *ecomp) |
165 | { | 169 | { |
@@ -181,7 +185,7 @@ static int ses_set_fault(struct enclosure_device *edev, | |||
181 | /* zero is disabled */ | 185 | /* zero is disabled */ |
182 | break; | 186 | break; |
183 | case ENCLOSURE_SETTING_ENABLED: | 187 | case ENCLOSURE_SETTING_ENABLED: |
184 | desc[2] = 0x02; | 188 | desc[3] = 0x20; |
185 | break; | 189 | break; |
186 | default: | 190 | default: |
187 | /* SES doesn't do the SGPIO blink settings */ | 191 | /* SES doesn't do the SGPIO blink settings */ |