RE: [PATCH 2/5] arcmsr: Support Hibernation

2013-02-07 Thread NickCheng 
Please ignore the last mails with checkpatch file.
Thanks,
-Original Message-
From: NickCheng [mailto:nick.ch...@areca.com.tw] 
Sent: Friday, February 08, 2013 2:03 PM
To: 'linux-s...@vger.kernel.org'
Cc: 'linux-kernel@vger.kernel.org'; 'j...@kernel.org'; 黃清隆
Subject: [PATCH 2/5] arcmsr: Support Hibernation

From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/5] arcmsr: Support Hibernation

2013-02-07 Thread NickCheng 
From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---


patch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2013-02-07 Thread NickCheng 
From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---


checkpatch2
Description: Binary data

Re: [PATCH 2/5] arcmsr: Support Hibernation

2013-02-07 Thread Tomas Henzl 
On 02/06/2013 09:36 AM, NickCheng wrote:
> From: Nick Cheng 
>
> Support hibernation for whole series of RAID controllers
> Signed-off-by: Nick Cheng 
> ---

Hi Nick,
this patch (2/5) already uses msi-x in the PM part, while the "Support MSI and 
MSI-X"
is added in the patch 3/5. You should switch the order - the support for msi-x 
should precede
the use of it in "Support Hibernation".
Tomas

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/5] arcmsr: Support Hibernation

2013-02-07 Thread NickCheng 
From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---


checkpatch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2013-02-07 Thread NickCheng 
From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---


patch2
Description: Binary data

RE: [PATCH 2/5] arcmsr: Support Hibernation

2013-02-07 Thread NickCheng 
Please ignore the last mails with checkpatch file.
Thanks,
-Original Message-
From: NickCheng [mailto:nick.ch...@areca.com.tw] 
Sent: Friday, February 08, 2013 2:03 PM
To: 'linux-s...@vger.kernel.org'
Cc: 'linux-kernel@vger.kernel.org'; 'j...@kernel.org'; 黃清隆
Subject: [PATCH 2/5] arcmsr: Support Hibernation

From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 2/5] arcmsr: Support Hibernation

2013-02-07 Thread Tomas Henzl 
On 02/06/2013 09:36 AM, NickCheng wrote:
 From: Nick Cheng nick.ch...@areca.com.tw

 Support hibernation for whole series of RAID controllers
 Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
 ---

Hi Nick,
this patch (2/5) already uses msi-x in the PM part, while the Support MSI and 
MSI-X
is added in the patch 3/5. You should switch the order - the support for msi-x 
should precede
the use of it in Support Hibernation.
Tomas

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/5] arcmsr: Support Hibernation

2013-02-06 Thread NickCheng 
From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---


patch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2013-02-06 Thread NickCheng 
From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---


patch2
Description: Binary data

Re: [PATCH 2/5] arcmsr: Support Hibernation

2012-12-17 Thread James Bottomley 
On Tue, 2012-12-04 at 19:59 +0800, NickCheng wrote:
> From: Nick Cheng 
> 
> Support hibernation for whole series of RAID controllers

This doesn't compile:

  CC [M]  drivers/scsi/arcmsr/arcmsr_hba.o
drivers/scsi/arcmsr/arcmsr_hba.c: In function ‘arcmsr_iop_message_xfer’:
drivers/scsi/arcmsr/arcmsr_hba.c:1871:36: error: ‘KM_IRQ0’ undeclared (first 
use in this function)
drivers/scsi/arcmsr/arcmsr_hba.c:1871:36: note: each undeclared identifier is 
reported only once for each function it appears in
drivers/scsi/arcmsr/arcmsr_hba.c:1871:2: error: too many arguments to function 
‘kmap_atomic’
In file included from include/linux/pagemap.h:10:0,
 from include/linux/blkdev.h:13,
 from include/scsi/scsi_cmnd.h:5,
 from drivers/scsi/arcmsr/arcmsr_hba.c:67:
