Skip to content

Devel unified clean #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kelvin-cao merged 5 commits into from
Jun 14, 2019
Merged

Devel unified clean #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a8c65b
Introduce Generation Variable
lsgunth Feb 13, 2019
4045bce
Seperate out gen3 specific fields in the sys_info_regs structure
Feb 25, 2019
ad418c8
Add gen4 support in struct sys_info_regs
Feb 25, 2019
c46a603
Add gen4 support in struct flash_info_regs
kelvin-cao Mar 4, 2019
9411b22
Introduce gen4 variants
kelvin-cao Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 126 additions & 17 deletions linux/switchtec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ enum {
SWITCHTEC_GAS_PFF_CSR_OFFSET = 0x134000,
};

enum switchtec_gen {
SWITCHTEC_GEN3,
SWITCHTEC_GEN4,
};

struct mrpc_regs {
u8 input_data[SWITCHTEC_MRPC_PAYLOAD_SIZE];
u8 output_data[SWITCHTEC_MRPC_PAYLOAD_SIZE];
Expand Down Expand Up @@ -120,16 +125,33 @@ 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 {
u32 device_id;
u32 device_version;
u32 firmware_version;
enum {
SWITCHTEC_GEN4_BL2_0_RUNNING = 0x01,
SWITCHTEC_GEN4_BL2_1_RUNNING = 0x02,
SWITCHTEC_GEN4_MAP0_RUNNING = 0x03,
SWITCHTEC_GEN4_MAP1_RUNNING = 0x04,
SWITCHTEC_GEN4_CFG0_RUNNING = 0x05,
SWITCHTEC_GEN4_CFG1_RUNNING = 0x06,
SWITCHTEC_GEN4_IMG0_RUNNING = 0x07,
SWITCHTEC_GEN4_IMG1_RUNNING = 0x08,
};

enum {
SWITCHTEC_GEN4_BL2_0_ACTIVE = 0,
SWITCHTEC_GEN4_BL2_1_ACTIVE = 1,
SWITCHTEC_GEN4_CFG0_ACTIVE = 0,
SWITCHTEC_GEN4_CFG1_ACTIVE = 1,
SWITCHTEC_GEN4_IMG0_ACTIVE = 0,
SWITCHTEC_GEN4_IMG1_ACTIVE = 1,
};

struct sys_info_regs_gen3 {
u32 reserved1;
u32 vendor_table_revision;
u32 table_format_version;
Expand All @@ -146,33 +168,118 @@ struct sys_info_regs {
u8 component_revision;
} __packed;

struct flash_info_regs {
struct sys_info_regs_gen4 {
u16 gas_layout_ver;
u8 evlist_ver;
u8 reserved1;
u16 mgmt_cmd_set_ver;
u16 fabric_cmd_set_ver;
u32 reserved2[2];
u8 mrpc_uart_ver;
u8 mrpc_twi_ver;
u8 mrpc_eth_ver;
u8 mrpc_inband_ver;
u32 reserved3[7];
u32 fw_update_tmo;
u32 table_version_cfg;
u32 table_version_img;
u32 partition_id;
u16 bl2_running;
u16 cfg_running;
u16 img_running;
u16 reserved4;
u32 reserved5[43];
u32 vendor_seeprom_twi;
u32 vendor_table_revision;
u32 vendor_specific_info[2];
u16 p2p_vendor_id;
u16 p2p_device_id;
u8 p2p_revision_id;
u8 reserved6[3];
u32 p2p_class_id;
u16 subsystem_vendor_id;
u16 subsystem_id;
u32 p2p_serial_number[2];
u8 mac_addr[6];
u8 reserved7[2];
u32 reserved8[3];
char vendor_id[8];
char product_id[24];
char product_revision[2];
u16 reserved9;
} __packed;

struct sys_info_regs {
u32 device_id;
u32 device_version;
u32 firmware_version;
union {
struct sys_info_regs_gen3 gen3;
struct sys_info_regs_gen4 gen4;
};
} __packed;

struct partition_info {
u32 address;
u32 length;
};

struct flash_info_regs_gen3 {
u32 flash_part_map_upd_idx;

struct active_partition_info {
struct active_partition_info_gen3 {
u32 address;
u32 build_version;
u32 build_string;
} active_img;

struct active_partition_info active_cfg;
struct active_partition_info inactive_img;
struct active_partition_info inactive_cfg;
struct active_partition_info_gen3 active_cfg;
struct active_partition_info_gen3 inactive_img;
struct active_partition_info_gen3 inactive_cfg;

u32 flash_length;

struct partition_info {
u32 address;
u32 length;
} cfg0;
struct partition_info cfg0;
struct partition_info cfg1;
struct partition_info img0;
struct partition_info img1;
struct partition_info nvlog;
struct partition_info vendor[8];
};

struct flash_info_regs_gen4 {
u32 flash_address;
u32 flash_length;

struct active_partition_info_gen4 {
unsigned char bl2;
unsigned char cfg;
unsigned char img;
unsigned char reserved;
} active_flag;

u32 reserved[3];

struct partition_info bl1;
struct partition_info bl2_0;
struct partition_info bl2_1;
struct partition_info map0;
struct partition_info map1;
struct partition_info cfg0;
struct partition_info cfg1;
struct partition_info img0;
struct partition_info img1;
struct partition_info nvlog;
struct partition_info vendor[8];
};

struct flash_info_regs {
union {
struct flash_info_regs_gen3 gen3;
struct flash_info_regs_gen4 gen4;
};
};

enum {
SWITCHTEC_NTB_REG_INFO_OFFSET = 0x0000,
SWITCHTEC_NTB_REG_CTRL_OFFSET = 0x4000,
Expand Down Expand Up @@ -383,6 +490,8 @@ struct switchtec_dev {
struct device dev;
struct cdev cdev;

enum switchtec_gen gen;

int partition;
int partition_count;
int pff_csr_count;
Expand Down
6 changes: 5 additions & 1 deletion linux/switchtec_ioctl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
#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_IOCTL_PART_BL2_0 13
#define SWITCHTEC_IOCTL_PART_BL2_1 14

#define SWITCHTEC_NUM_PARTITIONS_GEN3 13
#define SWITCHTEC_NUM_PARTITIONS_GEN4 15

struct switchtec_ioctl_flash_info {
__u64 flash_length;
Expand Down
Loading