PCI/switchtec: Rename generation-specific constants

Gen4 hardware will have different values for the SWITCHTEC_X_RUNNING and
SWITCHTEC_IOCTL_NUM_PARTITIONS, so rename them with GEN3 in their name.

No functional changes intended.

Link: https://lore.kernel.org/r/20200115035648.2578-2-logang@deltatee.com
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
index 05d4cb49219b3bcbd753ade61999e319828978cf..e4d9291864bc0c77d5bf9bde77db4b01d7639f8d 100644 (file)
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -569,7 +569,7 @@ static int ioctl_flash_info(struct switchtec_dev *stdev,
        struct flash_info_regs __iomem *fi = stdev->mmio_flash_info;
 
        info.flash_length = ioread32(&fi->flash_length);
-       info.num_partitions = SWITCHTEC_IOCTL_NUM_PARTITIONS;
+       info.num_partitions = SWITCHTEC_NUM_PARTITIONS_GEN3;
 
        if (copy_to_user(uinfo, &info, sizeof(info)))
                return -EFAULT;
@@ -599,25 +599,25 @@ static int ioctl_flash_part_info(struct switchtec_dev *stdev,
        case SWITCHTEC_IOCTL_PART_CFG0:
                active_addr = ioread32(&fi->active_cfg);
                set_fw_info_part(&info, &fi->cfg0);
-               if (ioread16(&si->cfg_running) == SWITCHTEC_CFG0_RUNNING)
+               if (ioread16(&si->cfg_running) == SWITCHTEC_GEN3_CFG0_RUNNING)
                        info.active |= SWITCHTEC_IOCTL_PART_RUNNING;
                break;
        case SWITCHTEC_IOCTL_PART_CFG1:
                active_addr = ioread32(&fi->active_cfg);
                set_fw_info_part(&info, &fi->cfg1);
-               if (ioread16(&si->cfg_running) == SWITCHTEC_CFG1_RUNNING)
+               if (ioread16(&si->cfg_running) == SWITCHTEC_GEN3_CFG1_RUNNING)
                        info.active |= SWITCHTEC_IOCTL_PART_RUNNING;
                break;
        case SWITCHTEC_IOCTL_PART_IMG0:
                active_addr = ioread32(&fi->active_img);
                set_fw_info_part(&info, &fi->img0);
-               if (ioread16(&si->img_running) == SWITCHTEC_IMG0_RUNNING)
+               if (ioread16(&si->img_running) == SWITCHTEC_GEN3_IMG0_RUNNING)
                        info.active |= SWITCHTEC_IOCTL_PART_RUNNING;
                break;
        case SWITCHTEC_IOCTL_PART_IMG1:
                active_addr = ioread32(&fi->active_img);
                set_fw_info_part(&info, &fi->img1);
-               if (ioread16(&si->img_running) == SWITCHTEC_IMG1_RUNNING)
+               if (ioread16(&si->img_running) == SWITCHTEC_GEN3_IMG1_RUNNING)
                        info.active |= SWITCHTEC_IOCTL_PART_RUNNING;
                break;
        case SWITCHTEC_IOCTL_PART_NVLOG:

diff --git a/include/linux/switchtec.h b/include/linux/switchtec.h
index b4ba3a38f30ffaccd2def4c28bdc1016ddbe1413..4ee450487fe464abe490a9817a1937d5364cb780 100644 (file)
--- a/include/linux/switchtec.h
+++ b/include/linux/switchtec.h
@@ -98,10 +98,10 @@ struct sw_event_regs {
 } __packed;
 
 enum {
-       SWITCHTEC_CFG0_RUNNING = 0x04,
-       SWITCHTEC_CFG1_RUNNING = 0x05,
-       SWITCHTEC_IMG0_RUNNING = 0x03,
-       SWITCHTEC_IMG1_RUNNING = 0x07,
+       SWITCHTEC_GEN3_CFG0_RUNNING = 0x04,
+       SWITCHTEC_GEN3_CFG1_RUNNING = 0x05,
+       SWITCHTEC_GEN3_IMG0_RUNNING = 0x03,
+       SWITCHTEC_GEN3_IMG1_RUNNING = 0x07,
 };
 
 struct sys_info_regs {

diff --git a/include/uapi/linux/switchtec_ioctl.h b/include/uapi/linux/switchtec_ioctl.h
index e8db938985ca954fae0a0084e5e52de7214b4cfe..4d09cfa2e9e6da8e26ccd1f8cd632138667069dd 100644 (file)
--- a/include/uapi/linux/switchtec_ioctl.h
+++ b/include/uapi/linux/switchtec_ioctl.h
@@ -32,7 +32,10 @@
 #define SWITCHTEC_IOCTL_PART_VENDOR5   10
 #define SWITCHTEC_IOCTL_PART_VENDOR6   11
 #define SWITCHTEC_IOCTL_PART_VENDOR7   12
-#define SWITCHTEC_IOCTL_NUM_PARTITIONS 13
+#define SWITCHTEC_NUM_PARTITIONS_GEN3  13
+
+/* obsolete: for compatibility with old userspace software */
+#define SWITCHTEC_IOCTL_NUM_PARTITIONS SWITCHTEC_NUM_PARTITIONS_GEN3
 
 struct switchtec_ioctl_flash_info {
        __u64 flash_length;