On 4/19/2025 4:29 PM, Christophe JAILLET wrote:
> Structures defined in hw.c are not modified in this driver.
>
> Constifying these structures moves some data to a read-only section, so
> increase overall security.
>
> On a x86_64, with allmodconfig:
> Before:
> ======
> text data bss dec hex filename
> 10357 951 0 11308 2c2c drivers/net/wireless/ath/ath10k/hw.o
>
> After:
> =====
> text data bss dec hex filename
> 11125 203 0 11328 2c40 drivers/net/wireless/ath/ath10k/hw.o
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
> ---
> ---
> drivers/net/wireless/ath/ath10k/ce.c | 28 ++++++-------
> drivers/net/wireless/ath/ath10k/hw.c | 62 ++++++++++++++--------------
> drivers/net/wireless/ath/ath10k/hw.h | 34 ++++++++-------
> 3 files changed, 64 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
> index afae4a8027f8..c6ee0cbb58e2 100644
> --- a/drivers/net/wireless/ath/ath10k/ce.c
> +++ b/drivers/net/wireless/ath/ath10k/ce.c
> @@ -80,7 +80,7 @@ static inline u32 shadow_sr_wr_ind_addr(struct ath10k *ar,
>
> static inline unsigned int
> ath10k_set_ring_byte(unsigned int offset,
> - struct ath10k_hw_ce_regs_addr_map *addr_map)
> + const struct ath10k_hw_ce_regs_addr_map *addr_map)
> {
> return ((offset << addr_map->lsb) & addr_map->mask);
> }
> @@ -203,7 +203,7 @@ static inline void ath10k_ce_src_ring_dmax_set(struct ath10k *ar,
> u32 ce_ctrl_addr,
> unsigned int n)
> {
> - struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs;
> + const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs;
>
> u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr +
> ctrl_regs->addr);
> @@ -217,7 +217,7 @@ static inline void ath10k_ce_src_ring_byte_swap_set(struct ath10k *ar,
> u32 ce_ctrl_addr,
> unsigned int n)
> {
> - struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs;
> + const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs;
>
> u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr +
> ctrl_regs->addr);
> @@ -231,7 +231,7 @@ static inline void ath10k_ce_dest_ring_byte_swap_set(struct ath10k *ar,
> u32 ce_ctrl_addr,
> unsigned int n)
> {
> - struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs;
> + const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs;
>
> u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr +
> ctrl_regs->addr);
> @@ -313,7 +313,7 @@ static inline void ath10k_ce_src_ring_highmark_set(struct ath10k *ar,
> u32 ce_ctrl_addr,
> unsigned int n)
> {
> - struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr;
> + const struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr;
> u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + srcr_wm->addr);
>
> ath10k_ce_write32(ar, ce_ctrl_addr + srcr_wm->addr,
> @@ -325,7 +325,7 @@ static inline void ath10k_ce_src_ring_lowmark_set(struct ath10k *ar,
> u32 ce_ctrl_addr,
> unsigned int n)
> {
> - struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr;
> + const struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr;
> u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + srcr_wm->addr);
>
> ath10k_ce_write32(ar, ce_ctrl_addr + srcr_wm->addr,
> @@ -337,7 +337,7 @@ static inline void ath10k_ce_dest_ring_highmark_set(struct ath10k *ar,
> u32 ce_ctrl_addr,
> unsigned int n)
> {
> - struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr;
> + const struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr;
> u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + dstr_wm->addr);
>
> ath10k_ce_write32(ar, ce_ctrl_addr + dstr_wm->addr,
> @@ -349,7 +349,7 @@ static inline void ath10k_ce_dest_ring_lowmark_set(struct ath10k *ar,
> u32 ce_ctrl_addr,
> unsigned int n)
> {
> - struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr;
> + const struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr;
> u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + dstr_wm->addr);
>
> ath10k_ce_write32(ar, ce_ctrl_addr + dstr_wm->addr,
> @@ -360,7 +360,7 @@ static inline void ath10k_ce_dest_ring_lowmark_set(struct ath10k *ar,
> static inline void ath10k_ce_copy_complete_inter_enable(struct ath10k *ar,
> u32 ce_ctrl_addr)
> {
> - struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie;
> + const struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie;
>
> u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +
> ar->hw_ce_regs->host_ie_addr);
> @@ -372,7 +372,7 @@ static inline void ath10k_ce_copy_complete_inter_enable(struct ath10k *ar,
> static inline void ath10k_ce_copy_complete_intr_disable(struct ath10k *ar,
> u32 ce_ctrl_addr)
> {
> - struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie;
> + const struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie;
>
> u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +
> ar->hw_ce_regs->host_ie_addr);
> @@ -384,7 +384,7 @@ static inline void ath10k_ce_copy_complete_intr_disable(struct ath10k *ar,
> static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar,
> u32 ce_ctrl_addr)
> {
> - struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs;
> + const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs;
>
> u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +
> ar->hw_ce_regs->host_ie_addr);
> @@ -396,7 +396,7 @@ static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar,
> static inline void ath10k_ce_error_intr_disable(struct ath10k *ar,
> u32 ce_ctrl_addr)
> {
> - struct ath10k_hw_ce_misc_regs *misc_regs = ar->hw_ce_regs->misc_regs;
> + const struct ath10k_hw_ce_misc_regs *misc_regs = ar->hw_ce_regs->misc_regs;
>
> u32 misc_ie_addr = ath10k_ce_read32(ar,
> ce_ctrl_addr + ar->hw_ce_regs->misc_ie_addr);
> @@ -410,7 +410,7 @@ static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar,
> u32 ce_ctrl_addr,
> unsigned int mask)
> {
> - struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs;
> + const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs;
>
> ath10k_ce_write32(ar, ce_ctrl_addr + wm_regs->addr, mask);
> }
> @@ -1230,7 +1230,7 @@ void ath10k_ce_per_engine_service(struct ath10k *ar, unsigned int ce_id)
> {
> struct ath10k_ce *ce = ath10k_ce_priv(ar);
> struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
> - struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs;
> + const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs;
> u32 ctrl_addr = ce_state->ctrl_addr;
>
> /*
> diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c
> index 8fafe096adff..84b35a22fc23 100644
> --- a/drivers/net/wireless/ath/ath10k/hw.c
> +++ b/drivers/net/wireless/ath/ath10k/hw.c
> @@ -212,40 +212,40 @@ const struct ath10k_hw_regs wcn3990_regs = {
> .pcie_intr_fw_mask = 0x00100000,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map wcn3990_src_ring = {
> +static const struct ath10k_hw_ce_regs_addr_map wcn3990_src_ring = {
> .msb = 0x00000010,
> .lsb = 0x00000010,
> .mask = GENMASK(17, 17),
> };
>
> -static struct ath10k_hw_ce_regs_addr_map wcn3990_dst_ring = {
> +static const struct ath10k_hw_ce_regs_addr_map wcn3990_dst_ring = {
> .msb = 0x00000012,
> .lsb = 0x00000012,
> .mask = GENMASK(18, 18),
> };
>
> -static struct ath10k_hw_ce_regs_addr_map wcn3990_dmax = {
> +static const struct ath10k_hw_ce_regs_addr_map wcn3990_dmax = {
> .msb = 0x00000000,
> .lsb = 0x00000000,
> .mask = GENMASK(15, 0),
> };
>
> -static struct ath10k_hw_ce_ctrl1 wcn3990_ctrl1 = {
> +static const struct ath10k_hw_ce_ctrl1 wcn3990_ctrl1 = {
> .addr = 0x00000018,
> .src_ring = &wcn3990_src_ring,
> .dst_ring = &wcn3990_dst_ring,
> .dmax = &wcn3990_dmax,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map wcn3990_host_ie_cc = {
> +static const struct ath10k_hw_ce_regs_addr_map wcn3990_host_ie_cc = {
> .mask = GENMASK(0, 0),
> };
>
> -static struct ath10k_hw_ce_host_ie wcn3990_host_ie = {
> +static const struct ath10k_hw_ce_host_ie wcn3990_host_ie = {
> .copy_complete = &wcn3990_host_ie_cc,
> };
>
> -static struct ath10k_hw_ce_host_wm_regs wcn3990_wm_reg = {
> +static const struct ath10k_hw_ce_host_wm_regs wcn3990_wm_reg = {
> .dstr_lmask = 0x00000010,
> .dstr_hmask = 0x00000008,
> .srcr_lmask = 0x00000004,
> @@ -255,7 +255,7 @@ static struct ath10k_hw_ce_host_wm_regs wcn3990_wm_reg = {
> .addr = 0x00000030,
> };
>
> -static struct ath10k_hw_ce_misc_regs wcn3990_misc_reg = {
> +static const struct ath10k_hw_ce_misc_regs wcn3990_misc_reg = {
> .axi_err = 0x00000100,
> .dstr_add_err = 0x00000200,
> .srcr_len_err = 0x00000100,
> @@ -266,19 +266,19 @@ static struct ath10k_hw_ce_misc_regs wcn3990_misc_reg = {
> .addr = 0x00000038,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map wcn3990_src_wm_low = {
> +static const struct ath10k_hw_ce_regs_addr_map wcn3990_src_wm_low = {
> .msb = 0x00000000,
> .lsb = 0x00000010,
> .mask = GENMASK(31, 16),
> };
>
> -static struct ath10k_hw_ce_regs_addr_map wcn3990_src_wm_high = {
> +static const struct ath10k_hw_ce_regs_addr_map wcn3990_src_wm_high = {
> .msb = 0x0000000f,
> .lsb = 0x00000000,
> .mask = GENMASK(15, 0),
> };
>
> -static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_src_ring = {
> +static const struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_src_ring = {
> .addr = 0x0000004c,
> .low_rst = 0x00000000,
> .high_rst = 0x00000000,
> @@ -286,18 +286,18 @@ static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_src_ring = {
> .wm_high = &wcn3990_src_wm_high,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map wcn3990_dst_wm_low = {
> +static const struct ath10k_hw_ce_regs_addr_map wcn3990_dst_wm_low = {
> .lsb = 0x00000010,
> .mask = GENMASK(31, 16),
> };
>
> -static struct ath10k_hw_ce_regs_addr_map wcn3990_dst_wm_high = {
> +static const struct ath10k_hw_ce_regs_addr_map wcn3990_dst_wm_high = {
> .msb = 0x0000000f,
> .lsb = 0x00000000,
> .mask = GENMASK(15, 0),
> };
>
> -static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_dst_ring = {
> +static const struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_dst_ring = {
> .addr = 0x00000050,
> .low_rst = 0x00000000,
> .high_rst = 0x00000000,
> @@ -305,7 +305,7 @@ static struct ath10k_hw_ce_dst_src_wm_regs wcn3990_wm_dst_ring = {
> .wm_high = &wcn3990_dst_wm_high,
> };
>
> -static struct ath10k_hw_ce_ctrl1_upd wcn3990_ctrl1_upd = {
> +static const struct ath10k_hw_ce_ctrl1_upd wcn3990_ctrl1_upd = {
> .shift = 19,
> .mask = 0x00080000,
> .enable = 0x00000000,
> @@ -344,25 +344,25 @@ const struct ath10k_hw_values wcn3990_values = {
> .ce_desc_meta_data_lsb = 4,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_src_ring = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_src_ring = {
> .msb = 0x00000010,
> .lsb = 0x00000010,
> .mask = GENMASK(16, 16),
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_dst_ring = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_dst_ring = {
> .msb = 0x00000011,
> .lsb = 0x00000011,
> .mask = GENMASK(17, 17),
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_dmax = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_dmax = {
> .msb = 0x0000000f,
> .lsb = 0x00000000,
> .mask = GENMASK(15, 0),
> };
>
> -static struct ath10k_hw_ce_ctrl1 qcax_ctrl1 = {
> +static const struct ath10k_hw_ce_ctrl1 qcax_ctrl1 = {
> .addr = 0x00000010,
> .hw_mask = 0x0007ffff,
> .sw_mask = 0x0007ffff,
> @@ -375,31 +375,31 @@ static struct ath10k_hw_ce_ctrl1 qcax_ctrl1 = {
> .dmax = &qcax_dmax,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_cmd_halt_status = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_cmd_halt_status = {
> .msb = 0x00000003,
> .lsb = 0x00000003,
> .mask = GENMASK(3, 3),
> };
>
> -static struct ath10k_hw_ce_cmd_halt qcax_cmd_halt = {
> +static const struct ath10k_hw_ce_cmd_halt qcax_cmd_halt = {
> .msb = 0x00000000,
> .mask = GENMASK(0, 0),
> .status_reset = 0x00000000,
> .status = &qcax_cmd_halt_status,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_host_ie_cc = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_host_ie_cc = {
> .msb = 0x00000000,
> .lsb = 0x00000000,
> .mask = GENMASK(0, 0),
> };
>
> -static struct ath10k_hw_ce_host_ie qcax_host_ie = {
> +static const struct ath10k_hw_ce_host_ie qcax_host_ie = {
> .copy_complete_reset = 0x00000000,
> .copy_complete = &qcax_host_ie_cc,
> };
>
> -static struct ath10k_hw_ce_host_wm_regs qcax_wm_reg = {
> +static const struct ath10k_hw_ce_host_wm_regs qcax_wm_reg = {
> .dstr_lmask = 0x00000010,
> .dstr_hmask = 0x00000008,
> .srcr_lmask = 0x00000004,
> @@ -409,7 +409,7 @@ static struct ath10k_hw_ce_host_wm_regs qcax_wm_reg = {
> .addr = 0x00000030,
> };
>
> -static struct ath10k_hw_ce_misc_regs qcax_misc_reg = {
> +static const struct ath10k_hw_ce_misc_regs qcax_misc_reg = {
> .axi_err = 0x00000400,
> .dstr_add_err = 0x00000200,
> .srcr_len_err = 0x00000100,
> @@ -420,19 +420,19 @@ static struct ath10k_hw_ce_misc_regs qcax_misc_reg = {
> .addr = 0x00000038,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_src_wm_low = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_src_wm_low = {
> .msb = 0x0000001f,
> .lsb = 0x00000010,
> .mask = GENMASK(31, 16),
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_src_wm_high = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_src_wm_high = {
> .msb = 0x0000000f,
> .lsb = 0x00000000,
> .mask = GENMASK(15, 0),
> };
>
> -static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_src_ring = {
> +static const struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_src_ring = {
> .addr = 0x0000004c,
> .low_rst = 0x00000000,
> .high_rst = 0x00000000,
> @@ -440,18 +440,18 @@ static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_src_ring = {
> .wm_high = &qcax_src_wm_high,
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_dst_wm_low = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_dst_wm_low = {
> .lsb = 0x00000010,
> .mask = GENMASK(31, 16),
> };
>
> -static struct ath10k_hw_ce_regs_addr_map qcax_dst_wm_high = {
> +static const struct ath10k_hw_ce_regs_addr_map qcax_dst_wm_high = {
> .msb = 0x0000000f,
> .lsb = 0x00000000,
> .mask = GENMASK(15, 0),
> };
>
> -static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_dst_ring = {
> +static const struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_dst_ring = {
> .addr = 0x00000050,
> .low_rst = 0x00000000,
> .high_rst = 0x00000000,
> diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
> index 442091c6dfd2..7ffa1fbe2874 100644
> --- a/drivers/net/wireless/ath/ath10k/hw.h
> +++ b/drivers/net/wireless/ath/ath10k/hw.h
> @@ -289,19 +289,22 @@ struct ath10k_hw_ce_ctrl1 {
> u32 sw_wr_mask;
> u32 reset_mask;
> u32 reset;
> - struct ath10k_hw_ce_regs_addr_map *src_ring;
> - struct ath10k_hw_ce_regs_addr_map *dst_ring;
> - struct ath10k_hw_ce_regs_addr_map *dmax; };
> + const struct ath10k_hw_ce_regs_addr_map *src_ring;
> + const struct ath10k_hw_ce_regs_addr_map *dst_ring;
> + const struct ath10k_hw_ce_regs_addr_map *dmax;
> +};
>
> struct ath10k_hw_ce_cmd_halt {
> u32 status_reset;
> u32 msb;
> u32 mask;
> - struct ath10k_hw_ce_regs_addr_map *status; };
> + const struct ath10k_hw_ce_regs_addr_map *status;
> +};
>
> struct ath10k_hw_ce_host_ie {
> u32 copy_complete_reset;
> - struct ath10k_hw_ce_regs_addr_map *copy_complete; };
> + const struct ath10k_hw_ce_regs_addr_map *copy_complete;
> +};
>
> struct ath10k_hw_ce_host_wm_regs {
> u32 dstr_lmask;
> @@ -328,8 +331,9 @@ struct ath10k_hw_ce_dst_src_wm_regs {
> u32 addr;
> u32 low_rst;
> u32 high_rst;
> - struct ath10k_hw_ce_regs_addr_map *wm_low;
> - struct ath10k_hw_ce_regs_addr_map *wm_high; };
> + const struct ath10k_hw_ce_regs_addr_map *wm_low;
> + const struct ath10k_hw_ce_regs_addr_map *wm_high;
> +};
>
> struct ath10k_hw_ce_ctrl1_upd {
> u32 shift;
> @@ -355,14 +359,14 @@ struct ath10k_hw_ce_regs {
> u32 ce_rri_low;
> u32 ce_rri_high;
> u32 host_ie_addr;
> - struct ath10k_hw_ce_host_wm_regs *wm_regs;
> - struct ath10k_hw_ce_misc_regs *misc_regs;
> - struct ath10k_hw_ce_ctrl1 *ctrl1_regs;
> - struct ath10k_hw_ce_cmd_halt *cmd_halt;
> - struct ath10k_hw_ce_host_ie *host_ie;
> - struct ath10k_hw_ce_dst_src_wm_regs *wm_srcr;
> - struct ath10k_hw_ce_dst_src_wm_regs *wm_dstr;
> - struct ath10k_hw_ce_ctrl1_upd *upd;
> + const struct ath10k_hw_ce_host_wm_regs *wm_regs;
> + const struct ath10k_hw_ce_misc_regs *misc_regs;
> + const struct ath10k_hw_ce_ctrl1 *ctrl1_regs;
> + const struct ath10k_hw_ce_cmd_halt *cmd_halt;
> + const struct ath10k_hw_ce_host_ie *host_ie;
> + const struct ath10k_hw_ce_dst_src_wm_regs *wm_srcr;
> + const struct ath10k_hw_ce_dst_src_wm_regs *wm_dstr;
> + const struct ath10k_hw_ce_ctrl1_upd *upd;
> };
>
> struct ath10k_hw_values {
Reviewed-by: Baochen Qiang <quic_bqiang@xxxxxxxxxxx>
