Skip to content

L
linux
Commit 329e5983 authored by Jingjing Wu's avatar Jingjing Wu Committed by Jeff Kirsher
Browse files
Options

i40e: change ppp name to ddp 

PPP name was going to be confusing since PPP already means point
to point protocol. It is decided to change pipeline personalization
profile(ppp) to dynamic device personalization(ddp).
Signed-off-by: default avatarJingjing Wu <jingjing.wu@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a6cab7d7
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 69 deletions
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
View file @ 329e5983
...@@ -198,7 +198,7 @@ enum i40e_admin_queue_opc { ...@@ -198,7 +198,7 @@ enum i40e_admin_queue_opc {
i40e_aqc_opc_add_mirror_rule = 0x0260, i40e_aqc_opc_add_mirror_rule = 0x0260,
i40e_aqc_opc_delete_mirror_rule = 0x0261, i40e_aqc_opc_delete_mirror_rule = 0x0261,
/* Pipeline Personalization Profile */ /* Dynamic Device Personalization */
i40e_aqc_opc_write_personalization_profile = 0x0270, i40e_aqc_opc_write_personalization_profile = 0x0270,
i40e_aqc_opc_get_personalization_profile_list = 0x0271, i40e_aqc_opc_get_personalization_profile_list = 0x0271,
...@@ -1594,7 +1594,7 @@ struct i40e_aqc_add_delete_mirror_rule_completion { ...@@ -1594,7 +1594,7 @@ struct i40e_aqc_add_delete_mirror_rule_completion {
I40E_CHECK_CMD_LENGTH(i40e_aqc_add_delete_mirror_rule_completion); I40E_CHECK_CMD_LENGTH(i40e_aqc_add_delete_mirror_rule_completion);
/* Pipeline Personalization Profile */ /* Dynamic Device Personalization */
struct i40e_aqc_write_personalization_profile { struct i40e_aqc_write_personalization_profile {
u8 flags; u8 flags;
u8 reserved[3]; u8 reserved[3];
...@@ -1605,7 +1605,7 @@ struct i40e_aqc_write_personalization_profile { ...@@ -1605,7 +1605,7 @@ struct i40e_aqc_write_personalization_profile {
I40E_CHECK_CMD_LENGTH(i40e_aqc_write_personalization_profile); I40E_CHECK_CMD_LENGTH(i40e_aqc_write_personalization_profile);
struct i40e_aqc_write_ppp_resp { struct i40e_aqc_write_ddp_resp {
__le32 error_offset; __le32 error_offset;
__le32 error_info; __le32 error_info;
__le32 addr_high; __le32 addr_high;
...@@ -1614,8 +1614,8 @@ struct i40e_aqc_write_ppp_resp { ...@@ -1614,8 +1614,8 @@ struct i40e_aqc_write_ppp_resp {
struct i40e_aqc_get_applied_profiles { struct i40e_aqc_get_applied_profiles {
u8 flags; u8 flags;
#define I40E_AQC_GET_PPP_GET_CONF 0x1 #define I40E_AQC_GET_DDP_GET_CONF 0x1
#define I40E_AQC_GET_PPP_GET_RDPU_CONF 0x2 #define I40E_AQC_GET_DDP_GET_RDPU_CONF 0x2
u8 rsv[3]; u8 rsv[3];
__le32 reserved; __le32 reserved;
__le32 addr_high; __le32 addr_high;
......
drivers/net/ethernet/intel/i40e/i40e_common.c
View file @ 329e5983
...@@ -5236,7 +5236,7 @@ i40e_status i40e_aq_get_phy_register(struct i40e_hw *hw, ...@@ -5236,7 +5236,7 @@ i40e_status i40e_aq_get_phy_register(struct i40e_hw *hw,
} }
/** /**
* i40e_aq_write_ppp - Write pipeline personalization profile (ppp) * i40e_aq_write_ddp - Write dynamic device personalization (ddp)
* @hw: pointer to the hw struct * @hw: pointer to the hw struct
* @buff: command buffer (size in bytes = buff_size) * @buff: command buffer (size in bytes = buff_size)
* @buff_size: buffer size in bytes * @buff_size: buffer size in bytes
...@@ -5246,7 +5246,7 @@ i40e_status i40e_aq_get_phy_register(struct i40e_hw *hw, ...@@ -5246,7 +5246,7 @@ i40e_status i40e_aq_get_phy_register(struct i40e_hw *hw,
* @cmd_details: pointer to command details structure or NULL * @cmd_details: pointer to command details structure or NULL
**/ **/
enum enum
i40e_status_code i40e_aq_write_ppp(struct i40e_hw *hw, void *buff, i40e_status_code i40e_aq_write_ddp(struct i40e_hw *hw, void *buff,
u16 buff_size, u32 track_id, u16 buff_size, u32 track_id,
u32 *error_offset, u32 *error_info, u32 *error_offset, u32 *error_info,
struct i40e_asq_cmd_details *cmd_details) struct i40e_asq_cmd_details *cmd_details)
...@@ -5255,7 +5255,7 @@ i40e_status_code i40e_aq_write_ppp(struct i40e_hw *hw, void *buff, ...@@ -5255,7 +5255,7 @@ i40e_status_code i40e_aq_write_ppp(struct i40e_hw *hw, void *buff,
struct i40e_aqc_write_personalization_profile *cmd = struct i40e_aqc_write_personalization_profile *cmd =
(struct i40e_aqc_write_personalization_profile *) (struct i40e_aqc_write_personalization_profile *)
&desc.params.raw; &desc.params.raw;
struct i40e_aqc_write_ppp_resp *resp; struct i40e_aqc_write_ddp_resp *resp;
i40e_status status; i40e_status status;
i40e_fill_default_direct_cmd_desc(&desc, i40e_fill_default_direct_cmd_desc(&desc,
...@@ -5271,7 +5271,7 @@ i40e_status_code i40e_aq_write_ppp(struct i40e_hw *hw, void *buff, ...@@ -5271,7 +5271,7 @@ i40e_status_code i40e_aq_write_ppp(struct i40e_hw *hw, void *buff,
status = i40e_asq_send_command(hw, &desc, buff, buff_size, cmd_details); status = i40e_asq_send_command(hw, &desc, buff, buff_size, cmd_details);
if (!status) { if (!status) {
resp = (struct i40e_aqc_write_ppp_resp *)&desc.params.raw; resp = (struct i40e_aqc_write_ddp_resp *)&desc.params.raw;
if (error_offset) if (error_offset)
*error_offset = le32_to_cpu(resp->error_offset); *error_offset = le32_to_cpu(resp->error_offset);
if (error_info) if (error_info)
...@@ -5282,14 +5282,14 @@ i40e_status_code i40e_aq_write_ppp(struct i40e_hw *hw, void *buff, ...@@ -5282,14 +5282,14 @@ i40e_status_code i40e_aq_write_ppp(struct i40e_hw *hw, void *buff,
} }
/** /**
* i40e_aq_get_ppp_list - Read pipeline personalization profile (ppp) * i40e_aq_get_ddp_list - Read dynamic device personalization (ddp)
* @hw: pointer to the hw struct * @hw: pointer to the hw struct
* @buff: command buffer (size in bytes = buff_size) * @buff: command buffer (size in bytes = buff_size)
* @buff_size: buffer size in bytes * @buff_size: buffer size in bytes
* @cmd_details: pointer to command details structure or NULL * @cmd_details: pointer to command details structure or NULL
**/ **/
enum enum
i40e_status_code i40e_aq_get_ppp_list(struct i40e_hw *hw, void *buff, i40e_status_code i40e_aq_get_ddp_list(struct i40e_hw *hw, void *buff,
u16 buff_size, u8 flags, u16 buff_size, u8 flags,
struct i40e_asq_cmd_details *cmd_details) struct i40e_asq_cmd_details *cmd_details)
{ {
...@@ -5378,7 +5378,7 @@ i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile, ...@@ -5378,7 +5378,7 @@ i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,
break; break;
} }
if (i == dev_cnt) { if (i == dev_cnt) {
i40e_debug(hw, I40E_DEBUG_PACKAGE, "Device doesn't support PPP"); i40e_debug(hw, I40E_DEBUG_PACKAGE, "Device doesn't support DDP");
return I40E_ERR_DEVICE_NOT_SUPPORTED; return I40E_ERR_DEVICE_NOT_SUPPORTED;
} }
...@@ -5397,7 +5397,7 @@ i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile, ...@@ -5397,7 +5397,7 @@ i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,
sizeof(struct i40e_profile_section_header); sizeof(struct i40e_profile_section_header);
/* Write profile */ /* Write profile */
status = i40e_aq_write_ppp(hw, (void *)sec, (u16)section_size, status = i40e_aq_write_ddp(hw, (void *)sec, (u16)section_size,
track_id, &offset, &info, NULL); track_id, &offset, &info, NULL);
if (status) { if (status) {
i40e_debug(hw, I40E_DEBUG_PACKAGE, i40e_debug(hw, I40E_DEBUG_PACKAGE,
...@@ -5439,10 +5439,10 @@ i40e_add_pinfo_to_list(struct i40e_hw *hw, ...@@ -5439,10 +5439,10 @@ i40e_add_pinfo_to_list(struct i40e_hw *hw,
sec->section.offset); sec->section.offset);
pinfo->track_id = track_id; pinfo->track_id = track_id;
pinfo->version = profile->version; pinfo->version = profile->version;
pinfo->op = I40E_PPP_ADD_TRACKID; pinfo->op = I40E_DDP_ADD_TRACKID;
memcpy(pinfo->name, profile->name, I40E_PPP_NAME_SIZE); memcpy(pinfo->name, profile->name, I40E_DDP_NAME_SIZE);
status = i40e_aq_write_ppp(hw, (void *)sec, sec->data_end, status = i40e_aq_write_ddp(hw, (void *)sec, sec->data_end,
track_id, &offset, &info, NULL); track_id, &offset, &info, NULL);
return status; return status;
......
drivers/net/ethernet/intel/i40e/i40e_prototype.h
View file @ 329e5983
...@@ -431,13 +431,15 @@ i40e_status i40e_write_phy_register(struct i40e_hw *hw, u8 page, u16 reg, ...@@ -431,13 +431,15 @@ i40e_status i40e_write_phy_register(struct i40e_hw *hw, u8 page, u16 reg,
u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num); u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num);
i40e_status i40e_blink_phy_link_led(struct i40e_hw *hw, i40e_status i40e_blink_phy_link_led(struct i40e_hw *hw,
u32 time, u32 interval); u32 time, u32 interval);
i40e_status i40e_aq_write_ppp(struct i40e_hw *hw, void *buff, i40e_status i40e_aq_write_ddp(struct i40e_hw *hw, void *buff,
u16 buff_size, u32 track_id, u16 buff_size, u32 track_id,
u32 *error_offset, u32 *error_info, u32 *error_offset, u32 *error_info,
struct i40e_asq_cmd_details *cmd_details); struct i40e_asq_cmd_details *
i40e_status i40e_aq_get_ppp_list(struct i40e_hw *hw, void *buff, cmd_details);
i40e_status i40e_aq_get_ddp_list(struct i40e_hw *hw, void *buff,
u16 buff_size, u8 flags, u16 buff_size, u8 flags,
struct i40e_asq_cmd_details *cmd_details); struct i40e_asq_cmd_details *
cmd_details);
struct i40e_generic_seg_header * struct i40e_generic_seg_header *
i40e_find_segment_in_package(u32 segment_type, i40e_find_segment_in_package(u32 segment_type,
struct i40e_package_header *pkg_header); struct i40e_package_header *pkg_header);
......
drivers/net/ethernet/intel/i40e/i40e_type.h
View file @ 329e5983
...@@ -1502,19 +1502,19 @@ struct i40e_lldp_variables { ...@@ -1502,19 +1502,19 @@ struct i40e_lldp_variables {
#define I40E_FLEX_57_SHIFT 6 #define I40E_FLEX_57_SHIFT 6
#define I40E_FLEX_57_MASK (0x1ULL << I40E_FLEX_57_SHIFT) #define I40E_FLEX_57_MASK (0x1ULL << I40E_FLEX_57_SHIFT)
/* Version format for PPP */ /* Version format for Dynamic Device Personalization(DDP) */
struct i40e_ppp_version { struct i40e_ddp_version {
u8 major; u8 major;
u8 minor; u8 minor;
u8 update; u8 update;
u8 draft; u8 draft;
}; };
#define I40E_PPP_NAME_SIZE 32 #define I40E_DDP_NAME_SIZE 32
/* Package header */ /* Package header */
struct i40e_package_header { struct i40e_package_header {
struct i40e_ppp_version version; struct i40e_ddp_version version;
u32 segment_count; u32 segment_count;
u32 segment_offset[1]; u32 segment_offset[1];
}; };
...@@ -1526,16 +1526,16 @@ struct i40e_generic_seg_header { ...@@ -1526,16 +1526,16 @@ struct i40e_generic_seg_header {
#define SEGMENT_TYPE_I40E 0x00000011 #define SEGMENT_TYPE_I40E 0x00000011
#define SEGMENT_TYPE_X722 0x00000012 #define SEGMENT_TYPE_X722 0x00000012
u32 type; u32 type;
struct i40e_ppp_version version; struct i40e_ddp_version version;
u32 size; u32 size;
char name[I40E_PPP_NAME_SIZE]; char name[I40E_DDP_NAME_SIZE];
}; };
struct i40e_metadata_segment { struct i40e_metadata_segment {
struct i40e_generic_seg_header header; struct i40e_generic_seg_header header;
struct i40e_ppp_version version; struct i40e_ddp_version version;
u32 track_id; u32 track_id;
char name[I40E_PPP_NAME_SIZE]; char name[I40E_DDP_NAME_SIZE];
}; };
struct i40e_device_id_entry { struct i40e_device_id_entry {
...@@ -1545,8 +1545,8 @@ struct i40e_device_id_entry { ...@@ -1545,8 +1545,8 @@ struct i40e_device_id_entry {
struct i40e_profile_segment { struct i40e_profile_segment {
struct i40e_generic_seg_header header; struct i40e_generic_seg_header header;
struct i40e_ppp_version version; struct i40e_ddp_version version;
char name[I40E_PPP_NAME_SIZE]; char name[I40E_DDP_NAME_SIZE];
u32 device_table_count; u32 device_table_count;
struct i40e_device_id_entry device_table[1]; struct i40e_device_id_entry device_table[1];
}; };
...@@ -1573,11 +1573,11 @@ struct i40e_profile_section_header { ...@@ -1573,11 +1573,11 @@ struct i40e_profile_section_header {
struct i40e_profile_info { struct i40e_profile_info {
u32 track_id; u32 track_id;
struct i40e_ppp_version version; struct i40e_ddp_version version;
u8 op; u8 op;
#define I40E_PPP_ADD_TRACKID 0x01 #define I40E_DDP_ADD_TRACKID 0x01
#define I40E_PPP_REMOVE_TRACKID 0x02 #define I40E_DDP_REMOVE_TRACKID 0x02
u8 reserved[7]; u8 reserved[7];
u8 name[I40E_PPP_NAME_SIZE]; u8 name[I40E_DDP_NAME_SIZE];
}; };
#endif /* _I40E_TYPE_H_ */ #endif /* _I40E_TYPE_H_ */
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
View file @ 329e5983
...@@ -198,7 +198,7 @@ enum i40e_admin_queue_opc { ...@@ -198,7 +198,7 @@ enum i40e_admin_queue_opc {
i40e_aqc_opc_add_mirror_rule = 0x0260, i40e_aqc_opc_add_mirror_rule = 0x0260,
i40e_aqc_opc_delete_mirror_rule = 0x0261, i40e_aqc_opc_delete_mirror_rule = 0x0261,
/* Pipeline Personalization Profile */ /* Dynamic Device Personalization */
i40e_aqc_opc_write_personalization_profile = 0x0270, i40e_aqc_opc_write_personalization_profile = 0x0270,
i40e_aqc_opc_get_personalization_profile_list = 0x0271, i40e_aqc_opc_get_personalization_profile_list = 0x0271,
...@@ -1562,7 +1562,7 @@ struct i40e_aqc_add_delete_mirror_rule_completion { ...@@ -1562,7 +1562,7 @@ struct i40e_aqc_add_delete_mirror_rule_completion {
I40E_CHECK_CMD_LENGTH(i40e_aqc_add_delete_mirror_rule_completion); I40E_CHECK_CMD_LENGTH(i40e_aqc_add_delete_mirror_rule_completion);
/* Pipeline Personalization Profile */ /* Dynamic Device Personalization */
struct i40e_aqc_write_personalization_profile { struct i40e_aqc_write_personalization_profile {
u8 flags; u8 flags;
u8 reserved[3]; u8 reserved[3];
...@@ -1573,7 +1573,7 @@ struct i40e_aqc_write_personalization_profile { ...@@ -1573,7 +1573,7 @@ struct i40e_aqc_write_personalization_profile {
I40E_CHECK_CMD_LENGTH(i40e_aqc_write_personalization_profile); I40E_CHECK_CMD_LENGTH(i40e_aqc_write_personalization_profile);
struct i40e_aqc_write_ppp_resp { struct i40e_aqc_write_ddp_resp {
__le32 error_offset; __le32 error_offset;
__le32 error_info; __le32 error_info;
__le32 addr_high; __le32 addr_high;
...@@ -1582,8 +1582,8 @@ struct i40e_aqc_write_ppp_resp { ...@@ -1582,8 +1582,8 @@ struct i40e_aqc_write_ppp_resp {
struct i40e_aqc_get_applied_profiles { struct i40e_aqc_get_applied_profiles {
u8 flags; u8 flags;
#define I40E_AQC_GET_PPP_GET_CONF 0x1 #define I40E_AQC_GET_DDP_GET_CONF 0x1
#define I40E_AQC_GET_PPP_GET_RDPU_CONF 0x2 #define I40E_AQC_GET_DDP_GET_RDPU_CONF 0x2
u8 rsv[3]; u8 rsv[3];
__le32 reserved; __le32 reserved;
__le32 addr_high; __le32 addr_high;
......
drivers/net/ethernet/intel/i40evf/i40e_common.c
View file @ 329e5983
...@@ -1202,7 +1202,7 @@ i40e_status i40e_vf_reset(struct i40e_hw *hw) ...@@ -1202,7 +1202,7 @@ i40e_status i40e_vf_reset(struct i40e_hw *hw)
} }
/** /**
* i40evf_aq_write_ppp - Write pipeline personalization profile (ppp) * i40evf_aq_write_ddp - Write dynamic device personalization (ddp)
* @hw: pointer to the hw struct * @hw: pointer to the hw struct
* @buff: command buffer (size in bytes = buff_size) * @buff: command buffer (size in bytes = buff_size)
* @buff_size: buffer size in bytes * @buff_size: buffer size in bytes
...@@ -1212,7 +1212,7 @@ i40e_status i40e_vf_reset(struct i40e_hw *hw) ...@@ -1212,7 +1212,7 @@ i40e_status i40e_vf_reset(struct i40e_hw *hw)
* @cmd_details: pointer to command details structure or NULL * @cmd_details: pointer to command details structure or NULL
**/ **/
enum enum
i40e_status_code i40evf_aq_write_ppp(struct i40e_hw *hw, void *buff, i40e_status_code i40evf_aq_write_ddp(struct i40e_hw *hw, void *buff,
u16 buff_size, u32 track_id, u16 buff_size, u32 track_id,
u32 *error_offset, u32 *error_info, u32 *error_offset, u32 *error_info,
struct i40e_asq_cmd_details *cmd_details) struct i40e_asq_cmd_details *cmd_details)
...@@ -1221,7 +1221,7 @@ i40e_status_code i40evf_aq_write_ppp(struct i40e_hw *hw, void *buff, ...@@ -1221,7 +1221,7 @@ i40e_status_code i40evf_aq_write_ppp(struct i40e_hw *hw, void *buff,
struct i40e_aqc_write_personalization_profile *cmd = struct i40e_aqc_write_personalization_profile *cmd =
(struct i40e_aqc_write_personalization_profile *) (struct i40e_aqc_write_personalization_profile *)
&desc.params.raw; &desc.params.raw;
struct i40e_aqc_write_ppp_resp *resp; struct i40e_aqc_write_ddp_resp *resp;
i40e_status status; i40e_status status;
i40evf_fill_default_direct_cmd_desc(&desc, i40evf_fill_default_direct_cmd_desc(&desc,
...@@ -1237,7 +1237,7 @@ i40e_status_code i40evf_aq_write_ppp(struct i40e_hw *hw, void *buff, ...@@ -1237,7 +1237,7 @@ i40e_status_code i40evf_aq_write_ppp(struct i40e_hw *hw, void *buff,
status = i40evf_asq_send_command(hw, &desc, buff, buff_size, cmd_details); status = i40evf_asq_send_command(hw, &desc, buff, buff_size, cmd_details);
if (!status) { if (!status) {
resp = (struct i40e_aqc_write_ppp_resp *)&desc.params.raw; resp = (struct i40e_aqc_write_ddp_resp *)&desc.params.raw;
if (error_offset) if (error_offset)
*error_offset = le32_to_cpu(resp->error_offset); *error_offset = le32_to_cpu(resp->error_offset);
if (error_info) if (error_info)
...@@ -1248,14 +1248,14 @@ i40e_status_code i40evf_aq_write_ppp(struct i40e_hw *hw, void *buff, ...@@ -1248,14 +1248,14 @@ i40e_status_code i40evf_aq_write_ppp(struct i40e_hw *hw, void *buff,
} }
/** /**
* i40evf_aq_get_ppp_list - Read pipeline personalization profile (ppp) * i40evf_aq_get_ddp_list - Read dynamic device personalization (ddp)
* @hw: pointer to the hw struct * @hw: pointer to the hw struct
* @buff: command buffer (size in bytes = buff_size) * @buff: command buffer (size in bytes = buff_size)
* @buff_size: buffer size in bytes * @buff_size: buffer size in bytes
* @cmd_details: pointer to command details structure or NULL * @cmd_details: pointer to command details structure or NULL
**/ **/
enum enum
i40e_status_code i40evf_aq_get_ppp_list(struct i40e_hw *hw, void *buff, i40e_status_code i40evf_aq_get_ddp_list(struct i40e_hw *hw, void *buff,
u16 buff_size, u8 flags, u16 buff_size, u8 flags,
struct i40e_asq_cmd_details *cmd_details) struct i40e_asq_cmd_details *cmd_details)
{ {
...@@ -1344,7 +1344,7 @@ i40evf_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile, ...@@ -1344,7 +1344,7 @@ i40evf_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,
break; break;
} }
if (i == dev_cnt) { if (i == dev_cnt) {
i40e_debug(hw, I40E_DEBUG_PACKAGE, "Device doesn't support PPP"); i40e_debug(hw, I40E_DEBUG_PACKAGE, "Device doesn't support DDP");
return I40E_ERR_DEVICE_NOT_SUPPORTED; return I40E_ERR_DEVICE_NOT_SUPPORTED;
} }
...@@ -1363,7 +1363,7 @@ i40evf_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile, ...@@ -1363,7 +1363,7 @@ i40evf_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,
sizeof(struct i40e_profile_section_header); sizeof(struct i40e_profile_section_header);
/* Write profile */ /* Write profile */
status = i40evf_aq_write_ppp(hw, (void *)sec, (u16)section_size, status = i40evf_aq_write_ddp(hw, (void *)sec, (u16)section_size,
track_id, &offset, &info, NULL); track_id, &offset, &info, NULL);
if (status) { if (status) {
i40e_debug(hw, I40E_DEBUG_PACKAGE, i40e_debug(hw, I40E_DEBUG_PACKAGE,
...@@ -1405,10 +1405,10 @@ i40evf_add_pinfo_to_list(struct i40e_hw *hw, ...@@ -1405,10 +1405,10 @@ i40evf_add_pinfo_to_list(struct i40e_hw *hw,
sec->section.offset); sec->section.offset);
pinfo->track_id = track_id; pinfo->track_id = track_id;
pinfo->version = profile->version; pinfo->version = profile->version;
pinfo->op = I40E_PPP_ADD_TRACKID; pinfo->op = I40E_DDP_ADD_TRACKID;
memcpy(pinfo->name, profile->name, I40E_PPP_NAME_SIZE); memcpy(pinfo->name, profile->name, I40E_DDP_NAME_SIZE);
status = i40evf_aq_write_ppp(hw, (void *)sec, sec->data_end, status = i40evf_aq_write_ddp(hw, (void *)sec, sec->data_end,
track_id, &offset, &info, NULL); track_id, &offset, &info, NULL);
return status; return status;
} }
drivers/net/ethernet/intel/i40evf/i40e_prototype.h
View file @ 329e5983
...@@ -131,13 +131,15 @@ i40e_status i40e_write_phy_register(struct i40e_hw *hw, u8 page, u16 reg, ...@@ -131,13 +131,15 @@ i40e_status i40e_write_phy_register(struct i40e_hw *hw, u8 page, u16 reg,
u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num); u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num);
i40e_status i40e_blink_phy_link_led(struct i40e_hw *hw, i40e_status i40e_blink_phy_link_led(struct i40e_hw *hw,
u32 time, u32 interval); u32 time, u32 interval);
i40e_status i40evf_aq_write_ppp(struct i40e_hw *hw, void *buff, i40e_status i40evf_aq_write_ddp(struct i40e_hw *hw, void *buff,
u16 buff_size, u32 track_id, u16 buff_size, u32 track_id,
u32 *error_offset, u32 *error_info, u32 *error_offset, u32 *error_info,
struct i40e_asq_cmd_details *cmd_details); struct i40e_asq_cmd_details *
i40e_status i40evf_aq_get_ppp_list(struct i40e_hw *hw, void *buff, cmd_details);
i40e_status i40evf_aq_get_ddp_list(struct i40e_hw *hw, void *buff,
u16 buff_size, u8 flags, u16 buff_size, u8 flags,
struct i40e_asq_cmd_details *cmd_details); struct i40e_asq_cmd_details *
cmd_details);
struct i40e_generic_seg_header * struct i40e_generic_seg_header *
i40evf_find_segment_in_package(u32 segment_type, i40evf_find_segment_in_package(u32 segment_type,
struct i40e_package_header *pkg_header); struct i40e_package_header *pkg_header);
......
drivers/net/ethernet/intel/i40evf/i40e_type.h
View file @ 329e5983
...@@ -1422,19 +1422,19 @@ enum i40e_reset_type { ...@@ -1422,19 +1422,19 @@ enum i40e_reset_type {
#define I40E_FD_INSET_FLEX_WORD57_MASK (0x1ULL << \ #define I40E_FD_INSET_FLEX_WORD57_MASK (0x1ULL << \
I40E_FD_INSET_FLEX_WORD57_SHIFT) I40E_FD_INSET_FLEX_WORD57_SHIFT)
/* Version format for PPP */ /* Version format for Dynamic Device Personalization(DDP) */
struct i40e_ppp_version { struct i40e_ddp_version {
u8 major; u8 major;
u8 minor; u8 minor;
u8 update; u8 update;
u8 draft; u8 draft;
}; };
#define I40E_PPP_NAME_SIZE 32 #define I40E_DDP_NAME_SIZE 32
/* Package header */ /* Package header */
struct i40e_package_header { struct i40e_package_header {
struct i40e_ppp_version version; struct i40e_ddp_version version;
u32 segment_count; u32 segment_count;
u32 segment_offset[1]; u32 segment_offset[1];
}; };
...@@ -1446,16 +1446,16 @@ struct i40e_generic_seg_header { ...@@ -1446,16 +1446,16 @@ struct i40e_generic_seg_header {
#define SEGMENT_TYPE_I40E 0x00000011 #define SEGMENT_TYPE_I40E 0x00000011
#define SEGMENT_TYPE_X722 0x00000012 #define SEGMENT_TYPE_X722 0x00000012
u32 type; u32 type;
struct i40e_ppp_version version; struct i40e_ddp_version version;
u32 size; u32 size;
char name[I40E_PPP_NAME_SIZE]; char name[I40E_DDP_NAME_SIZE];
}; };
struct i40e_metadata_segment { struct i40e_metadata_segment {
struct i40e_generic_seg_header header; struct i40e_generic_seg_header header;
struct i40e_ppp_version version; struct i40e_ddp_version version;
u32 track_id; u32 track_id;
char name[I40E_PPP_NAME_SIZE]; char name[I40E_DDP_NAME_SIZE];
}; };
struct i40e_device_id_entry { struct i40e_device_id_entry {
...@@ -1465,8 +1465,8 @@ struct i40e_device_id_entry { ...@@ -1465,8 +1465,8 @@ struct i40e_device_id_entry {
struct i40e_profile_segment { struct i40e_profile_segment {
struct i40e_generic_seg_header header; struct i40e_generic_seg_header header;
struct i40e_ppp_version version; struct i40e_ddp_version version;
char name[I40E_PPP_NAME_SIZE]; char name[I40E_DDP_NAME_SIZE];
u32 device_table_count; u32 device_table_count;
struct i40e_device_id_entry device_table[1]; struct i40e_device_id_entry device_table[1];
}; };
...@@ -1493,11 +1493,11 @@ struct i40e_profile_section_header { ...@@ -1493,11 +1493,11 @@ struct i40e_profile_section_header {
struct i40e_profile_info { struct i40e_profile_info {
u32 track_id; u32 track_id;
struct i40e_ppp_version version; struct i40e_ddp_version version;
u8 op; u8 op;
#define I40E_PPP_ADD_TRACKID 0x01 #define I40E_DDP_ADD_TRACKID 0x01
#define I40E_PPP_REMOVE_TRACKID 0x02 #define I40E_DDP_REMOVE_TRACKID 0x02
u8 reserved[7]; u8 reserved[7];
u8 name[I40E_PPP_NAME_SIZE]; u8 name[I40E_DDP_NAME_SIZE];
}; };
#endif /* _I40E_TYPE_H_ */ #endif /* _I40E_TYPE_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7