From: dann frazier Date: Thu, 16 Aug 2018 19:19:36 +0000 (-0600) Subject: Revert "UBUNTU: SAUCE: {topost} net: hns3: use lower_32_bits and upper_32_bits" X-Git-Tag: Ubuntu-4.15.0-35.38~118 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=30d1b41ee9cec684f9e69a56054366be671fbbed;p=mirror_ubuntu-bionic-kernel.git Revert "UBUNTU: SAUCE: {topost} net: hns3: use lower_32_bits and upper_32_bits" BugLink: https://bugs.launchpad.net/bugs/1787477 This reverts commit 6f3ea4f0b78b206ac070ff61dd9d41f97dbcff40. Signed-off-by: dann frazier Acked-by: Stefan Bader Acked-by: Kleber Sacilotto de Souza Signed-off-by: Kleber Sacilotto de Souza --- diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c index 383ecf036e31..7049d0bc72ac 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c @@ -123,9 +123,9 @@ static void hclge_cmd_config_regs(struct hclge_cmq_ring *ring) if (ring->flag == HCLGE_TYPE_CSQ) { hclge_write_dev(hw, HCLGE_NIC_CSQ_BASEADDR_L_REG, - lower_32_bits(dma)); + (u32)dma); hclge_write_dev(hw, HCLGE_NIC_CSQ_BASEADDR_H_REG, - upper_32_bits(dma)); + (u32)((dma >> 31) >> 1)); hclge_write_dev(hw, HCLGE_NIC_CSQ_DEPTH_REG, (ring->desc_num >> HCLGE_NIC_CMQ_DESC_NUM_S) | HCLGE_NIC_CMQ_ENABLE); @@ -133,9 +133,9 @@ static void hclge_cmd_config_regs(struct hclge_cmq_ring *ring) hclge_write_dev(hw, HCLGE_NIC_CSQ_HEAD_REG, 0); } else { hclge_write_dev(hw, HCLGE_NIC_CRQ_BASEADDR_L_REG, - lower_32_bits(dma)); + (u32)dma); hclge_write_dev(hw, HCLGE_NIC_CRQ_BASEADDR_H_REG, - upper_32_bits(dma)); + (u32)((dma >> 31) >> 1)); hclge_write_dev(hw, HCLGE_NIC_CRQ_DEPTH_REG, (ring->desc_num >> HCLGE_NIC_CMQ_DESC_NUM_S) | HCLGE_NIC_CMQ_ENABLE);