Skip to content

L
linux
Commit e590adfd authored by Sakthivel K's avatar Sakthivel K Committed by James Bottomley
Browse files
Options

[SCSI] pm80xx: Multiple inbound/outbound queue configuration 

Memory allocation and configuration of multiple inbound and
outbound queues.
Signed-off-by: default avatarSakthivel K <Sakthivel.SaravananKamalRaju@pmcs.com>
Signed-off-by: default avatarAnand Kumar S <AnandKumar.Santhanam@pmcs.com>
Acked-by: default avatarJack Wang <jack_wang@usish.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent e5742101
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 60 deletions
drivers/scsi/pm8001/pm8001_defs.h
View file @ e590adfd
...@@ -48,8 +48,7 @@ enum chip_flavors { ...@@ -48,8 +48,7 @@ enum chip_flavors {
chip_8018, chip_8018,
chip_8019 chip_8019
}; };
#define USI_MAX_MEMCNT 9
#define PM8001_MAX_DMA_SG SG_ALL
enum phy_speed { enum phy_speed {
PHY_SPEED_15 = 0x01, PHY_SPEED_15 = 0x01,
PHY_SPEED_30 = 0x02, PHY_SPEED_30 = 0x02,
...@@ -87,13 +86,16 @@ enum port_type { ...@@ -87,13 +86,16 @@ enum port_type {
#define PM8001_MAX_DEVICES 2048 /* max supported device */ #define PM8001_MAX_DEVICES 2048 /* max supported device */
#define PM8001_MAX_MSIX_VEC 64 /* max msi-x int for spcv/ve */ #define PM8001_MAX_MSIX_VEC 64 /* max msi-x int for spcv/ve */
#define USI_MAX_MEMCNT_BASE 4
#define IB (USI_MAX_MEMCNT_BASE + 1)
#define CI (IB + PM8001_MAX_SPCV_INB_NUM)
#define OB (CI + PM8001_MAX_SPCV_INB_NUM)
#define PI (OB + PM8001_MAX_SPCV_OUTB_NUM)
#define USI_MAX_MEMCNT (PI + PM8001_MAX_SPCV_OUTB_NUM)
#define PM8001_MAX_DMA_SG SG_ALL
enum memory_region_num { enum memory_region_num {
AAP1 = 0x0, /* application acceleration processor */ AAP1 = 0x0, /* application acceleration processor */
IOP, /* IO processor */ IOP, /* IO processor */
CI, /* consumer index */
PI, /* producer index */
IB, /* inbound queue */
OB, /* outbound queue */
NVMD, /* NVM device */ NVMD, /* NVM device */
DEV_MEM, /* memory for devices */ DEV_MEM, /* memory for devices */
CCB_MEM, /* memory for command control block */ CCB_MEM, /* memory for command control block */
......
drivers/scsi/pm8001/pm8001_hwi.c
View file @ e590adfd
...@@ -151,10 +151,9 @@ static void read_general_status_table(struct pm8001_hba_info *pm8001_ha) ...@@ -151,10 +151,9 @@ static void read_general_status_table(struct pm8001_hba_info *pm8001_ha)
*/ */
static void read_inbnd_queue_table(struct pm8001_hba_info *pm8001_ha) static void read_inbnd_queue_table(struct pm8001_hba_info *pm8001_ha)
{ {
int inbQ_num = 1;
int i; int i;
void __iomem *address = pm8001_ha->inbnd_q_tbl_addr; void __iomem *address = pm8001_ha->inbnd_q_tbl_addr;
for (i = 0; i < inbQ_num; i++) { for (i = 0; i < PM8001_MAX_INB_NUM; i++) {
u32 offset = i * 0x20; u32 offset = i * 0x20;
pm8001_ha->inbnd_q_tbl[i].pi_pci_bar = pm8001_ha->inbnd_q_tbl[i].pi_pci_bar =
get_pci_bar_index(pm8001_mr32(address, (offset + 0x14))); get_pci_bar_index(pm8001_mr32(address, (offset + 0x14)));
...@@ -169,10 +168,9 @@ static void read_inbnd_queue_table(struct pm8001_hba_info *pm8001_ha) ...@@ -169,10 +168,9 @@ static void read_inbnd_queue_table(struct pm8001_hba_info *pm8001_ha)
*/ */
static void read_outbnd_queue_table(struct pm8001_hba_info *pm8001_ha) static void read_outbnd_queue_table(struct pm8001_hba_info *pm8001_ha)
{ {
int outbQ_num = 1;
int i; int i;
void __iomem *address = pm8001_ha->outbnd_q_tbl_addr; void __iomem *address = pm8001_ha->outbnd_q_tbl_addr;
for (i = 0; i < outbQ_num; i++) { for (i = 0; i < PM8001_MAX_OUTB_NUM; i++) {
u32 offset = i * 0x24; u32 offset = i * 0x24;
pm8001_ha->outbnd_q_tbl[i].ci_pci_bar = pm8001_ha->outbnd_q_tbl[i].ci_pci_bar =
get_pci_bar_index(pm8001_mr32(address, (offset + 0x14))); get_pci_bar_index(pm8001_mr32(address, (offset + 0x14)));
...@@ -225,19 +223,19 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) ...@@ -225,19 +223,19 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha)
pm8001_ha->inbnd_q_tbl[i].element_pri_size_cnt = pm8001_ha->inbnd_q_tbl[i].element_pri_size_cnt =
PM8001_MPI_QUEUE | (64 << 16) | (0x00<<30); PM8001_MPI_QUEUE | (64 << 16) | (0x00<<30);
pm8001_ha->inbnd_q_tbl[i].upper_base_addr = pm8001_ha->inbnd_q_tbl[i].upper_base_addr =
pm8001_ha->memoryMap.region[IB].phys_addr_hi; pm8001_ha->memoryMap.region[IB + i].phys_addr_hi;
pm8001_ha->inbnd_q_tbl[i].lower_base_addr = pm8001_ha->inbnd_q_tbl[i].lower_base_addr =
pm8001_ha->memoryMap.region[IB].phys_addr_lo; pm8001_ha->memoryMap.region[IB + i].phys_addr_lo;
pm8001_ha->inbnd_q_tbl[i].base_virt = pm8001_ha->inbnd_q_tbl[i].base_virt =
(u8 *)pm8001_ha->memoryMap.region[IB].virt_ptr; (u8 *)pm8001_ha->memoryMap.region[IB + i].virt_ptr;
pm8001_ha->inbnd_q_tbl[i].total_length = pm8001_ha->inbnd_q_tbl[i].total_length =
pm8001_ha->memoryMap.region[IB].total_len; pm8001_ha->memoryMap.region[IB + i].total_len;
pm8001_ha->inbnd_q_tbl[i].ci_upper_base_addr = pm8001_ha->inbnd_q_tbl[i].ci_upper_base_addr =
pm8001_ha->memoryMap.region[CI].phys_addr_hi; pm8001_ha->memoryMap.region[CI + i].phys_addr_hi;
pm8001_ha->inbnd_q_tbl[i].ci_lower_base_addr = pm8001_ha->inbnd_q_tbl[i].ci_lower_base_addr =
pm8001_ha->memoryMap.region[CI].phys_addr_lo; pm8001_ha->memoryMap.region[CI + i].phys_addr_lo;
pm8001_ha->inbnd_q_tbl[i].ci_virt = pm8001_ha->inbnd_q_tbl[i].ci_virt =
pm8001_ha->memoryMap.region[CI].virt_ptr; pm8001_ha->memoryMap.region[CI + i].virt_ptr;
offsetib = i * 0x20; offsetib = i * 0x20;
pm8001_ha->inbnd_q_tbl[i].pi_pci_bar = pm8001_ha->inbnd_q_tbl[i].pi_pci_bar =
get_pci_bar_index(pm8001_mr32(addressib, get_pci_bar_index(pm8001_mr32(addressib,
...@@ -251,21 +249,21 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) ...@@ -251,21 +249,21 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha)
pm8001_ha->outbnd_q_tbl[i].element_size_cnt = pm8001_ha->outbnd_q_tbl[i].element_size_cnt =
PM8001_MPI_QUEUE | (64 << 16) | (0x01<<30); PM8001_MPI_QUEUE | (64 << 16) | (0x01<<30);
pm8001_ha->outbnd_q_tbl[i].upper_base_addr = pm8001_ha->outbnd_q_tbl[i].upper_base_addr =
pm8001_ha->memoryMap.region[OB].phys_addr_hi; pm8001_ha->memoryMap.region[OB + i].phys_addr_hi;
pm8001_ha->outbnd_q_tbl[i].lower_base_addr = pm8001_ha->outbnd_q_tbl[i].lower_base_addr =
pm8001_ha->memoryMap.region[OB].phys_addr_lo; pm8001_ha->memoryMap.region[OB + i].phys_addr_lo;
pm8001_ha->outbnd_q_tbl[i].base_virt = pm8001_ha->outbnd_q_tbl[i].base_virt =
(u8 *)pm8001_ha->memoryMap.region[OB].virt_ptr; (u8 *)pm8001_ha->memoryMap.region[OB + i].virt_ptr;
pm8001_ha->outbnd_q_tbl[i].total_length = pm8001_ha->outbnd_q_tbl[i].total_length =
pm8001_ha->memoryMap.region[OB].total_len; pm8001_ha->memoryMap.region[OB + i].total_len;
pm8001_ha->outbnd_q_tbl[i].pi_upper_base_addr = pm8001_ha->outbnd_q_tbl[i].pi_upper_base_addr =
pm8001_ha->memoryMap.region[PI].phys_addr_hi; pm8001_ha->memoryMap.region[PI + i].phys_addr_hi;
pm8001_ha->outbnd_q_tbl[i].pi_lower_base_addr = pm8001_ha->outbnd_q_tbl[i].pi_lower_base_addr =
pm8001_ha->memoryMap.region[PI].phys_addr_lo; pm8001_ha->memoryMap.region[PI + i].phys_addr_lo;
pm8001_ha->outbnd_q_tbl[i].interrup_vec_cnt_delay = pm8001_ha->outbnd_q_tbl[i].interrup_vec_cnt_delay =
0 | (10 << 16) | (0 << 24); 0 | (10 << 16) | (i << 24);
pm8001_ha->outbnd_q_tbl[i].pi_virt = pm8001_ha->outbnd_q_tbl[i].pi_virt =
pm8001_ha->memoryMap.region[PI].virt_ptr; pm8001_ha->memoryMap.region[PI + i].virt_ptr;
offsetob = i * 0x24; offsetob = i * 0x24;
pm8001_ha->outbnd_q_tbl[i].ci_pci_bar = pm8001_ha->outbnd_q_tbl[i].ci_pci_bar =
get_pci_bar_index(pm8001_mr32(addressob, get_pci_bar_index(pm8001_mr32(addressob,
...@@ -641,6 +639,7 @@ static void init_pci_device_addresses(struct pm8001_hba_info *pm8001_ha) ...@@ -641,6 +639,7 @@ static void init_pci_device_addresses(struct pm8001_hba_info *pm8001_ha)
*/ */
static int pm8001_chip_init(struct pm8001_hba_info *pm8001_ha) static int pm8001_chip_init(struct pm8001_hba_info *pm8001_ha)
{ {
u8 i = 0;
/* check the firmware status */ /* check the firmware status */
if (-1 == check_fw_ready(pm8001_ha)) { if (-1 == check_fw_ready(pm8001_ha)) {
PM8001_FAIL_DBG(pm8001_ha, PM8001_FAIL_DBG(pm8001_ha,
...@@ -657,8 +656,10 @@ static int pm8001_chip_init(struct pm8001_hba_info *pm8001_ha) ...@@ -657,8 +656,10 @@ static int pm8001_chip_init(struct pm8001_hba_info *pm8001_ha)
read_outbnd_queue_table(pm8001_ha); read_outbnd_queue_table(pm8001_ha);
/* update main config table ,inbound table and outbound table */ /* update main config table ,inbound table and outbound table */
update_main_config_table(pm8001_ha); update_main_config_table(pm8001_ha);
update_inbnd_queue_table(pm8001_ha, 0); for (i = 0; i < PM8001_MAX_INB_NUM; i++)
update_outbnd_queue_table(pm8001_ha, 0); update_inbnd_queue_table(pm8001_ha, i);
for (i = 0; i < PM8001_MAX_OUTB_NUM; i++)
update_outbnd_queue_table(pm8001_ha, i);
mpi_set_phys_g3_with_ssc(pm8001_ha, 0); mpi_set_phys_g3_with_ssc(pm8001_ha, 0);
/* 7->130ms, 34->500ms, 119->1.5s */ /* 7->130ms, 34->500ms, 119->1.5s */
mpi_set_open_retry_interval_reg(pm8001_ha, 119); mpi_set_open_retry_interval_reg(pm8001_ha, 119);
......
drivers/scsi/pm8001/pm8001_init.c
View file @ e590adfd
...@@ -199,10 +199,14 @@ static irqreturn_t pm8001_interrupt(int irq, void *opaque) ...@@ -199,10 +199,14 @@ static irqreturn_t pm8001_interrupt(int irq, void *opaque)
* @pm8001_ha:our hba structure. * @pm8001_ha:our hba structure.
* *
*/ */
static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha) static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha,
const struct pci_device_id *ent)
{ {
int i; int i;
spin_lock_init(&pm8001_ha->lock); spin_lock_init(&pm8001_ha->lock);
PM8001_INIT_DBG(pm8001_ha,
pm8001_printk("pm8001_alloc: PHY:%x\n",
pm8001_ha->chip->n_phy));
for (i = 0; i < pm8001_ha->chip->n_phy; i++) { for (i = 0; i < pm8001_ha->chip->n_phy; i++) {
pm8001_phy_init(pm8001_ha, i); pm8001_phy_init(pm8001_ha, i);
pm8001_ha->port[i].wide_port_phymap = 0; pm8001_ha->port[i].wide_port_phymap = 0;
...@@ -226,30 +230,57 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha) ...@@ -226,30 +230,57 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha)
pm8001_ha->memoryMap.region[IOP].total_len = PM8001_EVENT_LOG_SIZE; pm8001_ha->memoryMap.region[IOP].total_len = PM8001_EVENT_LOG_SIZE;
pm8001_ha->memoryMap.region[IOP].alignment = 32; pm8001_ha->memoryMap.region[IOP].alignment = 32;
/* MPI Memory region 3 for consumer Index of inbound queues */ for (i = 0; i < PM8001_MAX_SPCV_INB_NUM; i++) {
pm8001_ha->memoryMap.region[CI].num_elements = 1; /* MPI Memory region 3 for consumer Index of inbound queues */
pm8001_ha->memoryMap.region[CI].element_size = 4; pm8001_ha->memoryMap.region[CI+i].num_elements = 1;
pm8001_ha->memoryMap.region[CI].total_len = 4; pm8001_ha->memoryMap.region[CI+i].element_size = 4;
pm8001_ha->memoryMap.region[CI].alignment = 4; pm8001_ha->memoryMap.region[CI+i].total_len = 4;
pm8001_ha->memoryMap.region[CI+i].alignment = 4;
/* MPI Memory region 4 for producer Index of outbound queues */
pm8001_ha->memoryMap.region[PI].num_elements = 1; if ((ent->driver_data) != chip_8001) {
pm8001_ha->memoryMap.region[PI].element_size = 4; /* MPI Memory region 5 inbound queues */
pm8001_ha->memoryMap.region[PI].total_len = 4; pm8001_ha->memoryMap.region[IB+i].num_elements =
pm8001_ha->memoryMap.region[PI].alignment = 4; PM8001_MPI_QUEUE;
pm8001_ha->memoryMap.region[IB+i].element_size = 128;
/* MPI Memory region 5 inbound queues */ pm8001_ha->memoryMap.region[IB+i].total_len =
pm8001_ha->memoryMap.region[IB].num_elements = PM8001_MPI_QUEUE; PM8001_MPI_QUEUE * 128;
pm8001_ha->memoryMap.region[IB].element_size = 64; pm8001_ha->memoryMap.region[IB+i].alignment = 128;
pm8001_ha->memoryMap.region[IB].total_len = PM8001_MPI_QUEUE * 64; } else {
pm8001_ha->memoryMap.region[IB].alignment = 64; pm8001_ha->memoryMap.region[IB+i].num_elements =
PM8001_MPI_QUEUE;
/* MPI Memory region 6 outbound queues */ pm8001_ha->memoryMap.region[IB+i].element_size = 64;
pm8001_ha->memoryMap.region[OB].num_elements = PM8001_MPI_QUEUE; pm8001_ha->memoryMap.region[IB+i].total_len =
pm8001_ha->memoryMap.region[OB].element_size = 64; PM8001_MPI_QUEUE * 64;
pm8001_ha->memoryMap.region[OB].total_len = PM8001_MPI_QUEUE * 64; pm8001_ha->memoryMap.region[IB+i].alignment = 64;
pm8001_ha->memoryMap.region[OB].alignment = 64; }
}
for (i = 0; i < PM8001_MAX_SPCV_OUTB_NUM; i++) {
/* MPI Memory region 4 for producer Index of outbound queues */
pm8001_ha->memoryMap.region[PI+i].num_elements = 1;
pm8001_ha->memoryMap.region[PI+i].element_size = 4;
pm8001_ha->memoryMap.region[PI+i].total_len = 4;
pm8001_ha->memoryMap.region[PI+i].alignment = 4;
if (ent->driver_data != chip_8001) {
/* MPI Memory region 6 Outbound queues */
pm8001_ha->memoryMap.region[OB+i].num_elements =
PM8001_MPI_QUEUE;
pm8001_ha->memoryMap.region[OB+i].element_size = 128;
pm8001_ha->memoryMap.region[OB+i].total_len =
PM8001_MPI_QUEUE * 128;
pm8001_ha->memoryMap.region[OB+i].alignment = 128;
} else {
/* MPI Memory region 6 Outbound queues */
pm8001_ha->memoryMap.region[OB+i].num_elements =
PM8001_MPI_QUEUE;
pm8001_ha->memoryMap.region[OB+i].element_size = 64;
pm8001_ha->memoryMap.region[OB+i].total_len =
PM8001_MPI_QUEUE * 64;
pm8001_ha->memoryMap.region[OB+i].alignment = 64;
}
}
/* Memory region write DMA*/ /* Memory region write DMA*/
pm8001_ha->memoryMap.region[NVMD].num_elements = 1; pm8001_ha->memoryMap.region[NVMD].num_elements = 1;
pm8001_ha->memoryMap.region[NVMD].element_size = 4096; pm8001_ha->memoryMap.region[NVMD].element_size = 4096;
...@@ -343,10 +374,12 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha) ...@@ -343,10 +374,12 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha)
ioremap(pm8001_ha->io_mem[logicalBar].membase, ioremap(pm8001_ha->io_mem[logicalBar].membase,
pm8001_ha->io_mem[logicalBar].memsize); pm8001_ha->io_mem[logicalBar].memsize);
PM8001_INIT_DBG(pm8001_ha, PM8001_INIT_DBG(pm8001_ha,
pm8001_printk("PCI: bar %d, logicalBar %d " pm8001_printk("PCI: bar %d, logicalBar %d ",
"virt_addr=%lx,len=%d\n", bar, logicalBar, bar, logicalBar));
(unsigned long) PM8001_INIT_DBG(pm8001_ha, pm8001_printk(
pm8001_ha->io_mem[logicalBar].memvirtaddr, "base addr %llx virt_addr=%llx len=%d\n",
(u64)pm8001_ha->io_mem[logicalBar].membase,
(u64)pm8001_ha->io_mem[logicalBar].memvirtaddr,
pm8001_ha->io_mem[logicalBar].memsize)); pm8001_ha->io_mem[logicalBar].memsize));
} else { } else {
pm8001_ha->io_mem[logicalBar].membase = 0; pm8001_ha->io_mem[logicalBar].membase = 0;
...@@ -365,8 +398,9 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha) ...@@ -365,8 +398,9 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha)
* @shost: scsi host struct which has been initialized before. * @shost: scsi host struct which has been initialized before.
*/ */
static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev, static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev,
u32 chip_id, const struct pci_device_id *ent,
struct Scsi_Host *shost) struct Scsi_Host *shost)
{ {
struct pm8001_hba_info *pm8001_ha; struct pm8001_hba_info *pm8001_ha;
struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost); struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost);
...@@ -378,7 +412,7 @@ static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev, ...@@ -378,7 +412,7 @@ static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev,
pm8001_ha->pdev = pdev; pm8001_ha->pdev = pdev;
pm8001_ha->dev = &pdev->dev; pm8001_ha->dev = &pdev->dev;
pm8001_ha->chip_id = chip_id; pm8001_ha->chip_id = ent->driver_data;
pm8001_ha->chip = &pm8001_chips[pm8001_ha->chip_id]; pm8001_ha->chip = &pm8001_chips[pm8001_ha->chip_id];
pm8001_ha->irq = pdev->irq; pm8001_ha->irq = pdev->irq;
pm8001_ha->sas = sha; pm8001_ha->sas = sha;
...@@ -391,7 +425,7 @@ static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev, ...@@ -391,7 +425,7 @@ static struct pm8001_hba_info *pm8001_pci_alloc(struct pci_dev *pdev,
(unsigned long)pm8001_ha); (unsigned long)pm8001_ha);
#endif #endif
pm8001_ioremap(pm8001_ha); pm8001_ioremap(pm8001_ha);
if (!pm8001_alloc(pm8001_ha)) if (!pm8001_alloc(pm8001_ha, ent))
return pm8001_ha; return pm8001_ha;
pm8001_free(pm8001_ha); pm8001_free(pm8001_ha);
return NULL; return NULL;
...@@ -669,7 +703,8 @@ static int pm8001_pci_probe(struct pci_dev *pdev, ...@@ -669,7 +703,8 @@ static int pm8001_pci_probe(struct pci_dev *pdev,
goto err_out_free; goto err_out_free;
} }
pci_set_drvdata(pdev, SHOST_TO_SAS_HA(shost)); pci_set_drvdata(pdev, SHOST_TO_SAS_HA(shost));
pm8001_ha = pm8001_pci_alloc(pdev, chip_8001, shost); /* ent->driver variable is used to differentiate between controllers */
pm8001_ha = pm8001_pci_alloc(pdev, ent, shost);
if (!pm8001_ha) { if (!pm8001_ha) {
rc = -ENOMEM; rc = -ENOMEM;
goto err_out_free; goto err_out_free;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7