[PATCH kernel-4.19 35/73] net: hns3: Constify static structs

11 Sep 2021

From: Rikard Falkeborn rikard.falkeborn@gmail.com
mainline inclusion
from mainline-v5.10-rc1
commit e4b9146849f246e77da4787657a3a95c1b6d2833
category: feature
bugzilla: NA
CVE: NA
----------------------------
A number of static variables were not modified. Make them const to allow
the compiler to put them in read-only memory. In order to do so,
constify a couple of input pointers as well as some local pointers.
This moves about 35Kb to read-only memory as seen by the output of the
size command.
Before:
   text    data     bss     dec     hex filename
 404938  111534     640  517112   7e3f8 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge.ko
After:
   text    data     bss     dec     hex filename
 439499   76974     640  517113   7e3f9 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge.ko
Signed-off-by: Rikard Falkeborn rikard.falkeborn@gmail.com
Signed-off-by: David S. Miller davem@davemloft.net
Signed-off-by: Yonglong Liu liuyonglong@huawei.com
Reviewed-by: Junxin Chen chenjunxin1@huawei.com
Signed-off-by: Yang Yingliang yangyingliang@huawei.com
---
 .../hisilicon/hns3/hns3pf/hclge_debugfs.c     | 10 ++++----
 .../hisilicon/hns3/hns3pf/hclge_debugfs.h     | 24 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
index 37e2234fa72dc..d795b4d6a98e4 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
@@ -14,7 +14,7 @@ static const char * const hclge_mac_state_str[] = {
    "TO_ADD", "TO_DEL", "ACTIVE"
 };
-static struct hclge_dbg_reg_type_info hclge_dbg_reg_info[] = {
+static const struct hclge_dbg_reg_type_info hclge_dbg_reg_info[] = {
    { .reg_type = "bios common",
      .dfx_msg = &hclge_dbg_bios_common_reg[0],
      .reg_msg = { .msg_num = ARRAY_SIZE(hclge_dbg_bios_common_reg),
@@ -150,14 +150,14 @@ static int hclge_dbg_cmd_send(struct hclge_dev *hdev,
 }
static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev,
-				      struct hclge_dbg_reg_type_info *reg_info,
+				      const struct hclge_dbg_reg_type_info *reg_info,
    			      const char *cmd_buf)
 {
 #define IDX_OFFSET	1
const char *s = &cmd_buf[strlen(reg_info->reg_type) + IDX_OFFSET];
-	struct hclge_dbg_dfx_message *dfx_message = reg_info->dfx_msg;
-	struct hclge_dbg_reg_common_msg *reg_msg = &reg_info->reg_msg;
+	const struct hclge_dbg_dfx_message *dfx_message = reg_info->dfx_msg;
+	const struct hclge_dbg_reg_common_msg *reg_msg = &reg_info->reg_msg;
    struct hclge_desc *desc_src;
    struct hclge_desc *desc;
    int entries_per_desc;
@@ -434,7 +434,7 @@ static void hclge_dbg_dump_dcb(struct hclge_dev *hdev, const char *cmd_buf)
static void hclge_dbg_dump_reg_cmd(struct hclge_dev *hdev, const char *cmd_buf)
 {
-	struct hclge_dbg_reg_type_info *reg_info;
+	const struct hclge_dbg_reg_type_info *reg_info;
    bool has_dump = false;
    int i;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h
index 86e3f7b52e45b..574e86e376173 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h
@@ -97,7 +97,7 @@ struct hclge_dbg_dfx_message {
 #define HCLGE_DBG_MAC_REG_TYPE_LEN	32
 struct hclge_dbg_reg_type_info {
    const char *reg_type;
-	struct hclge_dbg_dfx_message *dfx_msg;
+	const struct hclge_dbg_dfx_message *dfx_msg;
    struct hclge_dbg_reg_common_msg reg_msg;
 };
@@ -122,7 +122,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_bios_common_reg[] = {
    {false, "Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_0[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_0[] = {
    {false, "Reserved"},
    {true,	"SSU_ETS_PORT_STATUS"},
    {true,	"SSU_ETS_TCG_STATUS"},
@@ -194,7 +194,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_0[] = {
    {false, "Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_1[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_1[] = {
    {true,	"prt_id"},
    {true,	"PACKET_TC_CURR_BUFFER_CNT_0"},
    {true,	"PACKET_TC_CURR_BUFFER_CNT_1"},
@@ -301,7 +301,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_1[] = {
    {false, "Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_2[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_2[] = {
    {true,	"OQ_INDEX"},
    {true,	"QUEUE_CNT"},
    {false, "Reserved"},
@@ -310,7 +310,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_ssu_reg_2[] = {
    {false, "Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_igu_egu_reg[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_igu_egu_reg[] = {
    {true,	"prt_id"},
    {true,	"IGU_RX_ERR_PKT"},
    {true,	"IGU_RX_NO_SOF_PKT"},
@@ -375,7 +375,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_igu_egu_reg[] = {
    {false,	"Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_rpu_reg_0[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_rpu_reg_0[] = {
    {true, "tc_queue_num"},
    {true, "FSM_DFX_ST0"},
    {true, "FSM_DFX_ST1"},
@@ -384,7 +384,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_rpu_reg_0[] = {
    {true, "BUF_WAIT_TIMEOUT_QID"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_rpu_reg_1[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_rpu_reg_1[] = {
    {false, "Reserved"},
    {true,	"FIFO_DFX_ST0"},
    {true,	"FIFO_DFX_ST1"},
@@ -400,7 +400,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_rpu_reg_1[] = {
    {false, "Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_ncsi_reg[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_ncsi_reg[] = {
    {false, "Reserved"},
    {true,	"NCSI_EGU_TX_FIFO_STS"},
    {true,	"NCSI_PAUSE_STATUS"},
@@ -472,7 +472,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_ncsi_reg[] = {
    {true,	"NCSI_MAC_RX_PAUSE_FRAMES"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_rtc_reg[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_rtc_reg[] = {
    {false, "Reserved"},
    {true,	"LGE_IGU_AFIFO_DFX_0"},
    {true,	"LGE_IGU_AFIFO_DFX_1"},
@@ -502,7 +502,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_rtc_reg[] = {
    {false, "Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_ppp_reg[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_ppp_reg[] = {
    {false, "Reserved"},
    {true,	"DROP_FROM_PRT_PKT_CNT"},
    {true,	"DROP_FROM_HOST_PKT_CNT"},
@@ -658,7 +658,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_ppp_reg[] = {
    {false, "Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_rcb_reg[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_rcb_reg[] = {
    {false, "Reserved"},
    {true,	"FSM_DFX_ST0"},
    {true,	"FSM_DFX_ST1"},
@@ -730,7 +730,7 @@ static struct hclge_dbg_dfx_message hclge_dbg_rcb_reg[] = {
    {false, "Reserved"},
 };
-static struct hclge_dbg_dfx_message hclge_dbg_tqp_reg[] = {
+static const struct hclge_dbg_dfx_message hclge_dbg_tqp_reg[] = {
    {true, "q_num"},
    {true, "RCB_CFG_RX_RING_TAIL"},
    {true, "RCB_CFG_RX_RING_HEAD"},
-- 
2.25.1

    

2024

2023

2022

2021

2020

2019

[PATCH kernel-4.19 35/73] net: hns3: Constify static structs