Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4089caa7 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Burton
Browse files

MIPS: OCTEON: delete redundant register definitions 



For most OCTEON SoCs there is a repeated and redundant register definition
for almost every hardware register, although the register bit fields
would not differ from other SoCs. Since the driver code should use only
one definition for simplicity, these other fields are just redundant
and can be deleted.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
parent 036d0823

arch/mips/include/asm/octeon/cvmx-agl-defs.h

+0 −699

File changed.

Preview size limit exceeded, changes collapsed.

arch/mips/include/asm/octeon/cvmx-asxx-defs.h

+0 −105
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ union cvmx_asxx_gmii_rx_clk_set { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_gmii_rx_clk_set_s cn30xx;

	struct cvmx_asxx_gmii_rx_clk_set_s cn31xx;

	struct cvmx_asxx_gmii_rx_clk_set_s cn50xx;

};



union cvmx_asxx_gmii_rx_dat_set {
@@ -84,9 +81,6 @@ union cvmx_asxx_gmii_rx_dat_set { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_gmii_rx_dat_set_s cn30xx;

	struct cvmx_asxx_gmii_rx_dat_set_s cn31xx;

	struct cvmx_asxx_gmii_rx_dat_set_s cn50xx;

};



union cvmx_asxx_int_en {
@@ -121,12 +115,6 @@ union cvmx_asxx_int_en { 
		uint64_t reserved_11_63:53;

#endif

	} cn30xx;

	struct cvmx_asxx_int_en_cn30xx cn31xx;

	struct cvmx_asxx_int_en_s cn38xx;

	struct cvmx_asxx_int_en_s cn38xxp2;

	struct cvmx_asxx_int_en_cn30xx cn50xx;

	struct cvmx_asxx_int_en_s cn58xx;

	struct cvmx_asxx_int_en_s cn58xxp1;

};



union cvmx_asxx_int_reg {
@@ -161,12 +149,6 @@ union cvmx_asxx_int_reg { 
		uint64_t reserved_11_63:53;

#endif

	} cn30xx;

	struct cvmx_asxx_int_reg_cn30xx cn31xx;

	struct cvmx_asxx_int_reg_s cn38xx;

	struct cvmx_asxx_int_reg_s cn38xxp2;

	struct cvmx_asxx_int_reg_cn30xx cn50xx;

	struct cvmx_asxx_int_reg_s cn58xx;

	struct cvmx_asxx_int_reg_s cn58xxp1;

};



union cvmx_asxx_mii_rx_dat_set {
@@ -180,8 +162,6 @@ union cvmx_asxx_mii_rx_dat_set { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_mii_rx_dat_set_s cn30xx;

	struct cvmx_asxx_mii_rx_dat_set_s cn50xx;

};



union cvmx_asxx_prt_loop {
@@ -210,12 +190,6 @@ union cvmx_asxx_prt_loop { 
		uint64_t reserved_7_63:57;

#endif

	} cn30xx;

	struct cvmx_asxx_prt_loop_cn30xx cn31xx;

	struct cvmx_asxx_prt_loop_s cn38xx;

	struct cvmx_asxx_prt_loop_s cn38xxp2;

	struct cvmx_asxx_prt_loop_cn30xx cn50xx;

	struct cvmx_asxx_prt_loop_s cn58xx;

	struct cvmx_asxx_prt_loop_s cn58xxp1;

};



union cvmx_asxx_rld_bypass {
@@ -229,10 +203,6 @@ union cvmx_asxx_rld_bypass { 
		uint64_t reserved_1_63:63;

#endif

	} s;

	struct cvmx_asxx_rld_bypass_s cn38xx;

	struct cvmx_asxx_rld_bypass_s cn38xxp2;

	struct cvmx_asxx_rld_bypass_s cn58xx;

	struct cvmx_asxx_rld_bypass_s cn58xxp1;

};



union cvmx_asxx_rld_bypass_setting {
@@ -246,10 +216,6 @@ union cvmx_asxx_rld_bypass_setting { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_rld_bypass_setting_s cn38xx;

	struct cvmx_asxx_rld_bypass_setting_s cn38xxp2;

	struct cvmx_asxx_rld_bypass_setting_s cn58xx;

	struct cvmx_asxx_rld_bypass_setting_s cn58xxp1;

};



union cvmx_asxx_rld_comp {
@@ -276,9 +242,6 @@ union cvmx_asxx_rld_comp { 
		uint64_t reserved_8_63:56;

#endif

	} cn38xx;

