summaryrefslogtreecommitdiffstats
path: root/drivers/nvme
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.dk/linux-blockLinus Torvalds2017-05-217-5/+25
|\
| * nvmet: release the sq ref on rdma read errorsVijay Immanuel2017-05-203-0/+8
| * nvmet-fc: remove target cpu scheduling flagJames Smart2017-05-202-4/+1Star
| * nvme-fc: stop queues on error detectionJames Smart2017-05-201-0/+4
| * nvme-fc: require target or discovery role for fc-nvme targetsJames Smart2017-05-201-0/+6
| * nvme: unmap CMB and remove sysfs file in reset pathJon Derrick2017-05-201-1/+6
* | Merge branch 'for-linus' of git://git.kernel.dk/linux-blockLinus Torvalds2017-05-111-4/+5
|\|
| * nvme: lightnvm: fix memory leakRakesh Pandit2017-05-101-1/+2
| * lightnvm: remove unused rq parameter of nvme_nvm_rqtocmd() to kill warningGeert Uytterhoeven2017-05-081-3/+3
* | Merge tag 'pci-v4.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-05-091-17/+13Star
|\ \ | |/ |/|
| * nvme/pci: Switch to pci_request_irq()Christoph Hellwig2017-04-181-17/+13Star
* | lightnvm: create cmd before allocating requestJavier González2017-05-041-2/+2
* | blk-mq: update ->init_request and ->exit_request prototypesChristoph Hellwig2017-05-024-41/+39Star
* | Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/post-m...Jens Axboe2017-04-275-370/+748
|\ \
| * | nvme-scsi: remove nvme_trans_security_protocolChristoph Hellwig2017-04-271-13/+0Star
| * | nvme-lightnvm: add missing endianess conversion in nvme_nvm_end_ioChristoph Hellwig2017-04-251-1/+1
| * | nvme-scsi: Consider LBA format in IO splitting calculationJon Derrick2017-04-251-1/+1
| * | nvme-fc: avoid memory corruption caused by calling nvmf_free_options() twiceEwan D. Milne2017-04-251-1/+3
| * | nvmet-fcloop: mark two symbols staticChristoph Hellwig2017-04-241-2/+2
| * | nvmet-fc: properly endian swap sq_headChristoph Hellwig2017-04-241-1/+1
| * | nvmet-fc: mark the sqhd field as __le16Christoph Hellwig2017-04-241-1/+1
| * | nvmet-fc: fix endianess annoations for nvmet_fc_format_rsp_hdrChristoph Hellwig2017-04-241-1/+1
| * | nvmet-fc: mark nvmet_fc_handle_fcp_rqst staticChristoph Hellwig2017-04-241-1/+1
| * | nvme-fc: mark two symbols staticChristoph Hellwig2017-04-241-2/+2
| * | nvme_fc: add controller reset supportJames Smart2017-04-241-315/+616
| * | nvme_fc: add aen abort to teardownJames Smart2017-04-241-52/+139
| * | nvme_fc: fix command id checkJames Smart2017-04-241-1/+2
* | | nvme: Add nvme_core.force_apst to ignore the NO_APST quirkAndy Lutomirski2017-04-251-1/+19
* | | nvme: Display raw APST configuration via DYNAMIC_DEBUGAndy Lutomirski2017-04-251-0/+16
* | | nvme: Fix APST commentAndy Lutomirski2017-04-251-1/+1
* | | Merge branch 'master' into for-4.12/post-mergeJens Axboe2017-04-256-12/+48
|\ \ \ | |/ / |/| |
| * | nvme: Quirk APST off on "THNSF5256GPUK TOSHIBA"Andy Lutomirski2017-04-201-0/+9
| * | nvme: Adjust the Samsung APST quirkAndy Lutomirski2017-04-203-11/+38
| * | nvme-fc: Fix sqsize wrong assignment based on ctrl MQES capabilitySagi Grimberg2017-04-091-1/+1
| * | nvme-rdma: Fix sqsize wrong assignment based on ctrl MQES capabilitySagi Grimberg2017-04-091-1/+1
| * | nvme-loop: Fix sqsize wrong assignment based on ctrl MQES capabilitySagi Grimberg2017-04-091-1/+1
* | | nvme: let dm-mpath distinguish nvme error codesJunxiong Guan2017-04-211-0/+14
* | | nvme/pci: Poll CQ on timeoutKeith Busch2017-04-211-3/+18
* | | nvmet_fc: Change traddr field separator to a colonJames Smart2017-04-211-1/+1
* | | nvme_fc: Add ls aborts on remote port teardownJames Smart2017-04-211-0/+33
* | | nvme_fc: Move LS's to rportJames Smart2017-04-211-54/+65
* | | nvmet_fc: add missing reference in add_portJames Smart2017-04-211-0/+1
* | | nvmet_fc: Rework target side abort handlingJames Smart2017-04-212-76/+281
* | | nvme_fcloop: split job struct from transport for req_releaseJames Smart2017-04-211-8/+17
* | | nvmet_fc: add req_release to lldd apiJames Smart2017-04-212-7/+16
* | | nvmet_fc: add target feature flags for upcall isr contextsJames Smart2017-04-212-5/+37
* | | nvmet: convert from kmap to nvmet_copy_from_sglLogan Gunthorpe2017-04-211-7/+25
* | | nvme: improve performance for virtual NVMe devicesHelen Koike2017-04-211-2/+141
* | | nvme/pci: Don't set reserved SQ create flagsKeith Busch2017-04-211-1/+1
* | | blk-mq: remove the error argument to blk_mq_complete_requestChristoph Hellwig2017-04-202-2/+2
ter turning power off, we must wait for at least 1 second * before taking any action that relies on power having been * removed from the slot/adapter. */ msleep(1000); } pciehp_green_led_off(pslot); pciehp_set_attention_status(pslot, 1); } /** * board_added - Called after a board has been added to the system. * @p_slot: &slot where board is added * * Turns power on for the board. * Configures board. */ static int board_added(struct slot *p_slot) { int retval = 0; struct controller *ctrl = p_slot->ctrl; struct pci_bus *parent = ctrl->pcie->port->subordinate; if (POWER_CTRL(ctrl)) { /* Power on slot */ retval = pciehp_power_on_slot(p_slot); if (retval) return retval; } pciehp_green_led_blink(p_slot); /* Check link training status */ retval = pciehp_check_link_status(ctrl); if (retval) { ctrl_err(ctrl, "Failed to check link status\n"); goto err_exit; } /* Check for a power fault */ if (ctrl->power_fault_detected || pciehp_query_power_fault(p_slot)) { ctrl_err(ctrl, "Power fault on slot %s\n", slot_name(p_slot)); retval = -EIO; goto err_exit; } retval = pciehp_configure_device(p_slot); if (retval) { ctrl_err(ctrl, "Cannot add device at %04x:%02x:00\n", pci_domain_nr(parent), parent->number); if (retval != -EEXIST) goto err_exit; } pciehp_green_led_on(p_slot); return 0; err_exit: set_slot_off(ctrl, p_slot); return retval; } /** * remove_board - Turns off slot and LEDs * @p_slot: slot where board is being removed */ static int remove_board(struct slot *p_slot) { int retval; struct controller *ctrl = p_slot->ctrl; retval = pciehp_unconfigure_device(p_slot); if (retval) return retval; if (POWER_CTRL(ctrl)) { pciehp_power_off_slot(p_slot); /* * After turning power off, we must wait for at least 1 second * before taking any action that relies on power having been * removed from the slot/adapter. */ msleep(1000); } /* turn off Green LED */ pciehp_green_led_off(p_slot); return 0; } struct power_work_info { struct slot *p_slot; struct work_struct work; unsigned int req; #define DISABLE_REQ 0 #define ENABLE_REQ 1 }; /** * pciehp_power_thread - handle pushbutton events * @work: &struct work_struct describing work to be done * * Scheduled procedure to handle blocking stuff for the pushbuttons. * Handles all pending events and exits. */ static void pciehp_power_thread(struct work_struct *work) { struct power_work_info *info = container_of(work, struct power_work_info, work); struct slot *p_slot = info->p_slot; int ret; switch (info->req) { case DISABLE_REQ: mutex_lock(&p_slot->hotplug_lock); pciehp_disable_slot(p_slot); mutex_unlock(&p_slot->hotplug_lock); mutex_lock(&p_slot->lock); p_slot->state = STATIC_STATE; mutex_unlock(&p_slot->lock); break; case ENABLE_REQ: mutex_lock(&p_slot->hotplug_lock); ret = pciehp_enable_slot(p_slot); mutex_unlock(&p_slot->hotplug_lock); if (ret) pciehp_green_led_off(p_slot); mutex_lock(&p_slot->lock); p_slot->state = STATIC_STATE; mutex_unlock(&p_slot->lock); break; default: break; } kfree(info); } static void pciehp_queue_power_work(struct slot *p_slot, int req) { struct power_work_info *info; p_slot->state = (req == ENABLE_REQ) ? POWERON_STATE : POWEROFF_STATE; info = kmalloc(sizeof(*info), GFP_KERNEL); if (!info) { ctrl_err(p_slot->ctrl, "no memory to queue %s request\n", (req == ENABLE_REQ) ? "poweron" : "poweroff"); return; } info->p_slot = p_slot; INIT_WORK(&info->work, pciehp_power_thread); info->req = req; queue_work(p_slot->wq, &info->work); } void pciehp_queue_pushbutton_work(struct work_struct *work) { struct slot *p_slot = container_of(work, struct slot, work.work); mutex_lock(&p_slot->lock); switch (p_slot->state) { case BLINKINGOFF_STATE: pciehp_queue_power_work(p_slot, DISABLE_REQ); break; case BLINKINGON_STATE: pciehp_queue_power_work(p_slot, ENABLE_REQ); break; default: break; } mutex_unlock(&p_slot->lock); } /* * Note: This function must be called with slot->lock held */ static void handle_button_press_event(struct slot *p_slot) { struct controller *ctrl = p_slot->ctrl; u8 getstatus; switch (p_slot->state) { case STATIC_STATE: pciehp_get_power_status(p_slot, &getstatus); if (getstatus) { p_slot->state = BLINKINGOFF_STATE; ctrl_info(ctrl, "PCI slot #%s - powering off due to button press\n", slot_name(p_slot)); } else { p_slot->state = BLINKINGON_STATE; ctrl_info(ctrl, "PCI slot #%s - powering on due to button press\n", slot_name(p_slot)); } /* blink green LED and turn off amber */ pciehp_green_led_blink(p_slot); pciehp_set_attention_status(p_slot, 0); queue_delayed_work(p_slot->wq, &p_slot->work, 5*HZ); break; case BLINKINGOFF_STATE: case BLINKINGON_STATE: /* * Cancel if we are still blinking; this means that we * press the attention again before the 5 sec. limit * expires to cancel hot-add or hot-remove */ ctrl_info(ctrl, "Button cancel on Slot(%s)\n", slot_name(p_slot)); cancel_delayed_work(&p_slot->work); if (p_slot->state == BLINKINGOFF_STATE) pciehp_green_led_on(p_slot); else pciehp_green_led_off(p_slot); pciehp_set_attention_status(p_slot, 0); ctrl_info(ctrl, "PCI slot #%s - action canceled due to button press\n", slot_name(p_slot)); p_slot->state = STATIC_STATE; break; case POWEROFF_STATE: case POWERON_STATE: /* * Ignore if the slot is on power-on or power-off state; * this means that the previous attention button action * to hot-add or hot-remove is undergoing */ ctrl_info(ctrl, "Button ignore on Slot(%s)\n", slot_name(p_slot)); break; default: ctrl_warn(ctrl, "ignoring invalid state %#x\n", p_slot->state); break; } } /* * Note: This function must be called with slot->lock held */ static void handle_surprise_event(struct slot *p_slot) { u8 getstatus; pciehp_get_adapter_status(p_slot, &getstatus); if (!getstatus) pciehp_queue_power_work(p_slot, DISABLE_REQ); else pciehp_queue_power_work(p_slot, ENABLE_REQ); } /* * Note: This function must be called with slot->lock held */ static void handle_link_event(struct slot *p_slot, u32 event) { struct controller *ctrl = p_slot->ctrl; switch (p_slot->state) { case BLINKINGON_STATE: case BLINKINGOFF_STATE: cancel_delayed_work(&p_slot->work); /* Fall through */ case STATIC_STATE: pciehp_queue_power_work(p_slot, event == INT_LINK_UP ? ENABLE_REQ : DISABLE_REQ); break; case POWERON_STATE: if (event == INT_LINK_UP) { ctrl_info(ctrl, "Link Up event ignored on slot(%s): already powering on\n", slot_name(p_slot)); } else { ctrl_info(ctrl, "Link Down event queued on slot(%s): currently getting powered on\n", slot_name(p_slot)); pciehp_queue_power_work(p_slot, DISABLE_REQ); } break; case POWEROFF_STATE: if (event == INT_LINK_UP) { ctrl_info(ctrl, "Link Up event queued on slot(%s): currently getting powered off\n", slot_name(p_slot)); pciehp_queue_power_work(p_slot, ENABLE_REQ); } else { ctrl_info(ctrl, "Link Down event ignored on slot(%s): already powering off\n", slot_name(p_slot)); } break; default: ctrl_err(ctrl, "ignoring invalid state %#x on slot(%s)\n", p_slot->state, slot_name(p_slot)); break; } } static void interrupt_event_handler(struct work_struct *work) { struct event_info *info = container_of(work, struct event_info, work); struct slot *p_slot = info->p_slot; struct controller *ctrl = p_slot->ctrl; mutex_lock(&p_slot->lock); switch (info->event_type) { case INT_BUTTON_PRESS: handle_button_press_event(p_slot); break; case INT_POWER_FAULT: if (!POWER_CTRL(ctrl)) break; pciehp_set_attention_status(p_slot, 1); pciehp_green_led_off(p_slot); break; case INT_PRESENCE_ON: handle_surprise_event(p_slot); break; case INT_PRESENCE_OFF: /* * Regardless of surprise capability, we need to * definitely remove a card that has been pulled out! */ handle_surprise_event(p_slot); break; case INT_LINK_UP: case INT_LINK_DOWN: handle_link_event(p_slot, info->event_type); break; default: break; } mutex_unlock(&p_slot->lock); kfree(info); } /* * Note: This function must be called with slot->hotplug_lock held */ int pciehp_enable_slot(struct slot *p_slot) { u8 getstatus = 0; int rc; struct controller *ctrl = p_slot->ctrl; pciehp_get_adapter_status(p_slot, &getstatus); if (!getstatus) { ctrl_info(ctrl, "No adapter on slot(%s)\n", slot_name(p_slot)); return -ENODEV; } if (MRL_SENS(p_slot->ctrl)) { pciehp_get_latch_status(p_slot, &getstatus); if (getstatus) { ctrl_info(ctrl, "Latch open on slot(%s)\n", slot_name(p_slot)); return -ENODEV; } } if (POWER_CTRL(p_slot->ctrl)) { pciehp_get_power_status(p_slot, &getstatus); if (getstatus) { ctrl_info(ctrl, "Already enabled on slot(%s)\n", slot_name(p_slot)); return -EINVAL; } } pciehp_get_latch_status(p_slot, &getstatus); rc = board_added(p_slot); if (rc) pciehp_get_latch_status(p_slot, &getstatus); return rc; } /* * Note: This function must be called with slot->hotplug_lock held */ int pciehp_disable_slot(struct slot *p_slot) { u8 getstatus = 0; struct controller *ctrl = p_slot->ctrl; if (!p_slot->ctrl) return 1; if (POWER_CTRL(p_slot->ctrl)) { pciehp_get_power_status(p_slot, &getstatus); if (!getstatus) { ctrl_info(ctrl, "Already disabled on slot(%s)\n", slot_name(p_slot)); return -EINVAL; } } return remove_board(p_slot); } int pciehp_sysfs_enable_slot(struct slot *p_slot) { int retval = -ENODEV; struct controller *ctrl = p_slot->ctrl; mutex_lock(&p_slot->lock); switch (p_slot->state) { case BLINKINGON_STATE: cancel_delayed_work(&p_slot->work); case STATIC_STATE: p_slot->state = POWERON_STATE; mutex_unlock(&p_slot->lock); mutex_lock(&p_slot->hotplug_lock); retval = pciehp_enable_slot(p_slot); mutex_unlock(&p_slot->hotplug_lock); mutex_lock(&p_slot->lock); p_slot->state = STATIC_STATE; break; case POWERON_STATE: ctrl_info(ctrl, "Slot %s is already in powering on state\n", slot_name(p_slot)); break; case BLINKINGOFF_STATE: case POWEROFF_STATE: ctrl_info(ctrl, "Already enabled on slot %s\n", slot_name(p_slot)); break; default: ctrl_err(ctrl, "invalid state %#x on slot %s\n", p_slot->state, slot_name(p_slot)); break; } mutex_unlock(&p_slot->lock); return retval; } int pciehp_sysfs_disable_slot(struct slot *p_slot) { int retval = -ENODEV; struct controller *ctrl = p_slot->ctrl; mutex_lock(&p_slot->lock); switch (p_slot->state) { case BLINKINGOFF_STATE: cancel_delayed_work(&p_slot->work); case STATIC_STATE: p_slot->state = POWEROFF_STATE; mutex_unlock(&p_slot->lock); mutex_lock(&p_slot->hotplug_lock); retval = pciehp_disable_slot(p_slot); mutex_unlock(&p_slot->hotplug_lock); mutex_lock(&p_slot->lock); p_slot->state = STATIC_STATE; break; case POWEROFF_STATE: ctrl_info(ctrl, "Slot %s is already in powering off state\n", slot_name(p_slot)); break; case BLINKINGON_STATE: case POWERON_STATE: ctrl_info(ctrl, "Already disabled on slot %s\n", slot_name(p_slot)); break; default: ctrl_err(ctrl, "invalid state %#x on slot %s\n", p_slot->state, slot_name(p_slot)); break; } mutex_unlock(&p_slot->lock); return retval; }