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

Commit 239eab19 authored by Mark Haverkamp's avatar Mark Haverkamp Committed by James Bottomley
Browse files

[SCSI] aacraid: Begin adding support for new adapter type 



Received from Mark Salyzyn,

Add in the NEMER/ARK physical register mapping, represented in up and coming
products currently under test at Adaptec.

Signed-off-by Mark Haverkamp <markh@linux-foundation.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 28713324

drivers/scsi/aacraid/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
obj-$(CONFIG_SCSI_AACRAID) := aacraid.o



aacraid-objs	:= linit.o aachba.o commctrl.o comminit.o commsup.o \

		   dpcsup.o rx.o sa.o rkt.o

		   dpcsup.o rx.o sa.o rkt.o nark.o



EXTRA_CFLAGS	:= -Idrivers/scsi

drivers/scsi/aacraid/aacraid.h

+1 −0
Original line number Diff line number Diff line
@@ -1810,6 +1810,7 @@ int aac_dev_ioctl(struct aac_dev *dev, int cmd, void __user *arg); 
int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg);

int aac_rx_init(struct aac_dev *dev);

int aac_rkt_init(struct aac_dev *dev);

int aac_nark_init(struct aac_dev *dev);

int aac_sa_init(struct aac_dev *dev);

int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw_fib, int wait, struct fib * fibptr, unsigned long *nonotify);

unsigned int aac_response_normal(struct aac_queue * q);

drivers/scsi/aacraid/linit.c

+3 −2
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ static struct pci_device_id aac_pci_tbl[] = { 
	{ 0x9005, 0x0285, 0x17aa, PCI_ANY_ID, 0, 0, 58 }, /* Legend Catchall */

	{ 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */

	{ 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */

	{ 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */

	{ 0,}

};

MODULE_DEVICE_TABLE(pci, aac_pci_tbl);
@@ -230,7 +231,8 @@ static struct aac_driver_ident aac_drivers[] = { 
	{ aac_rx_init, "aacraid",  "DELL    ", "RAID            ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Dell Catchall */

	{ aac_rx_init, "aacraid",  "Legend  ", "RAID            ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Legend Catchall */

	{ aac_rx_init, "aacraid",  "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Adaptec Catch All */

	{ aac_rkt_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec Rocket Catch All */

	{ aac_rkt_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Rocket Catch All */

	{ aac_nark_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec NEMER/ARK Catch All */

};



/**
@@ -804,7 +806,6 @@ static struct scsi_host_template aac_driver_template = { 
	.emulated                       = 1,

};





static int __devinit aac_probe_one(struct pci_dev *pdev,

		const struct pci_device_id *id)

{

drivers/scsi/aacraid/nark.c

0 → 100644
+87 −0
Original line number Diff line number Diff line 
/*

 *	Adaptec AAC series RAID controller driver

 *	(c) Copyright 2001 Red Hat Inc.	<alan@redhat.com>

 *

 * based on the old aacraid driver that is..

 * Adaptec aacraid device driver for Linux.

 *

 * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2, or (at your option)

 * any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; see the file COPYING.  If not, write to

 * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

 *

 * Module Name:

 *  nark.c

 *

 * Abstract: Hardware Device Interface for NEMER/ARK

 *

 */



#include <linux/pci.h>

#include <linux/blkdev.h>



#include <scsi/scsi_host.h>



#include "aacraid.h"



/**

 *	aac_nark_ioremap

 *	@size: mapping resize request

 *

 */

static int aac_nark_ioremap(struct aac_dev * dev, u32 size)

{

	if (!size) {

		iounmap(dev->regs.rx);

		dev->regs.rx = NULL;

		iounmap(dev->base);

		dev->base = NULL;

		return 0;

	}

	dev->scsi_host_ptr->base = pci_resource_start(dev->pdev, 2);

	dev->regs.rx = ioremap((u64)pci_resource_start(dev->pdev, 0) |

	  ((u64)pci_resource_start(dev->pdev, 1) << 32),

	  sizeof(struct rx_registers) - sizeof(struct rx_inbound));

	dev->base = NULL;

	if (dev->regs.rx == NULL)

		return -1;

	dev->base = ioremap(dev->scsi_host_ptr->base, size);

	if (dev->base == NULL) {

		iounmap(dev->regs.rx);

		dev->regs.rx = NULL;

		return -1;

	}

	dev->IndexRegs = &((struct rx_registers __iomem *)dev->base)->IndexRegs;

	return 0;

}



/**

 *	aac_nark_init	-	initialize an NEMER/ARK Split Bar card

 *	@dev: device to configure

 *

 */



int aac_nark_init(struct aac_dev * dev)

{

	extern int _aac_rx_init(struct aac_dev *dev);

	extern int aac_rx_select_comm(struct aac_dev *dev, int comm);



	/*

	 *	Fill in the function dispatch table.

	 */

	dev->a_ops.adapter_ioremap = aac_nark_ioremap;

	dev->a_ops.adapter_comm = aac_rx_select_comm;



	return _aac_rx_init(dev);

}