	struct cvmx_asxx_rld_comp_cn38xx cn38xxp2;

	struct cvmx_asxx_rld_comp_s cn58xx;

	struct cvmx_asxx_rld_comp_s cn58xxp1;

};



union cvmx_asxx_rld_data_drv {
@@ -294,10 +257,6 @@ union cvmx_asxx_rld_data_drv { 
		uint64_t reserved_8_63:56;

#endif

	} s;

	struct cvmx_asxx_rld_data_drv_s cn38xx;

	struct cvmx_asxx_rld_data_drv_s cn38xxp2;

	struct cvmx_asxx_rld_data_drv_s cn58xx;

	struct cvmx_asxx_rld_data_drv_s cn58xxp1;

};



union cvmx_asxx_rld_fcram_mode {
@@ -311,8 +270,6 @@ union cvmx_asxx_rld_fcram_mode { 
		uint64_t reserved_1_63:63;

#endif

	} s;

	struct cvmx_asxx_rld_fcram_mode_s cn38xx;

	struct cvmx_asxx_rld_fcram_mode_s cn38xxp2;

};



union cvmx_asxx_rld_nctl_strong {
@@ -326,10 +283,6 @@ union cvmx_asxx_rld_nctl_strong { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_rld_nctl_strong_s cn38xx;

	struct cvmx_asxx_rld_nctl_strong_s cn38xxp2;

	struct cvmx_asxx_rld_nctl_strong_s cn58xx;

	struct cvmx_asxx_rld_nctl_strong_s cn58xxp1;

};



union cvmx_asxx_rld_nctl_weak {
@@ -343,10 +296,6 @@ union cvmx_asxx_rld_nctl_weak { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_rld_nctl_weak_s cn38xx;

	struct cvmx_asxx_rld_nctl_weak_s cn38xxp2;

	struct cvmx_asxx_rld_nctl_weak_s cn58xx;

	struct cvmx_asxx_rld_nctl_weak_s cn58xxp1;

};



union cvmx_asxx_rld_pctl_strong {
@@ -360,10 +309,6 @@ union cvmx_asxx_rld_pctl_strong { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_rld_pctl_strong_s cn38xx;

	struct cvmx_asxx_rld_pctl_strong_s cn38xxp2;

	struct cvmx_asxx_rld_pctl_strong_s cn58xx;

	struct cvmx_asxx_rld_pctl_strong_s cn58xxp1;

};



union cvmx_asxx_rld_pctl_weak {
@@ -377,10 +322,6 @@ union cvmx_asxx_rld_pctl_weak { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_rld_pctl_weak_s cn38xx;

	struct cvmx_asxx_rld_pctl_weak_s cn38xxp2;

	struct cvmx_asxx_rld_pctl_weak_s cn58xx;

	struct cvmx_asxx_rld_pctl_weak_s cn58xxp1;

};



union cvmx_asxx_rld_setting {
@@ -411,9 +352,6 @@ union cvmx_asxx_rld_setting { 
		uint64_t reserved_5_63:59;

#endif

	} cn38xx;

	struct cvmx_asxx_rld_setting_cn38xx cn38xxp2;

	struct cvmx_asxx_rld_setting_s cn58xx;

	struct cvmx_asxx_rld_setting_s cn58xxp1;

};



union cvmx_asxx_rx_clk_setx {
@@ -427,13 +365,6 @@ union cvmx_asxx_rx_clk_setx { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_rx_clk_setx_s cn30xx;

	struct cvmx_asxx_rx_clk_setx_s cn31xx;

	struct cvmx_asxx_rx_clk_setx_s cn38xx;

	struct cvmx_asxx_rx_clk_setx_s cn38xxp2;

	struct cvmx_asxx_rx_clk_setx_s cn50xx;

	struct cvmx_asxx_rx_clk_setx_s cn58xx;

	struct cvmx_asxx_rx_clk_setx_s cn58xxp1;

};



union cvmx_asxx_rx_prt_en {
@@ -456,12 +387,6 @@ union cvmx_asxx_rx_prt_en { 
		uint64_t reserved_3_63:61;

#endif

	} cn30xx;

	struct cvmx_asxx_rx_prt_en_cn30xx cn31xx;

	struct cvmx_asxx_rx_prt_en_s cn38xx;

	struct cvmx_asxx_rx_prt_en_s cn38xxp2;

	struct cvmx_asxx_rx_prt_en_cn30xx cn50xx;

