rtw88: access chip_info by const pointer
Ping-Ke Shih
maintainerPATCH 1/1 rtw88: access chip_info by const pointer
Since chip_info has became const table, we must access them via const pointer to avoid invalid writing.
Signed-off-by Ping-Ke Shih <[email protected]>
---
Dependency of this patch is "rtw88: use const pointer of chip_info and fix hw_scan misbehavior".
--- drivers/net/wireless/realtek/rtw88/bf.c | 2 +- drivers/net/wireless/realtek/rtw88/coex.c | 88 +++++++++---------- drivers/net/wireless/realtek/rtw88/coex.h | 14 +-- drivers/net/wireless/realtek/rtw88/efuse.c | 4 +- drivers/net/wireless/realtek/rtw88/fw.c | 20 ++--- drivers/net/wireless/realtek/rtw88/mac.c | 18 ++-- drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +- drivers/net/wireless/realtek/rtw88/main.c | 28 +++--- drivers/net/wireless/realtek/rtw88/main.h | 2 +- drivers/net/wireless/realtek/rtw88/pci.c | 20 ++--- drivers/net/wireless/realtek/rtw88/phy.c | 44 +++++----- drivers/net/wireless/realtek/rtw88/phy.h | 2 +- drivers/net/wireless/realtek/rtw88/tx.c | 8 +- drivers/net/wireless/realtek/rtw88/util.c | 4 +- 14 files changed, 129 insertions(+), 129 deletions(-)
drivers/net/wireless/realtek/rtw88/bf.c +1 -1
@@ -30,11 +30,11 @@ void rtw_bf_disassoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,void rtw_bf_assoc (struct rtw_dev *rtwdev,struct ieee80211_vif *vif,struct ieee80211_bss_conf *bss_conf) { +const struct rtw_chip_info *chip = rtwdev->chip;struct ieee80211_hw *hw = rtwdev->hw;struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;struct rtw_bfee *bfee = &rtwvif->bfee;struct rtw_bf_info *bfinfo = &rtwdev->bf_info; -struct rtw_chip_info *chip = rtwdev->chip;struct ieee80211_sta *sta;struct ieee80211_sta_vht_cap *vht_cap;struct ieee80211_sta_vht_cap *ic_vht_cap;
drivers/net/wireless/realtek/rtw88/coex.c +44 -44
430 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/coex.h +7 -7
@@ -327,7 +327,7 @@ struct coex_rf_para {static inline void rtw_coex_set_init (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_init (rtwdev); }
@@ -335,7 +335,7 @@ static inline void rtw_coex_set_init(struct rtw_dev *rtwdev)static inline void rtw_coex_set_ant_switch (struct rtw_dev *rtwdev,u8 ctrl_type,u8 pos_type) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;if (!chip->ops->coex_set_ant_switch)return ;
@@ -345,28 +345,28 @@ void rtw_coex_set_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, u8 pos_type)static inline void rtw_coex_set_gnt_fix (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_gnt_fix (rtwdev); }static inline void rtw_coex_set_gnt_debug (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_gnt_debug (rtwdev); }static inline void rtw_coex_set_rfe_type (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_rfe_type (rtwdev); }static inline void rtw_coex_set_wl_tx_power (struct rtw_dev *rtwdev,u8 wl_pwr) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_wl_tx_power (rtwdev, wl_pwr); }
@@ -374,7 +374,7 @@ static inline void rtw_coex_set_wl_tx_power(struct rtw_dev *rtwdev, u8 wl_pwr)static inline void rtw_coex_set_wl_rx_gain (struct rtw_dev *rtwdev,bool low_gain) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_wl_rx_gain (rtwdev, low_gain); }
drivers/net/wireless/realtek/rtw88/efuse.c +2 -2
@@ -86,7 +86,7 @@ static int rtw_dump_logical_efuse_map(struct rtw_dev *rtwdev, u8 *phy_map,static int rtw_dump_physical_efuse_map (struct rtw_dev *rtwdev,u8 *map) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;u32 size = rtwdev->efuse.physical_size;u32 efuse_ctl;u32 addr;
@@ -145,7 +145,7 @@ EXPORT_SYMBOL(rtw_read8_physical_efuse);int rtw_parse_efuse_map (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_efuse *efuse = &rtwdev->efuse;u32 phy_size = efuse->physical_size;u32 log_size = efuse->logical_size;
drivers/net/wireless/realtek/rtw88/fw.c +10 -10
@@ -904,7 +904,7 @@ void rtw_send_rsvd_page_h2c(struct rtw_dev *rtwdev)static struct sk_buff *rtw_nlo_info_get (struct ieee80211_hw *hw) {struct rtw_dev *rtwdev = hw->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_pno_request *pno_req = &rtwdev->wow.pno_req;struct rtw_nlo_info_hdr *nlo_hdr;struct cfg80211_ssid *ssid;
@@ -959,7 +959,7 @@ static struct sk_buff *rtw_nlo_info_get(struct ieee80211_hw *hw)static struct sk_buff *rtw_cs_channel_info_get (struct ieee80211_hw *hw) {struct rtw_dev *rtwdev = hw->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_pno_request *pno_req = &rtwdev->wow.pno_req;struct ieee80211_channel *channels = pno_req->channels;struct sk_buff *skb;
@@ -993,7 +993,7 @@ static struct sk_buff *rtw_cs_channel_info_get(struct ieee80211_hw *hw)static struct sk_buff *rtw_lps_pg_dpk_get (struct ieee80211_hw *hw) {struct rtw_dev *rtwdev = hw->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_dpk_info *dpk_info = &rtwdev->dm_info.dpk_info;struct rtw_lps_pg_dpk_hdr *dpk_hdr;struct sk_buff *skb;
@@ -1018,7 +1018,7 @@ static struct sk_buff *rtw_lps_pg_dpk_get(struct ieee80211_hw *hw)static struct sk_buff *rtw_lps_pg_info_get (struct ieee80211_hw *hw) {struct rtw_dev *rtwdev = hw->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_lps_conf *conf = &rtwdev->lps_conf;struct rtw_lps_pg_info_hdr *pg_info_hdr;struct rtw_wow_param *rtw_wow = &rtwdev->wow;
@@ -1122,7 +1122,7 @@ static void rtw_fill_rsvd_page_desc(struct rtw_dev *rtwdev, struct sk_buff *skb, enum rtw_rsvd_packet_type type) {struct rtw_tx_pkt_info pkt_info = {0 }; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;u8 *pkt_desc;rtw_tx_rsvd_page_pkt_info_update (rtwdev, &pkt_info, skb, type);
@@ -1433,7 +1433,7 @@ static int __rtw_build_rsvd_page_from_vifs(struct rtw_dev *rtwdev)static u8 *rtw_build_rsvd_page (struct rtw_dev *rtwdev,u32 *size) {struct ieee80211_hw *hw = rtwdev->hw; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct sk_buff *iter;struct rtw_rsvd_page *rsvd_pkt;u32 page =0 ;
@@ -1647,7 +1647,7 @@ static void rtw_fw_read_fifo_page(struct rtw_dev *rtwdev, u32 offset, u32 size,static void rtw_fw_read_fifo (struct rtw_dev *rtwdev,enum rtw_fw_fifo_sel sel,u32 offset,u32 size,u32 *buf) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;u32 start_pg, residue;if (sel >=RTW_FW_FIFO_MAX ) {
@@ -1706,7 +1706,7 @@ int rtw_fw_dump_fifo(struct rtw_dev *rtwdev, u8 fifo_sel, u32 addr, u32 size,static void __rtw_fw_update_pkt (struct rtw_dev *rtwdev,u8 pkt_id,u16 size,u8 location) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;u8 h2c_pkt[H2C_PKT_SIZE ] = {0 };u16 total_size =H2C_PKT_HDR_SIZE +H2C_PKT_UPDATE_PKT_LEN ;
@@ -1818,8 +1818,8 @@ static int rtw_append_probe_req_ie(struct rtw_dev *rtwdev, struct sk_buff *skb, struct sk_buff_head *list, u8 *bands, struct rtw_vif *rtwvif) { + const struct rtw_chip_info *chip = rtwdev->chip;struct ieee80211_scan_ies *ies = rtwvif->scan_ies; -struct rtw_chip_info *chip = rtwdev->chip;struct sk_buff *new;u8 idx;
@@ -1841,7 +1841,7 @@ static int rtw_append_probe_req_ie(struct rtw_dev *rtwdev, struct sk_buff *skb,static int _rtw_hw_scan_update_probe_req (struct rtw_dev *rtwdev,u8 num_probes,struct sk_buff_head *probe_req_list) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct sk_buff *skb, *tmp;u8 page_offset =1 , *buf, page_size = chip->page_size;u16 pg_addr = rtwdev->fifo.rsvd_h2c_info_addr, loc;
drivers/net/wireless/realtek/rtw88/mac.c +9 -9
@@ -243,7 +243,7 @@ static int rtw_pwr_seq_parser(struct rtw_dev *rtwdev,static int rtw_mac_power_switch (struct rtw_dev *rtwdev,bool pwr_on) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;const struct rtw_pwr_seq_cmd **pwr_seq;u8 rpwm;bool cur_pwr;
@@ -587,7 +587,7 @@ static int download_firmware_to_mem(struct rtw_dev *rtwdev, const u8 *data, u32 src, u32 dst, u32 size) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip;u32 desc_size = chip->tx_pkt_desc_sz;u8 first_part;u32 mem_offset;
@@ -934,7 +934,7 @@ static u32 get_priority_queues(struct rtw_dev *rtwdev, u32 queues)static void __rtw_mac_flush_prio_queue (struct rtw_dev *rtwdev,u32 prio_queue,bool drop) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;const struct rtw_prioq_addr *addr;bool wsize;u16 avail_page, rsvd_page;
@@ -996,7 +996,7 @@ void rtw_mac_flush_queues(struct rtw_dev *rtwdev, u32 queues, bool drop)static int txdma_queue_mapping (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;const struct rtw_rqpn *rqpn =NULL ;u16 txdma_pq_map =0 ;
@@ -1037,8 +1037,8 @@ static int txdma_queue_mapping(struct rtw_dev *rtwdev)static int set_trx_fifo_info (struct rtw_dev *rtwdev) { +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fifo_conf *fifo = &rtwdev->fifo; -struct rtw_chip_info *chip = rtwdev->chip;u16 cur_pg_addr;u8 csi_buf_pg_num = chip->csi_buf_pg_num;
@@ -1092,8 +1092,8 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev, const struct rtw_page_table *pg_tbl, u16 pubq_num) { +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fifo_conf *fifo = &rtwdev->fifo; -struct rtw_chip_info *chip = rtwdev->chip;rtw_write16 (rtwdev,REG_FIFOPAGE_INFO_1 , pg_tbl->hq_num);rtw_write16 (rtwdev,REG_FIFOPAGE_INFO_2 , pg_tbl->lq_num);
@@ -1123,8 +1123,8 @@ static int __priority_queue_cfg_legacy(struct rtw_dev *rtwdev, const struct rtw_page_table *pg_tbl, u16 pubq_num) { +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fifo_conf *fifo = &rtwdev->fifo; -struct rtw_chip_info *chip = rtwdev->chip;u32 val32; val32 =BIT_RQPN_NE (pg_tbl->nq_num, pg_tbl->exq_num);
@@ -1149,8 +1149,8 @@ static int __priority_queue_cfg_legacy(struct rtw_dev *rtwdev,static int priority_queue_cfg (struct rtw_dev *rtwdev) { +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fifo_conf *fifo = &rtwdev->fifo; -struct rtw_chip_info *chip = rtwdev->chip;const struct rtw_page_table *pg_tbl =NULL ;u16 pubq_num;int ret;
@@ -1277,7 +1277,7 @@ static int rtw_drv_info_cfg(struct rtw_dev *rtwdev)int rtw_mac_init (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;int ret; ret =rtw_init_trx_cfg (rtwdev);
drivers/net/wireless/realtek/rtw88/mac80211.c +2 -2
@@ -437,7 +437,7 @@ static int rtw_ops_start_ap(struct ieee80211_hw *hw, struct ieee80211_bss_conf *link_conf) {struct rtw_dev *rtwdev = hw->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;mutex_lock (&rtwdev->mutex); chip->ops->phy_calibration (rtwdev);
@@ -755,7 +755,7 @@ static int rtw_ops_set_antenna(struct ieee80211_hw *hw, u32 rx_antenna) {struct rtw_dev *rtwdev = hw->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;int ret;if (!chip->ops->set_antenna)
drivers/net/wireless/realtek/rtw88/main.c +14 -14
@@ -353,7 +353,7 @@ struct rtw_fwcd_hdr {static int rtw_fwcd_prep (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fwcd_desc *desc = &rtwdev->fw.fwcd_desc;const struct rtw_fwcd_segs *segs = chip->fwcd_segs;u32 prep_size = chip->fw_rxff_size +sizeof (struct rtw_fwcd_hdr );
@@ -756,9 +756,9 @@ void rtw_get_channel_params(struct cfg80211_chan_def *chandef,void rtw_set_channel (struct rtw_dev *rtwdev) { +const struct rtw_chip_info *chip = rtwdev->chip;struct ieee80211_hw *hw = rtwdev->hw;struct rtw_hal *hal = &rtwdev->hal; -struct rtw_chip_info *chip = rtwdev->chip;struct rtw_channel_params ch_param;u8 center_chan, bandwidth, primary_chan_idx;u8 i;
@@ -821,7 +821,7 @@ void rtw_set_channel(struct rtw_dev *rtwdev)void rtw_chip_prepare_tx (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;if (rtwdev->need_rfk) { rtwdev->need_rfk = false;
@@ -890,8 +890,8 @@ static u8 hw_bw_cap_to_bitamp(u8 bw_cap)static void rtw_hw_config_rf_ant_num (struct rtw_dev *rtwdev,u8 hw_ant_num) { +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_hal *hal = &rtwdev->hal; -struct rtw_chip_info *chip = rtwdev->chip;if (hw_ant_num ==EFUSE_HW_CAP_IGNORE || hw_ant_num >= hal->rf_path_num)
@@ -1240,7 +1240,7 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si,static int rtw_wait_firmware_completion (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fw_state *fw; fw = &rtwdev->fw;
@@ -1261,7 +1261,7 @@ static int rtw_wait_firmware_completion(struct rtw_dev *rtwdev)static enum rtw_lps_deep_mode rtw_update_lps_deep_mode (struct rtw_dev *rtwdev,struct rtw_fw_state *fw) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;if (rtw_disable_lps_deep_mode || !chip->lps_deep_mode_supported || !fw->feature)
@@ -1280,7 +1280,7 @@ static enum rtw_lps_deep_mode rtw_update_lps_deep_mode(struct rtw_dev *rtwdev,static int rtw_power_on (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fw_state *fw = &rtwdev->fw;bool wifi_only;int ret;
@@ -1469,8 +1469,8 @@ void rtw_core_stop(struct rtw_dev *rtwdev)static void rtw_init_ht_cap (struct rtw_dev *rtwdev,struct ieee80211_sta_ht_cap *ht_cap) { +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_efuse *efuse = &rtwdev->efuse; -struct rtw_chip_info *chip = rtwdev->chip; ht_cap->ht_supported = true; ht_cap->cap =0 ;
@@ -1568,7 +1568,7 @@ static u16 rtw_get_max_scan_ie_len(struct rtw_dev *rtwdev) }static void rtw_set_supported_band (struct ieee80211_hw *hw, -struct rtw_chip_info *chip) +const struct rtw_chip_info *chip) {struct rtw_dev *rtwdev = hw->priv;struct ieee80211_supported_band *sband;
@@ -1600,7 +1600,7 @@ static void rtw_set_supported_band(struct ieee80211_hw *hw, }static void rtw_unset_supported_band (struct ieee80211_hw *hw, -struct rtw_chip_info *chip) +const struct rtw_chip_info *chip) {kfree (hw->wiphy->bands[NL80211_BAND_2GHZ ]);kfree (hw->wiphy->bands[NL80211_BAND_5GHZ ]);
@@ -1622,7 +1622,7 @@ static void rtw_vif_smps_iter(void *data, u8 *mac,void rtw_set_txrx_1ss (struct rtw_dev *rtwdev,bool txrx_1ss) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_hal *hal = &rtwdev->hal;if (!chip->ops->config_txrx_mode || rtwdev->hal.txrx_1ss == txrx_1ss)
@@ -1743,7 +1743,7 @@ static int rtw_load_firmware(struct rtw_dev *rtwdev, enum rtw_fw_type type)static int rtw_chip_parameter_setup (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_hal *hal = &rtwdev->hal;struct rtw_efuse *efuse = &rtwdev->efuse;
@@ -2001,7 +2001,7 @@ static void rtw_stats_init(struct rtw_dev *rtwdev)int rtw_core_init (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_coex *coex = &rtwdev->coex;int ret;
@@ -2195,7 +2195,7 @@ EXPORT_SYMBOL(rtw_register_hw);void rtw_unregister_hw (struct rtw_dev *rtwdev,struct ieee80211_hw *hw) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;ieee80211_unregister_hw (hw);rtw_unset_supported_band (hw, chip);
drivers/net/wireless/realtek/rtw88/main.h +1 -1
@@ -1980,7 +1980,7 @@ struct rtw_dev {struct rtw_hci hci;struct rtw_hw_scan_info scan_info; -struct rtw_chip_info *chip; +const struct rtw_chip_info *chip;struct rtw_hal hal;struct rtw_fifo_conf fifo;struct rtw_fw_state fw;
drivers/net/wireless/realtek/rtw88/pci.c +10 -10
@@ -322,7 +322,7 @@ static int rtw_pci_init_trx_ring(struct rtw_dev *rtwdev)struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;struct rtw_pci_tx_ring *tx_ring;struct rtw_pci_rx_ring *rx_ring; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;int i =0 , j =0 , tx_alloced =0 , rx_alloced =0 ;int tx_desc_size, rx_desc_size;u32 len;
@@ -721,7 +721,7 @@ static void rtw_pci_dma_check(struct rtw_dev *rtwdev, u32 idx) {struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_pci_rx_buffer_desc *buf_desc;u32 desc_sz = chip->rx_buf_desc_sz;u16 total_pkt_size;
@@ -834,7 +834,7 @@ static int rtw_pci_tx_write_data(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 queue) {struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_pci_tx_ring *ring;struct rtw_pci_tx_data *tx_data;dma_addr_t dma;
@@ -1073,7 +1073,7 @@ static int rtw_pci_get_hw_rx_ring_nr(struct rtw_dev *rtwdev,static u32 rtw_pci_rx_napi (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci,u8 hw_queue,u32 limit) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct napi_struct *napi = &rtwpci->napi;struct rtw_pci_rx_ring *ring = &rtwpci->rx_rings[RTW_RX_QUEUE_MPDU ];struct rtw_rx_pkt_stat pkt_stat;
@@ -1425,7 +1425,7 @@ static void rtw_pci_link_ps(struct rtw_dev *rtwdev, bool enter)static void rtw_pci_link_cfg (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;struct pci_dev *pdev = rtwpci->pdev;u16 link_ctrl;
@@ -1467,7 +1467,7 @@ static void rtw_pci_link_cfg(struct rtw_dev *rtwdev)static void rtw_pci_interface_cfg (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;switch (chip->id) {case RTW_CHIP_TYPE_8822C :
@@ -1483,7 +1483,7 @@ static void rtw_pci_interface_cfg(struct rtw_dev *rtwdev)static void rtw_pci_phy_cfg (struct rtw_dev *rtwdev) {struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct pci_dev *pdev = rtwpci->pdev;const struct rtw_intf_phy_para *para;u16 cut;
@@ -1538,7 +1538,7 @@ static int __maybe_unused rtw_pci_suspend(struct device *dev) {struct ieee80211_hw *hw =dev_get_drvdata (dev);struct rtw_dev *rtwdev = hw->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_efuse *efuse = &rtwdev->efuse;if (chip->id ==RTW_CHIP_TYPE_8822C && efuse->rfe_option ==6 )
@@ -1550,7 +1550,7 @@ static int __maybe_unused rtw_pci_resume(struct device *dev) {struct ieee80211_hw *hw =dev_get_drvdata (dev);struct rtw_dev *rtwdev = hw->priv; -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_efuse *efuse = &rtwdev->efuse;if (chip->id ==RTW_CHIP_TYPE_8822C && efuse->rfe_option ==6 )
@@ -1848,7 +1848,7 @@ void rtw_pci_shutdown(struct pci_dev *pdev) {struct ieee80211_hw *hw =pci_get_drvdata (pdev);struct rtw_dev *rtwdev; -struct rtw_chip_info *chip; +const struct rtw_chip_info *chip;if (!hw)return ;
drivers/net/wireless/realtek/rtw88/phy.c +22 -22
171 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/phy.h +1 -1
@@ -114,7 +114,7 @@ const struct rtw_table name ## _tbl = { \static inline const struct rtw_rfe_def *rtw_get_rfe_def (struct rtw_dev *rtwdev) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_efuse *efuse = &rtwdev->efuse;const struct rtw_rfe_def *rfe_def =NULL ;
drivers/net/wireless/realtek/rtw88/tx.c +4 -4
@@ -384,7 +384,7 @@ void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev,struct ieee80211_sta *sta, struct sk_buff *skb) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct rtw_sta_info *si;
@@ -424,7 +424,7 @@ void rtw_tx_rsvd_page_pkt_info_update(struct rtw_dev *rtwdev, struct sk_buff *skb, enum rtw_rsvd_packet_type type) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;bool bmc;
@@ -475,7 +475,7 @@ rtw_tx_write_data_rsvd_page_get(struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info, u8 *buf, u32 size) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip;struct sk_buff *skb;u32 tx_pkt_desc_sz;u32 length;
@@ -501,7 +501,7 @@ rtw_tx_write_data_h2c_get(struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info, u8 *buf, u32 size) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip;struct sk_buff *skb;u32 tx_pkt_desc_sz;u32 length;
drivers/net/wireless/realtek/rtw88/util.c +2 -2
@@ -23,7 +23,7 @@ EXPORT_SYMBOL(check_hw_ready);bool ltecoex_read_reg (struct rtw_dev *rtwdev,u16 offset,u32 *val) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;const struct rtw_ltecoex_addr *ltecoex = chip->ltecoex_addr;if (!check_hw_ready (rtwdev, ltecoex->ctrl,LTECOEX_READY ,1 ))
@@ -37,7 +37,7 @@ bool ltecoex_read_reg(struct rtw_dev *rtwdev, u16 offset, u32 *val)bool ltecoex_reg_write (struct rtw_dev *rtwdev,u16 offset,u32 value) { -struct rtw_chip_info *chip = rtwdev->chip; +const struct rtw_chip_info *chip = rtwdev->chip;const struct rtw_ltecoex_addr *ltecoex = chip->ltecoex_addr;if (!check_hw_ready (rtwdev, ltecoex->ctrl,LTECOEX_READY ,1 ))
Signature · 1 line
2.25.1
Re: wifi: rtw88: access chip_info by const pointer
Quoted 4 lines · Ping-Ke Shih
Since
chip_infohas became const table, we must access them via const pointer to avoid invalid writing.Signed-off-by Ping-Ke Shih <[email protected]>
Patch applied to wireless-next.git, thanks.
dcbf179cbc18 wifi: rtw88: access chip_info by const pointer
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches