lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 307/639] PCI: rockchip: Fix rockchip_pcie_ep_assert_intx() bitwise operations
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit c577f4a5a08bb9677e12ddafb62e2f3a901de87f ]

    Currently the bitwise operations on the u16 variable 'status' with
    the setting ROCKCHIP_PCIE_EP_CMD_STATUS_IS are incorrect because
    ROCKCHIP_PCIE_EP_CMD_STATUS_IS is 1UL<<19 which is wider than the
    u16 variable.

    Fix this by making status a u32.

    Fixes: cf590b078391 ("PCI: rockchip: Add EP driver for Rockchip PCIe controller")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
    Acked-by: Shawn Lin <shawn.lin@rock-chips.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/pcie-rockchip-ep.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c
    index b8163c56a142d..caf34661d38d4 100644
    --- a/drivers/pci/controller/pcie-rockchip-ep.c
    +++ b/drivers/pci/controller/pcie-rockchip-ep.c
    @@ -350,7 +350,7 @@ static void rockchip_pcie_ep_assert_intx(struct rockchip_pcie_ep *ep, u8 fn,
    struct rockchip_pcie *rockchip = &ep->rockchip;
    u32 r = ep->max_regions - 1;
    u32 offset;
    - u16 status;
    + u32 status;
    u8 msg_code;

    if (unlikely(ep->irq_pci_addr != ROCKCHIP_PCIE_EP_PCI_LEGACY_IRQ_ADDR ||
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:17    [W:2.076 / U:1.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site