hisi_sas: Add abnormal irq handler

Add abnormal irq handler. This handler is concerned with phy down event.
Also add port formed and port deformed handlers.

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
John Garry 2015-11-18 00:50:52 +08:00 committed by Martin K. Petersen
parent abda97c2fe
commit 184a463534
3 changed files with 190 additions and 0 deletions

View File

@ -136,6 +136,7 @@ struct hisi_sas_hw {
struct hisi_sas_slot *slot, int abort); struct hisi_sas_slot *slot, int abort);
void (*free_device)(struct hisi_hba *hisi_hba, void (*free_device)(struct hisi_hba *hisi_hba,
struct hisi_sas_device *dev); struct hisi_sas_device *dev);
int (*get_wideport_bitmap)(struct hisi_hba *hisi_hba, int port_id);
int complete_hdr_size; int complete_hdr_size;
}; };
@ -330,6 +331,7 @@ extern int hisi_sas_probe(struct platform_device *pdev,
const struct hisi_sas_hw *ops); const struct hisi_sas_hw *ops);
extern int hisi_sas_remove(struct platform_device *pdev); extern int hisi_sas_remove(struct platform_device *pdev);
extern void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy);
extern void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, extern void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba,
struct sas_task *task, struct sas_task *task,
struct hisi_sas_slot *slot); struct hisi_sas_slot *slot);

View File