include/linux/highmem.h:66:21: note: declared here
drivers/scsi/arcmsr/arcmsr_hba.c:2127:44: error: macro "kunmap_atomic" passed 2 
arguments, but takes just 1
drivers/scsi/arcmsr/arcmsr_hba.c:2127:2: error: ‘kunmap_atomic’ undeclared 
(first use in this function)
drivers/scsi/arcmsr/arcmsr_hba.c: In function ‘arcmsr_handle_virtual_command’:
drivers/scsi/arcmsr/arcmsr_hba.c:2180:37: error: ‘KM_IRQ0’ undeclared (first 
use in this function)
drivers/scsi/arcmsr/arcmsr_hba.c:2180:3: error: too many arguments to function 
‘kmap_atomic’
In file included from include/linux/pagemap.h:10:0,
 from include/linux/blkdev.h:13,
 from include/scsi/scsi_cmnd.h:5,
 from drivers/scsi/arcmsr/arcmsr_hba.c:67:
include/linux/highmem.h:66:21: note: declared here
drivers/scsi/arcmsr/arcmsr_hba.c:2184:45: error: macro "kunmap_atomic" passed 2 
arguments, but takes just 1
drivers/scsi/arcmsr/arcmsr_hba.c:2184:3: error: ‘kunmap_atomic’ undeclared 
(first use in this function)
make[3]: *** [drivers/scsi/arcmsr/arcmsr_hba.o] Error 1

And that's because you're using an ancient form of kmap_atomic() which
was deprecated by

commit 3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73
Author: Peter Zijlstra 
Date:   Tue Oct 26 14:21:51 2010 -0700

mm: stack based kmap_atomic()

And actually made unsupported a year ago.  What are you compile testing
this against?

James


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 2/5] arcmsr: Support Hibernation

2012-12-17 Thread James Bottomley 
On Tue, 2012-12-04 at 19:59 +0800, NickCheng wrote:
 From: Nick Cheng nick.ch...@areca.com.tw
 
 Support hibernation for whole series of RAID controllers

This doesn't compile:

  CC [M]  drivers/scsi/arcmsr/arcmsr_hba.o
drivers/scsi/arcmsr/arcmsr_hba.c: In function ‘arcmsr_iop_message_xfer’:
drivers/scsi/arcmsr/arcmsr_hba.c:1871:36: error: ‘KM_IRQ0’ undeclared (first 
use in this function)
drivers/scsi/arcmsr/arcmsr_hba.c:1871:36: note: each undeclared identifier is 
reported only once for each function it appears in
drivers/scsi/arcmsr/arcmsr_hba.c:1871:2: error: too many arguments to function 
‘kmap_atomic’
In file included from include/linux/pagemap.h:10:0,
 from include/linux/blkdev.h:13,
 from include/scsi/scsi_cmnd.h:5,
 from drivers/scsi/arcmsr/arcmsr_hba.c:67:
include/linux/highmem.h:66:21: note: declared here
drivers/scsi/arcmsr/arcmsr_hba.c:2127:44: error: macro kunmap_atomic passed 2 
arguments, but takes just 1
drivers/scsi/arcmsr/arcmsr_hba.c:2127:2: error: ‘kunmap_atomic’ undeclared 
(first use in this function)
drivers/scsi/arcmsr/arcmsr_hba.c: In function ‘arcmsr_handle_virtual_command’:
drivers/scsi/arcmsr/arcmsr_hba.c:2180:37: error: ‘KM_IRQ0’ undeclared (first 
use in this function)
drivers/scsi/arcmsr/arcmsr_hba.c:2180:3: error: too many arguments to function 
‘kmap_atomic’
In file included from include/linux/pagemap.h:10:0,
 from include/linux/blkdev.h:13,
 from include/scsi/scsi_cmnd.h:5,
 from drivers/scsi/arcmsr/arcmsr_hba.c:67:
include/linux/highmem.h:66:21: note: declared here
drivers/scsi/arcmsr/arcmsr_hba.c:2184:45: error: macro kunmap_atomic passed 2 
arguments, but takes just 1
drivers/scsi/arcmsr/arcmsr_hba.c:2184:3: error: ‘kunmap_atomic’ undeclared 
(first use in this function)
make[3]: *** [drivers/scsi/arcmsr/arcmsr_hba.o] Error 1

And that's because you're using an ancient form of kmap_atomic() which
was deprecated by

commit 3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73
Author: Peter Zijlstra a.p.zijls...@chello.nl
Date:   Tue Oct 26 14:21:51 2010 -0700

mm: stack based kmap_atomic()

And actually made unsupported a year ago.  What are you compile testing
this against?

James


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/5] arcmsr: Support Hibernation

2012-12-04 Thread NickCheng 
From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---


patch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2012-12-04 Thread NickCheng 
From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---


patch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2012-11-16 Thread NickCheng 
From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---


patch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2012-11-16 Thread NickCheng 
From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---


patch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2012-11-14 Thread NickCheng 
From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---


patch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2012-11-14 Thread NickCheng 
From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---


patch2
Description: Binary data

[PATCH 2/5] arcmsr: Support Hibernation

2012-10-12 Thread NickCheng 
From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---
diff -uprN a//drivers/scsi/arcmsr/arcmsr.h b//drivers/scsi/arcmsr/arcmsr.h
--- a//drivers/scsi/arcmsr/arcmsr.h 2012-10-12 16:28:42.175958900 +0800
+++ b//drivers/scsi/arcmsr/arcmsr.h 2012-10-12 16:29:10.215958628 +0800
@@ -63,7 +63,8 @@ struct device_attribute;
 #define ARCMSR_DEFAULT_SG_ENTRIES  38
 #define ARCMSR_MAX_HBB_POSTQUEUE   264
 #define ARCMSR_MAX_XFER_LEN0x26000
-#define ARCMSR_CDB_SG_PAGE_LENGTH  256 
+#define ARCMSR_CDB_SG_PAGE_LENGTH  256
+#define ARCMST_NUM_MSIX_VECTORS4
 #ifndef PCI_DEVICE_ID_ARECA_1880
#define PCI_DEVICE_ID_ARECA_18800x1880
  #endif
@@ -511,6 +512,7 @@ struct AdapterControlBlock
struct pci_dev *pdev;
struct Scsi_Host *host;
unsigned long vir2phy_offset;
+   struct msix_entry entries[ARCMST_NUM_MSIX_VECTORS];
/* Offset is used in making arc cdb physical to virtual calculations */
uint32_t outbound_int_enable;
uint32_t cdb_phyaddr_hi32;
@@ -547,6 +549,8 @@ struct AdapterControlBlock
/* iop init */
#define ACB_F_ABORT 0x0200
#define ACB_F_FIRMWARE_TRAP 0x0400
+   #define ACB_F_MSI_ENABLED   0x1000
+   #define ACB_F_MSIX_ENABLED  0x2000
struct CommandControlBlock *pccb_pool[ARCMSR_MAX_FREECCB_NUM];
/* used for memory free */
struct list_head ccb_free_list;
diff -uprN a//drivers/scsi/arcmsr/arcmsr_hba.c 
b//drivers/scsi/arcmsr/arcmsr_hba.c
--- a//drivers/scsi/arcmsr/arcmsr_hba.c 2012-10-12 16:28:42.175958900 +0800
+++ b//drivers/scsi/arcmsr/arcmsr_hba.c 2012-10-12 16:29:10.239958629 +0800
@@ -89,11 +89,18 @@ static int arcmsr_bios_param(struct scsi
 static int arcmsr_queue_command(struct Scsi_Host *h, struct scsi_cmnd *cmd);
 static int arcmsr_probe(struct pci_dev *pdev,
const struct pci_device_id *id);
+#ifdef CONFIG_PM
+   static int arcmsr_suspend(struct pci_dev *pdev,
+   pm_message_t state);
+   static int arcmsr_resume(struct pci_dev *pdev);
+#endif
 static void arcmsr_remove(struct pci_dev *pdev);
 static void arcmsr_shutdown(struct pci_dev *pdev);
 static void arcmsr_iop_init(struct AdapterControlBlock *acb);
 static void arcmsr_free_ccb_pool(struct AdapterControlBlock *acb);
 static u32 arcmsr_disable_outbound_ints(struct AdapterControlBlock *acb);
+static void arcmsr_enable_outbound_ints(struct AdapterControlBlock *acb,
+   u32 orig_mask);
 static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb);
 static void arcmsr_hbaA_flush_cache(struct AdapterControlBlock *acb);
 static void arcmsr_hbaB_flush_cache(struct AdapterControlBlock *acb);
