ACK: [FIXUP][Bionic][PATCH] UBUNTU: PCI: mediatek: Fixup MSI enablement logic by enabling MSI before clocks
Andrea Righi
andrea.righi at canonical.com
Fri Dec 20 16:45:27 UTC 2019
On Thu, Dec 19, 2019 at 06:27:21AM -0800, Kamal Mostafa wrote:
> BugLink: https://bugs.launchpad.net/bugs/1854975
>
> [ Upstream commit 3828d60fd2ef99f97a677c1f95af2ab3e65e2576 ]
>
> The Bionic backport of upstream stable commit
> 3828d60fd2ef ("PCI: mediatek: Fixup MSI enablement logic by enabling MSI
> before clocks") accidentally ommited this hunk.
>
> Signed-off-by: Kamal Mostafa <kamal at canonical.com>
> ---
>
> NOTE:
>
> This patch could optimally be squash-fixed into the as yet unreleased
> bionic/master-next "Fixup MSI enablement" commit, currently this SHA:
>
> f40e837a2ab4 ("PCI: mediatek: Fixup MSI enablement logic by enabling MSI
> before clocks")
>
> -Kamal
>
>
> drivers/pci/host/pcie-mediatek.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c
> index b58338f3ff60..79bd4b0a90a5 100644
> --- a/drivers/pci/host/pcie-mediatek.c
> +++ b/drivers/pci/host/pcie-mediatek.c
> @@ -653,6 +653,9 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
> val &= ~INTX_MASK;
> writel(val, port->base + PCIE_INT_MASK);
>
> + if (IS_ENABLED(CONFIG_PCI_MSI))
> + mtk_pcie_enable_msi(port);
> +
> /* Set AHB to PCIe translation windows */
> size = mem->end - mem->start;
> val = lower_32_bits(mem->start) | AHB2PCIE_SIZE(fls(size));
> --
> 2.17.1
Makes sense to me.
Acked-by: Andrea Righi <andrea.righi at canonical.com>
More information about the kernel-team
mailing list