	struct cvmx_asxx_rx_prt_en_s cn58xx;

	struct cvmx_asxx_rx_prt_en_s cn58xxp1;

};



union cvmx_asxx_rx_wol {
@@ -477,8 +402,6 @@ union cvmx_asxx_rx_wol { 
		uint64_t reserved_2_63:62;

#endif

	} s;

	struct cvmx_asxx_rx_wol_s cn38xx;

	struct cvmx_asxx_rx_wol_s cn38xxp2;

};



union cvmx_asxx_rx_wol_msk {
@@ -490,8 +413,6 @@ union cvmx_asxx_rx_wol_msk { 
		uint64_t msk:64;

#endif

	} s;

	struct cvmx_asxx_rx_wol_msk_s cn38xx;

	struct cvmx_asxx_rx_wol_msk_s cn38xxp2;

};



union cvmx_asxx_rx_wol_powok {
@@ -505,8 +426,6 @@ union cvmx_asxx_rx_wol_powok { 
		uint64_t reserved_1_63:63;

#endif

	} s;

	struct cvmx_asxx_rx_wol_powok_s cn38xx;

	struct cvmx_asxx_rx_wol_powok_s cn38xxp2;

};



union cvmx_asxx_rx_wol_sig {
@@ -520,8 +439,6 @@ union cvmx_asxx_rx_wol_sig { 
		uint64_t reserved_32_63:32;

#endif

	} s;

	struct cvmx_asxx_rx_wol_sig_s cn38xx;

	struct cvmx_asxx_rx_wol_sig_s cn38xxp2;

};



union cvmx_asxx_tx_clk_setx {
@@ -535,13 +452,6 @@ union cvmx_asxx_tx_clk_setx { 
		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_asxx_tx_clk_setx_s cn30xx;

	struct cvmx_asxx_tx_clk_setx_s cn31xx;

	struct cvmx_asxx_tx_clk_setx_s cn38xx;

	struct cvmx_asxx_tx_clk_setx_s cn38xxp2;

	struct cvmx_asxx_tx_clk_setx_s cn50xx;

	struct cvmx_asxx_tx_clk_setx_s cn58xx;

	struct cvmx_asxx_tx_clk_setx_s cn58xxp1;

};



union cvmx_asxx_tx_comp_byp {
@@ -566,7 +476,6 @@ union cvmx_asxx_tx_comp_byp { 
		uint64_t reserved_9_63:55;

#endif

	} cn30xx;

	struct cvmx_asxx_tx_comp_byp_cn30xx cn31xx;

	struct cvmx_asxx_tx_comp_byp_cn38xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_8_63:56;
@@ -578,7 +487,6 @@ union cvmx_asxx_tx_comp_byp { 
		uint64_t reserved_8_63:56;

#endif

	} cn38xx;

	struct cvmx_asxx_tx_comp_byp_cn38xx cn38xxp2;

	struct cvmx_asxx_tx_comp_byp_cn50xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_17_63:47;
@@ -609,7 +517,6 @@ union cvmx_asxx_tx_comp_byp { 
		uint64_t reserved_13_63:51;

#endif

	} cn58xx;

	struct cvmx_asxx_tx_comp_byp_cn58xx cn58xxp1;

};



union cvmx_asxx_tx_hi_waterx {
@@ -632,12 +539,6 @@ union cvmx_asxx_tx_hi_waterx { 
		uint64_t reserved_3_63:61;

#endif

	} cn30xx;

	struct cvmx_asxx_tx_hi_waterx_cn30xx cn31xx;

	struct cvmx_asxx_tx_hi_waterx_s cn38xx;

	struct cvmx_asxx_tx_hi_waterx_s cn38xxp2;

	struct cvmx_asxx_tx_hi_waterx_cn30xx cn50xx;

	struct cvmx_asxx_tx_hi_waterx_s cn58xx;

	struct cvmx_asxx_tx_hi_waterx_s cn58xxp1;

};



union cvmx_asxx_tx_prt_en {
@@ -660,12 +561,6 @@ union cvmx_asxx_tx_prt_en { 
		uint64_t reserved_3_63:61;

#endif

	} cn30xx;

	struct cvmx_asxx_tx_prt_en_cn30xx cn31xx;

	struct cvmx_asxx_tx_prt_en_s cn38xx;

	struct cvmx_asxx_tx_prt_en_s cn38xxp2;

	struct cvmx_asxx_tx_prt_en_cn30xx cn50xx;

