March 2020 - Linux-stable-mirror

[PATCH] drm: avoid spurious EBUSY due to nonblocking atomic modesets

by Daniel Vetter

When doing an atomic modeset with ALLOW_MODESET drivers are allowed to pull in arbitrary other resources, including CRTCs (e.g. when reconfiguring global resources). But in nonblocking mode userspace has then no idea this happened, which can lead to spurious EBUSY calls, both: - when that other CRTC is currently busy doing a page_flip the ALLOW_MODESET commit can fail with an EBUSY - on the other CRTC a normal atomic flip can fail with EBUSY because of the additional commit inserted by the kernel without userspace's knowledge For blocking commits this isn't a problem, because everyone else will just block until all the CRTC are reconfigured. Only thing userspace can notice is the dropped frames without any reason for why frames got dropped. Consensus is that we need new uapi to handle this properly, but no one has any idea what exactly the new uapi should look like. As a stop-gap plug this problem by demoting nonblocking commits which might cause issues by including CRTCs not in the original request to blocking commits. v2: Add comments and a WARN_ON to enforce this only when allowed - we don't want to silently convert page flips into blocking plane updates just because the driver is buggy. References: https://lists.freedesktop.org/archives/dri-devel/2018-July/182281.html Bugzilla: https://gitlab.freedesktop.org/wayland/weston/issues/24#note_9568 Cc: Daniel Stone <daniel(a)fooishbar.org> Cc: Pekka Paalanen <pekka.paalanen(a)collabora.co.uk> Cc: stable(a)vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> --- drivers/gpu/drm/drm_atomic.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index d5cefb1cb2a2..058512f14772 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -2018,15 +2018,43 @@ EXPORT_SYMBOL(drm_atomic_commit); int drm_atomic_nonblocking_commit(struct drm_atomic_state *state) { struct drm_mode_config *config = &state->dev->mode_config; - int ret; + unsigned requested_crtc = 0; + unsigned affected_crtc = 0; + struct drm_crtc *crtc; + struct drm_crtc_state *crtc_state; + bool nonblocking = true; + int ret, i; + + /* + * For commits that allow modesets drivers can add other CRTCs to the + * atomic commit, e.g. when they need to reallocate global resources. + * + * But when userspace also requests a nonblocking commit then userspace + * cannot know that the commit affects other CRTCs, which can result in + * spurious EBUSY failures. Until we have better uapi plug this by + * demoting such commits to blocking mode. + */ + for_each_new_crtc_in_state(state, crtc, crtc_state, i) + requested_crtc |= drm_crtc_mask(crtc); ret = drm_atomic_check_only(state); if (ret) return ret; - DRM_DEBUG_ATOMIC("committing %p nonblocking\n", state); + for_each_new_crtc_in_state(state, crtc, crtc_state, i) + affected_crtc |= drm_crtc_mask(crtc); + + if (affected_crtc != requested_crtc) { + /* adding other CRTC is only allowed for modeset commits */ + WARN_ON(state->allow_modeset); + + DRM_DEBUG_ATOMIC("demoting %p to blocking mode to avoid EBUSY\n", state); + nonblocking = false; + } else { + DRM_DEBUG_ATOMIC("committing %p nonblocking\n", state); + } - return config->funcs->atomic_commit(state->dev, state, true); + return config->funcs->atomic_commit(state->dev, state, nonblocking); } EXPORT_SYMBOL(drm_atomic_nonblocking_commit); -- 2.18.0

4 years

3
11
0 0

[PATCH] [Patch v2] usbtv: Fix refcounting mixup

by Oliver Neukum

The premature free in the error path is blocked by V4L refcounting, not USB refcounting. Thanks to Ben Hutchings for review. [v2] corrected attributions Signed-off-by: Oliver Neukum <oneukum(a)suse.com> Fixes: 50e704453553 ("media: usbtv: prevent double free in error case") CC: stable(a)vger.kernel.org Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> --- drivers/media/usb/usbtv/usbtv-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c index 5095c380b2c1..4a03c4d66314 100644 --- a/drivers/media/usb/usbtv/usbtv-core.c +++ b/drivers/media/usb/usbtv/usbtv-core.c @@ -113,7 +113,8 @@ static int usbtv_probe(struct usb_interface *intf, usbtv_audio_fail: /* we must not free at this point */ - usb_get_dev(usbtv->udev); + v4l2_device_get(&usbtv->v4l2_dev); + /* this will undo the v4l2_device_get() */ usbtv_video_free(usbtv); usbtv_video_fail: -- 2.13.6

4 years

3
7
0 0

[PATCH AUTOSEL 4.14 01/33] iommu/arm-smmu: Free context bitmap in the err path of arm_smmu_init_domain_context

by Sasha Levin

From: Liu Xiang <liuxiang_1999(a)126.com> [ Upstream commit 6db7bfb431220d78e34d2d0afdb7c12683323588 ] When alloc_io_pgtable_ops is failed, context bitmap which is just allocated by __arm_smmu_alloc_bitmap should be freed to release the resource. Signed-off-by: Liu Xiang <liuxiang_1999(a)126.com> Signed-off-by: Will Deacon <will(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/iommu/arm-smmu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index c38cf03c099ed..f97c26c90c41f 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -922,6 +922,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, return 0; out_clear_smmu: + __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); smmu_domain->smmu = NULL; out_unlock: mutex_unlock(&smmu_domain->init_mutex); -- 2.20.1

4 years

3
36
0 0

Re: [PATCH 1/2] mm: memcontrol: flush percpu vmstats before releasing memcg

by Roman Gushchin

On Tue, Aug 13, 2019 at 02:27:52PM -0700, Andrew Morton wrote: > On Mon, 12 Aug 2019 15:29:10 -0700 Roman Gushchin <guro(a)fb.com> wrote: > > > Percpu caching of local vmstats with the conditional propagation > > by the cgroup tree leads to an accumulation of errors on non-leaf > > levels. > > > > Let's imagine two nested memory cgroups A and A/B. Say, a process > > belonging to A/B allocates 100 pagecache pages on the CPU 0. > > The percpu cache will spill 3 times, so that 32*3=96 pages will be > > accounted to A/B and A atomic vmstat counters, 4 pages will remain > > in the percpu cache. > > > > Imagine A/B is nearby memory.max, so that every following allocation > > triggers a direct reclaim on the local CPU. Say, each such attempt > > will free 16 pages on a new cpu. That means every percpu cache will > > have -16 pages, except the first one, which will have 4 - 16 = -12. > > A/B and A atomic counters will not be touched at all. > > > > Now a user removes A/B. All percpu caches are freed and corresponding > > vmstat numbers are forgotten. A has 96 pages more than expected. > > > > As memory cgroups are created and destroyed, errors do accumulate. > > Even 1-2 pages differences can accumulate into large numbers. > > > > To fix this issue let's accumulate and propagate percpu vmstat > > values before releasing the memory cgroup. At this point these > > numbers are stable and cannot be changed. > > > > Since on cpu hotplug we do flush percpu vmstats anyway, we can > > iterate only over online cpus. > > > > Fixes: 42a300353577 ("mm: memcontrol: fix recursive statistics correctness & scalabilty") > > Is this not serious enough for a cc:stable? I hope the "Fixes" tag will work, but yeah, my bad, cc:stable is definitely a good idea here. Added stable@ to cc. Thanks!

4 years, 1 month

2
1
0 0

[PATCH 1/2] i2c: i801: Fix runtime PM

by Jarkko Nikula

Commit 9c8088c7988 ("i2c: i801: Don't restore config registers on runtime PM") nullified the runtime PM suspend/resume callback pointers while keeping the runtime PM enabled. This causes that device stays in D0 power state and sysfs /sys/bus/pci/devices/.../power/runtime_status shows "error" when runtime PM framework attempts to autosuspend the device. This is due PCI bus runtime PM which checks for driver runtime PM callbacks and returns with -ENOSYS if they are not set. Fix this by having a shared dummy runtime PM callback that returns with success. Fixes: a9c8088c7988 ("i2c: i801: Don't restore config registers on runtime PM") Reported-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- drivers/i2c/busses/i2c-i801.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index aa726607645e..3747484c2669 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1731,7 +1731,20 @@ static int i801_resume(struct device *dev) } #endif -static SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); +static int __maybe_unused i801_runtime_nop(struct device *dev) +{ + /* + * PCI core expects runtime PM suspend/resume callbacks return + * successfully before really suspending/resuming the device. + * Have a shared dummy callback that returns with success. + */ + return 0; +} + +static const struct dev_pm_ops i801_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(i801_suspend, i801_resume) + SET_RUNTIME_PM_OPS(i801_runtime_nop, i801_runtime_nop, NULL) +}; static struct pci_driver i801_driver = { .name = "i801_smbus", -- 2.18.0

4 years, 1 month

5
6
0 0

[PATCH AUTOSEL 5.4 01/58] ACPI: watchdog: Allow disabling WDAT at boot

by Sasha Levin

From: Jean Delvare <jdelvare(a)suse.de> [ Upstream commit 3f9e12e0df012c4a9a7fd7eb0d3ae69b459d6b2c ] In case the WDAT interface is broken, give the user an option to ignore it to let a native driver bind to the watchdog device instead. Signed-off-by: Jean Delvare <jdelvare(a)suse.de> Acked-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- Documentation/admin-guide/kernel-parameters.txt | 4 ++++ drivers/acpi/acpi_watchdog.c | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 5594c8bf1dcd4..b5c933fa971f3 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -136,6 +136,10 @@ dynamic table installation which will install SSDT tables to /sys/firmware/acpi/tables/dynamic. + acpi_no_watchdog [HW,ACPI,WDT] + Ignore the ACPI-based watchdog interface (WDAT) and let + a native driver control the watchdog device instead. + acpi_rsdp= [ACPI,EFI,KEXEC] Pass the RSDP address to the kernel, mostly used on machines running EFI runtime service to boot the diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c index b5516b04ffc07..ab6e434b4cee0 100644 --- a/drivers/acpi/acpi_watchdog.c +++ b/drivers/acpi/acpi_watchdog.c @@ -55,12 +55,14 @@ static bool acpi_watchdog_uses_rtc(const struct acpi_table_wdat *wdat) } #endif +static bool acpi_no_watchdog; + static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void) { const struct acpi_table_wdat *wdat = NULL; acpi_status status; - if (acpi_disabled) + if (acpi_disabled || acpi_no_watchdog) return NULL; status = acpi_get_table(ACPI_SIG_WDAT, 0, @@ -88,6 +90,14 @@ bool acpi_has_watchdog(void) } EXPORT_SYMBOL_GPL(acpi_has_watchdog); +/* ACPI watchdog can be disabled on boot command line */ +static int __init disable_acpi_watchdog(char *str) +{ + acpi_no_watchdog = true; + return 1; +} +__setup("acpi_no_watchdog", disable_acpi_watchdog); + void __init acpi_watchdog_init(void) { const struct acpi_wdat_entry *entries; -- 2.20.1

4 years, 1 month

2
42
0 0

