On Tue, Nov 24, 2020 at 12:24 AM Wei Li <liwei...@huawei.com> wrote: > > IS_ERR_VALUE macro should be used only with unsigned long type. > Especially it works incorrectly with unsigned shorter types on > 64bit machines.
This is truly a problem for the driver to run on 64-bit architectures. But from an earlier discussion https://patchwork.kernel.org/project/linux-kbuild/patch/1464384685-347275-1-git-send-email-a...@arndb.de/, the preferred solution would be removing the IS_ERR_VALUE() usage or make the values to be unsigned long. It looks like we are having a bigger problem with the 64-bit support for the driver that the offset variables can also be real pointers which cannot be held with 32-bit data types(when uf_info->bd_mem_part == MEM_PART_SYSTEM). So actually we have to change these offsets to unsigned long, otherwise we are having more serious issues on 64-bit systems. Are you willing to make such changes or you want us to deal with it? Regards, Leo > > Fixes: 4c35630ccda5 ("[POWERPC] Change rheap functions to use ulongs instead > of pointers") > Signed-off-by: Wei Li <liwei...@huawei.com> > --- > drivers/net/ethernet/freescale/ucc_geth.c | 30 +++++++++++------------ > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/ucc_geth.c > b/drivers/net/ethernet/freescale/ucc_geth.c > index 714b501be7d0..8656d9be256a 100644 > --- a/drivers/net/ethernet/freescale/ucc_geth.c > +++ b/drivers/net/ethernet/freescale/ucc_geth.c > @@ -286,7 +286,7 @@ static int fill_init_enet_entries(struct ucc_geth_private > *ugeth, > else { > init_enet_offset = > qe_muram_alloc(thread_size, thread_alignment); > - if (IS_ERR_VALUE(init_enet_offset)) { > + if (IS_ERR_VALUE((unsigned > long)(int)init_enet_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM > memory\n"); > qe_put_snum((u8) snum); > @@ -2223,7 +2223,7 @@ static int ucc_geth_alloc_tx(struct ucc_geth_private > *ugeth) > ugeth->tx_bd_ring_offset[j] = > qe_muram_alloc(length, > UCC_GETH_TX_BD_RING_ALIGNMENT); > - if (!IS_ERR_VALUE(ugeth->tx_bd_ring_offset[j])) > + if (!IS_ERR_VALUE((unsigned > long)(int)ugeth->tx_bd_ring_offset[j])) > ugeth->p_tx_bd_ring[j] = > (u8 __iomem *) qe_muram_addr(ugeth-> > > tx_bd_ring_offset[j]); > @@ -2300,7 +2300,7 @@ static int ucc_geth_alloc_rx(struct ucc_geth_private > *ugeth) > ugeth->rx_bd_ring_offset[j] = > qe_muram_alloc(length, > UCC_GETH_RX_BD_RING_ALIGNMENT); > - if (!IS_ERR_VALUE(ugeth->rx_bd_ring_offset[j])) > + if (!IS_ERR_VALUE((unsigned > long)(int)ugeth->rx_bd_ring_offset[j])) > ugeth->p_rx_bd_ring[j] = > (u8 __iomem *) qe_muram_addr(ugeth-> > > rx_bd_ring_offset[j]); > @@ -2510,7 +2510,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > ugeth->tx_glbl_pram_offset = > qe_muram_alloc(sizeof(struct ucc_geth_tx_global_pram), > UCC_GETH_TX_GLOBAL_PRAM_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->tx_glbl_pram_offset)) { > + if (IS_ERR_VALUE((unsigned long)(int)ugeth->tx_glbl_pram_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_tx_glbl_pram\n"); > return -ENOMEM; > @@ -2530,7 +2530,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > sizeof(struct ucc_geth_thread_data_tx) + > 32 * (numThreadsTxNumerical == 1), > UCC_GETH_THREAD_DATA_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->thread_dat_tx_offset)) { > + if (IS_ERR_VALUE((unsigned long)(int)ugeth->thread_dat_tx_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_thread_data_tx\n"); > return -ENOMEM; > @@ -2557,7 +2557,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > qe_muram_alloc(ug_info->numQueuesTx * > sizeof(struct ucc_geth_send_queue_qd), > UCC_GETH_SEND_QUEUE_QUEUE_DESCRIPTOR_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->send_q_mem_reg_offset)) { > + if (IS_ERR_VALUE((unsigned long)(int)ugeth->send_q_mem_reg_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_send_q_mem_reg\n"); > return -ENOMEM; > @@ -2597,7 +2597,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > ugeth->scheduler_offset = > qe_muram_alloc(sizeof(struct ucc_geth_scheduler), > UCC_GETH_SCHEDULER_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->scheduler_offset)) { > + if (IS_ERR_VALUE((unsigned > long)(int)ugeth->scheduler_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_scheduler\n"); > return -ENOMEM; > @@ -2644,7 +2644,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > qe_muram_alloc(sizeof > (struct > ucc_geth_tx_firmware_statistics_pram), > UCC_GETH_TX_STATISTICS_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->tx_fw_statistics_pram_offset)) { > + if (IS_ERR_VALUE((unsigned > long)(int)ugeth->tx_fw_statistics_pram_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_tx_fw_statistics_pram\n"); > return -ENOMEM; > @@ -2681,7 +2681,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > ugeth->rx_glbl_pram_offset = > qe_muram_alloc(sizeof(struct ucc_geth_rx_global_pram), > UCC_GETH_RX_GLOBAL_PRAM_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->rx_glbl_pram_offset)) { > + if (IS_ERR_VALUE((unsigned long)(int)ugeth->rx_glbl_pram_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_rx_glbl_pram\n"); > return -ENOMEM; > @@ -2700,7 +2700,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > qe_muram_alloc(numThreadsRxNumerical * > sizeof(struct ucc_geth_thread_data_rx), > UCC_GETH_THREAD_DATA_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->thread_dat_rx_offset)) { > + if (IS_ERR_VALUE((unsigned long)(int)ugeth->thread_dat_rx_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_thread_data_rx\n"); > return -ENOMEM; > @@ -2721,7 +2721,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > qe_muram_alloc(sizeof > (struct > ucc_geth_rx_firmware_statistics_pram), > UCC_GETH_RX_STATISTICS_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->rx_fw_statistics_pram_offset)) { > + if (IS_ERR_VALUE((unsigned > long)(int)ugeth->rx_fw_statistics_pram_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_rx_fw_statistics_pram\n"); > return -ENOMEM; > @@ -2741,7 +2741,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > qe_muram_alloc(ug_info->numQueuesRx * > sizeof(struct > ucc_geth_rx_interrupt_coalescing_entry) > + 4, UCC_GETH_RX_INTERRUPT_COALESCING_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->rx_irq_coalescing_tbl_offset)) { > + if (IS_ERR_VALUE((unsigned > long)(int)ugeth->rx_irq_coalescing_tbl_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_rx_irq_coalescing_tbl\n"); > return -ENOMEM; > @@ -2807,7 +2807,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > (sizeof(struct ucc_geth_rx_bd_queues_entry) + > sizeof(struct ucc_geth_rx_prefetched_bds)), > UCC_GETH_RX_BD_QUEUES_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->rx_bd_qs_tbl_offset)) { > + if (IS_ERR_VALUE((unsigned long)(int)ugeth->rx_bd_qs_tbl_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_rx_bd_qs_tbl\n"); > return -ENOMEM; > @@ -2892,7 +2892,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > ugeth->exf_glbl_param_offset = > qe_muram_alloc(sizeof(struct ucc_geth_exf_global_pram), > UCC_GETH_RX_EXTENDED_FILTERING_GLOBAL_PARAMETERS_ALIGNMENT); > - if (IS_ERR_VALUE(ugeth->exf_glbl_param_offset)) { > + if (IS_ERR_VALUE((unsigned > long)(int)ugeth->exf_glbl_param_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_exf_glbl_param\n"); > return -ENOMEM; > @@ -3026,7 +3026,7 @@ static int ucc_geth_startup(struct ucc_geth_private > *ugeth) > > /* Allocate InitEnet command parameter structure */ > init_enet_pram_offset = qe_muram_alloc(sizeof(struct > ucc_geth_init_pram), 4); > - if (IS_ERR_VALUE(init_enet_pram_offset)) { > + if (IS_ERR_VALUE((unsigned long)(int)init_enet_pram_offset)) { > if (netif_msg_ifup(ugeth)) > pr_err("Can not allocate DPRAM memory for > p_init_enet_pram\n"); > return -ENOMEM; > -- > 2.17.1 >