	struct cvmx_asxx_tx_prt_en_s cn58xx;

	struct cvmx_asxx_tx_prt_en_s cn58xxp1;

};



#endif

arch/mips/include/asm/octeon/cvmx-dbg-defs.h

+0 −4
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ union cvmx_dbg_data { 
		uint64_t reserved_31_63:33;

#endif

	} cn30xx;

	struct cvmx_dbg_data_cn30xx cn31xx;

	struct cvmx_dbg_data_cn38xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_29_63:35;
@@ -82,8 +81,6 @@ union cvmx_dbg_data { 
		uint64_t reserved_29_63:35;

#endif

	} cn38xx;

	struct cvmx_dbg_data_cn38xx cn38xxp2;

	struct cvmx_dbg_data_cn30xx cn50xx;

	struct cvmx_dbg_data_cn58xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_29_63:35;
@@ -99,7 +96,6 @@ union cvmx_dbg_data { 
		uint64_t reserved_29_63:35;

#endif

	} cn58xx;

	struct cvmx_dbg_data_cn58xx cn58xxp1;

};



#endif

arch/mips/include/asm/octeon/cvmx-dpi-defs.h

+0 −178
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ union cvmx_dpi_bist_status { 
		uint64_t reserved_47_63:17;

#endif

	} s;

	struct cvmx_dpi_bist_status_s cn61xx;

	struct cvmx_dpi_bist_status_cn63xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_45_63:19;
@@ -108,10 +107,6 @@ union cvmx_dpi_bist_status { 
		uint64_t reserved_37_63:27;

#endif

	} cn63xxp1;

	struct cvmx_dpi_bist_status_s cn66xx;

	struct cvmx_dpi_bist_status_cn63xx cn68xx;

	struct cvmx_dpi_bist_status_cn63xx cn68xxp1;

	struct cvmx_dpi_bist_status_s cnf71xx;

};



union cvmx_dpi_ctl {
@@ -136,12 +131,6 @@ union cvmx_dpi_ctl { 
		uint64_t reserved_1_63:63;

#endif

	} cn61xx;

	struct cvmx_dpi_ctl_s cn63xx;

	struct cvmx_dpi_ctl_s cn63xxp1;

	struct cvmx_dpi_ctl_s cn66xx;

	struct cvmx_dpi_ctl_s cn68xx;

	struct cvmx_dpi_ctl_s cn68xxp1;

	struct cvmx_dpi_ctl_cn61xx cnf71xx;

};



union cvmx_dpi_dmax_counts {
@@ -157,13 +146,6 @@ union cvmx_dpi_dmax_counts { 
		uint64_t reserved_39_63:25;

#endif

	} s;

	struct cvmx_dpi_dmax_counts_s cn61xx;

	struct cvmx_dpi_dmax_counts_s cn63xx;

	struct cvmx_dpi_dmax_counts_s cn63xxp1;

	struct cvmx_dpi_dmax_counts_s cn66xx;

	struct cvmx_dpi_dmax_counts_s cn68xx;

	struct cvmx_dpi_dmax_counts_s cn68xxp1;

	struct cvmx_dpi_dmax_counts_s cnf71xx;

};



union cvmx_dpi_dmax_dbell {
@@ -177,13 +159,6 @@ union cvmx_dpi_dmax_dbell { 
		uint64_t reserved_16_63:48;

#endif

	} s;

	struct cvmx_dpi_dmax_dbell_s cn61xx;

	struct cvmx_dpi_dmax_dbell_s cn63xx;

	struct cvmx_dpi_dmax_dbell_s cn63xxp1;

	struct cvmx_dpi_dmax_dbell_s cn66xx;

	struct cvmx_dpi_dmax_dbell_s cn68xx;

	struct cvmx_dpi_dmax_dbell_s cn68xxp1;

	struct cvmx_dpi_dmax_dbell_s cnf71xx;

};



union cvmx_dpi_dmax_err_rsp_status {
@@ -197,11 +172,6 @@ union cvmx_dpi_dmax_err_rsp_status { 
		uint64_t reserved_6_63:58;

#endif

	} s;

	struct cvmx_dpi_dmax_err_rsp_status_s cn61xx;

	struct cvmx_dpi_dmax_err_rsp_status_s cn66xx;

	struct cvmx_dpi_dmax_err_rsp_status_s cn68xx;

	struct cvmx_dpi_dmax_err_rsp_status_s cn68xxp1;

