subject:"Re\: \[PATCH v2 2\/3\] arcmsr\: adds code for support areca new adapter ARC1203"

Re: [PATCH v2 2/3] arcmsr: adds code for support areca new adapter ARC1203

2015-11-25 Thread Ching Huang

On Wed, 2015-11-25 at 09:43 +0100, Johannes Thumshirn wrote:
> On Wed, 2015-11-25 at 11:25 +0800, Ching Huang wrote:
> > From: Ching Huang 
> > 
> > Support areca new PCIe to SATA RAID adapter ARC1203
> > 
> > Signed-of-by: Ching Huang
> > 
> > ---
> > 
> > diff -uprN a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
> > --- a/drivers/scsi/arcmsr/arcmsr.h  2015-11-25 10:52:16.28647 +0800
> > +++ b/drivers/scsi/arcmsr/arcmsr.h  2015-11-25 10:52:13.33447 +0800
> > @@ -74,6 +74,9 @@ struct device_attribute;
> >  #ifndef PCI_DEVICE_ID_ARECA_1214
> > #define PCI_DEVICE_ID_ARECA_12140x1214
> >  #endif
> > +#ifndef PCI_DEVICE_ID_ARECA_1203
> > +   #define PCI_DEVICE_ID_ARECA_12030x1203
> > +#endif
> >  /*
> >  
> > 
> > **
> >  **
> > @@ -245,6 +248,12 @@ struct FIRMWARE_INFO
> >  /* window of "instruction flags" from iop to driver */
> >  #define ARCMSR_IOP2DRV_DOORBELL   0x00020408
> >  #define ARCMSR_IOP2DRV_DOORBELL_MASK  0x0002040C
> > +/* window of "instruction flags" from iop to driver */
> > +#define ARCMSR_IOP2DRV_DOORBELL_1203  0x00021870
> > +#define ARCMSR_IOP2DRV_DOORBELL_MASK_1203 0x00021874
> > +/* window of "instruction flags" from driver to iop */
> > +#define ARCMSR_DRV2IOP_DOORBELL_1203  0x00021878
> > +#define ARCMSR_DRV2IOP_DOORBELL_MASK_1203 0x0002187C
> >  /* ARECA FLAG LANGUAGE */
> >  /* ioctl transfer */
> >  #define ARCMSR_IOP2DRV_DATA_WRITE_OK  0x0001
> > diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c
> > b/drivers/scsi/arcmsr/arcmsr_hba.c
> > --- a/drivers/scsi/arcmsr/arcmsr_hba.c  2015-11-24 11:35:26.0
> > +0800
> > +++ b/drivers/scsi/arcmsr/arcmsr_hba.c  2015-11-24 18:58:40.640226000
> > +0800
> > @@ -114,6 +114,7 @@ static void arcmsr_hardware_reset(struct
> >  static const char *arcmsr_info(struct Scsi_Host *);
> >  static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb);
> >  static void arcmsr_free_irq(struct pci_dev *, struct AdapterControlBlock 
> > *);
> > +static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb);
> >  static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev, int
> > queue_depth)
> >  {
> > if (queue_depth > ARCMSR_MAX_CMD_PERLUN)
> > @@ -157,6 +158,8 @@ static struct pci_device_id arcmsr_devic
> > .driver_data = ACB_ADAPTER_TYPE_B},
> > {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1202),
> > .driver_data = ACB_ADAPTER_TYPE_B},
> > +   {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1203),
> > +   .driver_data = ACB_ADAPTER_TYPE_B},
> > {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1210),
> > .driver_data = ACB_ADAPTER_TYPE_A},
> > {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1214),
> > @@ -2621,7 +2624,7 @@ static bool arcmsr_hbaA_get_config(struc
> >  }
> >  static bool arcmsr_hbaB_get_config(struct AdapterControlBlock *acb)
> >  {
> > -   struct MessageUnit_B *reg = acb->pmuB;
> > +   struct MessageUnit_B *reg;
> > struct pci_dev *pdev = acb->pdev;
> > void *dma_coherent;
> > dma_addr_t dma_coherent_handle;
> > @@ -2649,10 +2652,17 @@ static bool arcmsr_hbaB_get_config(struc
> > acb->dma_coherent2 = dma_coherent;
> > reg = (struct MessageUnit_B *)dma_coherent;
> > acb->pmuB = reg;
> > -   reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned long)acb-
> > >mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
> > -   reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK);
> > -   reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned long)acb-
> > >mem_base0 + ARCMSR_IOP2DRV_DOORBELL);
> > -   reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK);
> > +   if (acb->pdev->device == PCI_DEVICE_ID_ARECA_1203) {
> > +   reg->drv2iop_doorbell = (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_1203);
> > +   reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK_1203);
> > +   reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_1203);
> > +   reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK_1203);
> > +   } else {
> > +   reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
> > +   reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK);
> > +   reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL);
> > +   reg->iop2drv_doorbell_mask = (

Re: [PATCH v2 2/3] arcmsr: adds code for support areca new adapter ARC1203

2015-11-25 Thread Ching Huang

On Wed, 2015-11-25 at 08:18 +0100, Hannes Reinecke wrote:
> On 11/25/2015 04:25 AM, Ching Huang wrote:
> > From: Ching Huang 
> > 
> > Support areca new PCIe to SATA RAID adapter ARC1203
> > 
> > Signed-of-by: Ching Huang
> > 
> > ---
> > 
> > diff -uprN a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
> > --- a/drivers/scsi/arcmsr/arcmsr.h  2015-11-25 10:52:16.28647 +0800
> > +++ b/drivers/scsi/arcmsr/arcmsr.h  2015-11-25 10:52:13.33447 +0800
> > @@ -74,6 +74,9 @@ struct device_attribute;
> >  #ifndef PCI_DEVICE_ID_ARECA_1214
> > #define PCI_DEVICE_ID_ARECA_12140x1214
> >  #endif
> > +#ifndef PCI_DEVICE_ID_ARECA_1203
> > +   #define PCI_DEVICE_ID_ARECA_12030x1203
> > +#endif
> >  /*
> >  
> > **
> >  **
> > @@ -245,6 +248,12 @@ struct FIRMWARE_INFO
> >  /* window of "instruction flags" from iop to driver */
> >  #define ARCMSR_IOP2DRV_DOORBELL   0x00020408
> >  #define ARCMSR_IOP2DRV_DOORBELL_MASK  0x0002040C
> > +/* window of "instruction flags" from iop to driver */
> > +#define ARCMSR_IOP2DRV_DOORBELL_1203  0x00021870
> > +#define ARCMSR_IOP2DRV_DOORBELL_MASK_1203 0x00021874
> > +/* window of "instruction flags" from driver to iop */
> > +#define ARCMSR_DRV2IOP_DOORBELL_1203  0x00021878
> > +#define ARCMSR_DRV2IOP_DOORBELL_MASK_1203 0x0002187C
> >  /* ARECA FLAG LANGUAGE */
> >  /* ioctl transfer */
> >  #define ARCMSR_IOP2DRV_DATA_WRITE_OK  0x0001
> > diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c 
> > b/drivers/scsi/arcmsr/arcmsr_hba.c
> > --- a/drivers/scsi/arcmsr/arcmsr_hba.c  2015-11-24 11:35:26.0 
> > +0800
> > +++ b/drivers/scsi/arcmsr/arcmsr_hba.c  2015-11-24 18:58:40.640226000 
> > +0800
> > @@ -114,6 +114,7 @@ static void arcmsr_hardware_reset(struct
> >  static const char *arcmsr_info(struct Scsi_Host *);
> >  static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb);
> >  static void arcmsr_free_irq(struct pci_dev *, struct AdapterControlBlock 
> > *);
> > +static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb);
> >  static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev, int 
> > queue_depth)
> >  {
> > if (queue_depth > ARCMSR_MAX_CMD_PERLUN)
> > @@ -157,6 +158,8 @@ static struct pci_device_id arcmsr_devic
> > .driver_data = ACB_ADAPTER_TYPE_B},
> > {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1202),
> > .driver_data = ACB_ADAPTER_TYPE_B},
> > +   {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1203),
> > +   .driver_data = ACB_ADAPTER_TYPE_B},
> > {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1210),
> > .driver_data = ACB_ADAPTER_TYPE_A},
> > {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1214),
> > @@ -2621,7 +2624,7 @@ static bool arcmsr_hbaA_get_config(struc
> >  }
> >  static bool arcmsr_hbaB_get_config(struct AdapterControlBlock *acb)
> >  {
> > -   struct MessageUnit_B *reg = acb->pmuB;
> > +   struct MessageUnit_B *reg;
> > struct pci_dev *pdev = acb->pdev;
> > void *dma_coherent;
> > dma_addr_t dma_coherent_handle;
> > @@ -2649,10 +2652,17 @@ static bool arcmsr_hbaB_get_config(struc
> > acb->dma_coherent2 = dma_coherent;
> > reg = (struct MessageUnit_B *)dma_coherent;
> > acb->pmuB = reg;
> > -   reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
> > -   reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK);
> > -   reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL);
> > -   reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK);
> > +   if (acb->pdev->device == PCI_DEVICE_ID_ARECA_1203) {
> > +   reg->drv2iop_doorbell = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_1203);
> > +   reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK_1203);
> > +   reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_1203);
> > +   reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK_1203);
> > +   } else {
> > +   reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
> > +   reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK);
> > +   reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned 
> > long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL);
> > +   reg->iop2drv_doorbell_mask = (uint32

Re: [PATCH v2 2/3] arcmsr: adds code for support areca new adapter ARC1203

2015-11-25 Thread Johannes Thumshirn

On Wed, 2015-11-25 at 11:25 +0800, Ching Huang wrote:
> From: Ching Huang 
> 
> Support areca new PCIe to SATA RAID adapter ARC1203
> 
> Signed-of-by: Ching Huang
> 
> ---
> 
> diff -uprN a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
> --- a/drivers/scsi/arcmsr/arcmsr.h2015-11-25 10:52:16.28647 +0800
> +++ b/drivers/scsi/arcmsr/arcmsr.h2015-11-25 10:52:13.33447 +0800
> @@ -74,6 +74,9 @@ struct device_attribute;
>  #ifndef PCI_DEVICE_ID_ARECA_1214
>   #define PCI_DEVICE_ID_ARECA_12140x1214
>  #endif
> +#ifndef PCI_DEVICE_ID_ARECA_1203
> + #define PCI_DEVICE_ID_ARECA_12030x1203
> +#endif
>  /*
>  
> **
>  **
> @@ -245,6 +248,12 @@ struct FIRMWARE_INFO
>  /* window of "instruction flags" from iop to driver */
>  #define ARCMSR_IOP2DRV_DOORBELL   0x00020408
>  #define ARCMSR_IOP2DRV_DOORBELL_MASK  0x0002040C
> +/* window of "instruction flags" from iop to driver */
> +#define ARCMSR_IOP2DRV_DOORBELL_1203  0x00021870
> +#define ARCMSR_IOP2DRV_DOORBELL_MASK_1203 0x00021874
> +/* window of "instruction flags" from driver to iop */
> +#define ARCMSR_DRV2IOP_DOORBELL_1203  0x00021878
> +#define ARCMSR_DRV2IOP_DOORBELL_MASK_1203 0x0002187C
>  /* ARECA FLAG LANGUAGE */
>  /* ioctl transfer */
>  #define ARCMSR_IOP2DRV_DATA_WRITE_OK  0x0001
> diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c
> b/drivers/scsi/arcmsr/arcmsr_hba.c
> --- a/drivers/scsi/arcmsr/arcmsr_hba.c2015-11-24 11:35:26.0
> +0800
> +++ b/drivers/scsi/arcmsr/arcmsr_hba.c2015-11-24 18:58:40.640226000
> +0800
> @@ -114,6 +114,7 @@ static void arcmsr_hardware_reset(struct
>  static const char *arcmsr_info(struct Scsi_Host *);
>  static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb);
>  static void arcmsr_free_irq(struct pci_dev *, struct AdapterControlBlock *);
> +static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb);
>  static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev, int
> queue_depth)
>  {
>   if (queue_depth > ARCMSR_MAX_CMD_PERLUN)
> @@ -157,6 +158,8 @@ static struct pci_device_id arcmsr_devic
>   .driver_data = ACB_ADAPTER_TYPE_B},
>   {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1202),
>   .driver_data = ACB_ADAPTER_TYPE_B},
> + {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1203),
> + .driver_data = ACB_ADAPTER_TYPE_B},
>   {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1210),
>   .driver_data = ACB_ADAPTER_TYPE_A},
>   {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1214),
> @@ -2621,7 +2624,7 @@ static bool arcmsr_hbaA_get_config(struc
>  }
>  static bool arcmsr_hbaB_get_config(struct AdapterControlBlock *acb)
>  {
> - struct MessageUnit_B *reg = acb->pmuB;
> + struct MessageUnit_B *reg;
>   struct pci_dev *pdev = acb->pdev;
>   void *dma_coherent;
>   dma_addr_t dma_coherent_handle;
> @@ -2649,10 +2652,17 @@ static bool arcmsr_hbaB_get_config(struc
>   acb->dma_coherent2 = dma_coherent;
>   reg = (struct MessageUnit_B *)dma_coherent;
>   acb->pmuB = reg;
> - reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned long)acb-
> >mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
> - reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK);
> - reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned long)acb-
> >mem_base0 + ARCMSR_IOP2DRV_DOORBELL);
> - reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK);
> + if (acb->pdev->device == PCI_DEVICE_ID_ARECA_1203) {
> + reg->drv2iop_doorbell = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_1203);
> + reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK_1203);
> + reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_1203);
> + reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK_1203);
> + } else {
> + reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
> + reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK);
> + reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL);
> + reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK);
> + }