@@ -166,6 +173,10 @@ static struct pci_driver arcmsr_pci_driv
.id_table   = arcmsr_device_id_table,
.probe  = arcmsr_probe,
.remove = arcmsr_remove,
+   #ifdef CONFIG_PM
+   .suspend= arcmsr_suspend,
+   .resume = arcmsr_resume,
+   #endif
.shutdown   = arcmsr_shutdown,
 };
 /*
@@ -662,6 +673,134 @@ arcmsr_message_isr_bh_fn(struct work_str
}
 }
 
+#ifdef CONFIG_PM
+   static int
+   arcmsr_suspend(struct pci_dev *pdev, pm_message_t state)
+   {
+   int i;
+   uint32_t intmask_org;
+   struct Scsi_Host *host = pci_get_drvdata(pdev);
+   struct AdapterControlBlock *acb =
+   (struct AdapterControlBlock *)host->hostdata;
+
+   intmask_org = arcmsr_disable_outbound_ints(acb);
+   if (acb->acb_flags & ACB_F_MSI_ENABLED) {
+   free_irq(pdev->irq, acb);
+   pci_disable_msi(pdev);
+   } else if (acb->acb_flags & ACB_F_MSIX_ENABLED) {
+   for (i = 0; i < ARCMST_NUM_MSIX_VECTORS; i++) {
+   free_irq(acb->entries[i].vector, acb);
+   }
+   pci_disable_msix(pdev);
+   } else {
+   free_irq(pdev->irq, acb);
+   }
+   del_timer_sync(>eternal_timer);
+   flush_scheduled_work();
+   arcmsr_stop_adapter_bgrb(acb);
+   arcmsr_flush_adapter_cache(acb);
+   arcmsr_enable_outbound_ints(acb, intmask_org);
+   pci_set_drvdata(pdev, host);
+   pci_save_state(pdev);
+   pci_disable_device(pdev);
+   pci_set_power_state(pdev, pci_choose_state(pdev, state));
+   return 0;
+   }
+   
+   static int
+   arcmsr_resume(struct pci_dev *pdev)
+   {
+   int error, i, j;
+   struct Scsi_Host *host

[PATCH 2/5] arcmsr: Support Hibernation

2012-10-12 Thread NickCheng 
From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---
diff -uprN a//drivers/scsi/arcmsr/arcmsr.h b//drivers/scsi/arcmsr/arcmsr.h
--- a//drivers/scsi/arcmsr/arcmsr.h 2012-10-12 16:28:42.175958900 +0800
+++ b//drivers/scsi/arcmsr/arcmsr.h 2012-10-12 16:29:10.215958628 +0800
@@ -63,7 +63,8 @@ struct device_attribute;
 #define ARCMSR_DEFAULT_SG_ENTRIES  38
 #define ARCMSR_MAX_HBB_POSTQUEUE   264
 #define ARCMSR_MAX_XFER_LEN0x26000
-#define ARCMSR_CDB_SG_PAGE_LENGTH  256 
+#define ARCMSR_CDB_SG_PAGE_LENGTH  256
+#define ARCMST_NUM_MSIX_VECTORS4
 #ifndef PCI_DEVICE_ID_ARECA_1880
#define PCI_DEVICE_ID_ARECA_18800x1880
  #endif
@@ -511,6 +512,7 @@ struct AdapterControlBlock
struct pci_dev *pdev;
struct Scsi_Host *host;
unsigned long vir2phy_offset;
+   struct msix_entry entries[ARCMST_NUM_MSIX_VECTORS];
/* Offset is used in making arc cdb physical to virtual calculations */
uint32_t outbound_int_enable;
uint32_t cdb_phyaddr_hi32;
@@ -547,6 +549,8 @@ struct AdapterControlBlock
/* iop init */
#define ACB_F_ABORT 0x0200
#define ACB_F_FIRMWARE_TRAP 0x0400
+   #define ACB_F_MSI_ENABLED   0x1000
+   #define ACB_F_MSIX_ENABLED  0x2000
struct CommandControlBlock *pccb_pool[ARCMSR_MAX_FREECCB_NUM];
/* used for memory free */
struct list_head ccb_free_list;
diff -uprN a//drivers/scsi/arcmsr/arcmsr_hba.c 
b//drivers/scsi/arcmsr/arcmsr_hba.c
--- a//drivers/scsi/arcmsr/arcmsr_hba.c 2012-10-12 16:28:42.175958900 +0800
+++ b//drivers/scsi/arcmsr/arcmsr_hba.c 2012-10-12 16:29:10.239958629 +0800
@@ -89,11 +89,18 @@ static int arcmsr_bios_param(struct scsi
 static int arcmsr_queue_command(struct Scsi_Host *h, struct scsi_cmnd *cmd);
 static int arcmsr_probe(struct pci_dev *pdev,
const struct pci_device_id *id);
+#ifdef CONFIG_PM
+   static int arcmsr_suspend(struct pci_dev *pdev,
+   pm_message_t state);
+   static int arcmsr_resume(struct pci_dev *pdev);
+#endif
 static void arcmsr_remove(struct pci_dev *pdev);
 static void arcmsr_shutdown(struct pci_dev *pdev);
 static void arcmsr_iop_init(struct AdapterControlBlock *acb);
 static void arcmsr_free_ccb_pool(struct AdapterControlBlock *acb);
 static u32 arcmsr_disable_outbound_ints(struct AdapterControlBlock *acb);
+static void arcmsr_enable_outbound_ints(struct AdapterControlBlock *acb,
+   u32 orig_mask);
 static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb);
 static void arcmsr_hbaA_flush_cache(struct AdapterControlBlock *acb);
 static void arcmsr_hbaB_flush_cache(struct AdapterControlBlock *acb);
@@ -166,6 +173,10 @@ static struct pci_driver arcmsr_pci_driv
.id_table   = arcmsr_device_id_table,
.probe  = arcmsr_probe,
.remove = arcmsr_remove,
+   #ifdef CONFIG_PM
+   .suspend= arcmsr_suspend,
+   .resume = arcmsr_resume,
+   #endif
.shutdown   = arcmsr_shutdown,
 };
 /*
@@ -662,6 +673,134 @@ arcmsr_message_isr_bh_fn(struct work_str
}
 }
 
+#ifdef CONFIG_PM
+   static int
+   arcmsr_suspend(struct pci_dev *pdev, pm_message_t state)
+   {
+   int i;
+   uint32_t intmask_org;
+   struct Scsi_Host *host = pci_get_drvdata(pdev);
+   struct AdapterControlBlock *acb =
+   (struct AdapterControlBlock *)host-hostdata;
+
+   intmask_org = arcmsr_disable_outbound_ints(acb);
+   if (acb-acb_flags  ACB_F_MSI_ENABLED) {
+   free_irq(pdev-irq, acb);
+   pci_disable_msi(pdev);
+   } else if (acb-acb_flags  ACB_F_MSIX_ENABLED) {
+   for (i = 0; i  ARCMST_NUM_MSIX_VECTORS; i++) {
+   free_irq(acb-entries[i].vector, acb);
+   }
+   pci_disable_msix(pdev);
+   } else {
+   free_irq(pdev-irq, acb);
+   }
+   del_timer_sync(acb-eternal_timer);
+   flush_scheduled_work();
+   arcmsr_stop_adapter_bgrb(acb);
+   arcmsr_flush_adapter_cache(acb);
+   arcmsr_enable_outbound_ints(acb, intmask_org);
+   pci_set_drvdata(pdev, host);
+   pci_save_state(pdev);
+   pci_disable_device(pdev);
+   pci_set_power_state(pdev, pci_choose_state(pdev, state));
+   return 0;
+   }
+   
+   static int
+   arcmsr_resume(struct pci_dev *pdev)
+   {
+   int error, i,

[PATCH 2/5] arcmsr: Support Hibernation

2012-10-03 Thread NickCheng 
From: Nick Cheng 

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng 
---
diff -uprN -X linux-vanilla/Documentation/dontdiff
linux-vanilla//drivers/scsi/arcmsr/arcmsr_hba.c
linux-development//drivers/scsi/arcmsr/arcmsr_hba.c
--- linux-vanilla//drivers/scsi/arcmsr/arcmsr_hba.c 2012-10-03
19:08:33.338634210 +0800
+++ linux-development//drivers/scsi/arcmsr/arcmsr_hba.c 2012-10-03
18:50:32.694644708 +0800
@@ -42,7 +42,7 @@
 ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 

***
 ** For history of changes, see Documentation/scsi/ChangeLog.arcmsr
-** Firmware Specification, see Documentation/scsi/arcmsr_spec.txt
+** Firmware Specification, see Documentation/scsi/arcmsr_spec.txt
 

***
 */
 #include 
