Home| summaryrefslogtreecommitdiff |
diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2019-10-16 15:39:51 +0200 |
|---|---|---|
| committer | Michal Kubecek <mkubecek@suse.cz> | 2019-10-16 15:39:51 +0200 |
| commit | adff98892a872dc45263067b728af2d0598fba0f (patch) | |
| tree | b6abfd33bb308ee538ba9076f87d1e34024522c9 | |
| parent | f99dc97bcab8e805c47cd255977cb5ef942e6ccb (diff) | |
| parent | 284f3c9059562d3c9145e64d2f4ebae806945b04 (diff) | |
Merge branch 'users/ykaukab/SLE15-SP2/for-next' into SLE15-SP2rpm-5.3.6-1--SLE-15-SP2-Full-Alpha5rpm-5.3.6-1
Pull ARM patch cleanup and git-fixes from Mian Yousaf Kaukab.
4 files changed, 60 insertions, 7 deletions
diff --git a/patches.suse/0001-ahci-thunderx2-stop-engine-fix-update.patch b/patches.suse/0001-ahci-thunderx2-stop-engine-fix-update.patch index 509c280412..3ba09aba8a 100644 --- a/patches.suse/0001-ahci-thunderx2-stop-engine-fix-update.patch +++ b/patches.suse/0001-ahci-thunderx2-stop-engine-fix-update.patch @@ -27,11 +27,11 @@ index fe4aa8b87504..2d052078f7b7 100644 #ifdef CONFIG_ARM64 /* Rev Ax of Cavium CN99XX needs a hack for port stop */ -- if (MIDR_IS_CPU_MODEL_RANGE(read_cpuid_id(), +- if (midr_is_cpu_model_range(read_cpuid_id(), + if (dev_is_pci(ap->host->dev) && + to_pci_dev(ap->host->dev)->vendor == 0x14e4 && + to_pci_dev(ap->host->dev)->device == 0x9027 && -+ MIDR_IS_CPU_MODEL_RANGE(read_cpuid_id(), ++ midr_is_cpu_model_range(read_cpuid_id(), MIDR_CPU_MODEL(ARM_CPU_IMP_BRCM, BRCM_CPU_PART_VULCAN), MIDR_CPU_VAR_REV(0, 0), MIDR_CPU_VAR_REV(0, MIDR_REVISION_MASK))) { diff --git a/patches.suse/0013-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch b/patches.suse/0013-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch index c4bca79b91..108fbde860 100644 --- a/patches.suse/0013-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch +++ b/patches.suse/0013-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch @@ -48,7 +48,7 @@ index ee7db3119b18..fe4aa8b87504 100644 +#ifdef CONFIG_ARM64 + /* Rev Ax of Cavium CN99XX needs a hack for port stop */ -+ if (MIDR_IS_CPU_MODEL_RANGE(read_cpuid_id(), ++ if (midr_is_cpu_model_range(read_cpuid_id(), + MIDR_CPU_MODEL(ARM_CPU_IMP_BRCM, BRCM_CPU_PART_VULCAN), + MIDR_CPU_VAR_REV(0, 0), + MIDR_CPU_VAR_REV(0, MIDR_REVISION_MASK))) { diff --git a/patches.suse/pinctrl-rockchip-Mark-expected-switch-fall-through.patch b/patches.suse/pinctrl-rockchip-Mark-expected-switch-fall-through.patch new file mode 100644 index 0000000000..92a6dc0570 --- /dev/null +++ b/patches.suse/pinctrl-rockchip-Mark-expected-switch-fall-through.patch @@ -0,0 +1,50 @@ +From: Anders Roxell <anders.roxell@linaro.org> +Date: Fri, 26 Jul 2019 13:28:12 +0200 +Subject: pinctrl: rockchip: Mark expected switch fall-through +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Git-commit: cd927f140d5199c04270241fb675732275c2d20f +Patch-mainline: v5.4-rc1 +References: bsc#1154208 + +When fall-through warnings was enabled by default the following warning +was starting to show up: + +../drivers/pinctrl/pinctrl-rockchip.c: In function ‘rockchip_gpio_set_config’: +../drivers/pinctrl/pinctrl-rockchip.c:2783:3: warning: this statement may fall + through [-Wimplicit-fallthrough=] + rockchip_gpio_set_debounce(gc, offset, true); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +../drivers/pinctrl/pinctrl-rockchip.c:2795:2: note: here + default: + ^~~~~~~ + +Rework so that the compiler doesn't warn about fall-through. Add +'return -ENOTSUPP;' to match the comment. + +Fixes: d93512ef0f0e ("Makefile: Globally enable fall-through warning") +Signed-off-by: Anders Roxell <anders.roxell@linaro.org> +Link: https://lore.kernel.org/r/20190726112812.19665-1-anders.roxell@linaro.org +Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de> +--- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c +index 62a622159006..dc0bbf198cbc 100644 +--- a/drivers/pinctrl/pinctrl-rockchip.c ++++ b/drivers/pinctrl/pinctrl-rockchip.c +@@ -2792,6 +2792,7 @@ static int rockchip_gpio_set_config(struct gpio_chip *gc, unsigned int offset, + * still return -ENOTSUPP as before, to make sure the caller + * of gpiod_set_debounce won't change its behaviour. + */ ++ return -ENOTSUPP; + default: + return -ENOTSUPP; + } +-- +2.16.4 + diff --git a/series.conf b/series.conf index 59447cea05..36b5678d8c 100644 --- a/series.conf +++ b/series.conf @@ -404,6 +404,7 @@ patches.suse/0001-ipmi-move-message-error-checking-to-avoid-deadlock.patch patches.suse/platform-chrome-cros_ec_rpmsg-Fix-race-with-host-com.patch patches.suse/pinctrl-stmfx-update-pinconf-settings.patch + patches.suse/pinctrl-rockchip-Mark-expected-switch-fall-through.patch patches.suse/pinctrl-tegra-Fix-write-barrier-placement-in-pmx_wri.patch patches.suse/pinctrl-amd-disable-spurious-firing-GPIO-IRQs.patch patches.suse/pinctrl-meson-gxbb-Fix-wrong-pinning-definition-for-.patch @@ -1345,6 +1346,12 @@ patches.suse/PCI-mobiveil-Add-8-bit-and-16-bit-CSR-register-acces.patch patches.suse/PCI-mobiveil-Add-PCIe-Gen4-RC-driver-for-NXP-Layersc.patch + #CN99xx silicon revision Ax erratum + patches.suse/0001-PCI-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-earl.patch + patches.suse/0013-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch + patches.suse/0001-ahci-thunderx2-stop-engine-fix-update.patch + patches.suse/0001-ahci-thunderx2-update-stop-engine-errata-delay-value.patch + ######################################################## # Debugging ######################################################## @@ -1573,8 +1580,4 @@ # wqu +wqu patches.suse/0001-btrfs-qgroup-Make-qgroup-async-transaction-commit-mo.patch # yousaf.kaukab -+yousaf.kaukab patches.suse/0001-PCI-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-earl.patch -+yousaf.kaukab patches.suse/0001-ahci-thunderx2-stop-engine-fix-update.patch -+yousaf.kaukab patches.suse/0001-ahci-thunderx2-update-stop-engine-errata-delay-value.patch -+yousaf.kaukab patches.suse/0013-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch +yousaf.kaukab patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch |