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

Commit 345f8422 authored by Haiying Wang's avatar Haiying Wang Committed by Kumar Gala
Browse files

net/ucc_geth: update riscTx and riscRx in ucc_geth 



Change the definition of riscTx and riscRx to unsigned integer instead of
enum, and change their values to support 4 risc allocation if the qe has
4 RISC engines.

Signed-off-by: default avatarHaiying Wang <Haiying.Wang@freescale.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 06c44350

drivers/net/ucc_geth.c

+11 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth, 
				  u8 num_entries,

				  u32 thread_size,

				  u32 thread_alignment,

				  enum qe_risc_allocation risc,

				  unsigned int risc,

				  int skip_page_for_first_entry)

{

	u32 init_enet_offset;
@@ -307,7 +307,7 @@ static int fill_init_enet_entries(struct ucc_geth_private *ugeth, 
static int return_init_enet_entries(struct ucc_geth_private *ugeth,

				    u32 *p_start,

				    u8 num_entries,

				    enum qe_risc_allocation risc,

				    unsigned int risc,

				    int skip_page_for_first_entry)

{

	u32 init_enet_offset;
@@ -342,7 +342,7 @@ static int dump_init_enet_entries(struct ucc_geth_private *ugeth, 
				  u32 __iomem *p_start,

				  u8 num_entries,

				  u32 thread_size,

				  enum qe_risc_allocation risc,

				  unsigned int risc,

				  int skip_page_for_first_entry)

{

	u32 init_enet_offset;
@@ -2135,6 +2135,14 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) 
		return -ENOMEM;

	}



	/* read the number of risc engines, update the riscTx and riscRx

	 * if there are 4 riscs in QE

	 */

	if (qe_get_num_of_risc() == 4) {

		ug_info->riscTx = QE_RISC_ALLOCATION_FOUR_RISCS;

		ug_info->riscRx = QE_RISC_ALLOCATION_FOUR_RISCS;

	}



	ugeth->ug_regs = ioremap(uf_info->regs, sizeof(*ugeth->ug_regs));

	if (!ugeth->ug_regs) {

		if (netif_msg_probe(ugeth))

drivers/net/ucc_geth.h

+2 −2
Original line number Diff line number Diff line
@@ -1120,8 +1120,8 @@ struct ucc_geth_info { 
	enum ucc_geth_maccfg2_pad_and_crc_mode padAndCrc;

	enum ucc_geth_num_of_threads numThreadsTx;

	enum ucc_geth_num_of_threads numThreadsRx;

	enum qe_risc_allocation riscTx;

	enum qe_risc_allocation riscRx;

	unsigned int riscTx;

	unsigned int riscRx;

};



/* structure representing UCC GETH */