@@ -90,6 +90,8 @@ static int arcmsr_bios_param(struct scsi
 static int arcmsr_queue_command(struct Scsi_Host *h, struct scsi_cmnd
*cmd);
 static int arcmsr_probe(struct pci_dev *pdev,
const struct pci_device_id *id);
+static int arcmsr_suspend(struct pci_dev *pdev, pm_message_t state);
+static int arcmsr_resume(struct pci_dev *pdev);
 static void arcmsr_remove(struct pci_dev *pdev);
 static void arcmsr_shutdown(struct pci_dev *pdev);
 static void arcmsr_iop_init(struct AdapterControlBlock *acb);
@@ -167,6 +169,8 @@ static struct pci_driver arcmsr_pci_driv
.id_table   = arcmsr_device_id_table,
.probe  = arcmsr_probe,
.remove = arcmsr_remove,
+   .suspend= arcmsr_suspend,
+   .resume = arcmsr_resume,
.shutdown   = arcmsr_shutdown,
 };
 /*
@@ -603,6 +607,80 @@ static void arcmsr_message_isr_bh_fn(str
}
 }
 
+static int arcmsr_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+   int i;
+   uint32_t intmask_org;
+   struct Scsi_Host *host = pci_get_drvdata(pdev);
+   struct AdapterControlBlock *acb = (struct AdapterControlBlock
*)host->hostdata;
+
+   intmask_org = arcmsr_disable_outbound_ints(acb);
+   del_timer_sync(>eternal_timer);
+   flush_scheduled_work();
+   arcmsr_stop_adapter_bgrb(acb);
+   arcmsr_flush_adapter_cache(acb);
+   arcmsr_enable_outbound_ints(acb, intmask_org);
+   pci_set_drvdata(pdev, host);
+   pci_save_state(pdev);
+   pci_disable_device(pdev);
+   pci_set_power_state(pdev, pci_choose_state(pdev, state));
+   return 0;
+}
+
+static int arcmsr_resume(struct pci_dev *pdev)
+{
+   int error, i, j;
+   struct Scsi_Host *host = pci_get_drvdata(pdev);
+   struct AdapterControlBlock *acb = (struct AdapterControlBlock
*)host->hostdata;
+
+   pci_set_power_state(pdev, PCI_D0);
+   pci_enable_wake(pdev, PCI_D0, 0);
+   pci_restore_state(pdev);
+   if (pci_enable_device(pdev)) {
+   printk("%s: pci_enable_device error \n", __func__);
+   return -ENODEV;
+   }
+   error = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+   if (error) {
+   error = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+   if (error) {
+   printk(KERN_WARNING
+  "scsi%d: No suitable DMA mask available\n",
+  host->host_no);
+   goto controller_unregister;
+   }
+   }
+   pci_set_master(pdev);
+   arcmsr_iop_init(acb);
+   if (request_irq(pdev->irq, arcmsr_do_interrupt, IRQF_SHARED,
"arcmsr", acb)) {
+   printk("arcmsr%d: request_irq =%d failed!\n",
acb->host->host_no, pdev->irq);
+   goto controller_stop;
+   }
+   timer_init:
+   INIT_WORK(>arcmsr_do_message_isr_bh,
+   arcmsr_message_isr_bh_fn);
+   atomic_set(>rq_map_token, 16);
+   atomic_set(>ante_token_value, 16);
+   acb->fw_flag = FW_NORMAL;
+   init_timer(>eternal_timer);
+   acb->eternal_timer.expires = jiffies + msecs_to_jiffies(6 *
HZ);
+   acb->eternal_timer.data = (unsigned long) acb;
+   acb->eternal_timer.function = _request_device_map;
+   add_timer(>eternal_timer);
+   return 0;
+   controller_stop:
+   arcmsr_stop_adapter_bgrb(acb);
+   arcmsr_flush_adapter_cache(acb);
+   controller_unregister:
+   scsi_remove_host(host);
+   arcmsr_free_ccb_pool(acb);
+   arcmsr_unmap_pciregion(acb);
+   pci_release_regions(pdev);
+   scsi_host_put(host);
+   pci_disable_device(pdev);
+   return -ENODEV;
+}
+
 static int arcmsr_probe(struct pci_dev *pdev, const struct pci_device_id
*id)
 {
struct Scsi_Host *host;
@@ -1539,14 +1617,7 @@ static void

[PATCH 2/5] arcmsr: Support Hibernation

2012-10-03 Thread NickCheng 
From: Nick Cheng nick.ch...@areca.com.tw

Support hibernation for whole series of RAID controllers
Signed-off-by: Nick Cheng nick.ch...@areca.com.tw
---
diff -uprN -X linux-vanilla/Documentation/dontdiff
linux-vanilla//drivers/scsi/arcmsr/arcmsr_hba.c
linux-development//drivers/scsi/arcmsr/arcmsr_hba.c
--- linux-vanilla//drivers/scsi/arcmsr/arcmsr_hba.c 2012-10-03
19:08:33.338634210 +0800
+++ linux-development//drivers/scsi/arcmsr/arcmsr_hba.c 2012-10-03
18:50:32.694644708 +0800
@@ -42,7 +42,7 @@
 ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 

***
 ** For history of changes, see Documentation/scsi/ChangeLog.arcmsr
-** Firmware Specification, see Documentation/scsi/arcmsr_spec.txt
+** Firmware Specification, see Documentation/scsi/arcmsr_spec.txt
 

***
 */
 #include linux/module.h
