Switchtec Gen4 Support
Subsystems (2)
Logan Gunthorpe
maintainerv2 cover Switchtec Gen4 Support
Hi,
Here are the cleaned up version of the patches for Gen4 support in switchtec. The end result is mostly the same, save some very minor changes, but the organization into commits has been reworked per Bjorn's feedback. This set is also rebased onto pci/switchtec.
A git branch is available here:
https://github.com/sbates130272/linux-p2pmem switchtec-next-v2
Thanks,
Logan
--
Kelvin Cao (2):
PCI/switchtec: Add gen4 support for the flash information interface PCI/switchtec: Introduce gen4 variant IDS in the device ID table
Logan Gunthorpe (5):
PCI/switchtec: Rename generation specific constants PCI/switchtec: Introduce Generation Variable PCI/switchtec: Refactor ioctl_flash_part_info() PCI/switchtec: Separate out gen3 register structures into unionse PCI/switchtec: Add gen4 support for the system info registers
drivers/pci/quirks.c | 18 ++ drivers/pci/switch/switchtec.c | 334 +++++++++++++++++++++------ include/linux/switchtec.h | 148 ++++++++++-- include/uapi/linux/switchtec_ioctl.h | 13 +- 4 files changed, 424 insertions(+), 89 deletions(-)
--
2.20.1
Logan Gunthorpe
maintainerPATCH v2 1/7 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.
--- drivers/pci/switch/switchtec.c | 10 +++++----- include/linux/switchtec.h | 8 ++++---- include/uapi/linux/switchtec_ioctl.h | 5 ++++- 3 files changed, 13 insertions(+), 10 deletions(-)
drivers/pci/switch/switchtec.c +5 -5
@@ -575,7 +575,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 ;
@@ -605,25 +605,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 :
include/linux/switchtec.h +4 -4
@@ -103,10 +103,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 {
include/uapi/linux/switchtec_ioctl.h +4 -1
@@ -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_GEN3struct switchtec_ioctl_flash_info {__u64 flash_length;
Signature · 1 line
2.20.1
Logan Gunthorpe
maintainerPATCH v2 2/7 PCI/switchtec: Introduce Generation Variable
In reply to Logan GunthorpeAdd a generation variable passed through the device id table and tests for GEN3 specific registers.
This will allow us to add generation 4 and other devices after they are functionally supported.
--- drivers/pci/switch/switchtec.c | 90 ++++++++++++++++++++++------------ include/linux/switchtec.h | 6 +++ 2 files changed, 64 insertions(+), 32 deletions(-)
drivers/pci/switch/switchtec.c +58 -32
@@ -326,7 +326,21 @@ static DEVICE_ATTR_RO(field)DEVICE_ATTR_SYS_INFO_STR (vendor_id);DEVICE_ATTR_SYS_INFO_STR (product_id);DEVICE_ATTR_SYS_INFO_STR (product_revision); -DEVICE_ATTR_SYS_INFO_STR (component_vendor); + +static ssize_t component_vendor_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct switchtec_dev *stdev =to_stdev (dev); +struct sys_info_regs __iomem *si = stdev->mmio_sys_info; + +/* component_vendor field not supported after gen3 */ +if (stdev->gen !=SWITCHTEC_GEN3 ) +return sprintf (buf,"none\n" ); + +return io_string_show (buf, &si->component_vendor, +sizeof (si->component_vendor)); +} +static DEVICE_ATTR_RO (component_vendor);static ssize_t component_id_show (struct device *dev,struct device_attribute *attr,char *buf)
@@ -334,6 +348,10 @@ static ssize_t component_id_show(struct device *dev,struct switchtec_dev *stdev =to_stdev (dev);int id =ioread16 (&stdev->mmio_sys_info->component_id); +/* component_id field not supported after gen3 */ +if (stdev->gen !=SWITCHTEC_GEN3 ) +return sprintf (buf,"none\n" ); +return sprintf (buf,"PM%04X\n" , id); }static DEVICE_ATTR_RO (component_id);
@@ -344,6 +362,10 @@ static ssize_t component_revision_show(struct device *dev,struct switchtec_dev *stdev =to_stdev (dev);int rev =ioread8 (&stdev->mmio_sys_info->component_revision); +/* component_revision field not supported after gen3 */ +if (stdev->gen !=SWITCHTEC_GEN3 ) +return sprintf (buf,"255\n" ); +return sprintf (buf,"%d\n" , rev); }static DEVICE_ATTR_RO (component_revision);
@@ -1426,6 +1448,8 @@ static int switchtec_pci_probe(struct pci_dev *pdev,if (IS_ERR (stdev))return PTR_ERR (stdev); + stdev->gen = id->driver_data; + rc =switchtec_init_pci (stdev, pdev);if (rc) goto err_put;
@@ -1473,7 +1497,7 @@ static void switchtec_pci_remove(struct pci_dev *pdev)put_device (&stdev->dev); } -#define SWITCHTEC_PCI_DEVICE (device_id) \ +#define SWITCHTEC_PCI_DEVICE (device_id, gen) \ { \ .vendor = PCI_VENDOR_ID_MICROSEMI, \ .device = device_id, \
@@ -1481,6 +1505,7 @@ static void switchtec_pci_remove(struct pci_dev *pdev) .subdevice = PCI_ANY_ID, \ .class = (PCI_CLASS_MEMORY_OTHER << 8), \ .class_mask = 0xFFFFFFFF, \ + .driver_data = gen, \ }, \ { \ .vendor = PCI_VENDOR_ID_MICROSEMI, \
@@ -1489,39 +1514,40 @@ static void switchtec_pci_remove(struct pci_dev *pdev) .subdevice = PCI_ANY_ID, \ .class = (PCI_CLASS_BRIDGE_OTHER << 8), \ .class_mask = 0xFFFFFFFF, \ + .driver_data = gen, \ }static const struct pci_device_id switchtec_pci_tbl[] = { -SWITCHTEC_PCI_DEVICE (0x8531 ),//PFX 24xG3 -SWITCHTEC_PCI_DEVICE (0x8532 ),//PFX 32xG3 -SWITCHTEC_PCI_DEVICE (0x8533 ),//PFX 48xG3 -SWITCHTEC_PCI_DEVICE (0x8534 ),//PFX 64xG3 -SWITCHTEC_PCI_DEVICE (0x8535 ),//PFX 80xG3 -SWITCHTEC_PCI_DEVICE (0x8536 ),//PFX 96xG3 -SWITCHTEC_PCI_DEVICE (0x8541 ),//PSX 24xG3 -SWITCHTEC_PCI_DEVICE (0x8542 ),//PSX 32xG3 -SWITCHTEC_PCI_DEVICE (0x8543 ),//PSX 48xG3 -SWITCHTEC_PCI_DEVICE (0x8544 ),//PSX 64xG3 -SWITCHTEC_PCI_DEVICE (0x8545 ),//PSX 80xG3 -SWITCHTEC_PCI_DEVICE (0x8546 ),//PSX 96xG3 -SWITCHTEC_PCI_DEVICE (0x8551 ),//PAX 24XG3 -SWITCHTEC_PCI_DEVICE (0x8552 ),//PAX 32XG3 -SWITCHTEC_PCI_DEVICE (0x8553 ),//PAX 48XG3 -SWITCHTEC_PCI_DEVICE (0x8554 ),//PAX 64XG3 -SWITCHTEC_PCI_DEVICE (0x8555 ),//PAX 80XG3 -SWITCHTEC_PCI_DEVICE (0x8556 ),//PAX 96XG3 -SWITCHTEC_PCI_DEVICE (0x8561 ),//PFXL 24XG3 -SWITCHTEC_PCI_DEVICE (0x8562 ),//PFXL 32XG3 -SWITCHTEC_PCI_DEVICE (0x8563 ),//PFXL 48XG3 -SWITCHTEC_PCI_DEVICE (0x8564 ),//PFXL 64XG3 -SWITCHTEC_PCI_DEVICE (0x8565 ),//PFXL 80XG3 -SWITCHTEC_PCI_DEVICE (0x8566 ),//PFXL 96XG3 -SWITCHTEC_PCI_DEVICE (0x8571 ),//PFXI 24XG3 -SWITCHTEC_PCI_DEVICE (0x8572 ),//PFXI 32XG3 -SWITCHTEC_PCI_DEVICE (0x8573 ),//PFXI 48XG3 -SWITCHTEC_PCI_DEVICE (0x8574 ),//PFXI 64XG3 -SWITCHTEC_PCI_DEVICE (0x8575 ),//PFXI 80XG3 -SWITCHTEC_PCI_DEVICE (0x8576 ),//PFXI 96XG3 +SWITCHTEC_PCI_DEVICE (0x8531 ,SWITCHTEC_GEN3 ),//PFX 24xG3 +SWITCHTEC_PCI_DEVICE (0x8532 ,SWITCHTEC_GEN3 ),//PFX 32xG3 +SWITCHTEC_PCI_DEVICE (0x8533 ,SWITCHTEC_GEN3 ),//PFX 48xG3 +SWITCHTEC_PCI_DEVICE (0x8534 ,SWITCHTEC_GEN3 ),//PFX 64xG3 +SWITCHTEC_PCI_DEVICE (0x8535 ,SWITCHTEC_GEN3 ),//PFX 80xG3 +SWITCHTEC_PCI_DEVICE (0x8536 ,SWITCHTEC_GEN3 ),//PFX 96xG3 +SWITCHTEC_PCI_DEVICE (0x8541 ,SWITCHTEC_GEN3 ),//PSX 24xG3 +SWITCHTEC_PCI_DEVICE (0x8542 ,SWITCHTEC_GEN3 ),//PSX 32xG3 +SWITCHTEC_PCI_DEVICE (0x8543 ,SWITCHTEC_GEN3 ),//PSX 48xG3 +SWITCHTEC_PCI_DEVICE (0x8544 ,SWITCHTEC_GEN3 ),//PSX 64xG3 +SWITCHTEC_PCI_DEVICE (0x8545 ,SWITCHTEC_GEN3 ),//PSX 80xG3 +SWITCHTEC_PCI_DEVICE (0x8546 ,SWITCHTEC_GEN3 ),//PSX 96xG3 +SWITCHTEC_PCI_DEVICE (0x8551 ,SWITCHTEC_GEN3 ),//PAX 24XG3 +SWITCHTEC_PCI_DEVICE (0x8552 ,SWITCHTEC_GEN3 ),//PAX 32XG3 +SWITCHTEC_PCI_DEVICE (0x8553 ,SWITCHTEC_GEN3 ),//PAX 48XG3 +SWITCHTEC_PCI_DEVICE (0x8554 ,SWITCHTEC_GEN3 ),//PAX 64XG3 +SWITCHTEC_PCI_DEVICE (0x8555 ,SWITCHTEC_GEN3 ),//PAX 80XG3 +SWITCHTEC_PCI_DEVICE (0x8556 ,SWITCHTEC_GEN3 ),//PAX 96XG3 +SWITCHTEC_PCI_DEVICE (0x8561 ,SWITCHTEC_GEN3 ),//PFXL 24XG3 +SWITCHTEC_PCI_DEVICE (0x8562 ,SWITCHTEC_GEN3 ),//PFXL 32XG3 +SWITCHTEC_PCI_DEVICE (0x8563 ,SWITCHTEC_GEN3 ),//PFXL 48XG3 +SWITCHTEC_PCI_DEVICE (0x8564 ,SWITCHTEC_GEN3 ),//PFXL 64XG3 +SWITCHTEC_PCI_DEVICE (0x8565 ,SWITCHTEC_GEN3 ),//PFXL 80XG3 +SWITCHTEC_PCI_DEVICE (0x8566 ,SWITCHTEC_GEN3 ),//PFXL 96XG3 +SWITCHTEC_PCI_DEVICE (0x8571 ,SWITCHTEC_GEN3 ),//PFXI 24XG3 +SWITCHTEC_PCI_DEVICE (0x8572 ,SWITCHTEC_GEN3 ),//PFXI 32XG3 +SWITCHTEC_PCI_DEVICE (0x8573 ,SWITCHTEC_GEN3 ),//PFXI 48XG3 +SWITCHTEC_PCI_DEVICE (0x8574 ,SWITCHTEC_GEN3 ),//PFXI 64XG3 +SWITCHTEC_PCI_DEVICE (0x8575 ,SWITCHTEC_GEN3 ),//PFXI 80XG3 +SWITCHTEC_PCI_DEVICE (0x8576 ,SWITCHTEC_GEN3 ),//PFXI 96XG3 {0 } };MODULE_DEVICE_TABLE (pci, switchtec_pci_tbl);
include/linux/switchtec.h +6 -0
@@ -37,6 +37,10 @@ enum { SWITCHTEC_GAS_PFF_CSR_OFFSET = 0x134000, }; +enum switchtec_gen { +SWITCHTEC_GEN3 , +}; +struct mrpc_regs {u8 input_data[SWITCHTEC_MRPC_PAYLOAD_SIZE ];u8 output_data[SWITCHTEC_MRPC_PAYLOAD_SIZE ];
@@ -363,6 +367,8 @@ struct switchtec_dev {struct device dev;struct cdev cdev; +enum switchtec_gen gen; +int partition;int partition_count;int pff_csr_count;
Signature · 1 line
2.20.1
Logan Gunthorpe
maintainerPATCH v2 3/7 PCI/switchtec: Refactor ioctl_flash_part_info()
In reply to Logan GunthorpeRefactor ioctl_flash_part_info() into a gen3 specific function seeing the registers for flash partition information have changed significantly in Gen4 and will require a completely different implementation.
No functional changes intended.
--- drivers/pci/switch/switchtec.c | 68 +++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 26 deletions(-)
drivers/pci/switch/switchtec.c +42 -26
@@ -612,75 +612,91 @@ static void set_fw_info_part(struct switchtec_ioctl_flash_part_info *info, info->length =ioread32 (&pi->length); } -static int ioctl_flash_part_info (struct switchtec_dev *stdev, -struct switchtec_ioctl_flash_part_info __user *uinfo) +static int flash_part_info_gen3 (struct switchtec_dev *stdev, +struct switchtec_ioctl_flash_part_info *info) { -struct switchtec_ioctl_flash_part_info info = {0 };struct flash_info_regs __iomem *fi = stdev->mmio_flash_info;struct sys_info_regs __iomem *si = stdev->mmio_sys_info;u32 active_addr =-1 ; -if (copy_from_user (&info, uinfo,sizeof (info))) -return -EFAULT ; - -switch (info.flash_partition) { +switch (info->flash_partition) {case SWITCHTEC_IOCTL_PART_CFG0 : active_addr =ioread32 (&fi->active_cfg); -set_fw_info_part (&info, &fi->cfg0); +set_fw_info_part (info, &fi->cfg0);if (ioread16 (&si->cfg_running) ==SWITCHTEC_GEN3_CFG0_RUNNING ) - info.active |=SWITCHTEC_IOCTL_PART_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); +set_fw_info_part (info, &fi->cfg1);if (ioread16 (&si->cfg_running) ==SWITCHTEC_GEN3_CFG1_RUNNING ) - info.active |=SWITCHTEC_IOCTL_PART_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); +set_fw_info_part (info, &fi->img0);if (ioread16 (&si->img_running) ==SWITCHTEC_GEN3_IMG0_RUNNING ) - info.active |=SWITCHTEC_IOCTL_PART_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); +set_fw_info_part (info, &fi->img1);if (ioread16 (&si->img_running) ==SWITCHTEC_GEN3_IMG1_RUNNING ) - info.active |=SWITCHTEC_IOCTL_PART_RUNNING ; + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ;break ;case SWITCHTEC_IOCTL_PART_NVLOG : -set_fw_info_part (&info, &fi->nvlog); +set_fw_info_part (info, &fi->nvlog);break ;case SWITCHTEC_IOCTL_PART_VENDOR0 : -set_fw_info_part (&info, &fi->vendor[0 ]); +set_fw_info_part (info, &fi->vendor[0 ]);break ;case SWITCHTEC_IOCTL_PART_VENDOR1 : -set_fw_info_part (&info, &fi->vendor[1 ]); +set_fw_info_part (info, &fi->vendor[1 ]);break ;case SWITCHTEC_IOCTL_PART_VENDOR2 : -set_fw_info_part (&info, &fi->vendor[2 ]); +set_fw_info_part (info, &fi->vendor[2 ]);break ;case SWITCHTEC_IOCTL_PART_VENDOR3 : -set_fw_info_part (&info, &fi->vendor[3 ]); +set_fw_info_part (info, &fi->vendor[3 ]);break ;case SWITCHTEC_IOCTL_PART_VENDOR4 : -set_fw_info_part (&info, &fi->vendor[4 ]); +set_fw_info_part (info, &fi->vendor[4 ]);break ;case SWITCHTEC_IOCTL_PART_VENDOR5 : -set_fw_info_part (&info, &fi->vendor[5 ]); +set_fw_info_part (info, &fi->vendor[5 ]);break ;case SWITCHTEC_IOCTL_PART_VENDOR6 : -set_fw_info_part (&info, &fi->vendor[6 ]); +set_fw_info_part (info, &fi->vendor[6 ]);break ;case SWITCHTEC_IOCTL_PART_VENDOR7 : -set_fw_info_part (&info, &fi->vendor[7 ]); +set_fw_info_part (info, &fi->vendor[7 ]);break ;default :return -EINVAL ; } -if (info.address == active_addr) - info.active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (info->address == active_addr) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; + +return 0 ; +} + +static int ioctl_flash_part_info (struct switchtec_dev *stdev, +struct switchtec_ioctl_flash_part_info __user *uinfo) +{ +int ret; +struct switchtec_ioctl_flash_part_info info = {0 }; + +if (copy_from_user (&info, uinfo,sizeof (info))) +return -EFAULT ; + +if (stdev->gen ==SWITCHTEC_GEN3 ) { + ret =flash_part_info_gen3 (stdev, &info); +if (ret) +return ret; + }else { +return -ENOTSUPP ; + }if (copy_to_user (uinfo, &info,sizeof (info)))return -EFAULT ;
Signature · 1 line
2.20.1
Logan Gunthorpe
maintainerPATCH v2 4/7 PCI/switchtec: Separate out gen3 register structures into unionse
In reply to Logan GunthorpeSince the sys_info and flash_info registers differ significantly in gen4 hardware, separate out the gen3 registers into their own structure with a union in the main structure.
No functions changes intended.
--- drivers/pci/switch/switchtec.c | 38 ++++++++++++++++++++++--------- include/linux/switchtec.h | 41 ++++++++++++++++++++++------------ 2 files changed, 54 insertions(+), 25 deletions(-)
drivers/pci/switch/switchtec.c +27 -11
@@ -317,8 +317,12 @@ static ssize_t field ## _show(struct device *dev, \ struct device_attribute *attr, char *buf) \ { \ struct switchtec_dev *stdev = to_stdev(dev); \ -return io_string_show (buf, &stdev->mmio_sys_info->field, \ -sizeof (stdev->mmio_sys_info->field)); \ + struct sys_info_regs __iomem *si = stdev->mmio_sys_info; \ +if (stdev->gen ==SWITCHTEC_GEN3 ) \ +return io_string_show (buf, &si->gen3.field, \ +sizeof (si->gen3.field)); \ +else \ +return -ENOTSUPP ; \ } \ \static DEVICE_ATTR_RO (field)
@@ -337,8 +341,8 @@ static ssize_t component_vendor_show(struct device *dev,if (stdev->gen !=SWITCHTEC_GEN3 )return sprintf (buf,"none\n" ); -return io_string_show (buf, &si->component_vendor, -sizeof (si->component_vendor)); +return io_string_show (buf, &si->gen3.component_vendor, +sizeof (si->gen3.component_vendor)); }static DEVICE_ATTR_RO (component_vendor);
@@ -346,7 +350,7 @@ static ssize_t component_id_show(struct device *dev, struct device_attribute *attr, char *buf) { struct switchtec_dev *stdev = to_stdev(dev); -int id =ioread16 (&stdev->mmio_sys_info->component_id); +int id =ioread16 (&stdev->mmio_sys_info->gen3.component_id);/* component_id field not supported after gen3 */ if (stdev->gen !=SWITCHTEC_GEN3 )
@@ -360,7 +364,7 @@ static ssize_t component_revision_show(struct device *dev, struct device_attribute *attr, char *buf) { struct switchtec_dev *stdev = to_stdev(dev); -int rev =ioread8 (&stdev->mmio_sys_info->component_revision); +int rev =ioread8 (&stdev->mmio_sys_info->gen3.component_revision);/* component_revision field not supported after gen3 */ if (stdev->gen !=SWITCHTEC_GEN3 )
@@ -596,8 +600,12 @@ static int ioctl_flash_info(struct switchtec_dev *stdev,struct switchtec_ioctl_flash_info info = {0 };struct flash_info_regs __iomem *fi = stdev->mmio_flash_info; - info.flash_length =ioread32 (&fi->flash_length); - info.num_partitions =SWITCHTEC_NUM_PARTITIONS_GEN3 ; +if (stdev->gen ==SWITCHTEC_GEN3 ) { + info.flash_length =ioread32 (&fi->gen3.flash_length); + info.num_partitions =SWITCHTEC_NUM_PARTITIONS_GEN3 ; + }else { +return -ENOTSUPP ; + }if (copy_to_user (uinfo, &info,sizeof (info)))return -EFAULT ;
@@ -615,8 +623,9 @@ static void set_fw_info_part(struct switchtec_ioctl_flash_part_info *info,static int flash_part_info_gen3 (struct switchtec_dev *stdev,struct switchtec_ioctl_flash_part_info *info) { -struct flash_info_regs __iomem *fi = stdev->mmio_flash_info; -struct sys_info_regs __iomem *si = stdev->mmio_sys_info; +struct flash_info_regs_gen3 __iomem *fi = + &stdev->mmio_flash_info->gen3; +struct sys_info_regs_gen3 __iomem *si = &stdev->mmio_sys_info->gen3;u32 active_addr =-1 ;switch (info->flash_partition) {
@@ -1388,6 +1397,7 @@ static int switchtec_init_pci(struct switchtec_dev *stdev,int rc;void __iomem *map;unsigned long res_start, res_len; +u32 __iomem *part_id; rc =pcim_enable_device (pdev);if (rc)
@@ -1422,7 +1432,13 @@ static int switchtec_init_pci(struct switchtec_dev *stdev, stdev->mmio_sys_info = stdev->mmio +SWITCHTEC_GAS_SYS_INFO_OFFSET ; stdev->mmio_flash_info = stdev->mmio +SWITCHTEC_GAS_FLASH_INFO_OFFSET ; stdev->mmio_ntb = stdev->mmio +SWITCHTEC_GAS_NTB_OFFSET ; - stdev->partition =ioread8 (&stdev->mmio_sys_info->partition_id); + +if (stdev->gen ==SWITCHTEC_GEN3 ) + part_id = &stdev->mmio_sys_info->gen3.partition_id; +else +return -ENOTSUPP ; + + stdev->partition =ioread8 (part_id); stdev->partition_count =ioread8 (&stdev->mmio_ntb->partition_count); stdev->mmio_part_cfg_all = stdev->mmio +SWITCHTEC_GAS_PART_CFG_OFFSET ; stdev->mmio_part_cfg = &stdev->mmio_part_cfg_all[stdev->partition];
include/linux/switchtec.h +27 -14
69 lines not on this page · raw message
Signature · 1 line
2.20.1
Logan Gunthorpe
maintainerPATCH v2 5/7 PCI/switchtec: Add gen4 support for the system info registers
In reply to Logan GunthorpeAdd the gen4 specific system info registers and ensure their usage is guarded by a check on the device's generation.
--- drivers/pci/switch/switchtec.c | 5 ++++ include/linux/switchtec.h | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+)
drivers/pci/switch/switchtec.c +5 -0
@@ -321,6 +321,9 @@ static ssize_t field ## _show(struct device *dev, \if (stdev->gen ==SWITCHTEC_GEN3 ) \return io_string_show (buf, &si->gen3.field, \sizeof (si->gen3.field)); \ +else if (stdev->gen ==SWITCHTEC_GEN4 ) \ +return io_string_show (buf, &si->gen4.field, \ +sizeof (si->gen4.field)); \else \return -ENOTSUPP ; \ } \
@@ -1435,6 +1438,8 @@ static int switchtec_init_pci(struct switchtec_dev *stdev,if (stdev->gen ==SWITCHTEC_GEN3 ) part_id = &stdev->mmio_sys_info->gen3.partition_id; +else if (stdev->gen ==SWITCHTEC_GEN4 ) + part_id = &stdev->mmio_sys_info->gen4.partition_id;else return -ENOTSUPP ;
include/linux/switchtec.h +43 -0
61 lines not on this page · raw message
Signature · 1 line
2.20.1
Logan Gunthorpe
maintainerPATCH v2 6/7 PCI/switchtec: Add gen4 support for the flash information interface
In reply to Logan GunthorpeFrom: Kelvin Cao <[email protected]>
Add the new flash_info registers struct and the implementation of ioctl_flash_part_info() for the new gen4 hardware.
--- drivers/pci/switch/switchtec.c | 111 +++++++++++++++++++++++++++ include/linux/switchtec.h | 52 +++++++++++++ include/uapi/linux/switchtec_ioctl.h | 8 ++ 3 files changed, 171 insertions(+)
drivers/pci/switch/switchtec.c +111 -0
@@ -606,6 +606,9 @@ static int ioctl_flash_info(struct switchtec_dev *stdev,if (stdev->gen ==SWITCHTEC_GEN3 ) { info.flash_length =ioread32 (&fi->gen3.flash_length); info.num_partitions =SWITCHTEC_NUM_PARTITIONS_GEN3 ; + }else if (stdev->gen ==SWITCHTEC_GEN4 ) { + info.flash_length =ioread32 (&fi->gen4.flash_length); + info.num_partitions =SWITCHTEC_NUM_PARTITIONS_GEN4 ; }else {return -ENOTSUPP ; }
@@ -693,6 +696,110 @@ static int flash_part_info_gen3(struct switchtec_dev *stdev,return 0 ; } +static int flash_part_info_gen4 (struct switchtec_dev *stdev, +struct switchtec_ioctl_flash_part_info *info) +{ +struct flash_info_regs_gen4 __iomem *fi = &stdev->mmio_flash_info->gen4; +struct sys_info_regs_gen4 __iomem *si = &stdev->mmio_sys_info->gen4; +struct active_partition_info_gen4 __iomem *af = &fi->active_flag; + +switch (info->flash_partition) { +case SWITCHTEC_IOCTL_PART_MAP_0 : +set_fw_info_part (info, &fi->map0); +break ; +case SWITCHTEC_IOCTL_PART_MAP_1 : +set_fw_info_part (info, &fi->map1); +break ; +case SWITCHTEC_IOCTL_PART_KEY_0 : +set_fw_info_part (info, &fi->key0); +if (ioread8 (&af->key) ==SWITCHTEC_GEN4_KEY0_ACTIVE ) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (ioread16 (&si->key_running) ==SWITCHTEC_GEN4_KEY0_RUNNING ) + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ; +break ; +case SWITCHTEC_IOCTL_PART_KEY_1 : +set_fw_info_part (info, &fi->key1); +if (ioread8 (&af->key) ==SWITCHTEC_GEN4_KEY1_ACTIVE ) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (ioread16 (&si->key_running) ==SWITCHTEC_GEN4_KEY1_RUNNING ) + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ; +break ; +case SWITCHTEC_IOCTL_PART_BL2_0 : +set_fw_info_part (info, &fi->bl2_0); +if (ioread8 (&af->bl2) ==SWITCHTEC_GEN4_BL2_0_ACTIVE ) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (ioread16 (&si->bl2_running) ==SWITCHTEC_GEN4_BL2_0_RUNNING ) + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ; +break ; +case SWITCHTEC_IOCTL_PART_BL2_1 : +set_fw_info_part (info, &fi->bl2_1); +if (ioread8 (&af->bl2) ==SWITCHTEC_GEN4_BL2_1_ACTIVE ) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (ioread16 (&si->bl2_running) ==SWITCHTEC_GEN4_BL2_1_RUNNING ) + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ; +break ; +case SWITCHTEC_IOCTL_PART_CFG0 : +set_fw_info_part (info, &fi->cfg0); +if (ioread8 (&af->cfg) ==SWITCHTEC_GEN4_CFG0_ACTIVE ) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (ioread16 (&si->cfg_running) ==SWITCHTEC_GEN4_CFG0_RUNNING ) + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ; +break ; +case SWITCHTEC_IOCTL_PART_CFG1 : +set_fw_info_part (info, &fi->cfg1); +if (ioread8 (&af->cfg) ==SWITCHTEC_GEN4_CFG1_ACTIVE ) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (ioread16 (&si->cfg_running) ==SWITCHTEC_GEN4_CFG1_RUNNING ) + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ; +break ; +case SWITCHTEC_IOCTL_PART_IMG0 : +set_fw_info_part (info, &fi->img0); +if (ioread8 (&af->img) ==SWITCHTEC_GEN4_IMG0_ACTIVE ) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (ioread16 (&si->img_running) ==SWITCHTEC_GEN4_IMG0_RUNNING ) + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ; +break ; +case SWITCHTEC_IOCTL_PART_IMG1 : +set_fw_info_part (info, &fi->img1); +if (ioread8 (&af->img) ==SWITCHTEC_GEN4_IMG1_ACTIVE ) + info->active |=SWITCHTEC_IOCTL_PART_ACTIVE ; +if (ioread16 (&si->img_running) ==SWITCHTEC_GEN4_IMG1_RUNNING ) + info->active |=SWITCHTEC_IOCTL_PART_RUNNING ; +break ; +case SWITCHTEC_IOCTL_PART_NVLOG : +set_fw_info_part (info, &fi->nvlog); +break ; +case SWITCHTEC_IOCTL_PART_VENDOR0 : +set_fw_info_part (info, &fi->vendor[0 ]); +break ; +case SWITCHTEC_IOCTL_PART_VENDOR1 : +set_fw_info_part (info, &fi->vendor[1 ]); +break ; +case SWITCHTEC_IOCTL_PART_VENDOR2 : +set_fw_info_part (info, &fi->vendor[2 ]); +break ; +case SWITCHTEC_IOCTL_PART_VENDOR3 : +set_fw_info_part (info, &fi->vendor[3 ]); +break ; +case SWITCHTEC_IOCTL_PART_VENDOR4 : +set_fw_info_part (info, &fi->vendor[4 ]); +break ; +case SWITCHTEC_IOCTL_PART_VENDOR5 : +set_fw_info_part (info, &fi->vendor[5 ]); +break ; +case SWITCHTEC_IOCTL_PART_VENDOR6 : +set_fw_info_part (info, &fi->vendor[6 ]); +break ; +case SWITCHTEC_IOCTL_PART_VENDOR7 : +set_fw_info_part (info, &fi->vendor[7 ]); +break ; +default : +return -EINVAL ; + } + +return 0 ; +} +static int ioctl_flash_part_info (struct switchtec_dev *stdev,struct switchtec_ioctl_flash_part_info __user *uinfo) {
@@ -706,6 +813,10 @@ static int ioctl_flash_part_info(struct switchtec_dev *stdev, ret =flash_part_info_gen3 (stdev, &info);if (ret)return ret; + }else if (stdev->gen ==SWITCHTEC_GEN4 ) { + ret =flash_part_info_gen4 (stdev, &info); +if (ret) +return ret; }else {return -ENOTSUPP ; }
include/linux/switchtec.h +52 -0
67 lines not on this page · raw message
include/uapi/linux/switchtec_ioctl.h +8 -0
@@ -32,7 +32,15 @@#define SWITCHTEC_IOCTL_PART_VENDOR5 10#define SWITCHTEC_IOCTL_PART_VENDOR6 11#define SWITCHTEC_IOCTL_PART_VENDOR7 12 +#define SWITCHTEC_IOCTL_PART_BL2_0 13 +#define SWITCHTEC_IOCTL_PART_BL2_1 14 +#define SWITCHTEC_IOCTL_PART_MAP_0 15 +#define SWITCHTEC_IOCTL_PART_MAP_1 16 +#define SWITCHTEC_IOCTL_PART_KEY_0 17 +#define SWITCHTEC_IOCTL_PART_KEY_1 18 +#define SWITCHTEC_NUM_PARTITIONS_GEN3 13 +#define SWITCHTEC_NUM_PARTITIONS_GEN4 19/* obsolete: for compatibility with old userspace software */ #define SWITCHTEC_IOCTL_NUM_PARTITIONS SWITCHTEC_NUM_PARTITIONS_GEN3
Signature · 1 line
2.20.1
Logan Gunthorpe
maintainerPATCH v2 7/7 PCI/switchtec: Introduce gen4 variant IDS in the device ID table
In reply to Logan GunthorpeFrom: Kelvin Cao <[email protected]>
Now that GEN4 is properly supported, advertise support in the module's device ID table and add the same IDs to the list of switchtec quirks.
--- drivers/pci/quirks.c | 18 ++++++++++++++++++ drivers/pci/switch/switchtec.c | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+)
drivers/pci/quirks.c +18 -0
@@ -5373,6 +5373,24 @@ SWITCHTEC_QUIRK(0x8573); /* PFXI 48XG3 */SWITCHTEC_QUIRK (0x8574 );/* PFXI 64XG3 */ SWITCHTEC_QUIRK (0x8575 );/* PFXI 80XG3 */ SWITCHTEC_QUIRK (0x8576 );/* PFXI 96XG3 */ +SWITCHTEC_QUIRK (0x4000 );/* PFX 100XG4 */ +SWITCHTEC_QUIRK (0x4084 );/* PFX 84XG4 */ +SWITCHTEC_QUIRK (0x4068 );/* PFX 68XG4 */ +SWITCHTEC_QUIRK (0x4052 );/* PFX 52XG4 */ +SWITCHTEC_QUIRK (0x4036 );/* PFX 36XG4 */ +SWITCHTEC_QUIRK (0x4028 );/* PFX 28XG4 */ +SWITCHTEC_QUIRK (0x4100 );/* PSX 100XG4 */ +SWITCHTEC_QUIRK (0x4184 );/* PSX 84XG4 */ +SWITCHTEC_QUIRK (0x4168 );/* PSX 68XG4 */ +SWITCHTEC_QUIRK (0x4152 );/* PSX 52XG4 */ +SWITCHTEC_QUIRK (0x4136 );/* PSX 36XG4 */ +SWITCHTEC_QUIRK (0x4128 );/* PSX 28XG4 */ +SWITCHTEC_QUIRK (0x4200 );/* PAX 100XG4 */ +SWITCHTEC_QUIRK (0x4284 );/* PAX 84XG4 */ +SWITCHTEC_QUIRK (0x4268 );/* PAX 68XG4 */ +SWITCHTEC_QUIRK (0x4252 );/* PAX 52XG4 */ +SWITCHTEC_QUIRK (0x4236 );/* PAX 36XG4 */ +SWITCHTEC_QUIRK (0x4228 );/* PAX 28XG4 */ /* * On Lenovo Thinkpad P50 SKUs with a Nvidia Quadro M1000M, the BIOS does
drivers/pci/switch/switchtec.c +18 -0
@@ -1696,6 +1696,24 @@ static const struct pci_device_id switchtec_pci_tbl[] = {SWITCHTEC_PCI_DEVICE (0x8574 ,SWITCHTEC_GEN3 ),//PFXI 64XG3 SWITCHTEC_PCI_DEVICE (0x8575 ,SWITCHTEC_GEN3 ),//PFXI 80XG3 SWITCHTEC_PCI_DEVICE (0x8576 ,SWITCHTEC_GEN3 ),//PFXI 96XG3 +SWITCHTEC_PCI_DEVICE (0x4000 ,SWITCHTEC_GEN4 ),//PFX 100XG4 +SWITCHTEC_PCI_DEVICE (0x4084 ,SWITCHTEC_GEN4 ),//PFX 84XG4 +SWITCHTEC_PCI_DEVICE (0x4068 ,SWITCHTEC_GEN4 ),//PFX 68XG4 +SWITCHTEC_PCI_DEVICE (0x4052 ,SWITCHTEC_GEN4 ),//PFX 52XG4 +SWITCHTEC_PCI_DEVICE (0x4036 ,SWITCHTEC_GEN4 ),//PFX 36XG4 +SWITCHTEC_PCI_DEVICE (0x4028 ,SWITCHTEC_GEN4 ),//PFX 28XG4 +SWITCHTEC_PCI_DEVICE (0x4100 ,SWITCHTEC_GEN4 ),//PSX 100XG4 +SWITCHTEC_PCI_DEVICE (0x4184 ,SWITCHTEC_GEN4 ),//PSX 84XG4 +SWITCHTEC_PCI_DEVICE (0x4168 ,SWITCHTEC_GEN4 ),//PSX 68XG4 +SWITCHTEC_PCI_DEVICE (0x4152 ,SWITCHTEC_GEN4 ),//PSX 52XG4 +SWITCHTEC_PCI_DEVICE (0x4136 ,SWITCHTEC_GEN4 ),//PSX 36XG4 +SWITCHTEC_PCI_DEVICE (0x4128 ,SWITCHTEC_GEN4 ),//PSX 28XG4 +SWITCHTEC_PCI_DEVICE (0x4200 ,SWITCHTEC_GEN4 ),//PAX 100XG4 +SWITCHTEC_PCI_DEVICE (0x4284 ,SWITCHTEC_GEN4 ),//PAX 84XG4 +SWITCHTEC_PCI_DEVICE (0x4268 ,SWITCHTEC_GEN4 ),//PAX 68XG4 +SWITCHTEC_PCI_DEVICE (0x4252 ,SWITCHTEC_GEN4 ),//PAX 52XG4 +SWITCHTEC_PCI_DEVICE (0x4236 ,SWITCHTEC_GEN4 ),//PAX 36XG4 +SWITCHTEC_PCI_DEVICE (0x4228 ,SWITCHTEC_GEN4 ),//PAX 28XG4 {0} };MODULE_DEVICE_TABLE (pci, switchtec_pci_tbl);
Signature · 1 line
2.20.1
Quoted 6 lines · Logan Gunthorpe
Hi,
Here are the cleaned up version of the patches for Gen4 support in switchtec. The end result is mostly the same, save some very minor changes, but the organization into commits has been reworked per Bjorn's feedback. This set is also rebased onto pci/switchtec.
Beautiful. Applied to pci/switchtec, thank you very much!
Quoted 19 lines
Kelvin Cao (2):
PCI/switchtec: Add gen4 support for the flash information interface PCI/switchtec: Introduce gen4 variant IDS in the device ID tableLogan Gunthorpe (5):
PCI/switchtec: Rename generation specific constants PCI/switchtec: Introduce Generation Variable PCI/switchtec: Refactorioctl_flash_part_info()PCI/switchtec: Separate out gen3 register structures into unionse PCI/switchtec: Add gen4 support for the system info registersdrivers/pci/quirks.c | 18 ++ drivers/pci/switch/switchtec.c | 334 +++++++++++++++++++++------ include/linux/switchtec.h | 148 ++++++++++-- include/uapi/linux/switchtec_ioctl.h | 13 +- 4 files changed, 424 insertions(+), 89 deletions(-)--
2.20.1