mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
[SCSI] lpfc: hgp/pgp cleanups
From: Christoph Hellwig <hch@lst.de>: - rename PGP/HPH to lpfc_pgp/lpfc_hgp - use __le32 types for the members to start fixing sparse -Wbitwise issues - remove lpfc_sli.MBhostaddr, we can always use the pointer from SLI2_DESC directly Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
6e3815ba3a
commit
4cc2da1d84
3 changed files with 26 additions and 46 deletions
|
@ -2214,20 +2214,20 @@ typedef union {
|
||||||
* SLI-2 specific structures
|
* SLI-2 specific structures
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct {
|
struct lpfc_hgp {
|
||||||
uint32_t cmdPutInx;
|
__le32 cmdPutInx;
|
||||||
uint32_t rspGetInx;
|
__le32 rspGetInx;
|
||||||
} HGP;
|
};
|
||||||
|
|
||||||
typedef struct {
|
struct lpfc_pgp {
|
||||||
uint32_t cmdGetInx;
|
__le32 cmdGetInx;
|
||||||
uint32_t rspPutInx;
|
__le32 rspPutInx;
|
||||||
} PGP;
|
};
|
||||||
|
|
||||||
typedef struct _SLI2_DESC {
|
typedef struct _SLI2_DESC {
|
||||||
HGP host[MAX_RINGS];
|
struct lpfc_hgp host[MAX_RINGS];
|
||||||
uint32_t unused1[16];
|
uint32_t unused1[16];
|
||||||
PGP port[MAX_RINGS];
|
struct lpfc_pgp port[MAX_RINGS];
|
||||||
} SLI2_DESC;
|
} SLI2_DESC;
|
||||||
|
|
||||||
typedef union {
|
typedef union {
|
||||||
|
|
|
@ -422,7 +422,6 @@ lpfc_config_pcb_setup(struct lpfc_hba * phba)
|
||||||
uint32_t iocbCnt;
|
uint32_t iocbCnt;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
psli->MBhostaddr = (uint32_t *)&phba->slim2p->mbx;
|
|
||||||
pcbp->maxRing = (psli->num_rings - 1);
|
pcbp->maxRing = (psli->num_rings - 1);
|
||||||
|
|
||||||
iocbCnt = 0;
|
iocbCnt = 0;
|
||||||
|
@ -528,7 +527,7 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
|
||||||
dma_addr_t pdma_addr;
|
dma_addr_t pdma_addr;
|
||||||
uint32_t bar_low, bar_high;
|
uint32_t bar_low, bar_high;
|
||||||
size_t offset;
|
size_t offset;
|
||||||
HGP hgp;
|
struct lpfc_hgp hgp;
|
||||||
void __iomem *to_slim;
|
void __iomem *to_slim;
|
||||||
|
|
||||||
memset(pmb, 0, sizeof(LPFC_MBOXQ_t));
|
memset(pmb, 0, sizeof(LPFC_MBOXQ_t));
|
||||||
|
@ -584,9 +583,9 @@ lpfc_config_port(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
|
||||||
else
|
else
|
||||||
phba->slim2p->pcb.hgpAddrHigh = 0;
|
phba->slim2p->pcb.hgpAddrHigh = 0;
|
||||||
/* write HGP data to SLIM at the required longword offset */
|
/* write HGP data to SLIM at the required longword offset */
|
||||||
memset(&hgp, 0, sizeof(HGP));
|
memset(&hgp, 0, sizeof(struct lpfc_hgp));
|
||||||
to_slim = phba->MBslimaddr + (SLIMOFF*sizeof (uint32_t));
|
to_slim = phba->MBslimaddr + (SLIMOFF*sizeof (uint32_t));
|
||||||
lpfc_memcpy_to_slim(to_slim, &hgp, sizeof (HGP));
|
lpfc_memcpy_to_slim(to_slim, &hgp, sizeof(struct lpfc_hgp));
|
||||||
|
|
||||||
/* Setup Port Group ring pointer */
|
/* Setup Port Group ring pointer */
|
||||||
offset = (uint8_t *)&phba->slim2p->mbx.us.s2.port -
|
offset = (uint8_t *)&phba->slim2p->mbx.us.s2.port -
|
||||||
|
|
|
@ -225,8 +225,7 @@ lpfc_sli_ringtx_get(struct lpfc_hba * phba, struct lpfc_sli_ring * pring)
|
||||||
static IOCB_t *
|
static IOCB_t *
|
||||||
lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
|
lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
|
||||||
{
|
{
|
||||||
MAILBOX_t *mbox = (MAILBOX_t *)phba->sli.MBhostaddr;
|
struct lpfc_pgp *pgp = &phba->slim2p->mbx.us.s2.port[pring->ringno];
|
||||||
PGP *pgp = (PGP *)&mbox->us.s2.port[pring->ringno];
|
|
||||||
uint32_t max_cmd_idx = pring->numCiocb;
|
uint32_t max_cmd_idx = pring->numCiocb;
|
||||||
IOCB_t *iocb = NULL;
|
IOCB_t *iocb = NULL;
|
||||||
|
|
||||||
|
@ -411,9 +410,7 @@ lpfc_sli_resume_iocb(struct lpfc_hba * phba, struct lpfc_sli_ring * pring)
|
||||||
static void
|
static void
|
||||||
lpfc_sli_turn_on_ring(struct lpfc_hba * phba, int ringno)
|
lpfc_sli_turn_on_ring(struct lpfc_hba * phba, int ringno)
|
||||||
{
|
{
|
||||||
PGP *pgp =
|
struct lpfc_pgp *pgp = &phba->slim2p->mbx.us.s2.port[ringno];
|
||||||
((PGP *) &
|
|
||||||
(((MAILBOX_t *)phba->sli.MBhostaddr)->us.s2.port[ringno]));
|
|
||||||
|
|
||||||
/* If the ring is active, flag it */
|
/* If the ring is active, flag it */
|
||||||
if (phba->sli.ring[ringno].cmdringaddr) {
|
if (phba->sli.ring[ringno].cmdringaddr) {
|
||||||
|
@ -537,7 +534,7 @@ lpfc_sli_handle_mb_event(struct lpfc_hba * phba)
|
||||||
/* Get a Mailbox buffer to setup mailbox commands for callback */
|
/* Get a Mailbox buffer to setup mailbox commands for callback */
|
||||||
if ((pmb = phba->sli.mbox_active)) {
|
if ((pmb = phba->sli.mbox_active)) {
|
||||||
pmbox = &pmb->mb;
|
pmbox = &pmb->mb;
|
||||||
mbox = (MAILBOX_t *) phba->sli.MBhostaddr;
|
mbox = &phba->slim2p->mbx;
|
||||||
|
|
||||||
/* First check out the status word */
|
/* First check out the status word */
|
||||||
lpfc_sli_pcimem_bcopy(mbox, pmbox, sizeof (uint32_t));
|
lpfc_sli_pcimem_bcopy(mbox, pmbox, sizeof (uint32_t));
|
||||||
|
@ -905,10 +902,10 @@ static int
|
||||||
lpfc_sli_handle_fast_ring_event(struct lpfc_hba * phba,
|
lpfc_sli_handle_fast_ring_event(struct lpfc_hba * phba,
|
||||||
struct lpfc_sli_ring * pring, uint32_t mask)
|
struct lpfc_sli_ring * pring, uint32_t mask)
|
||||||
{
|
{
|
||||||
|
struct lpfc_pgp *pgp = &phba->slim2p->mbx.us.s2.port[pring->ringno];
|
||||||
IOCB_t *irsp = NULL;
|
IOCB_t *irsp = NULL;
|
||||||
struct lpfc_iocbq *cmdiocbq = NULL;
|
struct lpfc_iocbq *cmdiocbq = NULL;
|
||||||
struct lpfc_iocbq rspiocbq;
|
struct lpfc_iocbq rspiocbq;
|
||||||
PGP *pgp;
|
|
||||||
uint32_t status;
|
uint32_t status;
|
||||||
uint32_t portRspPut, portRspMax;
|
uint32_t portRspPut, portRspMax;
|
||||||
int rc = 1;
|
int rc = 1;
|
||||||
|
@ -920,10 +917,6 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba * phba,
|
||||||
spin_lock_irqsave(phba->host->host_lock, iflag);
|
spin_lock_irqsave(phba->host->host_lock, iflag);
|
||||||
pring->stats.iocb_event++;
|
pring->stats.iocb_event++;
|
||||||
|
|
||||||
/* The driver assumes SLI-2 mode */
|
|
||||||
pgp = (PGP *) &((MAILBOX_t *) phba->sli.MBhostaddr)
|
|
||||||
->us.s2.port[pring->ringno];
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The next available response entry should never exceed the maximum
|
* The next available response entry should never exceed the maximum
|
||||||
* entries. If it does, treat it as an adapter hardware error.
|
* entries. If it does, treat it as an adapter hardware error.
|
||||||
|
@ -1075,9 +1068,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba * phba,
|
||||||
struct lpfc_iocbq *cmdiocbp;
|
struct lpfc_iocbq *cmdiocbp;
|
||||||
struct lpfc_iocbq *saveq;
|
struct lpfc_iocbq *saveq;
|
||||||
struct list_head *lpfc_iocb_list = &phba->lpfc_iocb_list;
|
struct list_head *lpfc_iocb_list = &phba->lpfc_iocb_list;
|
||||||
HGP *hgp;
|
struct lpfc_pgp *pgp = &phba->slim2p->mbx.us.s2.port[pring->ringno];
|
||||||
PGP *pgp;
|
|
||||||
MAILBOX_t *mbox;
|
|
||||||
uint8_t iocb_cmd_type;
|
uint8_t iocb_cmd_type;
|
||||||
lpfc_iocb_type type;
|
lpfc_iocb_type type;
|
||||||
uint32_t status, free_saveq;
|
uint32_t status, free_saveq;
|
||||||
|
@ -1089,11 +1080,6 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba * phba,
|
||||||
spin_lock_irqsave(phba->host->host_lock, iflag);
|
spin_lock_irqsave(phba->host->host_lock, iflag);
|
||||||
pring->stats.iocb_event++;
|
pring->stats.iocb_event++;
|
||||||
|
|
||||||
/* The driver assumes SLI-2 mode */
|
|
||||||
mbox = (MAILBOX_t *) phba->sli.MBhostaddr;
|
|
||||||
pgp = (PGP *) & mbox->us.s2.port[pring->ringno];
|
|
||||||
hgp = (HGP *) & mbox->us.s2.host[pring->ringno];
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The next available response entry should never exceed the maximum
|
* The next available response entry should never exceed the maximum
|
||||||
* entries. If it does, treat it as an adapter hardware error.
|
* entries. If it does, treat it as an adapter hardware error.
|
||||||
|
@ -1771,7 +1757,6 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
|
||||||
int
|
int
|
||||||
lpfc_sli_issue_mbox(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmbox, uint32_t flag)
|
lpfc_sli_issue_mbox(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmbox, uint32_t flag)
|
||||||
{
|
{
|
||||||
MAILBOX_t *mbox;
|
|
||||||
MAILBOX_t *mb;
|
MAILBOX_t *mb;
|
||||||
struct lpfc_sli *psli;
|
struct lpfc_sli *psli;
|
||||||
uint32_t status, evtctr;
|
uint32_t status, evtctr;
|
||||||
|
@ -1901,15 +1886,13 @@ lpfc_sli_issue_mbox(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmbox, uint32_t flag)
|
||||||
mb->mbxOwner = OWN_CHIP;
|
mb->mbxOwner = OWN_CHIP;
|
||||||
|
|
||||||
if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
|
if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
|
||||||
|
|
||||||
/* First copy command data to host SLIM area */
|
/* First copy command data to host SLIM area */
|
||||||
mbox = (MAILBOX_t *) psli->MBhostaddr;
|
lpfc_sli_pcimem_bcopy(mb, &phba->slim2p->mbx, MAILBOX_CMD_SIZE);
|
||||||
lpfc_sli_pcimem_bcopy(mb, mbox, MAILBOX_CMD_SIZE);
|
|
||||||
} else {
|
} else {
|
||||||
if (mb->mbxCommand == MBX_CONFIG_PORT) {
|
if (mb->mbxCommand == MBX_CONFIG_PORT) {
|
||||||
/* copy command data into host mbox for cmpl */
|
/* copy command data into host mbox for cmpl */
|
||||||
mbox = (MAILBOX_t *) psli->MBhostaddr;
|
lpfc_sli_pcimem_bcopy(mb, &phba->slim2p->mbx,
|
||||||
lpfc_sli_pcimem_bcopy(mb, mbox, MAILBOX_CMD_SIZE);
|
MAILBOX_CMD_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* First copy mbox command data to HBA SLIM, skip past first
|
/* First copy mbox command data to HBA SLIM, skip past first
|
||||||
|
@ -1946,8 +1929,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmbox, uint32_t flag)
|
||||||
psli->mbox_active = NULL;
|
psli->mbox_active = NULL;
|
||||||
if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
|
if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
|
||||||
/* First read mbox status word */
|
/* First read mbox status word */
|
||||||
mbox = (MAILBOX_t *) psli->MBhostaddr;
|
word0 = *((volatile uint32_t *)&phba->slim2p->mbx);
|
||||||
word0 = *((volatile uint32_t *)mbox);
|
|
||||||
word0 = le32_to_cpu(word0);
|
word0 = le32_to_cpu(word0);
|
||||||
} else {
|
} else {
|
||||||
/* First read mbox status word */
|
/* First read mbox status word */
|
||||||
|
@ -1984,8 +1966,8 @@ lpfc_sli_issue_mbox(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmbox, uint32_t flag)
|
||||||
|
|
||||||
if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
|
if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
|
||||||
/* First copy command data */
|
/* First copy command data */
|
||||||
mbox = (MAILBOX_t *) psli->MBhostaddr;
|
word0 = *((volatile uint32_t *)
|
||||||
word0 = *((volatile uint32_t *)mbox);
|
&phba->slim2p->mbx);
|
||||||
word0 = le32_to_cpu(word0);
|
word0 = le32_to_cpu(word0);
|
||||||
if (mb->mbxCommand == MBX_CONFIG_PORT) {
|
if (mb->mbxCommand == MBX_CONFIG_PORT) {
|
||||||
MAILBOX_t *slimmb;
|
MAILBOX_t *slimmb;
|
||||||
|
@ -2009,10 +1991,9 @@ lpfc_sli_issue_mbox(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmbox, uint32_t flag)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
|
if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
|
||||||
/* First copy command data */
|
|
||||||
mbox = (MAILBOX_t *) psli->MBhostaddr;
|
|
||||||
/* copy results back to user */
|
/* copy results back to user */
|
||||||
lpfc_sli_pcimem_bcopy(mbox, mb, MAILBOX_CMD_SIZE);
|
lpfc_sli_pcimem_bcopy(&phba->slim2p->mbx, mb,
|
||||||
|
MAILBOX_CMD_SIZE);
|
||||||
} else {
|
} else {
|
||||||
/* First copy command data */
|
/* First copy command data */
|
||||||
lpfc_memcpy_from_slim(mb, phba->MBslimaddr,
|
lpfc_memcpy_from_slim(mb, phba->MBslimaddr,
|
||||||
|
|
Loading…
Reference in a new issue