@ -431,6 +431,72 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no)
INIT_WORK(&phy->phyup_ws, hisi_sas_phyup_work); INIT_WORK(&phy->phyup_ws, hisi_sas_phyup_work);
} }
static void hisi_sas_port_notify_formed(struct asd_sas_phy *sas_phy)
{
struct sas_ha_struct *sas_ha = sas_phy->ha;
struct hisi_hba *hisi_hba = sas_ha->lldd_ha;
struct hisi_sas_phy *phy = sas_phy->lldd_phy;
struct asd_sas_port *sas_port = sas_phy->port;
struct hisi_sas_port *port = &hisi_hba->port[sas_phy->id];
unsigned long flags;
if (!sas_port)
return;
spin_lock_irqsave(&hisi_hba->lock, flags);
port->port_attached = 1;
port->id = phy->port_id;
phy->port = port;
sas_port->lldd_port = port;
spin_unlock_irqrestore(&hisi_hba->lock, flags);
}
static void hisi_sas_do_release_task(struct hisi_hba *hisi_hba, int phy_no,
struct domain_device *device)
{
struct hisi_sas_phy *phy;
struct hisi_sas_port *port;
struct hisi_sas_slot *slot, *slot2;
struct device *dev = &hisi_hba->pdev->dev;
phy = &hisi_hba->phy[phy_no];
port = phy->port;
if (!port)
return;
list_for_each_entry_safe(slot, slot2, &port->list, entry) {
struct sas_task *task;
task = slot->task;
if (device && task->dev != device)
continue;
dev_info(dev, "Release slot [%d:%d], task [%p]:\n",
slot->dlvry_queue, slot->dlvry_queue_slot, task);
hisi_hba->hw->slot_complete(hisi_hba, slot, 1);
}
}
static void hisi_sas_port_notify_deformed(struct asd_sas_phy *sas_phy)
{
struct domain_device *device;
struct hisi_sas_phy *phy = sas_phy->lldd_phy;
struct asd_sas_port *sas_port = sas_phy->port;
list_for_each_entry(device, &sas_port->dev_list, dev_list_node)
hisi_sas_do_release_task(phy->hisi_hba, sas_phy->id, device);
}
static void hisi_sas_release_task(struct hisi_hba *hisi_hba,
struct domain_device *device)
{
struct asd_sas_port *port = device->port;
struct asd_sas_phy *sas_phy;
list_for_each_entry(sas_phy, &port->phy_list, port_phy_el)
hisi_sas_do_release_task(hisi_hba, sas_phy->id, device);
}
static void hisi_sas_dev_gone(struct domain_device *device) static void hisi_sas_dev_gone(struct domain_device *device)
{ {
struct hisi_sas_device *sas_dev = device->lldd_dev; struct hisi_sas_device *sas_dev = device->lldd_dev;
@ -454,6 +520,56 @@ static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags)
return hisi_sas_task_exec(task, gfp_flags, 0, NULL); return hisi_sas_task_exec(task, gfp_flags, 0, NULL);
} }
static void hisi_sas_port_formed(struct asd_sas_phy *sas_phy)
{
hisi_sas_port_notify_formed(sas_phy);
}
static void hisi_sas_port_deformed(struct asd_sas_phy *sas_phy)
{
hisi_sas_port_notify_deformed(sas_phy);
}
static void hisi_sas_phy_disconnected(struct hisi_sas_phy *phy)
{
phy->phy_attached = 0;
phy->phy_type = 0;
phy->port = NULL;
}
void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy)
{
struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];
struct asd_sas_phy *sas_phy = &phy->sas_phy;
struct sas_ha_struct *sas_ha = &hisi_hba->sha;
if (rdy) {
/* Phy down but ready */
hisi_sas_bytes_dmaed(hisi_hba, phy_no);
hisi_sas_port_notify_formed(sas_phy);
} else {
struct hisi_sas_port *port = phy->port;
/* Phy down and not ready */
sas_ha->notify_phy_event(sas_phy, PHYE_LOSS_OF_SIGNAL);
sas_phy_disconnected(sas_phy);
if (port) {
if (phy->phy_type & PORT_TYPE_SAS) {
int port_id = port->id;
if (!hisi_hba->hw->get_wideport_bitmap(hisi_hba,
port_id))
port->port_attached = 0;
} else if (phy->phy_type & PORT_TYPE_SATA)
port->port_attached = 0;
}
hisi_sas_phy_disconnected(phy);
}
}
EXPORT_SYMBOL_GPL(hisi_sas_phy_down);
static struct scsi_transport_template *hisi_sas_stt; static struct scsi_transport_template *hisi_sas_stt;
static struct scsi_host_template hisi_sas_sht = { static struct scsi_host_template hisi_sas_sht = {
@ -479,6 +595,8 @@ static struct sas_domain_function_template hisi_sas_transport_ops = {
.lldd_dev_found = hisi_sas_dev_found, .lldd_dev_found = hisi_sas_dev_found,
.lldd_dev_gone = hisi_sas_dev_gone, .lldd_dev_gone = hisi_sas_dev_gone,
.lldd_execute_task = hisi_sas_queue_command, .lldd_execute_task = hisi_sas_queue_command,
.lldd_port_formed = hisi_sas_port_formed,
.lldd_port_deformed = hisi_sas_port_deformed,
}; };
static int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost) static int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)

View File