	struct cvmx_dpi_dmax_err_rsp_status_s cnf71xx;

};



union cvmx_dpi_dmax_ibuff_saddr {
@@ -242,12 +212,6 @@ union cvmx_dpi_dmax_ibuff_saddr { 
		uint64_t reserved_62_63:2;

#endif

	} cn61xx;

	struct cvmx_dpi_dmax_ibuff_saddr_cn61xx cn63xx;

	struct cvmx_dpi_dmax_ibuff_saddr_cn61xx cn63xxp1;

	struct cvmx_dpi_dmax_ibuff_saddr_cn61xx cn66xx;

	struct cvmx_dpi_dmax_ibuff_saddr_s cn68xx;

	struct cvmx_dpi_dmax_ibuff_saddr_s cn68xxp1;

	struct cvmx_dpi_dmax_ibuff_saddr_cn61xx cnf71xx;

};



union cvmx_dpi_dmax_iflight {
@@ -261,11 +225,6 @@ union cvmx_dpi_dmax_iflight { 
		uint64_t reserved_3_63:61;

#endif

	} s;

	struct cvmx_dpi_dmax_iflight_s cn61xx;

	struct cvmx_dpi_dmax_iflight_s cn66xx;

	struct cvmx_dpi_dmax_iflight_s cn68xx;

	struct cvmx_dpi_dmax_iflight_s cn68xxp1;

	struct cvmx_dpi_dmax_iflight_s cnf71xx;

};



union cvmx_dpi_dmax_naddr {
@@ -288,12 +247,6 @@ union cvmx_dpi_dmax_naddr { 
		uint64_t reserved_36_63:28;

#endif

	} cn61xx;

	struct cvmx_dpi_dmax_naddr_cn61xx cn63xx;

	struct cvmx_dpi_dmax_naddr_cn61xx cn63xxp1;

	struct cvmx_dpi_dmax_naddr_cn61xx cn66xx;

	struct cvmx_dpi_dmax_naddr_s cn68xx;

	struct cvmx_dpi_dmax_naddr_s cn68xxp1;

	struct cvmx_dpi_dmax_naddr_cn61xx cnf71xx;

};



union cvmx_dpi_dmax_reqbnk0 {
@@ -305,13 +258,6 @@ union cvmx_dpi_dmax_reqbnk0 { 
		uint64_t state:64;

#endif

	} s;

	struct cvmx_dpi_dmax_reqbnk0_s cn61xx;

	struct cvmx_dpi_dmax_reqbnk0_s cn63xx;

	struct cvmx_dpi_dmax_reqbnk0_s cn63xxp1;

	struct cvmx_dpi_dmax_reqbnk0_s cn66xx;

	struct cvmx_dpi_dmax_reqbnk0_s cn68xx;

	struct cvmx_dpi_dmax_reqbnk0_s cn68xxp1;

	struct cvmx_dpi_dmax_reqbnk0_s cnf71xx;

};



union cvmx_dpi_dmax_reqbnk1 {
@@ -323,13 +269,6 @@ union cvmx_dpi_dmax_reqbnk1 { 
		uint64_t state:64;

#endif

	} s;

	struct cvmx_dpi_dmax_reqbnk1_s cn61xx;

	struct cvmx_dpi_dmax_reqbnk1_s cn63xx;

	struct cvmx_dpi_dmax_reqbnk1_s cn63xxp1;

	struct cvmx_dpi_dmax_reqbnk1_s cn66xx;

	struct cvmx_dpi_dmax_reqbnk1_s cn68xx;

	struct cvmx_dpi_dmax_reqbnk1_s cn68xxp1;

	struct cvmx_dpi_dmax_reqbnk1_s cnf71xx;

};



union cvmx_dpi_dma_control {
@@ -379,7 +318,6 @@ union cvmx_dpi_dma_control { 
		uint64_t reserved_62_63:2;

#endif

	} s;

	struct cvmx_dpi_dma_control_s cn61xx;

	struct cvmx_dpi_dma_control_cn63xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_61_63:3;
@@ -462,10 +400,6 @@ union cvmx_dpi_dma_control { 
		uint64_t reserved_59_63:5;

#endif

	} cn63xxp1;

	struct cvmx_dpi_dma_control_cn63xx cn66xx;

	struct cvmx_dpi_dma_control_s cn68xx;

	struct cvmx_dpi_dma_control_cn63xx cn68xxp1;

	struct cvmx_dpi_dma_control_s cnf71xx;

};



union cvmx_dpi_dma_engx_en {
@@ -479,13 +413,6 @@ union cvmx_dpi_dma_engx_en { 
		uint64_t reserved_8_63:56;

#endif

	} s;

	struct cvmx_dpi_dma_engx_en_s cn61xx;

	struct cvmx_dpi_dma_engx_en_s cn63xx;

	struct cvmx_dpi_dma_engx_en_s cn63xxp1;

	struct cvmx_dpi_dma_engx_en_s cn66xx;

	struct cvmx_dpi_dma_engx_en_s cn68xx;

	struct cvmx_dpi_dma_engx_en_s cn68xxp1;

	struct cvmx_dpi_dma_engx_en_s cnf71xx;

};



union cvmx_dpi_dma_ppx_cnt {
@@ -499,9 +426,6 @@ union cvmx_dpi_dma_ppx_cnt { 
		uint64_t reserved_16_63:48;

#endif

	} s;

	struct cvmx_dpi_dma_ppx_cnt_s cn61xx;

	struct cvmx_dpi_dma_ppx_cnt_s cn68xx;

	struct cvmx_dpi_dma_ppx_cnt_s cnf71xx;

};



union cvmx_dpi_engx_buf {
@@ -521,7 +445,6 @@ union cvmx_dpi_engx_buf { 
		uint64_t reserved_37_63:27;

#endif

	} s;

	struct cvmx_dpi_engx_buf_s cn61xx;

	struct cvmx_dpi_engx_buf_cn63xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_8_63:56;
@@ -533,11 +456,6 @@ union cvmx_dpi_engx_buf { 
		uint64_t reserved_8_63:56;

#endif

	} cn63xx;

	struct cvmx_dpi_engx_buf_cn63xx cn63xxp1;

	struct cvmx_dpi_engx_buf_s cn66xx;

	struct cvmx_dpi_engx_buf_s cn68xx;

	struct cvmx_dpi_engx_buf_s cn68xxp1;

	struct cvmx_dpi_engx_buf_s cnf71xx;

};



union cvmx_dpi_info_reg {
@@ -557,8 +475,6 @@ union cvmx_dpi_info_reg { 
		uint64_t reserved_8_63:56;

#endif

	} s;

	struct cvmx_dpi_info_reg_s cn61xx;

	struct cvmx_dpi_info_reg_s cn63xx;

	struct cvmx_dpi_info_reg_cn63xxp1 {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_2_63:62;
@@ -570,10 +486,6 @@ union cvmx_dpi_info_reg { 
		uint64_t reserved_2_63:62;

#endif

	} cn63xxp1;

	struct cvmx_dpi_info_reg_s cn66xx;

	struct cvmx_dpi_info_reg_s cn68xx;

	struct cvmx_dpi_info_reg_s cn68xxp1;

	struct cvmx_dpi_info_reg_s cnf71xx;

};



union cvmx_dpi_int_en {
@@ -617,7 +529,6 @@ union cvmx_dpi_int_en { 
		uint64_t reserved_28_63:36;

#endif

	} s;

	struct cvmx_dpi_int_en_s cn61xx;

	struct cvmx_dpi_int_en_cn63xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_26_63:38;
@@ -653,11 +564,6 @@ union cvmx_dpi_int_en { 
		uint64_t reserved_26_63:38;

#endif

	} cn63xx;

	struct cvmx_dpi_int_en_cn63xx cn63xxp1;

	struct cvmx_dpi_int_en_s cn66xx;

	struct cvmx_dpi_int_en_cn63xx cn68xx;

	struct cvmx_dpi_int_en_cn63xx cn68xxp1;

	struct cvmx_dpi_int_en_s cnf71xx;

};



union cvmx_dpi_int_reg {
@@ -701,7 +607,6 @@ union cvmx_dpi_int_reg { 
		uint64_t reserved_28_63:36;

#endif

	} s;

	struct cvmx_dpi_int_reg_s cn61xx;

	struct cvmx_dpi_int_reg_cn63xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_26_63:38;
@@ -737,11 +642,6 @@ union cvmx_dpi_int_reg { 
		uint64_t reserved_26_63:38;

#endif

	} cn63xx;

	struct cvmx_dpi_int_reg_cn63xx cn63xxp1;

	struct cvmx_dpi_int_reg_s cn66xx;

	struct cvmx_dpi_int_reg_cn63xx cn68xx;

	struct cvmx_dpi_int_reg_cn63xx cn68xxp1;

	struct cvmx_dpi_int_reg_s cnf71xx;

};



union cvmx_dpi_ncbx_cfg {
@@ -755,10 +655,6 @@ union cvmx_dpi_ncbx_cfg { 
		uint64_t reserved_6_63:58;

#endif

	} s;

	struct cvmx_dpi_ncbx_cfg_s cn61xx;

	struct cvmx_dpi_ncbx_cfg_s cn66xx;

	struct cvmx_dpi_ncbx_cfg_s cn68xx;

	struct cvmx_dpi_ncbx_cfg_s cnf71xx;

};



union cvmx_dpi_pint_info {
@@ -776,13 +672,6 @@ union cvmx_dpi_pint_info { 
		uint64_t reserved_14_63:50;

#endif

	} s;

	struct cvmx_dpi_pint_info_s cn61xx;

	struct cvmx_dpi_pint_info_s cn63xx;

	struct cvmx_dpi_pint_info_s cn63xxp1;

	struct cvmx_dpi_pint_info_s cn66xx;

	struct cvmx_dpi_pint_info_s cn68xx;

	struct cvmx_dpi_pint_info_s cn68xxp1;

	struct cvmx_dpi_pint_info_s cnf71xx;

};



union cvmx_dpi_pkt_err_rsp {
@@ -796,13 +685,6 @@ union cvmx_dpi_pkt_err_rsp { 
		uint64_t reserved_1_63:63;

#endif

	} s;

	struct cvmx_dpi_pkt_err_rsp_s cn61xx;

	struct cvmx_dpi_pkt_err_rsp_s cn63xx;

	struct cvmx_dpi_pkt_err_rsp_s cn63xxp1;

	struct cvmx_dpi_pkt_err_rsp_s cn66xx;

	struct cvmx_dpi_pkt_err_rsp_s cn68xx;

	struct cvmx_dpi_pkt_err_rsp_s cn68xxp1;

	struct cvmx_dpi_pkt_err_rsp_s cnf71xx;

};



union cvmx_dpi_req_err_rsp {
@@ -816,13 +698,6 @@ union cvmx_dpi_req_err_rsp { 
		uint64_t reserved_8_63:56;

#endif

	} s;

	struct cvmx_dpi_req_err_rsp_s cn61xx;

	struct cvmx_dpi_req_err_rsp_s cn63xx;

	struct cvmx_dpi_req_err_rsp_s cn63xxp1;

	struct cvmx_dpi_req_err_rsp_s cn66xx;

	struct cvmx_dpi_req_err_rsp_s cn68xx;

	struct cvmx_dpi_req_err_rsp_s cn68xxp1;

	struct cvmx_dpi_req_err_rsp_s cnf71xx;

};



union cvmx_dpi_req_err_rsp_en {
@@ -836,13 +711,6 @@ union cvmx_dpi_req_err_rsp_en { 
		uint64_t reserved_8_63:56;

#endif

	} s;

	struct cvmx_dpi_req_err_rsp_en_s cn61xx;

	struct cvmx_dpi_req_err_rsp_en_s cn63xx;

	struct cvmx_dpi_req_err_rsp_en_s cn63xxp1;

	struct cvmx_dpi_req_err_rsp_en_s cn66xx;

	struct cvmx_dpi_req_err_rsp_en_s cn68xx;

	struct cvmx_dpi_req_err_rsp_en_s cn68xxp1;

	struct cvmx_dpi_req_err_rsp_en_s cnf71xx;

};



union cvmx_dpi_req_err_rst {
@@ -856,13 +724,6 @@ union cvmx_dpi_req_err_rst { 
		uint64_t reserved_8_63:56;

#endif

	} s;

	struct cvmx_dpi_req_err_rst_s cn61xx;

	struct cvmx_dpi_req_err_rst_s cn63xx;

	struct cvmx_dpi_req_err_rst_s cn63xxp1;

	struct cvmx_dpi_req_err_rst_s cn66xx;

	struct cvmx_dpi_req_err_rst_s cn68xx;

	struct cvmx_dpi_req_err_rst_s cn68xxp1;

	struct cvmx_dpi_req_err_rst_s cnf71xx;

};



union cvmx_dpi_req_err_rst_en {
@@ -876,13 +737,6 @@ union cvmx_dpi_req_err_rst_en { 
		uint64_t reserved_8_63:56;

#endif

	} s;

	struct cvmx_dpi_req_err_rst_en_s cn61xx;

