dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

[SCSI] aic79xx: Use struct map_node

Browse source 
Use struct map_node instead of separate variables.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Hannes Reinecke 2006-01-12 12:05:46 +01:00 committed by James Bottomley
parent 5e46631b04
commit 66a0683e46
3 changed files with 58 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/scsi/aic7xxx/aic79xx.h
View file

@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES. * POSSIBILITY OF SUCH DAMAGES.
* *
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#95 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#108 $
* *
* $FreeBSD$ * $FreeBSD$
*/ */
@ -1062,6 +1062,7 @@ struct ahd_softc {
struct scb_data scb_data; struct scb_data scb_data;
struct hardware_scb *next_queued_hscb; struct hardware_scb *next_queued_hscb;
struct map_node *next_queued_hscb_map;
/* /*
* SCBs that have been sent to the controller * SCBs that have been sent to the controller
@ -1140,10 +1141,6 @@ struct ahd_softc {
ahd_flag flags; ahd_flag flags;
struct seeprom_config *seep_config; struct seeprom_config *seep_config;
/* Values to store in the SEQCTL register for pause and unpause */
uint8_t unpause;
uint8_t pause;
/* Command Queues */ /* Command Queues */
uint16_t qoutfifonext; uint16_t qoutfifonext;
uint16_t qoutfifonext_valid_tag; uint16_t qoutfifonext_valid_tag;
@ -1151,6 +1148,17 @@ struct ahd_softc {
uint16_t qinfifo[AHD_SCB_MAX]; uint16_t qinfifo[AHD_SCB_MAX];
uint16_t *qoutfifo; uint16_t *qoutfifo;
/*
* Our qfreeze count. The sequencer compares
* this value with its own counter to determine
* whether to allow selections to occur.
*/
uint16_t qfreeze_cnt;
/* Values to store in the SEQCTL register for pause and unpause */
uint8_t unpause;
uint8_t pause;
/* Critical Section Data */ /* Critical Section Data */
struct cs *critical_sections; struct cs *critical_sections;
u_int num_critical_sections; u_int num_critical_sections;
@ -1197,8 +1205,7 @@ struct ahd_softc {
*/ */
bus_dma_tag_t parent_dmat; bus_dma_tag_t parent_dmat;
bus_dma_tag_t shared_data_dmat; bus_dma_tag_t shared_data_dmat;
bus_dmamap_t shared_data_dmamap; struct map_node shared_data_map;
dma_addr_t shared_data_busaddr;
/* Information saved through suspend/resume cycles */ /* Information saved through suspend/resume cycles */
struct ahd_suspend_state suspend_state; struct ahd_suspend_state suspend_state;
@ -1296,9 +1303,9 @@ struct ahd_devinfo {
}; };
/****************************** PCI Structures ********************************/ /****************************** PCI Structures ********************************/
#define AHD_PCI_IOADDR0 PCIR_MAPS /* I/O BAR*/ #define AHD_PCI_IOADDR0 PCIR_BAR(0) /* I/O BAR*/
#define AHD_PCI_MEMADDR (PCIR_MAPS + 4) /* Memory BAR */ #define AHD_PCI_MEMADDR PCIR_BAR(1) /* Memory BAR */
#define AHD_PCI_IOADDR1 (PCIR_MAPS + 12)/* Second I/O BAR */ #define AHD_PCI_IOADDR1 PCIR_BAR(3) /* Second I/O BAR */
typedef int (ahd_device_setup_t)(struct ahd_softc *); typedef int (ahd_device_setup_t)(struct ahd_softc *);

30
drivers/scsi/aic7xxx/aic79xx_core.c
View file

@ -5203,13 +5203,13 @@ ahd_free(struct ahd_softc *ahd)
/* FALLTHROUGH */ /* FALLTHROUGH */
case 4: case 4:
ahd_dmamap_unload(ahd, ahd->shared_data_dmat, ahd_dmamap_unload(ahd, ahd->shared_data_dmat,
ahd->shared_data_dmamap); ahd->shared_data_map.dmamap);
/* FALLTHROUGH */ /* FALLTHROUGH */
case 3: case 3:
ahd_dmamem_free(ahd, ahd->shared_data_dmat, ahd->qoutfifo, ahd_dmamem_free(ahd, ahd->shared_data_dmat, ahd->qoutfifo,
ahd->shared_data_dmamap); ahd->shared_data_map.dmamap);
ahd_dmamap_destroy(ahd, ahd->shared_data_dmat, ahd_dmamap_destroy(ahd, ahd->shared_data_dmat,
ahd->shared_data_dmamap); ahd->shared_data_map.dmamap);
/* FALLTHROUGH */ /* FALLTHROUGH */
case 2: case 2:
ahd_dma_tag_destroy(ahd, ahd->shared_data_dmat); ahd_dma_tag_destroy(ahd, ahd->shared_data_dmat);
@ -6088,7 +6088,6 @@ static const char *termstat_strings[] = {
int int
ahd_init(struct ahd_softc *ahd) ahd_init(struct ahd_softc *ahd)
{ {
uint8_t *base_vaddr;
uint8_t *next_vaddr; uint8_t *next_vaddr;
dma_addr_t next_baddr; dma_addr_t next_baddr;
size_t driver_data_size; size_t driver_data_size;
@ -6178,20 +6177,23 @@ ahd_init(struct ahd_softc *ahd)
/* Allocation of driver data */ /* Allocation of driver data */
if (ahd_dmamem_alloc(ahd, ahd->shared_data_dmat, if (ahd_dmamem_alloc(ahd, ahd->shared_data_dmat,
(void **)&base_vaddr, (void **)&ahd->shared_data_map.vaddr,
BUS_DMA_NOWAIT, &ahd->shared_data_dmamap) != 0) { BUS_DMA_NOWAIT,
&ahd->shared_data_map.dmamap) != 0) {
return (ENOMEM); return (ENOMEM);
} }
ahd->init_level++; ahd->init_level++;
/* And permanently map it in */ /* And permanently map it in */
ahd_dmamap_load(ahd, ahd->shared_data_dmat, ahd->shared_data_dmamap, ahd_dmamap_load(ahd, ahd->shared_data_dmat, ahd->shared_data_map.dmamap,
base_vaddr, driver_data_size, ahd_dmamap_cb, ahd->shared_data_map.vaddr, driver_data_size,
&ahd->shared_data_busaddr, /*flags*/0); ahd_dmamap_cb, &ahd->shared_data_map.physaddr,
ahd->qoutfifo = (uint16_t *)base_vaddr; /*flags*/0);
ahd->qoutfifo = (uint16_t *)ahd->shared_data_map.vaddr;
next_vaddr = (uint8_t *)&ahd->qoutfifo[AHD_QOUT_SIZE]; next_vaddr = (uint8_t *)&ahd->qoutfifo[AHD_QOUT_SIZE];
next_baddr = ahd->shared_data_busaddr + AHD_QOUT_SIZE*sizeof(uint16_t); next_baddr = ahd->shared_data_map.physaddr
+ AHD_QOUT_SIZE*sizeof(uint16_t);
if ((ahd->features & AHD_TARGETMODE) != 0) { if ((ahd->features & AHD_TARGETMODE) != 0) {
ahd->targetcmds = (struct target_cmd *)next_vaddr; ahd->targetcmds = (struct target_cmd *)next_vaddr;
next_vaddr += AHD_TMODE_CMDS * sizeof(struct target_cmd); next_vaddr += AHD_TMODE_CMDS * sizeof(struct target_cmd);
@ -6212,6 +6214,7 @@ ahd_init(struct ahd_softc *ahd)
* specially from the DMA safe memory chunk used for the QOUTFIFO. * specially from the DMA safe memory chunk used for the QOUTFIFO.
*/ */
ahd->next_queued_hscb = (struct hardware_scb *)next_vaddr; ahd->next_queued_hscb = (struct hardware_scb *)next_vaddr;
ahd->next_queued_hscb_map = &ahd->shared_data_map;
ahd->next_queued_hscb->hscb_busaddr = ahd_htole32(next_baddr); ahd->next_queued_hscb->hscb_busaddr = ahd_htole32(next_baddr);
ahd->init_level++; ahd->init_level++;
@ -6557,12 +6560,13 @@ ahd_chip_init(struct ahd_softc *ahd)
/* /*
* The Freeze Count is 0. * The Freeze Count is 0.
*/ */
ahd->qfreeze_cnt = 0;
ahd_outw(ahd, QFREEZE_COUNT, 0); ahd_outw(ahd, QFREEZE_COUNT, 0);
/* /*
* Tell the sequencer where it can find our arrays in memory. * Tell the sequencer where it can find our arrays in memory.
*/ */
busaddr = ahd->shared_data_busaddr; busaddr = ahd->shared_data_map.physaddr;
ahd_outb(ahd, SHARED_DATA_ADDR, busaddr & 0xFF); ahd_outb(ahd, SHARED_DATA_ADDR, busaddr & 0xFF);
ahd_outb(ahd, SHARED_DATA_ADDR + 1, (busaddr >> 8) & 0xFF); ahd_outb(ahd, SHARED_DATA_ADDR + 1, (busaddr >> 8) & 0xFF);
ahd_outb(ahd, SHARED_DATA_ADDR + 2, (busaddr >> 16) & 0xFF); ahd_outb(ahd, SHARED_DATA_ADDR + 2, (busaddr >> 16) & 0xFF);
@ -9651,7 +9655,7 @@ ahd_run_tqinfifo(struct ahd_softc *ahd, int paused)
cmd->cmd_valid = 0; cmd->cmd_valid = 0;
ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd_dmamap_sync(ahd, ahd->shared_data_dmat,
ahd->shared_data_dmamap, ahd->shared_data_map.dmamap,
ahd_targetcmd_offset(ahd, ahd->tqinfifonext), ahd_targetcmd_offset(ahd, ahd->tqinfifonext),
sizeof(struct target_cmd), sizeof(struct target_cmd),
BUS_DMASYNC_PREREAD); BUS_DMASYNC_PREREAD);

34
drivers/scsi/aic7xxx/aic79xx_inline.h
View file

@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES. * POSSIBILITY OF SUCH DAMAGES.
* *
* $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#51 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#58 $
* *
* $FreeBSD$ * $FreeBSD$
*/ */
@ -522,12 +522,21 @@ do { \
static __inline uint16_t static __inline uint16_t
ahd_inw(struct ahd_softc *ahd, u_int port) ahd_inw(struct ahd_softc *ahd, u_int port)
{ {
/*
* Read high byte first as some registers increment
* or have other side effects when the low byte is
* read.
*/
return ((ahd_inb(ahd, port+1) << 8) | ahd_inb(ahd, port)); return ((ahd_inb(ahd, port+1) << 8) | ahd_inb(ahd, port));
} }
static __inline void static __inline void
ahd_outw(struct ahd_softc *ahd, u_int port, u_int value) ahd_outw(struct ahd_softc *ahd, u_int port, u_int value)
{ {
/*
* Write low byte first to accomodate registers
* such as PRGMCNT where the order maters.
*/
ahd_outb(ahd, port, value & 0xFF); ahd_outb(ahd, port, value & 0xFF);
ahd_outb(ahd, port+1, (value >> 8) & 0xFF); ahd_outb(ahd, port+1, (value >> 8) & 0xFF);
} }
@ -684,7 +693,7 @@ ahd_inb_scbram(struct ahd_softc *ahd, u_int offset)
* Razor #528 * Razor #528
*/ */
value = ahd_inb(ahd, offset); value = ahd_inb(ahd, offset);
if ((ahd->flags & AHD_PCIX_SCBRAM_RD_BUG) != 0) if ((ahd->bugs & AHD_PCIX_SCBRAM_RD_BUG) != 0)
ahd_inb(ahd, MODE_PTR); ahd_inb(ahd, MODE_PTR);
return (value); return (value);
} }
@ -727,7 +736,8 @@ ahd_lookup_scb(struct ahd_softc *ahd, u_int tag)
static __inline void static __inline void
ahd_swap_with_next_hscb(struct ahd_softc *ahd, struct scb *scb) ahd_swap_with_next_hscb(struct ahd_softc *ahd, struct scb *scb)
{ {
struct hardware_scb *q_hscb; struct hardware_scb *q_hscb;
struct map_node *q_hscb_map;
uint32_t saved_hscb_busaddr; uint32_t saved_hscb_busaddr;
/* /*
@ -743,6 +753,7 @@ ahd_swap_with_next_hscb(struct ahd_softc *ahd, struct scb *scb)
* locate the correct SCB by SCB_TAG. * locate the correct SCB by SCB_TAG.
*/ */
q_hscb = ahd->next_queued_hscb; q_hscb = ahd->next_queued_hscb;
q_hscb_map = ahd->next_queued_hscb_map;
saved_hscb_busaddr = q_hscb->hscb_busaddr; saved_hscb_busaddr = q_hscb->hscb_busaddr;
memcpy(q_hscb, scb->hscb, sizeof(*scb->hscb)); memcpy(q_hscb, scb->hscb, sizeof(*scb->hscb));
q_hscb->hscb_busaddr = saved_hscb_busaddr; q_hscb->hscb_busaddr = saved_hscb_busaddr;
@ -750,7 +761,9 @@ ahd_swap_with_next_hscb(struct ahd_softc *ahd, struct scb *scb)
/* Now swap HSCB pointers. */ /* Now swap HSCB pointers. */
ahd->next_queued_hscb = scb->hscb; ahd->next_queued_hscb = scb->hscb;
ahd->next_queued_hscb_map = scb->hscb_map;
scb->hscb = q_hscb; scb->hscb = q_hscb;
scb->hscb_map = q_hscb_map;
/* Now define the mapping from tag to SCB in the scbindex */ /* Now define the mapping from tag to SCB in the scbindex */
ahd->scb_data.scbindex[SCB_GET_TAG(scb)] = scb; ahd->scb_data.scbindex[SCB_GET_TAG(scb)] = scb;
@ -824,8 +837,9 @@ static __inline int ahd_intr(struct ahd_softc *ahd);
static __inline void static __inline void
ahd_sync_qoutfifo(struct ahd_softc *ahd, int op) ahd_sync_qoutfifo(struct ahd_softc *ahd, int op)
{ {
ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd->shared_data_dmamap, ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd->shared_data_map.dmamap,
/*offset*/0, /*len*/AHC_SCB_MAX * sizeof(uint16_t), op); /*offset*/0,
/*len*/AHD_SCB_MAX * sizeof(uint16_t), op);
} }
static __inline void static __inline void
@ -834,7 +848,7 @@ ahd_sync_tqinfifo(struct ahd_softc *ahd, int op)
#ifdef AHD_TARGET_MODE #ifdef AHD_TARGET_MODE
if ((ahd->flags & AHD_TARGETROLE) != 0) { if ((ahd->flags & AHD_TARGETROLE) != 0) {
ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd_dmamap_sync(ahd, ahd->shared_data_dmat,
ahd->shared_data_dmamap, ahd->shared_data_map.dmamap,
ahd_targetcmd_offset(ahd, 0), ahd_targetcmd_offset(ahd, 0),
sizeof(struct target_cmd) * AHD_TMODE_CMDS, sizeof(struct target_cmd) * AHD_TMODE_CMDS,
op); op);
@ -854,9 +868,9 @@ ahd_check_cmdcmpltqueues(struct ahd_softc *ahd)
u_int retval; u_int retval;
retval = 0; retval = 0;
ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd->shared_data_dmamap, ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd->shared_data_map.dmamap,
/*offset*/ahd->qoutfifonext, /*len*/2, /*offset*/ahd->qoutfifonext * sizeof(*ahd->qoutfifo),
BUS_DMASYNC_POSTREAD); /*len*/sizeof(*ahd->qoutfifo), BUS_DMASYNC_POSTREAD);
if ((ahd->qoutfifo[ahd->qoutfifonext] if ((ahd->qoutfifo[ahd->qoutfifonext]
& QOUTFIFO_ENTRY_VALID_LE) == ahd->qoutfifonext_valid_tag) & QOUTFIFO_ENTRY_VALID_LE) == ahd->qoutfifonext_valid_tag)
retval |= AHD_RUN_QOUTFIFO; retval |= AHD_RUN_QOUTFIFO;
@ -864,7 +878,7 @@ ahd_check_cmdcmpltqueues(struct ahd_softc *ahd)
if ((ahd->flags & AHD_TARGETROLE) != 0 if ((ahd->flags & AHD_TARGETROLE) != 0
&& (ahd->flags & AHD_TQINFIFO_BLOCKED) == 0) { && (ahd->flags & AHD_TQINFIFO_BLOCKED) == 0) {
ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd_dmamap_sync(ahd, ahd->shared_data_dmat,
ahd->shared_data_dmamap, ahd->shared_data_map.dmamap,
ahd_targetcmd_offset(ahd, ahd->tqinfifofnext), ahd_targetcmd_offset(ahd, ahd->tqinfifofnext),
/*len*/sizeof(struct target_cmd), /*len*/sizeof(struct target_cmd),
BUS_DMASYNC_POSTREAD); BUS_DMASYNC_POSTREAD);