[PATCH] pinctrl: cherryview: Add quirk with custom translation of ACPI GPIO numbers

by Michal Stanek

Dropping custom Linux GPIO translation caused some Intel_Strago based Chromebooks with old firmware to detect GPIOs incorrectly. Add quirk which restores some code removed by commit 03c4749dd6c7ff94 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux GPIO translation"). Fixes: 03c4749dd6c7ff94 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux GPIO translation") Cc: <stable(a)vger.kernel.org> Reported-by: Alex Levin <levinale(a)chromium.org> Signed-off-by: Michal Stanek <mst(a)semihalf.com> --- drivers/gpio/gpiolib-acpi.c | 102 ++++++++++++++++++++- drivers/pinctrl/intel/pinctrl-cherryview.c | 63 ++++++++++--- 2 files changed, 150 insertions(+), 15 deletions(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 31fee5e918b7..b5358facf3fb 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -23,6 +23,7 @@ #define QUIRK_NO_EDGE_EVENTS_ON_BOOT 0x01l #define QUIRK_NO_WAKEUP 0x02l +#define QUIRK_NEED_ACPI_GPIO_TRANSLATION 0x04l static int run_edge_events_on_boot = -1; module_param(run_edge_events_on_boot, int, 0444); @@ -34,6 +35,11 @@ module_param(honor_wakeup, int, 0444); MODULE_PARM_DESC(honor_wakeup, "Honor the ACPI wake-capable flag: 0=no, 1=yes, -1=auto"); +static int need_acpi_gpio_translation = -1; +module_param(need_acpi_gpio_translation, int, 0444); +MODULE_PARM_DESC(need_acpi_gpio_translation, + "Do custom ACPI GPIO number translation: 0=no, 1=yes, -1=auto"); + /** * struct acpi_gpio_event - ACPI GPIO event handler data * @@ -98,6 +104,62 @@ static int acpi_gpiochip_find(struct gpio_chip *gc, void *data) return ACPI_HANDLE(gc->parent) == data; } +#ifdef CONFIG_PINCTRL +/** + * acpi_gpiochip_pin_to_gpio_offset() - translates ACPI GPIO to Linux GPIO + * @gdev: GPIO device + * @pin: ACPI GPIO pin number from GpioIo/GpioInt resource + * + * Function takes ACPI GpioIo/GpioInt pin number as a parameter and + * translates it to a corresponding offset suitable to be passed to a + * GPIO controller driver. + * + * Typically the returned offset is same as @pin, but if the GPIO + * controller uses pin controller and the mapping is not contiguous the + * offset might be different. + */ +static int acpi_gpiochip_pin_to_gpio_offset(struct gpio_device *gdev, int pin) +{ + struct gpio_pin_range *pin_range; + + /* Only do translation on selected platforms */ + if (!need_acpi_gpio_translation) + return pin; + + /* If there are no ranges in this chip, use 1:1 mapping */ + if (list_empty(&gdev->pin_ranges)) + return pin; + + list_for_each_entry(pin_range, &gdev->pin_ranges, node) { + const struct pinctrl_gpio_range *range = &pin_range->range; + int i; + + if (range->pins) { + for (i = 0; i < range->npins; i++) { + if (range->pins[i] == pin) + return range->base + i - gdev->base; + } + } else { + if (pin >= range->pin_base && + pin < range->pin_base + range->npins) { + unsigned int gpio_base; + + gpio_base = range->base - gdev->base; + return gpio_base + pin - range->pin_base; + } + } + } + + return -EINVAL; +} +#else +static inline int acpi_gpiochip_pin_to_gpio_offset(struct gpio_device *gdev, + int pin) +{ + return pin; +} +#endif + /** * acpi_get_gpiod() - Translate ACPI GPIO pin to GPIO descriptor usable with GPIO API * @path: ACPI GPIO controller full path name, (e.g. "\\_SB.GPO1") @@ -113,6 +175,7 @@ static struct gpio_desc *acpi_get_gpiod(char *path, int pin) struct gpio_chip *chip; acpi_handle handle; acpi_status status; + int offset; status = acpi_get_handle(NULL, path, &handle); if (ACPI_FAILURE(status)) @@ -122,7 +185,11 @@ static struct gpio_desc *acpi_get_gpiod(char *path, int pin) if (!chip) return ERR_PTR(-EPROBE_DEFER); - return gpiochip_get_desc(chip, pin); + offset = acpi_gpiochip_pin_to_gpio_offset(chip->gpiodev, pin); + if (offset < 0) + return ERR_PTR(offset); + + return gpiochip_get_desc(chip, offset); } static irqreturn_t acpi_gpio_irq_handler(int irq, void *data) @@ -236,6 +303,10 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares, if (!handler) return AE_OK; + pin = acpi_gpiochip_pin_to_gpio_offset(chip->gpiodev, pin); + if (pin < 0) + return AE_BAD_PARAMETER; + desc = gpiochip_request_own_desc(chip, pin, "ACPI:Event", GPIO_ACTIVE_HIGH, GPIOD_IN); if (IS_ERR(desc)) { @@ -958,6 +1029,12 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, struct gpio_desc *desc; bool found; + pin = acpi_gpiochip_pin_to_gpio_offset(chip->gpiodev, pin); + if (pin < 0) { + status = AE_BAD_PARAMETER; + goto out; + } + mutex_lock(&achip->conn_lock); found = false; @@ -1086,7 +1163,11 @@ acpi_gpiochip_parse_own_gpio(struct acpi_gpio_chip *achip, if (ret < 0) return ERR_PTR(ret); - desc = gpiochip_get_desc(chip, gpios[0]); + ret = acpi_gpiochip_pin_to_gpio_offset(chip->gpiodev, gpios[0]); + if (ret < 0) + return ERR_PTR(ret); + + desc = gpiochip_get_desc(chip, ret); if (IS_ERR(desc)) return desc; @@ -1360,6 +1441,17 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] = { }, .driver_data = (void *)QUIRK_NO_WAKEUP, }, + { + /* + * Some Braswell based Google Chromebooks need custom ACPI GPIO + * number translation due to hardcoded GPIO numbers in firmware. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), + DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"), + }, + .driver_data = (void *)QUIRK_NEED_ACPI_GPIO_TRANSLATION, + }, {} /* Terminating entry */ }; @@ -1385,6 +1477,12 @@ static int acpi_gpio_setup_params(void) else honor_wakeup = 1; } + if (need_acpi_gpio_translation < 0) { + if (quirks & QUIRK_NEED_ACPI_GPIO_TRANSLATION) + need_acpi_gpio_translation = 1; + else + need_acpi_gpio_translation = 0; + } return 0; } diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 4c74fdde576d..dd190ac6b11c 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -119,6 +119,7 @@ struct chv_gpio_pinrange { * @nfunctions: Number of functions * @gpio_ranges: An array of GPIO ranges in this community * @ngpio_ranges: Number of GPIO ranges + * @ngpios: Total number of GPIOs in this community * @nirqs: Total number of IRQs this community can generate * @acpi_space_id: An address space ID for ACPI OpRegion handler */ @@ -132,6 +133,7 @@ struct chv_community { size_t nfunctions; const struct chv_gpio_pinrange *gpio_ranges; size_t ngpio_ranges; + size_t ngpios; size_t nirqs; acpi_adr_space_type acpi_space_id; }; @@ -380,6 +382,7 @@ static const struct chv_community southwest_community = { .nfunctions = ARRAY_SIZE(southwest_functions), .gpio_ranges = southwest_gpio_ranges, .ngpio_ranges = ARRAY_SIZE(southwest_gpio_ranges), + .ngpios = ARRAY_SIZE(southwest_pins), /* * Southwest community can generate GPIO interrupts only for the * first 8 interrupts. The upper half (8-15) can only be used to @@ -469,6 +472,7 @@ static const struct chv_community north_community = { .npins = ARRAY_SIZE(north_pins), .gpio_ranges = north_gpio_ranges, .ngpio_ranges = ARRAY_SIZE(north_gpio_ranges), + .ngpios = ARRAY_SIZE(north_pins), /* * North community can generate GPIO interrupts only for the first * 8 interrupts. The upper half (8-15) can only be used to trigger @@ -517,6 +521,7 @@ static const struct chv_community east_community = { .npins = ARRAY_SIZE(east_pins), .gpio_ranges = east_gpio_ranges, .ngpio_ranges = ARRAY_SIZE(east_gpio_ranges), + .ngpios = ARRAY_SIZE(east_pins), .nirqs = 16, .acpi_space_id = 0x93, }; @@ -643,6 +648,7 @@ static const struct chv_community southeast_community = { .nfunctions = ARRAY_SIZE(southeast_functions), .gpio_ranges = southeast_gpio_ranges, .ngpio_ranges = ARRAY_SIZE(southeast_gpio_ranges), + .ngpios = ARRAY_SIZE(southeast_pins), .nirqs = 16, .acpi_space_id = 0x94, }; @@ -1236,14 +1242,39 @@ static struct pinctrl_desc chv_pinctrl_desc = { .owner = THIS_MODULE, }; +static const struct dmi_system_id need_acpi_gpio_translation[] = { + { + /* + * Some Braswell based Google Chromebooks need custom ACPI GPIO + * number translation due to hardcoded GPIO numbers in firmware. + */ + .ident = "Intel_Strago based Chromebooks (All models)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), + DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"), + }, + }, +}; + +static unsigned int chv_gpio_offset_to_pin(struct chv_pinctrl *pctrl, + unsigned int offset) +{ + /* Mapping is not 1:1 on some platforms */ + if (dmi_check_system(need_acpi_gpio_translation)) + return pctrl->community->pins[offset].number; + else + return offset; +} + static int chv_gpio_get(struct gpio_chip *chip, unsigned int offset) { struct chv_pinctrl *pctrl = gpiochip_get_data(chip); + unsigned int pin = chv_gpio_offset_to_pin(pctrl, offset); unsigned long flags; u32 ctrl0, cfg; raw_spin_lock_irqsave(&chv_lock, flags); - ctrl0 = readl(chv_padreg(pctrl, offset, CHV_PADCTRL0)); + ctrl0 = readl(chv_padreg(pctrl, pin, CHV_PADCTRL0)); raw_spin_unlock_irqrestore(&chv_lock, flags); cfg = ctrl0 & CHV_PADCTRL0_GPIOCFG_MASK; @@ -1257,13 +1288,14 @@ static int chv_gpio_get(struct gpio_chip *chip, unsigned int offset) static void chv_gpio_set(struct gpio_chip *chip, unsigned int offset, int value) { struct chv_pinctrl *pctrl = gpiochip_get_data(chip); + unsigned int pin = chv_gpio_offset_to_pin(pctrl, offset); unsigned long flags; void __iomem *reg; u32 ctrl0; raw_spin_lock_irqsave(&chv_lock, flags); - reg = chv_padreg(pctrl, offset, CHV_PADCTRL0); + reg = chv_padreg(pctrl, pin, CHV_PADCTRL0); ctrl0 = readl(reg); if (value) @@ -1279,11 +1311,12 @@ static void chv_gpio_set(struct gpio_chip *chip, unsigned int offset, int value) static int chv_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) { struct chv_pinctrl *pctrl = gpiochip_get_data(chip); + unsigned int pin = chv_gpio_offset_to_pin(pctrl, offset); u32 ctrl0, direction; unsigned long flags; raw_spin_lock_irqsave(&chv_lock, flags); - ctrl0 = readl(chv_padreg(pctrl, offset, CHV_PADCTRL0)); + ctrl0 = readl(chv_padreg(pctrl, pin, CHV_PADCTRL0)); raw_spin_unlock_irqrestore(&chv_lock, flags); direction = ctrl0 & CHV_PADCTRL0_GPIOCFG_MASK; @@ -1322,7 +1355,7 @@ static void chv_gpio_irq_ack(struct irq_data *d) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct chv_pinctrl *pctrl = gpiochip_get_data(gc); - int pin = irqd_to_hwirq(d); + unsigned int pin = chv_gpio_offset_to_pin(pctrl, irqd_to_hwirq(d)); u32 intr_line; raw_spin_lock(&chv_lock); @@ -1339,7 +1372,7 @@ static void chv_gpio_irq_mask_unmask(struct irq_data *d, bool mask) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct chv_pinctrl *pctrl = gpiochip_get_data(gc); - int pin = irqd_to_hwirq(d); + unsigned int pin = chv_gpio_offset_to_pin(pctrl, irqd_to_hwirq(d)); u32 value, intr_line; unsigned long flags; @@ -1384,7 +1417,8 @@ static unsigned chv_gpio_irq_startup(struct irq_data *d) if (irqd_get_trigger_type(d) == IRQ_TYPE_NONE) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct chv_pinctrl *pctrl = gpiochip_get_data(gc); - unsigned int pin = irqd_to_hwirq(d); + unsigned int offset = irqd_to_hwirq(d); + unsigned int pin = chv_gpio_offset_to_pin(pctrl, offset); irq_flow_handler_t handler; unsigned long flags; u32 intsel, value; @@ -1402,7 +1436,7 @@ static unsigned chv_gpio_irq_startup(struct irq_data *d) if (!pctrl->intr_lines[intsel]) { irq_set_handler_locked(d, handler); - pctrl->intr_lines[intsel] = pin; + pctrl->intr_lines[intsel] = offset; } raw_spin_unlock_irqrestore(&chv_lock, flags); } @@ -1415,7 +1449,8 @@ static int chv_gpio_irq_type(struct irq_data *d, unsigned int type) { struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct chv_pinctrl *pctrl = gpiochip_get_data(gc); - unsigned int pin = irqd_to_hwirq(d); + unsigned int offset = irqd_to_hwirq(d); + unsigned int pin = chv_gpio_offset_to_pin(pctrl, offset); unsigned long flags; u32 value; @@ -1461,7 +1496,7 @@ static int chv_gpio_irq_type(struct irq_data *d, unsigned int type) value &= CHV_PADCTRL0_INTSEL_MASK; value >>= CHV_PADCTRL0_INTSEL_SHIFT; - pctrl->intr_lines[value] = pin; + pctrl->intr_lines[value] = offset; if (type & IRQ_TYPE_EDGE_BOTH) irq_set_handler_locked(d, handle_edge_irq); @@ -1591,17 +1626,19 @@ static int chv_gpio_add_pin_ranges(struct gpio_chip *chip) struct chv_pinctrl *pctrl = gpiochip_get_data(chip); const struct chv_community *community = pctrl->community; const struct chv_gpio_pinrange *range; - int ret, i; + int ret, i, offset; - for (i = 0; i < community->ngpio_ranges; i++) { + for (i = 0, offset = 0; i < community->ngpio_ranges; i++) { range = &community->gpio_ranges[i]; ret = gpiochip_add_pin_range(chip, dev_name(pctrl->dev), - range->base, range->base, + offset, range->base, range->npins); if (ret) { dev_err(pctrl->dev, "failed to add GPIO pin range\n"); return ret; } + + offset += range->npins; } return 0; @@ -1617,7 +1654,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq) *chip = chv_gpio_chip; - chip->ngpio = community->pins[community->npins - 1].number + 1; + chip->ngpio = community->ngpios; chip->label = dev_name(pctrl->dev); chip->add_pin_ranges = chv_gpio_add_pin_ranges; chip->parent = pctrl->dev; -- 2.17.1

4 years, 1 month

7
15
0 0

[PATCH 4.9 00/22] 4.9.148-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.148 release. There are 22 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun Dec 30 11:31:00 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.148-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.148-rc1 Gustavo A. R. Silva <gustavo(a)embeddedor.com> drm/ioctl: Fix Spectre v1 vulnerabilities Ivan Delalande <colona(a)arista.com> proc/sysctl: don't return ENOMEM on lookup when a table is unregistering Sergey Senozhatsky <sergey.senozhatsky.work(a)gmail.com> panic: avoid deadlocks in re-entrant console drivers Richard Weinberger <richard(a)nod.at> ubifs: Handle re-linking of inodes correctly while recovery Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> x86/fpu: Disable bottom halves while loading FPU registers Colin Ian King <colin.king(a)canonical.com> x86/mtrr: Don't copy uninitialized gentry fields back to userspace Dexuan Cui <decui(a)microsoft.com> Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels Christophe Leroy <christophe.leroy(a)c-s.fr> gpio: max7301: fix driver for use with CONFIG_VMAP_STACK Russell King <rmk+kernel(a)armlinux.org.uk> mmc: omap_hsmmc: fix DMA API warning Ulf Hansson <ulf.hansson(a)linaro.org> mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl Ulf Hansson <ulf.hansson(a)linaro.org> mmc: core: Allow BKOPS and CACHE ctrl even if no HPI support Ulf Hansson <ulf.hansson(a)linaro.org> mmc: core: Reset HPI enabled state during re-init and in case of errors Jörgen Storvist <jorgen.storvist(a)gmail.com> USB: serial: option: add Telit LN940 series Jörgen Storvist <jorgen.storvist(a)gmail.com> USB: serial: option: add Fibocom NL668 series Jörgen Storvist <jorgen.storvist(a)gmail.com> USB: serial: option: add Simcom SIM7500/SIM7600 (MBIM mode) Tore Anderson <tore(a)fud.no> USB: serial: option: add HP lt4132 Jörgen Storvist <jorgen.storvist(a)gmail.com> USB: serial: option: add GosunCn ZTE WeLink ME3630 Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: Don't prevent USB2 bus suspend in state check intended for USB3 only Hui Peng <benquike(a)gmail.com> USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data Bart Van Assche <bart.vanassche(a)wdc.com> ib_srpt: Fix a use-after-free in __srpt_close_all_ch() Mikulas Patocka <mpatocka(a)redhat.com> block: fix infinite loop if the device loses discard capability Jens Axboe <axboe(a)kernel.dk> block: break discard submissions into the user defined size ------------- Diffstat: Makefile | 4 ++-- arch/x86/kernel/cpu/mtrr/if.c | 2 ++ arch/x86/kernel/fpu/signal.c | 4 ++-- block/blk-lib.c | 22 ++++++++++++++++++--- drivers/gpio/gpio-max7301.c | 12 +++--------- drivers/gpu/drm/drm_ioctl.c | 10 ++++++++-- drivers/hv/vmbus_drv.c | 20 +++++++++++++++++++ drivers/infiniband/ulp/srpt/ib_srpt.c | 4 ++-- drivers/mmc/core/mmc.c | 24 ++++++++++++++--------- drivers/mmc/host/omap_hsmmc.c | 12 +++++++++++- drivers/net/usb/hso.c | 18 +++++++++++++++-- drivers/usb/host/xhci-hub.c | 3 ++- drivers/usb/serial/option.c | 16 ++++++++++++++- fs/proc/proc_sysctl.c | 13 ++++++------ fs/ubifs/replay.c | 37 +++++++++++++++++++++++++++++++++++ kernel/panic.c | 6 +++++- 16 files changed, 165 insertions(+), 42 deletions(-)

4 years, 2 months

6
28
0 0

[PATCH 5.2 000/313] 5.2.19-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.2.19 release. There are 313 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat 05 Oct 2019 03:37:47 PM UTC. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.19-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.2.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.2.19-rc1 Pi-Hsun Shih <pihsun(a)chromium.org> platform/chrome: cros_ec_rpmsg: Fix race with host command when probe failed Lorenzo Bianconi <lorenzo(a)kernel.org> mt76: mt7615: fix mt7615 firmware path definitions Lorenzo Bianconi <lorenzo(a)kernel.org> mt76: mt7615: always release sem in mt7615_load_patch NeilBrown <neilb(a)suse.de> md/raid0: avoid RAID0 data corruption due to layout confusion. Kai-Heng Feng <kai.heng.feng(a)canonical.com> drm/amd/display: Restore backlight brightness after system resume Pavel Shilovsky <pshilov(a)microsoft.com> CIFS: Fix oplock handling for SMB 2.1+ protocols Murphy Zhou <jencce.kernel(a)gmail.com> CIFS: fix max ea value size Chris Brandt <chris.brandt(a)renesas.com> i2c: riic: Clear NACK in tend isr Laurent Vivier <lvivier(a)redhat.com> hwrng: core - don't wait on add_early_randomness() Chao Yu <yuchao0(a)huawei.com> quota: fix wrong condition in is_quota_modification() Theodore Ts'o <tytso(a)mit.edu> ext4: fix punch hole for inline_data file systems Rakesh Pandit <rakesh(a)tuxera.com> ext4: fix warning inside ext4_convert_unwritten_extents_endio Christophe Kerello <christophe.kerello(a)st.com> mtd: rawnand: stm32_fmc2: avoid warnings when building with W=1 option Tony Camuso <tcamuso(a)redhat.com> ipmi: move message error checking to avoid deadlock Jan Kara <jack(a)suse.cz> xfs: Fix stale data exposure when readahead races with hole punch Jan Kara <jack(a)suse.cz> mm: Handle MADV_WILLNEED through vfs_fadvise() Jan Kara <jack(a)suse.cz> fs: Export generic_fadvise() Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> /dev/mem: Bail out upon SIGKILL. Denis Kenzior <denkenz(a)gmail.com> cfg80211: Purge frame registrations on iftype change NeilBrown <neilb(a)suse.com> md: only call set_in_sync() when it is expected to succeed. NeilBrown <neilb(a)suse.com> md: don't report active array_state until after revalidate_disk() completes. Xiao Ni <xni(a)redhat.com> md/raid6: Set R5_ReadError when there is read failure on parity disk Jarkko Nikula <jarkko.nikula(a)linux.intel.com> ACPI / LPSS: Save/restore LPSS private registers also on Lynxpoint Benjamin Coddington <bcodding(a)redhat.com> SUNRPC: Fix buffer handling of GSS MIC without slack Trond Myklebust <trondmy(a)gmail.com> SUNRPC: Dequeue the request from the receive queue while we're re-encoding Filipe Manana <fdmanana(a)suse.com> Btrfs: fix race setting up and completing qgroup rescan workers Qu Wenruo <wqu(a)suse.com> btrfs: qgroup: Fix reserved data space leak if we have multiple reserve calls Qu Wenruo <wqu(a)suse.com> btrfs: qgroup: Fix the wrong target io_tree when freeing reserved data space Dennis Zhou <dennis(a)kernel.org> btrfs: adjust dirty_metadata_bytes after writeback failure of extent buffer Nikolay Borisov <nborisov(a)suse.com> btrfs: Relinquish CPUs in btrfs_compare_trees Filipe Manana <fdmanana(a)suse.com> Btrfs: fix use-after-free when using the tree modification log Christophe Leroy <christophe.leroy(a)c-s.fr> btrfs: fix allocation of free space cache v1 bitmap pages Mark Salyzyn <salyzyn(a)android.com> ovl: filter of trusted xattr results in audit Ding Xiang <dingxiang(a)cmss.chinamobile.com> ovl: Fix dereferencing possible ERR_PTR() Steve French <stfrench(a)microsoft.com> smb3: fix leak in "open on server" perf counter Steve French <stfrench(a)microsoft.com> smb3: allow disabling requesting leases Yufen Yu <yuyufen(a)huawei.com> block: fix null pointer dereference in blk_mq_rq_timed_out() Damien Le Moal <damien.lemoal(a)wdc.com> block: mq-deadline: Fix queue restart handling Stefan Assmann <sassmann(a)kpanic.de> i40e: check __I40E_VF_DISABLE bit in i40e_sync_filters_subtask Rakesh Pillai <pillair(a)codeaurora.org> ath10k: fix channel info parsing for non tlv target Jian-Hong Pan <jian-hong(a)endlessm.com> rtw88: pci: Use DMA sync instead of remapping in RX ISR Jian-Hong Pan <jian-hong(a)endlessm.com> rtw88: pci: Rearrange the memory usage for skb in RX ISR Roberto Sassu <roberto.sassu(a)huawei.com> KEYS: trusted: correctly initialize digests and fix locking issue Felix Fietkau <nbd(a)nbd.name> mt76: round up length on mt76_wr_copy Dave Rodgman <dave.rodgman(a)arm.com> lib/lzo/lzo1x_compress.c: fix alignment bug in lzo-rle Michal Hocko <mhocko(a)suse.com> memcg, kmem: do not fail __GFP_NOFAIL charges Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> memcg, oom: don't require __GFP_FS when invoking memcg OOM killer Yafang Shao <laoar.shao(a)gmail.com> mm/compaction.c: clear total_{migrate,free}_scanned before scanning a new zone Vitaly Wool <vitalywool(a)gmail.com> z3fold: fix memory leak in kmem cache Vitaly Wool <vitalywool(a)gmail.com> z3fold: fix retry mechanism in page reclaim Bob Peterson <rpeterso(a)redhat.com> gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps Hans de Goede <hdegoede(a)redhat.com> efifb: BGRT: Improve efifb_bgrt_sanity_check Mark Brown <broonie(a)kernel.org> regulator: Defer init completion for a while after late_initcall Nadav Amit <namit(a)vmware.com> iommu/vt-d: Fix wrong analysis whether devices share the same bus Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP Will Deacon <will(a)kernel.org> iommu/arm-smmu-v3: Disable detection of ATS and PRI Shawn Lin <shawn.lin(a)rock-chips.com> arm64: dts: rockchip: limit clock rate of MMC controllers for RK3328 Will Deacon <will(a)kernel.org> arm64: tlb: Ensure we execute an ISB following walk cache invalidation Luis Araneda <luaraneda(a)gmail.com> ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up Lihua Yao <ylhuajnu(a)outlook.com> ARM: samsung: Fix system restart on S3C6410 Amadeusz Sławiński <amadeuszx.slawinski(a)intel.com> ASoC: Intel: Fix use of potentially uninitialized variable Amadeusz Sławiński <amadeuszx.slawinski(a)intel.com> ASoC: Intel: Skylake: Use correct function to access iomem space Amadeusz Sławiński <amadeuszx.slawinski(a)intel.com> ASoC: Intel: NHLT: Fix debug print format Kees Cook <keescook(a)chromium.org> binfmt_elf: Do not move brk for INTERP-less ET_EXEC Vladimir Oltean <olteanv(a)gmail.com> spi: spi-fsl-dspi: Exit the ISR with IRQ_NONE when it's not ours Alexander Sverdlin <alexander.sverdlin(a)gmail.com> spi: ep93xx: Repair SPI CS lookup tables Arnd Bergmann <arnd(a)arndb.de> media: don't drop front-end reference count for ->detach Hans de Goede <hdegoede(a)redhat.com> media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: videobuf-core.c: poll_wait needs a non-NULL buf pointer Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86/mmu: Use fast invalidate mechanism to zap MMIO sptes Alexander Graf <graf(a)amazon.com> KVM: x86: Disable posted interrupts for non-standard IRQs delivery modes Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86: Manually calculate reserved bits when loading PDPTRS Jan Dakinevich <jan.dakinevich(a)virtuozzo.com> KVM: x86: set ctxt->have_exception in x86_decode_insn() Jan Dakinevich <jan.dakinevich(a)virtuozzo.com> KVM: x86: always stop emulation on page fault Hans de Goede <hdegoede(a)redhat.com> platform/x86: intel_int0002_vgpio: Fix wakeups not working on Cherry Trail Helge Deller <deller(a)gmx.de> parisc: Disable HP HSC-PCI Cards to prevent kernel crash Tejun Heo <tj(a)kernel.org> fuse: fix beyond-end-of-page access in fuse_parse_cache() Vasily Averin <vvs(a)virtuozzo.com> fuse: fix missing unlock_page in fuse_writepage() Eric Biggers <ebiggers(a)google.com> fuse: fix deadlock with aio poll and fuse_iqueue::waitq.lock Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> tpm: Wrap the buffer from the caller to tpm_buf in tpm_send() Stefan Berger <stefanb(a)linux.ibm.com> tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts Stefan Berger <stefanb(a)linux.ibm.com> tpm_tis_core: Turn on the TPM before probing IRQ's Madhavan Srinivasan <maddy(a)linux.vnet.ibm.com> powerpc/imc: Dont create debugfs files for cpu-less nodes Ming Lei <ming.lei(a)redhat.com> scsi: implement .cleanup_rq callback Ming Lei <ming.lei(a)redhat.com> blk-mq: add callback of .cleanup_rq Jan-Marek Glogowski <glogow(a)fbihome.de> ALSA: hda/realtek - PCI quirk for Medion E4254 Peter Zijlstra <peterz(a)infradead.org> rcu/tree: Fix SCHED_FIFO params Adam Ford <aford173(a)gmail.com> ARM: dts: am3517-evm: Fix missing video Joonwon Kang <kjw1627(a)gmail.com> randstruct: Check member structs in is_pure_ops_struct() Jack Morgenstein <jackm(a)dev.mellanox.co.il> RDMA: Fix double-free in srq creation error flow Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Do not update hcrc for a KDETH packet during fault injection Ira Weiny <ira.weiny(a)intel.com> IB/hfi1: Define variables as unsigned long to fix KASAN warning Danit Goldberg <danitg(a)mellanox.com> IB/mlx5: Free mpi in mp_slave mode Vincent Whitchurch <vincent.whitchurch(a)axis.com> printk: Do not lose last line in kmsg buffer dump Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Fix Relogin to prevent modifying scan_state flag Martin Wilck <Martin.Wilck(a)suse.com> scsi: scsi_dh_rdac: zero cdb in send_mode_select() Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: firewire-tascam: check intermediate state of clock status and retry Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: firewire-tascam: handle error code when getting current source of clock Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36 Adam Ford <aford173(a)gmail.com> ARM: omap2plus_defconfig: Fix missing video Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-torpedo-baseboard: Fix missing video MyungJoo Ham <myungjoo.ham(a)samsung.com> PM / devfreq: passive: fix compiler warning Sakari Ailus <sakari.ailus(a)linux.intel.com> media: omap3isp: Set device on omap3isp subdevs Jiří Paleček <jpalecek(a)web.de> kvm: Nested KVM MMUs need PAE root too Qu Wenruo <wqu(a)suse.com> btrfs: Detect unbalanced tree with empty leaf before crashing btree operations Qu Wenruo <wqu(a)suse.com> btrfs: tree-checker: Add ROOT_ITEM check Qu Wenruo <wqu(a)suse.com> btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type Qu Wenruo <wqu(a)suse.com> btrfs: delayed-inode: Kill the BUG_ON() in btrfs_delete_delayed_dir_index() Oliver Neukum <oneukum(a)suse.com> zd1211rw: remove false assertion from zd_mac_clear() Kai-Heng Feng <kai.heng.feng(a)canonical.com> iommu/amd: Override wrong IVRS IOAPIC on Raven Ridge systems Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93 Jani Nikula <jani.nikula(a)intel.com> drm: fix module name in edid_firmware log message Tomas Bortoli <tomasbortoli(a)gmail.com> media: ttusb-dec: Fix info-leak in ttusb_dec_send_command() Ahzo <Ahzo(a)tutanota.com> drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2) Takashi Iwai <tiwai(a)suse.de> ALSA: hda - Drop unsol event handler for Intel HDMI codecs Tomas Espeleta <tomas.espeleta(a)gmail.com> ALSA: hda - Add a quirk model for fixing Huawei Matebook X right speaker Kai-Heng Feng <kai.heng.feng(a)canonical.com> e1000e: add workaround for possible stalled packet Kevin Easton <kevin(a)guarana.org> libertas: Add missing sentinel at end of if_usb.c fw_table Ulf Hansson <ulf.hansson(a)linaro.org> mmc: mtk-sd: Re-store SDIO IRQs mask at system resume Nigel Croxon <ncroxon(a)redhat.com> raid5: don't increment read_errors on EILSEQ return Ulf Hansson <ulf.hansson(a)linaro.org> mmc: dw_mmc: Re-store SDIO IRQs mask at system resume Ulf Hansson <ulf.hansson(a)linaro.org> mmc: core: Add helper function to indicate if SDIO IRQs is enabled Al Cooper <alcooperx(a)gmail.com> mmc: sdhci: Fix incorrect switch to HS mode Miles Chen <miles.chen(a)mediatek.com> sched/psi: Correct overly pessimistic size calculation Ulf Hansson <ulf.hansson(a)linaro.org> mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD Guoqing Jiang <guoqing.jiang(a)cloud.ionos.com> raid5: don't set STRIPE_HANDLE to stripe which is in batch list Hou Tao <houtao1(a)huawei.com> block: make rq sector size accessible for block stats Jackie Liu <liuyun01(a)kylinos.cn> io_uring: fix wrong sequence setting logic Peter Ujfalusi <peter.ujfalusi(a)ti.com> ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set Katsuhiro Suzuki <katsuhiro(a)katsuster.net> SoC: simple-card-utils: set 0Hz to sysclk when shutdown M. Vefa Bicakci <m.v.b(a)runbox.com> platform/x86: intel_pmc_core: Do not ioremap RAM Gayatri Kammela <gayatri.kammela(a)intel.com> x86/cpu: Add Tiger Lake to Intel family Marc Zyngier <maz(a)kernel.org> irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices Harald Freudenberger <freude(a)linux.ibm.com> s390/crypto: xts-aes-s390 fix extra run-time crypto self tests finding Christoph Hellwig <hch(a)lst.de> irqchip/sifive-plic: set max threshold for ignored handlers Peter Zijlstra <peterz(a)infradead.org> x86/mm: Fix cpumask_of_node() error condition Masami Hiramatsu <mhiramat(a)kernel.org> kprobes: Prohibit probing on BUG() and WARN() address Peter Ujfalusi <peter.ujfalusi(a)ti.com> dmaengine: ti: edma: Do not reset reserved paRAM slots Yufen Yu <yuyufen(a)huawei.com> md/raid1: fail run raid1 array when active disk less than one Wang Shenran <shenran268(a)gmail.com> hwmon: (acpi_power_meter) Change log level for 'unsafe software power cap' Marcel Bocu <marcel.p.bocu(a)gmail.com> hwmon: (k10temp) Add support for AMD family 17h, model 70h CPUs Kent Overstreet <kent.overstreet(a)gmail.com> closures: fix a race on wakeup from closure_sync Wenwen Wang <wenwen(a)cs.uga.edu> ACPI / PCI: fix acpi_pci_irq_enable() memory leak Wenwen Wang <wenwen(a)cs.uga.edu> ACPI: custom_method: fix memory leaks Marcel Bocu <marcel.p.bocu(a)gmail.com> x86/amd_nb: Add PCI device IDs for family 17h, model 70h Marek Szyprowski <m.szyprowski(a)samsung.com> ARM: dts: exynos: Mark LDO10 as always-on on Peach Pit/Pi Chromebooks Tzvetomir Stoyanov <tstoyanov(a)vmware.com> libtraceevent: Change users plugin directory Eric Dumazet <edumazet(a)google.com> iommu/iova: Avoid false sharing on fq_timer_on Dan Williams <dan.j.williams(a)intel.com> libata/ahci: Drop PCS quirk for Denverton and beyond Cezary Rojewski <cezary.rojewski(a)intel.com> ASoC: Intel: Haswell: Adjust machine device private context Qian Cai <cai(a)lca.pw> iommu/amd: Silence warnings under memory pressure Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: firewire-motu: add support for MOTU 4pre Anton Eidelman <anton(a)lightbitslabs.com> nvme-multipath: fix ana log nsid lookup when nsid is not found Tom Wu <tomwu(a)mellanox.com> nvmet: fix data units read and written counters in SMART log Song Liu <songliubraving(a)fb.com> x86/mm/pti: Handle unaligned address gracefully in pti_clone_pagetable() Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl_ssi: Fix clock control issue in master mode Thomas Gleixner <tglx(a)linutronix.de> x86/mm/pti: Do not invoke PTI functions when PTI is disabled Arnaldo Carvalho de Melo <acme(a)redhat.com> perf evlist: Use unshare(CLONE_FS) in sb threads to let setns(CLONE_NEWNS) work Mark Rutland <mark.rutland(a)arm.com> arm64: kpti: ensure patched kernel text is fetched from PoU Neil Horman <nhorman(a)tuxdriver.com> x86/apic/vector: Warn when vector space exhaustion breaks affinity Douglas RAILLARD <douglas.raillard(a)arm.com> sched/cpufreq: Align trace event behavior of fast switching Al Stone <ahs3(a)redhat.com> ACPI / CPPC: do not require the _PSD method Katsuhiro Suzuki <katsuhiro(a)katsuster.net> ASoC: es8316: fix headphone mixer volume table Dan Murphy <dmurphy(a)ti.com> leds: lm3532: Fixes for the driver for stability Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> media: ov9650: add a sanity check Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> media: aspeed-video: address a protential usage of an unitialized var Gustavo A. R. Silva <gustavo(a)embeddedor.com> perf script: Fix memory leaks in list_scripts() Andi Kleen <ak(a)linux.intel.com> perf report: Fix --ns time sort key output Benjamin Peterson <benjamin(a)python.org> perf trace beauty ioctl: Fix off-by-one error in cmd->string table Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate() Wenwen Wang <wenwen(a)cs.uga.edu> media: cpia2_usb: fix memory leaks Wenwen Wang <wenwen(a)cs.uga.edu> media: saa7146: add cleanup in hexium_attach() Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: cec-notifier: clear cec_adap in cec_notifier_unregister Kamil Konieczny <k.konieczny(a)partner.samsung.com> PM / devfreq: exynos-bus: Correct clock enable sequence Leonard Crestez <leonard.crestez(a)nxp.com> PM / devfreq: passive: Use non-devm notifiers Masahiro Yamada <yamada.masahiro(a)socionext.com> ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2 Ezequiel Garcia <ezequiel(a)collabora.com> PM / devfreq: Fix kernel oops on governor module load Geert Uytterhoeven <geert+renesas(a)glider.be> soc: renesas: Enable ARM_ERRATA_754322 for affected Cortex-A9 Geert Uytterhoeven <geert+renesas(a)glider.be> soc: renesas: rmobile-sysc: Set GENPD_FLAG_ALWAYS_ON for always-on domain Masahiro Yamada <yamada.masahiro(a)socionext.com> ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91 Yazen Ghannam <yazen.ghannam(a)amd.com> EDAC/amd64: Decode syndrome before translating address Yazen Ghannam <yazen.ghannam(a)amd.com> EDAC/amd64: Recognize DRAM device type ECC capability Gerald BAEZA <gerald.baeza(a)st.com> libperf: Fix alignment trap with xyarray contents in 'perf stat' Yazen Ghannam <yazen.ghannam(a)amd.com> EDAC/amd64: Support more than two controllers for chip selects handling Wenwen Wang <wenwen(a)cs.uga.edu> media: dvb-core: fix a memory leak bug Thomas Gleixner <tglx(a)linutronix.de> posix-cpu-timers: Sanitize bogus WARNONS Sean Young <sean(a)mess.org> media: dvb-frontends: use ida for pll number A Sun <as1033x(a)comcast.net> media: mceusb: fix (eliminate) TX IR signal length limit Vasily Gorbik <gor(a)linux.ibm.com> s390/kasan: provide uninstrumented __strlen James Morse <james.morse(a)arm.com> arm64: entry: Move ct_user_exit before any other exception Liguang Zhang <zhangliguang(a)linux.alibaba.com> ACPI / APEI: Release resources if gen_pool_add() fails Mike Christie <mchristi(a)redhat.com> nbd: add missing config put Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> ASoC: mchp-i2s-mcc: Fix unprepare of GCLK Wenwen Wang <wenwen(a)cs.uga.edu> led: triggers: Fix a memory leak bug Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> ASoC: mchp-i2s-mcc: Wait for RX/TX RDY only if controller is running Maxime Ripard <maxime.ripard(a)bootlin.com> ASoC: sun4i-i2s: Don't use the oversample to calculate BCLK Arnaldo Carvalho de Melo <acme(a)redhat.com> tools headers: Fixup bitsperlong per arch includes Michael Ellerman <mpe(a)ellerman.id.au> powerpc/Makefile: Always pass --synthetic to nm if supported Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> ASoC: uniphier: Fix double reset assersion when transitioning to suspend state Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: hdpvr: add terminating 0 at end of string Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: radio/si470x: kill urb on error Hans de Goede <hdegoede(a)redhat.com> x86/platform/intel/iosf_mbi Rewrite locking Stefan Agner <stefan.agner(a)toradex.com> ARM: dts: imx7-colibri: disable HS400 André Draszik <git(a)andred.net> ARM: dts: imx7d: cl-som-imx7: make ethernet work again Finn Thain <fthain(a)telegraphics.com.au> m68k: Prevent some compiler warnings in Coldfire builds Arnd Bergmann <arnd(a)arndb.de> net: lpc-enet: fix printk format strings Mark Rutland <mark.rutland(a)arm.com> kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE Ezequiel Garcia <ezequiel(a)collabora.com> media: imx: mipi csi-2: Don't fail if initial state times-out Sakari Ailus <sakari.ailus(a)linux.intel.com> media: omap3isp: Don't set streaming state on random subdevs Ezequiel Garcia <ezequiel(a)collabora.com> media: i2c: ov5645: Fix power sequence Colin Ian King <colin.king(a)canonical.com> media: vsp1: fix memory leak of dl on error return path Tan Xiaojun <tanxiaojun(a)huawei.com> perf record: Support aarch64 random socket_id assignment Arnd Bergmann <arnd(a)arndb.de> ARM: xscale: fix multi-cpu compilation Arnd Bergmann <arnd(a)arndb.de> dmaengine: iop-adma: use correct printk format strings Darius Rad <alpha(a)area49.net> media: rc: imon: Allow iMON RC protocol for ffdc 7e device John Keeping <john(a)metanate.com> perf unwind: Fix libunwind when tid != pid Kees Cook <keescook(a)chromium.org> arm64/efi: Move variable assignments after SECTIONS Sean Young <sean(a)mess.org> media: em28xx: modules workqueue not inited for 2nd device Geert Uytterhoeven <geert+renesas(a)glider.be> media: fdp1: Reduce FCP not found message level to debug Wolfram Sang <wsa+renesas(a)sang-engineering.com> media: i2c: tda1997x: prevent potential NULL pointer access Matthias Brugger <matthias.bgg(a)gmail.com> media: mtk-mdp: fix reference count on old device tree Arnaldo Carvalho de Melo <acme(a)redhat.com> perf test vfs_getname: Disable ~/.perfconfig to get default output Arnaldo Carvalho de Melo <acme(a)redhat.com> perf config: Honour $PERF_CONFIG env var to specify alternate .perfconfig Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: gspca: zero usb_buf on error zhengbin <zhengbin13(a)huawei.com> blk-mq: Fix memory leak in blk_mq_init_allocated_queue error handling Peter Zijlstra <peterz(a)infradead.org> idle: Prevent late-arriving interrupts from disrupting offline Phil Auld <pauld(a)redhat.com> sched/fair: Use rq_lock/unlock in online_fair_sched_group Sudeep Holla <sudeep.holla(a)arm.com> firmware: arm_scmi: Check if platform has released shmem before using Xiaofei Tan <tanxiaofei(a)huawei.com> efi: cper: print AER info of PCIe fatal error Stephen Douthit <stephend(a)silicom-usa.com> EDAC, pnd2: Fix ioremap() size in dnv_rd_reg() Luke Mujica <lukemujica(a)google.com> perf tools: Fix paths in include statements Alessio Balsini <balsini(a)android.com> loop: Add LOOP_SET_DIRECT_IO to compat ioctl Jiri Slaby <jslaby(a)suse.cz> ACPI / processor: don't print errors for processorIDs == 0xff Keyon Jie <yang.jie(a)linux.intel.com> ASoC: hdac_hda: fix page fault issue by removing race Valdis Kletnieks <valdis.kletnieks(a)vt.edu> RAS: Build debugfs.o only when enabled in Kconfig Valdis Kletnieks <valdis.kletnieks(a)vt.edu> RAS: Fix prototype warnings Randy Dunlap <rdunlap(a)infradead.org> media: media/platform: fsl-viu.c: fix build for MICROBLAZE Guoqing Jiang <jgq516(a)gmail.com> md: don't set In_sync if array is frozen Guoqing Jiang <jgq516(a)gmail.com> md: don't call spare_active in md_reap_sync_thread if all member devices can't work Yufen Yu <yuyufen(a)huawei.com> md/raid1: end bio when the device faulty Qian Cai <cai(a)lca.pw> arm64/prefetch: fix a -Wtype-limits warning Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: rsnd: don't call clk_get_rate() under atomic context Dan Carpenter <dan.carpenter(a)oracle.com> EDAC/altera: Use the proper type for the IRQ status bits chenzefeng <chenzefeng2(a)huawei.com> ia64:unwind: fix double free for mod->arch.init_unw_table Ard van Breemen <ard(a)kwaak.net> ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid Vinod Koul <vkoul(a)kernel.org> base: soc: Export soc_device_register/unregister APIs Neil Armstrong <narmstrong(a)baylibre.com> soc: amlogic: meson-clk-measure: protect measure with a mutex Junhua Huang <huang.junhua(a)zte.com.cn> arm64: mm: free the initrd reserved memblock in a aligned manner Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> cpuidle: teo: Allow tick to be stopped if PM QoS is used Oliver Neukum <oneukum(a)suse.com> media: iguanair: add sanity checks Robert Richter <rrichter(a)marvell.com> EDAC/mc: Fix grain_bits calculation Jia-Ju Bai <baijiaju1990(a)gmail.com> ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() Takashi Iwai <tiwai(a)suse.de> ALSA: hda - Show the fatal CORB/RIRB error more clearly Thomas Gleixner <tglx(a)linutronix.de> x86/apic: Soft disable APIC before initializing it Juri Lelli <juri.lelli(a)redhat.com> rcu/tree: Call setschedule() gp ktread to SCHED_FIFO outside of atomic region Grzegorz Halat <ghalat(a)redhat.com> x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails Juri Lelli <juri.lelli(a)redhat.com> sched/deadline: Fix bandwidth accounting at all levels after offline migration Thomas Gleixner <tglx(a)linutronix.de> x86/apic: Make apic_pending_intr_clear() more robust Juri Lelli <juri.lelli(a)redhat.com> sched/core: Fix CPU controller for !RT_GROUP_SCHED Vincent Guittot <vincent.guittot(a)linaro.org> sched/fair: Fix imbalance due to CPU affinity Paul E. McKenney <paulmck(a)linux.ibm.com> time/tick-broadcast: Fix tick_broadcast_offline() lockdep complaint Fabio Estevam <festevam(a)gmail.com> media: i2c: ov5640: Check for devm_gpiod_get_optional() error Luke Nowakowski-Krijger <lnowakow(a)eng.ucsd.edu> media: hdpvr: Add device num check and handling Arnd Bergmann <arnd(a)arndb.de> media: vivid: work around high stack usage with clang Michael Tretter <m.tretter(a)pengutronix.de> media: vb2: reorder checks in vb2_poll() Vandana BN <bnvandana(a)gmail.com> media: vivid:add sanity check to avoid divide error and set value to 1 if 0. Wen Yang <wen.yang99(a)zte.com.cn> media: exynos4-is: fix leaked of_node references Pan Xiuli <xiuli.pan(a)linux.intel.com> ASoC: SOF: pci: mark last_busy value at runtime PM init Sean Young <sean(a)mess.org> media: mtk-cir: lower de-glitch counter for rc-mm protocol Arnd Bergmann <arnd(a)arndb.de> media: dib0700: fix link error for dibx000_i2c_set_speed Nick Stoughton <nstoughton(a)logitech.com> leds: leds-lp5562 allow firmware files up to the maximum length Stefan Wahren <wahrenst(a)gmx.net> dmaengine: bcm2835: Print error in case setting DMA mask fails Stephen Boyd <swboyd(a)chromium.org> firmware: qcom_scm: Use proper types for dma mappings Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com> ASoC: sgtl5000: Fix charge pump source assignment Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com> ASoC: sgtl5000: Fix of unmute outputs on probe Lucas Stach <l.stach(a)pengutronix.de> ASoC: tlv320aic31xx: suppress error message for EPROBE_DEFER Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> spi: dw-mmio: Clock should be shut when error occurs Axel Lin <axel.lin(a)ingics.com> regulator: lm363x: Fix off-by-one n_voltages for lm3632 ldo_vpos/ldo_vneg Hariprasad Kelam <hariprasad.kelam(a)gmail.com> cpufreq: ap806: Add NULL check after kcalloc Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> ASoC: SOF: Intel: hda: Make hdac_device device-managed Chris Wilson <chris(a)chris-wilson.co.uk> ALSA: hda: Flush interrupts on disabling Ori Nimron <orinimron123(a)gmail.com> nfc: enforce CAP_NET_RAW for raw sockets Ori Nimron <orinimron123(a)gmail.com> ieee802154: enforce CAP_NET_RAW for raw sockets Ori Nimron <orinimron123(a)gmail.com> ax25: enforce CAP_NET_RAW for raw sockets Ori Nimron <orinimron123(a)gmail.com> appletalk: enforce CAP_NET_RAW for raw sockets Ori Nimron <orinimron123(a)gmail.com> mISDN: enforce CAP_NET_RAW for raw sockets Bodong Wang <bodong(a)mellanox.com> net/mlx5: Add device ID of upcoming BlueField-2 Eric Dumazet <edumazet(a)google.com> tcp: better handle TCP_USER_TIMEOUT in SYN_SENT state Eric Dumazet <edumazet(a)google.com> net: sched: fix possible crash in tcf_action_destroy() Saeed Mahameed <saeedm(a)mellanox.com> net/mlx5e: Fix traffic duplication in ethtool steering David Ahern <dsahern(a)gmail.com> vrf: Do not attempt to create IPv6 mcast rule if IPv6 is disabled Cong Wang <xiyou.wangcong(a)gmail.com> net_sched: add policy validation for action attributes David Ahern <dsahern(a)gmail.com> ipv4: Revert removal of rt_uses_gateway Vinicius Costa Gomes <vinicius.gomes(a)intel.com> net/sched: cbs: Fix not adding cbs instance to list Hans Andersson <hans.andersson(a)cellavision.se> net: phy: micrel: add Asym Pause workaround for KSZ9021 Oliver Neukum <oneukum(a)suse.com> usbnet: sanity checking of packet sizes and device mtu Bjørn Mork <bjorn(a)mork.no> usbnet: ignore endpoints with invalid wMaxPacketSize Kevin(Yudong) Yang <yyd(a)google.com> tcp_bbr: fix quantization code to not raise cwnd if not probing bandwidth Stephen Hemminger <stephen(a)networkplumber.org> skge: fix checksum byte order David Ahern <dsahern(a)gmail.com> selftests: Update fib_tests to handle missing ping6 Eric Dumazet <edumazet(a)google.com> sch_netem: fix a divide by zero in tabledist() Takeshi Misawa <jeliantsurux(a)gmail.com> ppp: Fix memory leak in ppp_write Li RongQing <lirongqing(a)baidu.com> openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC Navid Emamdoost <navid.emamdoost(a)gmail.com> nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs Navid Emamdoost <navid.emamdoost(a)gmail.com> nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs Cong Wang <xiyou.wangcong(a)gmail.com> net_sched: add max len check for TCA_KIND Davide Caratti <dcaratti(a)redhat.com> net/sched: act_sample: don't push mac header on ip6gre ingress Bjorn Andersson <bjorn.andersson(a)linaro.org> net: qrtr: Stop rx_worker before freeing node Peter Mamonov <pmamonov(a)gmail.com> net/phy: fix DP83865 10 Mbps HDX loopback disable function Xin Long <lucien.xin(a)gmail.com> macsec: drop skb sk before calling gro_cells_receive Jason A. Donenfeld <Jason(a)zx2c4.com> ipv6: do not free rt if FIB_LOOKUP_NOREF is set on suppress rule Bjørn Mork <bjorn(a)mork.no> cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> arcnet: provide a buffer big enough to actually receive packets ------------- Diffstat: Documentation/sound/hd-audio/models.rst | 3 + Makefile | 4 +- arch/arm/boot/dts/am3517-evm.dts | 23 +- arch/arm/boot/dts/exynos5420-peach-pit.dts | 1 + arch/arm/boot/dts/exynos5800-peach-pi.dts | 1 + arch/arm/boot/dts/imx7-colibri.dtsi | 1 + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 +- arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 37 +-- arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-at91/.gitignore | 1 + arch/arm/mach-at91/Makefile | 5 +- arch/arm/mach-at91/pm_suspend.S | 2 +- arch/arm/mach-ep93xx/edb93xx.c | 2 +- arch/arm/mach-ep93xx/simone.c | 2 +- arch/arm/mach-ep93xx/ts72xx.c | 4 +- arch/arm/mach-ep93xx/vision_ep9307.c | 2 +- arch/arm/mach-omap2/.gitignore | 1 + arch/arm/mach-omap2/Makefile | 5 +- arch/arm/mach-omap2/sleep33xx.S | 2 +- arch/arm/mach-omap2/sleep43xx.S | 2 +- arch/arm/mach-zynq/platsmp.c | 2 +- arch/arm/mm/copypage-xscale.c | 6 +- arch/arm/plat-samsung/watchdog-reset.c | 1 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 + arch/arm64/include/asm/cputype.h | 21 +- arch/arm64/include/asm/exception.h | 2 + arch/arm64/include/asm/tlbflush.h | 1 + arch/arm64/kernel/cpufeature.c | 2 +- arch/arm64/kernel/entry.S | 36 +-- arch/arm64/kernel/image-vars.h | 51 ++++ arch/arm64/kernel/image.h | 42 --- arch/arm64/kernel/traps.c | 9 + arch/arm64/kernel/vmlinux.lds.S | 2 + arch/arm64/mm/init.c | 6 +- arch/arm64/mm/proc.S | 9 + arch/ia64/kernel/module.c | 8 +- arch/m68k/include/asm/atarihw.h | 9 - arch/m68k/include/asm/io_mm.h | 6 +- arch/m68k/include/asm/macintosh.h | 1 + arch/powerpc/Makefile | 2 - arch/powerpc/platforms/powernv/opal-imc.c | 12 +- arch/s390/crypto/aes_s390.c | 6 + arch/s390/include/asm/string.h | 9 +- arch/x86/include/asm/intel-family.h | 3 + arch/x86/include/asm/kvm_host.h | 7 + arch/x86/kernel/amd_nb.c | 3 + arch/x86/kernel/apic/apic.c | 115 ++++--- arch/x86/kernel/apic/vector.c | 11 + arch/x86/kernel/smp.c | 46 +-- arch/x86/kvm/emulate.c | 2 + arch/x86/kvm/mmu.c | 47 +-- arch/x86/kvm/svm.c | 4 +- arch/x86/kvm/vmx/vmx.c | 6 +- arch/x86/kvm/x86.c | 21 +- arch/x86/mm/numa.c | 4 +- arch/x86/mm/pti.c | 8 +- arch/x86/platform/intel/iosf_mbi.c | 100 +++--- block/blk-flush.c | 10 + block/blk-mq.c | 25 +- block/blk-throttle.c | 3 +- block/blk.h | 7 + block/mq-deadline.c | 19 +- drivers/acpi/acpi_lpss.c | 8 +- drivers/acpi/acpi_processor.c | 10 +- drivers/acpi/apei/ghes.c | 17 +- drivers/acpi/cppc_acpi.c | 6 +- drivers/acpi/custom_method.c | 5 +- drivers/acpi/pci_irq.c | 4 +- drivers/ata/ahci.c | 116 ++++--- drivers/ata/ahci.h | 2 + drivers/base/soc.c | 2 + drivers/block/loop.c | 1 + drivers/block/nbd.c | 4 +- drivers/char/hw_random/core.c | 2 +- drivers/char/ipmi/ipmi_msghandler.c | 114 +++---- drivers/char/mem.c | 21 ++ drivers/char/tpm/tpm-interface.c | 23 +- drivers/char/tpm/tpm_tis_core.c | 3 + drivers/cpufreq/armada-8k-cpufreq.c | 2 + drivers/cpuidle/governors/teo.c | 32 +- drivers/devfreq/devfreq.c | 2 +- drivers/devfreq/exynos-bus.c | 31 +- drivers/devfreq/governor_passive.c | 7 +- drivers/dma/bcm2835-dma.c | 4 +- drivers/dma/iop-adma.c | 18 +- drivers/dma/ti/edma.c | 9 +- drivers/edac/altera_edac.c | 4 +- drivers/edac/amd64_edac.c | 151 ++++++---- drivers/edac/amd64_edac.h | 5 +- drivers/edac/edac_mc.c | 8 +- drivers/edac/pnd2_edac.c | 7 +- drivers/firmware/arm_scmi/driver.c | 8 + drivers/firmware/efi/cper.c | 15 + drivers/firmware/qcom_scm.c | 7 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 + drivers/gpu/drm/drm_kms_helper_common.c | 2 +- drivers/hwmon/acpi_power_meter.c | 4 +- drivers/hwmon/k10temp.c | 1 + drivers/i2c/busses/i2c-riic.c | 1 + drivers/infiniband/core/addr.c | 2 +- drivers/infiniband/core/uverbs_cmd.c | 3 +- drivers/infiniband/hw/hfi1/mad.c | 45 ++- drivers/infiniband/hw/hfi1/verbs.c | 17 +- drivers/infiniband/hw/mlx5/main.c | 1 + drivers/iommu/Makefile | 2 +- drivers/iommu/amd_iommu.c | 4 +- drivers/iommu/amd_iommu.h | 14 + drivers/iommu/amd_iommu_init.c | 5 +- drivers/iommu/amd_iommu_quirks.c | 92 ++++++ drivers/iommu/arm-smmu-v3.c | 2 + drivers/iommu/intel_irq_remapping.c | 6 +- drivers/iommu/iova.c | 4 +- drivers/irqchip/irq-gic-v3-its.c | 9 +- drivers/irqchip/irq-sifive-plic.c | 12 +- drivers/isdn/mISDN/socket.c | 2 + drivers/leds/led-triggers.c | 1 + drivers/leds/leds-lm3532.c | 17 +- drivers/leds/leds-lp5562.c | 6 +- drivers/md/bcache/closure.c | 10 +- drivers/md/dm-rq.c | 1 + drivers/md/md.c | 28 +- drivers/md/md.h | 3 + drivers/md/raid0.c | 33 +- drivers/md/raid0.h | 14 + drivers/md/raid1.c | 39 ++- drivers/md/raid5.c | 10 +- drivers/media/cec/cec-notifier.c | 2 + drivers/media/common/videobuf2/videobuf2-v4l2.c | 8 +- drivers/media/dvb-core/dvb_frontend.c | 4 +- drivers/media/dvb-core/dvbdev.c | 4 +- drivers/media/dvb-frontends/dvb-pll.c | 40 ++- drivers/media/i2c/ov5640.c | 5 + drivers/media/i2c/ov5645.c | 26 +- drivers/media/i2c/ov9650.c | 5 + drivers/media/i2c/tda1997x.c | 9 +- drivers/media/pci/saa7134/saa7134-i2c.c | 12 +- drivers/media/pci/saa7146/hexium_gemini.c | 3 + drivers/media/platform/aspeed-video.c | 5 +- drivers/media/platform/exynos4-is/fimc-is.c | 1 + drivers/media/platform/exynos4-is/media-dev.c | 2 + drivers/media/platform/fsl-viu.c | 2 +- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 4 +- drivers/media/platform/omap3isp/isp.c | 8 + drivers/media/platform/omap3isp/ispccdc.c | 1 + drivers/media/platform/omap3isp/ispccp2.c | 1 + drivers/media/platform/omap3isp/ispcsi2.c | 1 + drivers/media/platform/omap3isp/isppreview.c | 1 + drivers/media/platform/omap3isp/ispresizer.c | 1 + drivers/media/platform/omap3isp/ispstat.c | 2 + drivers/media/platform/rcar_fdp1.c | 2 +- drivers/media/platform/vivid/vivid-kthread-cap.c | 9 +- drivers/media/platform/vsp1/vsp1_dl.c | 4 +- drivers/media/radio/si470x/radio-si470x-usb.c | 5 +- drivers/media/rc/iguanair.c | 15 +- drivers/media/rc/imon.c | 7 +- drivers/media/rc/mceusb.c | 334 ++++++++++++--------- drivers/media/rc/mtk-cir.c | 8 + drivers/media/usb/cpia2/cpia2_usb.c | 4 + drivers/media/usb/dvb-usb/dib0700_devices.c | 8 + drivers/media/usb/dvb-usb/pctv452e.c | 8 - drivers/media/usb/em28xx/em28xx-cards.c | 1 - drivers/media/usb/gspca/konica.c | 5 + drivers/media/usb/gspca/nw80x.c | 5 + drivers/media/usb/gspca/ov519.c | 10 + drivers/media/usb/gspca/ov534.c | 5 + drivers/media/usb/gspca/ov534_9.c | 1 + drivers/media/usb/gspca/se401.c | 5 + drivers/media/usb/gspca/sn9c20x.c | 12 + drivers/media/usb/gspca/sonixb.c | 5 + drivers/media/usb/gspca/sonixj.c | 5 + drivers/media/usb/gspca/spca1528.c | 5 + drivers/media/usb/gspca/sq930x.c | 5 + drivers/media/usb/gspca/sunplus.c | 5 + drivers/media/usb/gspca/vc032x.c | 5 + drivers/media/usb/gspca/w996Xcf.c | 5 + drivers/media/usb/hdpvr/hdpvr-core.c | 13 +- drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- drivers/media/v4l2-core/videobuf-core.c | 5 +- drivers/mmc/core/sdio_irq.c | 9 +- drivers/mmc/host/dw_mmc.c | 4 + drivers/mmc/host/mtk-sd.c | 3 + drivers/mmc/host/sdhci.c | 4 +- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 90 ++---- drivers/net/arcnet/arcnet.c | 31 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 10 + drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 + drivers/net/ethernet/marvell/skge.c | 2 +- .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + drivers/net/ethernet/netronome/nfp/flower/main.c | 7 + drivers/net/ethernet/nxp/lpc_eth.c | 13 +- drivers/net/macsec.c | 1 + drivers/net/phy/micrel.c | 3 + drivers/net/phy/national.c | 9 +- drivers/net/ppp/ppp_generic.c | 2 + drivers/net/usb/cdc_ncm.c | 6 +- drivers/net/usb/usbnet.c | 8 + drivers/net/vrf.c | 3 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2 +- drivers/net/wireless/ath/ath10k/wmi-tlv.h | 16 + drivers/net/wireless/ath/ath10k/wmi.h | 8 - drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 8 +- drivers/net/wireless/marvell/libertas/if_usb.c | 3 +- drivers/net/wireless/mediatek/mt76/mmio.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 15 +- drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 6 +- drivers/net/wireless/mediatek/mt76/usb.c | 2 +- drivers/net/wireless/realtek/rtw88/pci.c | 71 +++-- drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 1 - drivers/nvme/host/multipath.c | 8 +- drivers/nvme/target/admin-cmd.c | 14 +- drivers/parisc/dino.c | 24 ++ drivers/platform/chrome/cros_ec_rpmsg.c | 32 +- drivers/platform/x86/intel_int0002_vgpio.c | 1 + drivers/platform/x86/intel_pmc_core.c | 8 +- drivers/ras/Makefile | 3 +- drivers/ras/cec.c | 1 + drivers/ras/debugfs.c | 2 + drivers/regulator/core.c | 42 ++- drivers/regulator/lm363x-regulator.c | 2 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 + drivers/scsi/qla2xxx/qla_init.c | 25 +- drivers/scsi/qla2xxx/qla_os.c | 1 + drivers/scsi/qla2xxx/qla_target.c | 1 - drivers/scsi/scsi_lib.c | 13 + drivers/soc/amlogic/meson-clk-measure.c | 12 +- drivers/soc/renesas/Kconfig | 5 + drivers/soc/renesas/rmobile-sysc.c | 31 +- drivers/spi/spi-dw-mmio.c | 6 +- drivers/spi/spi-fsl-dspi.c | 4 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 12 +- drivers/video/fbdev/efifb.c | 27 +- fs/binfmt_elf.c | 3 +- fs/btrfs/ctree.c | 5 +- fs/btrfs/ctree.h | 1 + fs/btrfs/delayed-inode.c | 13 +- fs/btrfs/disk-io.c | 10 + fs/btrfs/extent-tree.c | 8 + fs/btrfs/extent_io.c | 9 + fs/btrfs/free-space-cache.c | 20 +- fs/btrfs/inode.c | 8 + fs/btrfs/qgroup.c | 38 ++- fs/btrfs/tree-checker.c | 98 ++++++ fs/cifs/cifsfs.c | 2 + fs/cifs/cifsglob.h | 2 + fs/cifs/connect.c | 9 +- fs/cifs/smb2ops.c | 10 + fs/cifs/smb2pdu.c | 3 +- fs/cifs/xattr.c | 2 +- fs/ext4/extents.c | 4 +- fs/ext4/inode.c | 9 + fs/fuse/dev.c | 93 +++--- fs/fuse/file.c | 1 + fs/fuse/fuse_i.h | 3 + fs/fuse/inode.c | 1 + fs/fuse/readdir.c | 4 +- fs/gfs2/bmap.c | 1 + fs/io_uring.c | 4 +- fs/overlayfs/export.c | 3 +- fs/overlayfs/inode.c | 3 +- fs/xfs/xfs_file.c | 26 ++ include/linux/blk-mq.h | 13 + include/linux/blkdev.h | 15 +- include/linux/bug.h | 5 + include/linux/fs.h | 2 + include/linux/mmc/host.h | 9 + include/linux/pci_ids.h | 1 + include/linux/quotaops.h | 2 +- include/linux/sunrpc/xprt.h | 1 + include/net/route.h | 3 +- kernel/kprobes.c | 3 +- kernel/printk/printk.c | 2 +- kernel/rcu/tree.c | 6 +- kernel/sched/core.c | 61 +++- kernel/sched/cpufreq_schedutil.c | 7 +- kernel/sched/deadline.c | 33 ++ kernel/sched/fair.c | 11 +- kernel/sched/idle.c | 5 +- kernel/sched/psi.c | 2 +- kernel/time/alarmtimer.c | 4 +- kernel/time/posix-cpu-timers.c | 20 +- lib/lzo/lzo1x_compress.c | 14 +- mm/compaction.c | 35 +-- mm/fadvise.c | 4 +- mm/madvise.c | 22 +- mm/memcontrol.c | 10 + mm/oom_kill.c | 5 +- mm/z3fold.c | 64 ++-- net/appletalk/ddp.c | 5 + net/ax25/af_ax25.c | 2 + net/ieee802154/socket.c | 3 + net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_output.c | 2 +- net/ipv4/route.c | 34 ++- net/ipv4/tcp_bbr.c | 8 +- net/ipv4/tcp_timer.c | 5 +- net/ipv4/xfrm4_policy.c | 1 + net/ipv6/fib6_rules.c | 3 +- net/nfc/llcp_sock.c | 7 +- net/openvswitch/datapath.c | 2 +- net/qrtr/qrtr.c | 1 + net/sched/act_api.c | 34 ++- net/sched/act_sample.c | 1 + net/sched/cls_api.c | 6 +- net/sched/sch_api.c | 3 +- net/sched/sch_cbs.c | 30 +- net/sched/sch_netem.c | 2 +- net/sunrpc/clnt.c | 6 +- net/sunrpc/xdr.c | 27 +- net/sunrpc/xprt.c | 54 ++-- net/wireless/util.c | 1 + scripts/Makefile.kasan | 11 +- scripts/gcc-plugins/randomize_layout_plugin.c | 10 +- security/keys/trusted.c | 5 + sound/firewire/motu/motu.c | 12 + sound/firewire/tascam/tascam-pcm.c | 3 + sound/firewire/tascam/tascam-stream.c | 42 ++- sound/hda/hdac_controller.c | 2 + sound/i2c/other/ak4xxx-adda.c | 7 +- sound/pci/hda/hda_codec.c | 8 +- sound/pci/hda/hda_controller.c | 5 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/patch_hdmi.c | 9 +- sound/pci/hda/patch_realtek.c | 90 ++++++ sound/soc/atmel/mchp-i2s-mcc.c | 41 ++- sound/soc/codecs/es8316.c | 7 +- sound/soc/codecs/hdac_hda.c | 4 + sound/soc/codecs/sgtl5000.c | 21 +- sound/soc/codecs/tlv320aic31xx.c | 7 +- sound/soc/fsl/fsl_ssi.c | 18 +- sound/soc/generic/simple-card-utils.c | 7 + sound/soc/intel/common/sst-acpi.c | 3 +- sound/soc/intel/common/sst-ipc.c | 2 + sound/soc/intel/skylake/skl-debug.c | 2 +- sound/soc/intel/skylake/skl-nhlt.c | 2 +- sound/soc/sh/rcar/adg.c | 21 +- sound/soc/soc-generic-dmaengine-pcm.c | 6 + sound/soc/sof/intel/hda-codec.c | 6 +- sound/soc/sof/sof-pci-dev.c | 3 + sound/soc/sunxi/sun4i-i2s.c | 9 +- sound/soc/uniphier/aio-cpu.c | 31 +- sound/soc/uniphier/aio.h | 1 + sound/usb/pcm.c | 1 + tools/include/uapi/asm/bitsperlong.h | 18 +- tools/lib/traceevent/Makefile | 6 +- tools/lib/traceevent/event-plugin.c | 2 +- tools/perf/arch/x86/util/kvm-stat.c | 4 +- tools/perf/arch/x86/util/tsc.c | 6 +- tools/perf/perf.c | 3 + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 + tools/perf/trace/beauty/ioctl.c | 2 +- tools/perf/ui/browsers/scripts.c | 6 +- tools/perf/ui/helpline.c | 4 +- tools/perf/ui/util.c | 2 +- tools/perf/util/evlist.c | 9 + tools/perf/util/header.c | 4 +- tools/perf/util/hist.c | 5 +- tools/perf/util/map.c | 3 +- tools/perf/util/map_groups.h | 4 + tools/perf/util/thread.c | 7 +- tools/perf/util/thread.h | 4 - tools/perf/util/unwind-libunwind-local.c | 18 +- tools/perf/util/unwind-libunwind.c | 34 +-- tools/perf/util/unwind.h | 25 +- tools/perf/util/xyarray.h | 3 +- tools/testing/selftests/net/fib_tests.sh | 21 +- 369 files changed, 3159 insertions(+), 1539 deletions(-)