	struct cvmx_dpi_req_err_rst_en_s cn63xx;

	struct cvmx_dpi_req_err_rst_en_s cn63xxp1;

	struct cvmx_dpi_req_err_rst_en_s cn66xx;

	struct cvmx_dpi_req_err_rst_en_s cn68xx;

	struct cvmx_dpi_req_err_rst_en_s cn68xxp1;

	struct cvmx_dpi_req_err_rst_en_s cnf71xx;

};



union cvmx_dpi_req_err_skip_comp {
@@ -900,11 +754,6 @@ union cvmx_dpi_req_err_skip_comp { 
		uint64_t reserved_24_63:40;

#endif

	} s;

	struct cvmx_dpi_req_err_skip_comp_s cn61xx;

	struct cvmx_dpi_req_err_skip_comp_s cn66xx;

	struct cvmx_dpi_req_err_skip_comp_s cn68xx;

	struct cvmx_dpi_req_err_skip_comp_s cn68xxp1;

	struct cvmx_dpi_req_err_skip_comp_s cnf71xx;

};



union cvmx_dpi_req_gbl_en {
@@ -918,13 +767,6 @@ union cvmx_dpi_req_gbl_en { 
		uint64_t reserved_8_63:56;

#endif

	} s;

	struct cvmx_dpi_req_gbl_en_s cn61xx;

	struct cvmx_dpi_req_gbl_en_s cn63xx;

	struct cvmx_dpi_req_gbl_en_s cn63xxp1;

	struct cvmx_dpi_req_gbl_en_s cn66xx;

	struct cvmx_dpi_req_gbl_en_s cn68xx;

	struct cvmx_dpi_req_gbl_en_s cn68xxp1;

	struct cvmx_dpi_req_gbl_en_s cnf71xx;

};



union cvmx_dpi_sli_prtx_cfg {
@@ -960,7 +802,6 @@ union cvmx_dpi_sli_prtx_cfg { 
		uint64_t reserved_25_63:39;

#endif

	} s;

	struct cvmx_dpi_sli_prtx_cfg_s cn61xx;

	struct cvmx_dpi_sli_prtx_cfg_cn63xx {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_25_63:39;
@@ -994,11 +835,6 @@ union cvmx_dpi_sli_prtx_cfg { 
		uint64_t reserved_25_63:39;

#endif

	} cn63xx;

	struct cvmx_dpi_sli_prtx_cfg_cn63xx cn63xxp1;

	struct cvmx_dpi_sli_prtx_cfg_s cn66xx;

	struct cvmx_dpi_sli_prtx_cfg_cn63xx cn68xx;

	struct cvmx_dpi_sli_prtx_cfg_cn63xx cn68xxp1;

	struct cvmx_dpi_sli_prtx_cfg_s cnf71xx;

};



union cvmx_dpi_sli_prtx_err {
@@ -1012,13 +848,6 @@ union cvmx_dpi_sli_prtx_err { 
		uint64_t addr:61;

#endif

	} s;

	struct cvmx_dpi_sli_prtx_err_s cn61xx;

	struct cvmx_dpi_sli_prtx_err_s cn63xx;

	struct cvmx_dpi_sli_prtx_err_s cn63xxp1;

	struct cvmx_dpi_sli_prtx_err_s cn66xx;

	struct cvmx_dpi_sli_prtx_err_s cn68xx;

	struct cvmx_dpi_sli_prtx_err_s cn68xxp1;

	struct cvmx_dpi_sli_prtx_err_s cnf71xx;

};



union cvmx_dpi_sli_prtx_err_info {
@@ -1040,13 +869,6 @@ union cvmx_dpi_sli_prtx_err_info { 
		uint64_t reserved_9_63:55;

#endif

	} s;

	struct cvmx_dpi_sli_prtx_err_info_s cn61xx;

	struct cvmx_dpi_sli_prtx_err_info_s cn63xx;

	struct cvmx_dpi_sli_prtx_err_info_s cn63xxp1;

	struct cvmx_dpi_sli_prtx_err_info_s cn66xx;

	struct cvmx_dpi_sli_prtx_err_info_s cn68xx;

	struct cvmx_dpi_sli_prtx_err_info_s cn68xxp1;

	struct cvmx_dpi_sli_prtx_err_info_s cnf71xx;

};



#endif

arch/mips/include/asm/octeon/cvmx-fpa-defs.h

+0 −247

File changed.

Preview size limit exceeded, changes collapsed.