@@ -90,6 +90,8 @@ static int arcmsr_bios_param(struct scsi
 static int arcmsr_queue_command(struct Scsi_Host *h, struct scsi_cmnd
*cmd);
 static int arcmsr_probe(struct pci_dev *pdev,
const struct pci_device_id *id);
+static int arcmsr_suspend(struct pci_dev *pdev, pm_message_t state);
+static int arcmsr_resume(struct pci_dev *pdev);
 static void arcmsr_remove(struct pci_dev *pdev);
 static void arcmsr_shutdown(struct pci_dev *pdev);
 static void arcmsr_iop_init(struct AdapterControlBlock *acb);
@@ -167,6 +169,8 @@ static struct pci_driver arcmsr_pci_driv
.id_table   = arcmsr_device_id_table,
.probe  = arcmsr_probe,
.remove = arcmsr_remove,
+   .suspend= arcmsr_suspend,
+   .resume = arcmsr_resume,
.shutdown   = arcmsr_shutdown,
 };
 /*
@@ -603,6 +607,80 @@ static void arcmsr_message_isr_bh_fn(str
}
 }
 
+static int arcmsr_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+   int i;
+   uint32_t intmask_org;
+   struct Scsi_Host *host = pci_get_drvdata(pdev);
+   struct AdapterControlBlock *acb = (struct AdapterControlBlock
*)host-hostdata;
+
+   intmask_org = arcmsr_disable_outbound_ints(acb);
+   del_timer_sync(acb-eternal_timer);
+   flush_scheduled_work();
+   arcmsr_stop_adapter_bgrb(acb);
+   arcmsr_flush_adapter_cache(acb);
+   arcmsr_enable_outbound_ints(acb, intmask_org);
+   pci_set_drvdata(pdev, host);
+   pci_save_state(pdev);
+   pci_disable_device(pdev);
+   pci_set_power_state(pdev, pci_choose_state(pdev, state));
+   return 0;
+}
+
+static int arcmsr_resume(struct pci_dev *pdev)
+{
+   int error, i, j;
+   struct Scsi_Host *host = pci_get_drvdata(pdev);
+   struct AdapterControlBlock *acb = (struct AdapterControlBlock
*)host-hostdata;
+
+   pci_set_power_state(pdev, PCI_D0);
+   pci_enable_wake(pdev, PCI_D0, 0);
+   pci_restore_state(pdev);
+   if (pci_enable_device(pdev)) {
+   printk(%s: pci_enable_device error \n, __func__);
+   return -ENODEV;
+   }
+   error = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+   if (error) {
+   error = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+   if (error) {
+   printk(KERN_WARNING
+  scsi%d: No suitable DMA mask available\n,
+  host-host_no);
+   goto controller_unregister;
+   }
+   }
+   pci_set_master(pdev);
+   arcmsr_iop_init(acb);
+   if (request_irq(pdev-irq, arcmsr_do_interrupt, IRQF_SHARED,
arcmsr, acb)) {
+   printk(arcmsr%d: request_irq =%d failed!\n,
acb-host-host_no, pdev-irq);
+   goto controller_stop;
+   }
+   timer_init:
+   INIT_WORK(acb-arcmsr_do_message_isr_bh,
+   arcmsr_message_isr_bh_fn);
+   atomic_set(acb-rq_map_token, 16);
+   atomic_set(acb-ante_token_value, 16);
+   acb-fw_flag = FW_NORMAL;
+   init_timer(acb-eternal_timer);
+   acb-eternal_timer.expires = jiffies + msecs_to_jiffies(6 *
HZ);
+   acb-eternal_timer.data = (unsigned long) acb;
+   acb-eternal_timer.function = arcmsr_request_device_map;
+   add_timer(acb-eternal_timer);
+   return 0;
+   controller_stop:
+   arcmsr_stop_adapter_bgrb(acb);
+   arcmsr_flush_adapter_cache(acb);
+   controller_unregister:
+   scsi_remove_host(host);
+   arcmsr_free_ccb_pool(acb);
+   arcmsr_unmap_pciregion(acb);
+   pci_release_regions(pdev);
+   scsi_host_put(host);
+   pci_disable_device(pdev);
+   return -ENODEV;
+}
+
 static int arcmsr_probe(struct pci_dev *pdev, const struct pci_device_id
*id)
 {