kernel: bump 5.10 to 5.10.111

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch

diff --git a/target/linux/generic/backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch b/target/linux/generic/backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch
index afa8a1d9a254139b533dd54b48842aeca0d30f6c..dc01c5f85d7b502b0dfa6e5cb25a8157063f6c39 100644 (file)
--- a/target/linux/generic/backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch
+++ b/target/linux/generic/backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch
@@ -21,11 +21,9 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  drivers/pci/controller/pci-aardvark.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
-index 25af189a1052..71ce9f02d596 100644
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -116,6 +116,7 @@
+@@ -114,6 +114,7 @@
  #define PCIE_MSI_ADDR_HIGH_REG                        (CONTROL_BASE_ADDR + 0x54)
  #define PCIE_MSI_STATUS_REG                   (CONTROL_BASE_ADDR + 0x58)
  #define PCIE_MSI_MASK_REG                     (CONTROL_BASE_ADDR + 0x5C)
@@ -33,7 +31,7 @@ index 25af189a1052..71ce9f02d596 100644
  #define PCIE_MSI_PAYLOAD_REG                  (CONTROL_BASE_ADDR + 0x9C)
  #define     PCIE_MSI_DATA_MASK                        GENMASK(15, 0)
  
-@@ -571,6 +572,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
+@@ -577,6 +578,7 @@ static void advk_pcie_setup_hw(struct ad
        advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
  
        /* Clear all interrupts */
@@ -41,7 +39,7 @@ index 25af189a1052..71ce9f02d596 100644
        advk_writel(pcie, PCIE_ISR0_ALL_MASK, PCIE_ISR0_REG);
        advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
        advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
-@@ -583,7 +585,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
+@@ -589,7 +591,7 @@ static void advk_pcie_setup_hw(struct ad
        advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_MASK_REG);
  
        /* Unmask all MSIs */
@@ -50,7 +48,7 @@ index 25af189a1052..71ce9f02d596 100644
  
        /* Enable summary interrupt for GIC SPI source */
        reg = PCIE_IRQ_ALL_MASK & (~PCIE_IRQ_ENABLE_INTS_MASK);
-@@ -1399,7 +1401,7 @@ static void advk_pcie_handle_msi(struct advk_pcie *pcie)
+@@ -1397,7 +1399,7 @@ static void advk_pcie_handle_msi(struct
  
        msi_mask = advk_readl(pcie, PCIE_MSI_MASK_REG);
        msi_val = advk_readl(pcie, PCIE_MSI_STATUS_REG);
@@ -59,6 +57,3 @@ index 25af189a1052..71ce9f02d596 100644
  
        for (msi_idx = 0; msi_idx < MSI_IRQ_NUM; msi_idx++) {
                if (!(BIT(msi_idx) & msi_status))
--- 
-2.34.1
-