| From cef82c046c00620b36d44c42114f5bd90168d21e Mon Sep 17 00:00:00 2001 |
| From: Douglas Gilbert <dgilbert@interlog.com> |
| Date: Thu, 9 Jun 2011 00:27:07 -0400 |
| Subject: [PATCH] ses: requesting a fault indication |
| |
| commit 2a350cab9daf9a46322d83b091bb05cf54ccf6ab upstream. |
| |
| 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> |
| Signed-off-by: James Bottomley <JBottomley@Parallels.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| drivers/scsi/ses.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c |
| index 3b00e90..fedb4f9 100644 |
| --- a/drivers/scsi/ses.c |
| +++ b/drivers/scsi/ses.c |
| @@ -158,6 +158,10 @@ static unsigned char *ses_get_page2_descriptor(struct enclosure_device *edev, |
| return NULL; |
| } |
| |
| +/* For device slot and array device slot elements, byte 3 bit 6 |
| + * is "fault sensed" while byte 3 bit 5 is "fault reqstd". As this |
| + * code stands these bits are shifted 4 positions right so in |
| + * sysfs they will appear as bits 2 and 1 respectively. Strange. */ |
| static void ses_get_fault(struct enclosure_device *edev, |
| struct enclosure_component *ecomp) |
| { |
| @@ -179,7 +183,7 @@ static int ses_set_fault(struct enclosure_device *edev, |
| /* zero is disabled */ |
| break; |
| case ENCLOSURE_SETTING_ENABLED: |
| - desc[2] = 0x02; |
| + desc[3] = 0x20; |
| break; |
| default: |
| /* SES doesn't do the SGPIO blink settings */ |
| -- |
| 1.7.9.6 |
| |