4 years, 3 months

10
323
0 0

[PATCH] ARM: tegra: Fix restoration of PLLM when exiting suspend

by Jon Hunter

The suspend entry and exit code for 32-bit Tegra devices assumes that the PLLM (which is used to provide the clock for external memory) is always enabled on entry to suspend. Hence, the current code always disables the PLLM on entry to suspend and re-enables the PLLM on exit from suspend. Since the introduction of the Tegra124 EMC driver by commit 73a7f0a90641 ("memory: tegra: Add EMC (external memory controller) driver"), which is used to scale the EMC frequency, PLLM may not be the current clock source for the EMC on entry to suspend and hence may not be enabled. Always enabling the PLLM on exit from suspend can cause the actual status on the PLL to be different from that reported by the common clock framework. On kernels prior to v4.5, the code to set the rate of the PLLM had a test to verify if the PLL was enabled and if the PLL was enabled, setting the rate would fail. Since commit 267b62a96951 ("clk: tegra: pll: Update PLLM handling") the test to see if PLLM is enabled was removed. With these earlier kernels, if the PLLM is disabled on entering suspend and the EMC driver attempts to set the parent of the EMC clock to the PLLM on exiting suspend, then the set rate for the PLLM will fail and in turn cause the resume to fail. We should not be re-enabling the PLLM on resume from suspend unless it was enabled on entry to suspend. Therefore, fix this by saving the state of PLLM on entry to suspend and only re-enable it, if it was already enabled. Fixes: 73a7f0a90641 ("memory: tegra: Add EMC (external memory controller) driver") Cc: stable(a)vger.kernel.org Signed-off-by: Jon Hunter <jonathanh(a)nvidia.com> --- arch/arm/mach-tegra/sleep-tegra30.S | 33 +++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/sleep-tegra30.S index 3341a12bbb9c..c2f0793a424f 100644 --- a/arch/arm/mach-tegra/sleep-tegra30.S +++ b/arch/arm/mach-tegra/sleep-tegra30.S @@ -337,26 +337,42 @@ ENTRY(tegra30_lp1_reset) add r1, r1, #2 wait_until r1, r7, r3 - /* enable PLLM via PMC */ + /* restore PLLM state */ mov32 r2, TEGRA_PMC_BASE + adr r7, tegra_pllm_status + ldr r1, [r7] + cmp r2, #(1 << 12) + bne _skip_pllm + ldr r1, [r2, #PMC_PLLP_WB0_OVERRIDE] orr r1, r1, #(1 << 12) str r1, [r2, #PMC_PLLP_WB0_OVERRIDE] pll_enable r1, r0, CLK_RESET_PLLM_BASE, 0 + pll_locked r1, r0, CLK_RESET_PLLM_BASE + +_skip_pllm: pll_enable r1, r0, CLK_RESET_PLLC_BASE, 0 pll_enable r1, r0, CLK_RESET_PLLX_BASE, 0 b _pll_m_c_x_done _no_pll_iddq_exit: - /* enable PLLM via PMC */ + /* restore PLLM state */ mov32 r2, TEGRA_PMC_BASE + adr r7, tegra_pllm_status + ldr r1, [r7] + cmp r2, #(1 << 12) + bne _skip_pllm_no_iddq + ldr r1, [r2, #PMC_PLLP_WB0_OVERRIDE] orr r1, r1, #(1 << 12) str r1, [r2, #PMC_PLLP_WB0_OVERRIDE] pll_enable r1, r0, CLK_RESET_PLLM_BASE, CLK_RESET_PLLM_MISC + pll_locked r1, r0, CLK_RESET_PLLM_BASE + +_skip_pllm_no_iddq: pll_enable r1, r0, CLK_RESET_PLLC_BASE, CLK_RESET_PLLC_MISC pll_enable r1, r0, CLK_RESET_PLLX_BASE, CLK_RESET_PLLX_MISC @@ -364,7 +380,6 @@ _pll_m_c_x_done: pll_enable r1, r0, CLK_RESET_PLLP_BASE, CLK_RESET_PLLP_MISC pll_enable r1, r0, CLK_RESET_PLLA_BASE, CLK_RESET_PLLA_MISC - pll_locked r1, r0, CLK_RESET_PLLM_BASE pll_locked r1, r0, CLK_RESET_PLLP_BASE pll_locked r1, r0, CLK_RESET_PLLA_BASE pll_locked r1, r0, CLK_RESET_PLLC_BASE @@ -526,6 +541,8 @@ __no_dual_emc_chanl: ENDPROC(tegra30_lp1_reset) .align L1_CACHE_SHIFT +tegra_pllm_status: + .word 0 tegra30_sdram_pad_address: .word TEGRA_EMC_BASE + EMC_CFG @0x0 .word TEGRA_EMC_BASE + EMC_ZCAL_INTERVAL @0x4 @@ -624,10 +641,14 @@ tegra30_switch_cpu_to_clk32k: add r1, r1, #2 wait_until r1, r7, r9 - /* disable PLLM via PMC in LP1 */ + /* disable PLLM, if enabled, via PMC in LP1 */ + adr r1, tegra_pllm_status ldr r0, [r4, #PMC_PLLP_WB0_OVERRIDE] - bic r0, r0, #(1 << 12) - str r0, [r4, #PMC_PLLP_WB0_OVERRIDE] + and r2, r0, #(1 << 12) + str r2, [r1] + cmp r2, #(1 << 12) + biceq r0, r0, #(1 << 12) + streq r0, [r4, #PMC_PLLP_WB0_OVERRIDE] /* disable PLLP, PLLA, PLLC and PLLX */ ldr r0, [r5, #CLK_RESET_PLLP_BASE] -- 2.17.1

4 years, 3 months

4
10
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror March 2020