This isn't quite readable IMHO. Can't you do:

#define MEM_BASE0(x) (u32 __iomem *)((unsigned lo

Re: [PATCH v2 2/3] arcmsr: adds code for support areca new adapter ARC1203

2015-11-24 Thread Hannes Reinecke

On 11/25/2015 04:25 AM, Ching Huang wrote:
> From: Ching Huang 
> 
> Support areca new PCIe to SATA RAID adapter ARC1203
> 
> Signed-of-by: Ching Huang
> 
> ---
> 
> diff -uprN a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
> --- a/drivers/scsi/arcmsr/arcmsr.h2015-11-25 10:52:16.28647 +0800
> +++ b/drivers/scsi/arcmsr/arcmsr.h2015-11-25 10:52:13.33447 +0800
> @@ -74,6 +74,9 @@ struct device_attribute;
>  #ifndef PCI_DEVICE_ID_ARECA_1214
>   #define PCI_DEVICE_ID_ARECA_12140x1214
>  #endif
> +#ifndef PCI_DEVICE_ID_ARECA_1203
> + #define PCI_DEVICE_ID_ARECA_12030x1203
> +#endif
>  /*
>  
> **
>  **
> @@ -245,6 +248,12 @@ struct FIRMWARE_INFO
>  /* window of "instruction flags" from iop to driver */
>  #define ARCMSR_IOP2DRV_DOORBELL   0x00020408
>  #define ARCMSR_IOP2DRV_DOORBELL_MASK  0x0002040C
> +/* window of "instruction flags" from iop to driver */
> +#define ARCMSR_IOP2DRV_DOORBELL_1203  0x00021870
> +#define ARCMSR_IOP2DRV_DOORBELL_MASK_1203 0x00021874
> +/* window of "instruction flags" from driver to iop */
> +#define ARCMSR_DRV2IOP_DOORBELL_1203  0x00021878
> +#define ARCMSR_DRV2IOP_DOORBELL_MASK_1203 0x0002187C
>  /* ARECA FLAG LANGUAGE */
>  /* ioctl transfer */
>  #define ARCMSR_IOP2DRV_DATA_WRITE_OK  0x0001
> diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c 
> b/drivers/scsi/arcmsr/arcmsr_hba.c
> --- a/drivers/scsi/arcmsr/arcmsr_hba.c2015-11-24 11:35:26.0 
> +0800
> +++ b/drivers/scsi/arcmsr/arcmsr_hba.c2015-11-24 18:58:40.640226000 
> +0800
> @@ -114,6 +114,7 @@ static void arcmsr_hardware_reset(struct
>  static const char *arcmsr_info(struct Scsi_Host *);
>  static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb);
>  static void arcmsr_free_irq(struct pci_dev *, struct AdapterControlBlock *);
> +static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb);
>  static int arcmsr_adjust_disk_queue_depth(struct scsi_device *sdev, int 
> queue_depth)
>  {
>   if (queue_depth > ARCMSR_MAX_CMD_PERLUN)
> @@ -157,6 +158,8 @@ static struct pci_device_id arcmsr_devic
>   .driver_data = ACB_ADAPTER_TYPE_B},
>   {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1202),
>   .driver_data = ACB_ADAPTER_TYPE_B},
> + {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1203),
> + .driver_data = ACB_ADAPTER_TYPE_B},
>   {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1210),
>   .driver_data = ACB_ADAPTER_TYPE_A},
>   {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1214),
> @@ -2621,7 +2624,7 @@ static bool arcmsr_hbaA_get_config(struc
>  }
>  static bool arcmsr_hbaB_get_config(struct AdapterControlBlock *acb)
>  {
> - struct MessageUnit_B *reg = acb->pmuB;
> + struct MessageUnit_B *reg;
>   struct pci_dev *pdev = acb->pdev;
>   void *dma_coherent;
>   dma_addr_t dma_coherent_handle;
> @@ -2649,10 +2652,17 @@ static bool arcmsr_hbaB_get_config(struc
>   acb->dma_coherent2 = dma_coherent;
>   reg = (struct MessageUnit_B *)dma_coherent;
>   acb->pmuB = reg;
> - reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
> - reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK);
> - reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL);
> - reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK);
> + if (acb->pdev->device == PCI_DEVICE_ID_ARECA_1203) {
> + reg->drv2iop_doorbell = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_1203);
> + reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK_1203);
> + reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_1203);
> + reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK_1203);
> + } else {
> + reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
> + reg->drv2iop_doorbell_mask = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL_MASK);
> + reg->iop2drv_doorbell = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL);
> + reg->iop2drv_doorbell_mask = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base0 + ARCMSR_IOP2DRV_DOORBELL_MASK);
> + }
>   reg->message_wbuffer = (uint32_t __iomem *)((unsigned 
> long)acb->mem_base1 + ARCMSR_M

Re: [PATCH v2 2/3] arcmsr: adds code for support areca new adapter ARC1203

Re: [PATCH v2 2/3] arcmsr: adds code for support areca new adapter ARC1203

Re: [PATCH v2 2/3] arcmsr: adds code for support areca new adapter ARC1203

Re: [PATCH v2 2/3] arcmsr: adds code for support areca new adapter ARC1203

4 matches

Site Navigation

Mail list logo

Footer information