nvme.h: untangle AEN notice definitions

Stop including the event type in the definitions for the notice type.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 2c4cf65641a6b12d7706ae1214f64d1f6c3bc15f..86cb78653155cb1ddba4d3d680be354deb0b0af8 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3321,6 +3321,21 @@ static void nvme_fw_act_work(struct work_struct *work)
        nvme_get_fw_slot_info(ctrl);
 }
 
+static void nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result)
+{
+       switch ((result & 0xff00) >> 8) {
+       case NVME_AER_NOTICE_NS_CHANGED:
+               dev_info(ctrl->device, "rescanning\n");
+               nvme_queue_scan(ctrl);
+               break;
+       case NVME_AER_NOTICE_FW_ACT_STARTING:
+               queue_work(nvme_wq, &ctrl->fw_act_work);
+               break;
+       default:
+               dev_warn(ctrl->device, "async event result %08x\n", result);
+       }
+}
+
 void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
                volatile union nvme_result *res)
 {
@@ -3330,6 +3345,9 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
                return;
 
        switch (result & 0x7) {
+       case NVME_AER_NOTICE:
+               nvme_handle_aen_notice(ctrl, result);
+               break;
        case NVME_AER_ERROR:
        case NVME_AER_SMART:
        case NVME_AER_CSS:
@@ -3339,18 +3357,6 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,
        default:
                break;
        }
-
-       switch (result & 0xff07) {
-       case NVME_AER_NOTICE_NS_CHANGED:
-               dev_info(ctrl->device, "rescanning\n");
-               nvme_queue_scan(ctrl);
-               break;
-       case NVME_AER_NOTICE_FW_ACT_STARTING:
-               queue_work(nvme_wq, &ctrl->fw_act_work);
-               break;
-       default:
-               dev_warn(ctrl->device, "async event result %08x\n", result);
-       }
        queue_work(nvme_wq, &ctrl->async_event_work);
 }
 EXPORT_SYMBOL_GPL(nvme_complete_async_event);

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 4112e2bd747f5828f031e5ac638888d4f38384cd..c37103a4ad380d9ea516becfea1d38e8060521fc 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -436,10 +436,14 @@ enum {
 enum {
        NVME_AER_ERROR                  = 0,
        NVME_AER_SMART                  = 1,
+       NVME_AER_NOTICE                 = 2,
        NVME_AER_CSS                    = 6,
        NVME_AER_VS                     = 7,
-       NVME_AER_NOTICE_NS_CHANGED      = 0x0002,
-       NVME_AER_NOTICE_FW_ACT_STARTING = 0x0102,
+};
+
+enum {
+       NVME_AER_NOTICE_NS_CHANGED      = 0x00,
+       NVME_AER_NOTICE_FW_ACT_STARTING = 0x01,
 };
 
 struct nvme_lba_range_type {