@ -810,6 +810,18 @@ static void sl_notify_v1_hw(struct hisi_hba *hisi_hba, int phy_no)
hisi_sas_phy_write32(hisi_hba, phy_no, SL_CONTROL, sl_control); hisi_sas_phy_write32(hisi_hba, phy_no, SL_CONTROL, sl_control);
} }
static int get_wideport_bitmap_v1_hw(struct hisi_hba *hisi_hba, int port_id)
{
int i, bitmap = 0;
u32 phy_port_num_ma = hisi_sas_read32(hisi_hba, PHY_PORT_NUM_MA);
for (i = 0; i < hisi_hba->n_phy; i++)
if (((phy_port_num_ma >> (i * 4)) & 0xf) == port_id)
bitmap |= 1 << i;
return bitmap;
}
/** /**
* This function allocates across all queues to load balance. * This function allocates across all queues to load balance.
* Slots are allocated from queues in a round-robin fashion. * Slots are allocated from queues in a round-robin fashion.
@ -1321,6 +1333,61 @@ end:
return res; return res;
} }
static irqreturn_t int_abnormal_v1_hw(int irq, void *p)
{
struct hisi_sas_phy *phy = p;
struct hisi_hba *hisi_hba = phy->hisi_hba;
struct device *dev = &hisi_hba->pdev->dev;
struct asd_sas_phy *sas_phy = &phy->sas_phy;
u32 irq_value, irq_mask_old;
int phy_no = sas_phy->id;
/* mask_int0 */
irq_mask_old = hisi_sas_phy_read32(hisi_hba, phy_no, CHL_INT0_MSK);
hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0_MSK, 0x3fffff);
/* read int0 */
irq_value = hisi_sas_phy_read32(hisi_hba, phy_no, CHL_INT0);
if (irq_value & CHL_INT0_PHYCTRL_NOTRDY_MSK) {
u32 phy_state = hisi_sas_read32(hisi_hba, PHY_STATE);
hisi_sas_phy_down(hisi_hba, phy_no,
(phy_state & 1 << phy_no) ? 1 : 0);
}
if (irq_value & CHL_INT0_ID_TIMEOUT_MSK)
dev_dbg(dev, "abnormal: ID_TIMEOUT phy%d identify timeout\n",
phy_no);
if (irq_value & CHL_INT0_DWS_LOST_MSK)
dev_dbg(dev, "abnormal: DWS_LOST phy%d dws lost\n", phy_no);
if (irq_value & CHL_INT0_SN_FAIL_NGR_MSK)
dev_dbg(dev, "abnormal: SN_FAIL_NGR phy%d sn fail ngr\n",
phy_no);
if (irq_value & CHL_INT0_SL_IDAF_FAIL_MSK ||
irq_value & CHL_INT0_SL_OPAF_FAIL_MSK)
dev_dbg(dev, "abnormal: SL_ID/OPAF_FAIL phy%d check adr frm err\n",
phy_no);
if (irq_value & CHL_INT0_SL_PS_FAIL_OFF)
dev_dbg(dev, "abnormal: SL_PS_FAIL phy%d fail\n", phy_no);
/* write to zero */
hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0, irq_value);
if (irq_value & CHL_INT0_PHYCTRL_NOTRDY_MSK)
hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0_MSK,
0x3fffff & ~CHL_INT0_MSK_PHYCTRL_NOTRDY_MSK);
else
hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0_MSK,
irq_mask_old);
return IRQ_HANDLED;
}
static irqreturn_t cq_interrupt_v1_hw(int irq, void *p) static irqreturn_t cq_interrupt_v1_hw(int irq, void *p)
{ {
struct hisi_sas_cq *cq = p; struct hisi_sas_cq *cq = p;
@ -1372,11 +1439,13 @@ static irqreturn_t cq_interrupt_v1_hw(int irq, void *p)
static const char phy_int_names[HISI_SAS_PHY_INT_NR][32] = { static const char phy_int_names[HISI_SAS_PHY_INT_NR][32] = {
{"Phy Up"}, {"Phy Up"},
{"Abnormal"},
}; };
static const char cq_int_name[32] = "cq"; static const char cq_int_name[32] = "cq";
static irq_handler_t phy_interrupts[HISI_SAS_PHY_INT_NR] = { static irq_handler_t phy_interrupts[HISI_SAS_PHY_INT_NR] = {
int_phyup_v1_hw, int_phyup_v1_hw,
int_abnormal_v1_hw
}; };
static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
@ -1499,6 +1568,7 @@ static const struct hisi_sas_hw hisi_sas_v1_hw = {
.get_free_slot = get_free_slot_v1_hw, .get_free_slot = get_free_slot_v1_hw,
.start_delivery = start_delivery_v1_hw, .start_delivery = start_delivery_v1_hw,
.slot_complete = slot_complete_v1_hw, .slot_complete = slot_complete_v1_hw,
.get_wideport_bitmap = get_wideport_bitmap_v1_hw,
.complete_hdr_size = sizeof(struct hisi_sas_complete_v1_hdr), .complete_hdr_size = sizeof(struct hisi_sas_complete_v1_hdr),
}; };