4.19.60-stable review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 4.19.60-stable review
This is the start of the stable review cycle for the 4.19.60 release. There are 47 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 20 Jul 2019 02:59:27 AM 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/v4.x/stable-review/patch-4.19.60-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.60-rc1
Jiri Slaby <[email protected]>
x86/entry/32: Fix ENDPROC of common_spurious
Dave Airlie <[email protected]>
drm/udl: move to embedding drm device inside udl device.
Thomas Zimmermann <[email protected]>
drm/udl: Replace drm_dev_unref with drm_dev_put
Dave Airlie <[email protected]>
drm/udl: introduce a macro to convert dev to udl.
Mark Zhang <[email protected]>
regmap-irq: do not write mask register if mask_base is zero
Haren Myneni <[email protected]>
crypto/NX: Set receive window credits to max number of CRBs in RxFIFO
Christophe Leroy <[email protected]>
crypto: talitos - fix hash on SEC1.
Christophe Leroy <[email protected]>
crypto: talitos - move struct talitos_edesc into talitos.h
Julian Wiedmann <[email protected]>
s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
Julian Wiedmann <[email protected]>
s390/qdio: (re-)initialize tiqdio list entries
Heiko Carstens <[email protected]>
s390: fix stfle zero padding
Arnd Bergmann <[email protected]>
ARC: hide unused function unw_hdr_alloc
Thomas Gleixner <[email protected]>
x86/irq: Seperate unused system vectors from spurious entry again
Thomas Gleixner <[email protected]>
x86/irq: Handle spurious interrupt after shutdown gracefully
Thomas Gleixner <[email protected]>
x86/ioapic: Implement irq_get_irqchip_state() callback
Thomas Gleixner <[email protected]>
genirq: Add optional hardware synchronization for shutdown
Thomas Gleixner <[email protected]>
genirq: Fix misleading synchronize_irq() documentation
Thomas Gleixner <[email protected]>
genirq: Delay deactivation in free_irq()
Vinod Koul <[email protected]>
linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL
Nicolas Boichat <[email protected]>
pinctrl: mediatek: Update cur_mask in mask/mask ops
Eiichi Tsukata <[email protected]>
cpu/hotplug: Fix out-of-bounds read when setting fail state
Nicolas Boichat <[email protected]>
pinctrl: mediatek: Ignore interrupts that are wake only during resume
Kai-Heng Feng <[email protected]>
HID: multitouch: Add pointstick support for ALPS Touchpad
Oleksandr Natalenko <[email protected]>
HID: chicony: add another quirk for PixArt mouse
Kirill A. Shutemov <[email protected]>
x86/boot/64: Add missing fixup_pointer() for next_early_pgt access
Kirill A. Shutemov <[email protected]>
x86/boot/64: Fix crash if kernel image crosses page table boundary
Milan Broz <[email protected]>
dm verity: use message limit for data block corruption message
Jerome Marchand <[email protected]>
dm table: don't copy from a NULL pointer in realloc_argv()
Phil Reid <[email protected]>
pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order
Sébastien Szymanski <[email protected]>
ARM: dts: imx6ul: fix PWM[1-4] interrupts
Sergej Benilov <[email protected]>
sis900: fix TX completion
Takashi Iwai <[email protected]>
ppp: mppe: Add softdep to arc4
Petr Oros <[email protected]>
be2net: fix link failure after ethtool offline test
Colin Ian King <[email protected]>
x86/apic: Fix integer overflow on 10 bit left shift of cpu_khz
David Howells <[email protected]>
afs: Fix uninitialised spinlock afs_volume::cb_break_lock
Arnd Bergmann <[email protected]>
ARM: omap2: remove incorrect __init annotation
Linus Walleij <[email protected]>
ARM: dts: gemini Fix up DNS-313 compatible string
Peter Zijlstra <[email protected]>
perf/core: Fix perf_sample_regs_user() mm check
Hans de Goede <[email protected]>
efi/bgrt: Drop BGRT status field reserved bits check
Tony Lindgren <[email protected]>
clk: ti: clkctrl: Fix returning uninitialized data
Heyi Guo <[email protected]>
irqchip/gic-v3-its: Fix command queue pointer comparison bug
Sven Van Asbroeck <[email protected]>
firmware: improve LSM/IMA security behaviour
James Morse <[email protected]>
drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT
Masahiro Yamada <[email protected]>
nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
Cole Rogers <[email protected]>
Input: synaptics - enable SMBUS on T480 thinkpad trackpad
Konstantin Khlebnikov <[email protected]>
e1000e: start network tx queue only when link is up
Konstantin Khlebnikov <[email protected]>
Revert "e1000e: fix cyclic resets at link up with active tx"
-------------
Diffstat:
Makefile | 4 +- arch/arc/kernel/unwind.c | 9 ++- arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 +- arch/arm/boot/dts/imx6ul.dtsi | 8 +-- arch/arm/mach-omap2/prm3xxx.c | 2 +- arch/s390/include/asm/facility.h | 21 ++++-- arch/x86/entry/entry_32.S | 24 +++++++ arch/x86/entry/entry_64.S | 30 ++++++-- arch/x86/include/asm/hw_irq.h | 5 +- arch/x86/kernel/apic/apic.c | 36 ++++++---- arch/x86/kernel/apic/io_apic.c | 46 ++++++++++++ arch/x86/kernel/apic/vector.c | 4 +- arch/x86/kernel/head64.c | 20 +++--- arch/x86/kernel/idt.c | 3 +- arch/x86/kernel/irq.c | 2 +- drivers/base/cacheinfo.c | 3 +- drivers/base/firmware_loader/fallback.c | 2 +- drivers/base/regmap/regmap-irq.c | 6 ++ drivers/clk/ti/clkctrl.c | 7 +- drivers/crypto/nx/nx-842-powernv.c | 8 ++- drivers/crypto/talitos.c | 99 +++++++++++--------------- drivers/crypto/talitos.h | 30 ++++++++ drivers/firmware/efi/efi-bgrt.c | 5 -- drivers/gpu/drm/udl/udl_drv.c | 56 ++++++++++++--- drivers/gpu/drm/udl/udl_drv.h | 9 +-- drivers/gpu/drm/udl/udl_fb.c | 12 ++-- drivers/gpu/drm/udl/udl_gem.c | 2 +- drivers/gpu/drm/udl/udl_main.c | 35 +++------ drivers/hid/hid-ids.h | 2 + drivers/hid/hid-multitouch.c | 4 ++ drivers/hid/hid-quirks.c | 1 + drivers/input/mouse/synaptics.c | 1 + drivers/irqchip/irq-gic-v3-its.c | 35 ++++++--- drivers/md/dm-table.c | 2 +- drivers/md/dm-verity-target.c | 4 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 28 ++++++-- drivers/net/ethernet/intel/e1000e/netdev.c | 21 +++--- drivers/net/ethernet/sis/sis900.c | 16 ++--- drivers/net/ppp/ppp_mppe.c | 1 + drivers/pinctrl/mediatek/mtk-eint.c | 34 +++++---- drivers/pinctrl/pinctrl-mcp23s08.c | 8 +-- drivers/s390/cio/qdio_setup.c | 2 + drivers/s390/cio/qdio_thinint.c | 5 +- fs/afs/callback.c | 4 +- fs/afs/internal.h | 2 +- fs/afs/volume.c | 1 + include/linux/cpuhotplug.h | 1 + include/linux/kernel.h | 3 +- include/uapi/linux/nilfs2_ondisk.h | 24 +++---- kernel/cpu.c | 3 + kernel/events/core.c | 2 +- kernel/irq/autoprobe.c | 6 +- kernel/irq/chip.c | 6 ++ kernel/irq/cpuhotplug.c | 2 +- kernel/irq/internals.h | 5 ++ kernel/irq/manage.c | 88 +++++++++++++++++------ 56 files changed, 534 insertions(+), 267 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/47 Revert "e1000e: fix cyclic resets at link up with active tx"
From: Konstantin Khlebnikov <[email protected]>
commit caff422ea81e144842bc44bab408d85ac449377b upstream.
This reverts commit 0f9e980bf5ee1a97e2e401c846b2af989eb21c61.
That change cased false-positive warning about hardware hang:
e1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx
IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready e1000e 0000:00:1f.6 eth0: Detected Hardware Unit Hang:
TDH <0> TDT <1> next_to_use <1> next_to_clean <0> buffer_info[next_to_clean]: time_stamp <fffba7a7> next_to_watch <0> jiffies <fffbb140> next_to_watch.status <0> MAC Status <40080080> PHY Status <7949> PHY 1000BASE-T Status <0> PHY Extended Status <3000> PCI Status <10>
e1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx
Besides warning everything works fine.
Original issue will be fixed property in following patch.
--- drivers/net/ethernet/intel/e1000e/netdev.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +9 -6
@@ -5286,13 +5286,8 @@ static void e1000_watchdog_task(struct w/* 8000ES2LAN requires a Rx packet buffer work-around * on link down event; reset the controller to flush * the Rx packet buffer. -* -* If the link is lost the controller stops DMA, but -* if there is queued Tx work it cannot be done. So -* reset the controller to flush the Tx packet buffers. */ -if ((adapter->flags &FLAG_RX_NEEDS_RESTART ) || -e1000_desc_unused (tx_ring) +1 < tx_ring->count) +if (adapter->flags &FLAG_RX_NEEDS_RESTART ) adapter->flags |=FLAG_RESTART_NOW ;else pm_schedule_suspend(netdev->dev.parent,
@@ -5315,6 +5310,14 @@ link_up: adapter->gotc_old = adapter->stats.gotc;spin_unlock (&adapter->stats64_lock); +/* If the link is lost the controller stops DMA, but +* if there is queued Tx work it cannot be done. So +* reset the controller to flush the Tx packet buffers. +*/ +if (!netif_carrier_ok (netdev) && + (e1000_desc_unused (tx_ring) +1 < tx_ring->count)) + adapter->flags |=FLAG_RESTART_NOW ; +/* If reset is necessary, do it outside of interrupt context. */ if (adapter->flags &FLAG_RESTART_NOW ) {schedule_work (&adapter->reset_task);
Greg Kroah-Hartman
maintainerPATCH 2/47 e1000e: start network tx queue only when link is up
In reply to Greg Kroah-HartmanFrom: Konstantin Khlebnikov <[email protected]>
commit d17ba0f616a08f597d9348c372d89b8c0405ccf3 upstream.
Driver does not want to keep packets in Tx queue when link is lost. But present code only reset NIC to flush them, but does not prevent queuing new packets. Moreover reset sequence itself could generate new packets via netconsole and NIC falls into endless reset loop.
This patch wakes Tx queue only when NIC is ready to send packets.
This is proper fix for problem addressed by commit 0f9e980bf5ee ("e1000e: fix cyclic resets at link up with active tx").
--- drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +4 -2
@@ -4208,7 +4208,7 @@ void e1000e_up(struct e1000_adapter *adae1000_configure_msix (adapter);e1000_irq_enable (adapter); -netif_start_queue (adapter->netdev); +/* Tx queue started by watchdog timer when link is up */ e1000e_trigger_lsc (adapter); }
@@ -4584,6 +4584,7 @@ int e1000e_open(struct net_device *netdepm_runtime_get_sync (&pdev->dev);netif_carrier_off (netdev); +netif_stop_queue (netdev);/* allocate transmit descriptors */ err =e1000e_setup_tx_resources (adapter->tx_ring);
@@ -4644,7 +4645,6 @@ int e1000e_open(struct net_device *netdee1000_irq_enable (adapter); adapter->tx_hang_recheck = false; -netif_start_queue (netdev); hw->mac.get_link_status = true;pm_runtime_put (&pdev->dev);
@@ -5266,6 +5266,7 @@ static void e1000_watchdog_task(struct wif (phy->ops.cfg_on_link_up) phy->ops.cfg_on_link_up (hw); +netif_wake_queue (netdev);netif_carrier_on (netdev);if (!test_bit (__E1000_DOWN, &adapter->state))
@@ -5279,6 +5280,7 @@ static void e1000_watchdog_task(struct w/* Link status message must follow this format */ pr_info ("%s NIC Link is Down\n" , adapter->netdev->name);netif_carrier_off (netdev); +netif_stop_queue (netdev);if (!test_bit (__E1000_DOWN, &adapter->state))mod_timer (&adapter->phy_info_timer,round_jiffies (jiffies +2 *HZ ));
Greg Kroah-Hartman
maintainerPATCH 3/47 Input: synaptics - enable SMBUS on T480 thinkpad trackpad
In reply to Greg Kroah-HartmanFrom: Cole Rogers <[email protected]>
commit abbe3acd7d72ab4633ade6bd24e8306b67e0add3 upstream.
Thinkpad t480 laptops had some touchpad features disabled, resulting in the loss of pinch to activities in GNOME, on wayland, and other touch gestures being slower. This patch adds the touchpad of the t480 to the smbus_pnp_ids whitelist to enable the extra features. In my testing this does not break suspend (on fedora, with wayland, and GNOME, using the rc-6 kernel), while also fixing the feature on a T480.
--- drivers/input/mouse/synaptics.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/mouse/synaptics.c +1 -0
@@ -176,6 +176,7 @@ static const char * const smbus_pnp_ids["LEN0072" ,/* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */ "LEN0073" ,/* X1 Carbon G5 (Elantech) */ "LEN0092" ,/* X1 Carbon 6 */ +"LEN0093" ,/* T480 */ "LEN0096" ,/* X280 */ "LEN0097" ,/* X280 -> ALPS trackpoint */ "LEN200f", /* T450s */
Greg Kroah-Hartman
maintainerPATCH 4/47 nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit c32cc30c0544f13982ee0185d55f4910319b1a79 upstream.
cpu_to_le32/le32_to_cpu is defined in include/linux/byteorder/generic.h, which is not exported to user-space.
UAPI headers must use the ones prefixed with double-underscore.
Detected by compile-testing exported headers:
include/linux/nilfs2_ondisk.h: In function `nilfs_checkpoint_set_snapshot':
include/linux/nilfs2_ondisk.h:536:17: error: implicit declaration of function `cpu_to_le32' [-Werror=implicit-function-declaration]
cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \
^
include/linux/nilfs2_ondisk.h:552:1: note: in expansion of macro `NILFS_CHECKPOINT_FNS'
NILFS_CHECKPOINT_FNS(SNAPSHOT, snapshot)
^~~~~~~~~~~~~~~~~~~~
include/linux/nilfs2_ondisk.h:536:29: error: implicit declaration of function `le32_to_cpu' [-Werror=implicit-function-declaration]
cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \
^
include/linux/nilfs2_ondisk.h:552:1: note: in expansion of macro `NILFS_CHECKPOINT_FNS'
NILFS_CHECKPOINT_FNS(SNAPSHOT, snapshot)
^~~~~~~~~~~~~~~~~~~~
include/linux/nilfs2_ondisk.h: In function `nilfs_segment_usage_set_clean':
include/linux/nilfs2_ondisk.h:622:19: error: implicit declaration of function `cpu_to_le64' [-Werror=implicit-function-declaration]
su->su_lastmod = cpu_to_le64(0);
^~~~~~~~~~~--- include/uapi/linux/nilfs2_ondisk.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
include/uapi/linux/nilfs2_ondisk.h +12 -12
@@ -29,7 +29,7 @@#include <linux/types.h> #include <linux/magic.h> - +#include <asm/byteorder.h> #define NILFS_INODE_BMAP_SIZE 7
@@ -533,19 +533,19 @@ enum { static inline void \ nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp) \ { \ - cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \ - (1UL << NILFS_CHECKPOINT_##flag)); \ + cp->cp_flags = __cpu_to_le32(__le32_to_cpu(cp->cp_flags) | \ + (1UL << NILFS_CHECKPOINT_##flag)); \ } \ static inline void \ nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp) \ { \ - cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) & \ + cp->cp_flags = __cpu_to_le32(__le32_to_cpu(cp->cp_flags) & \ ~(1UL << NILFS_CHECKPOINT_##flag)); \ } \ static inline int \ nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp) \ { \ - return !!(le32_to_cpu(cp->cp_flags) & \ + return !!(__le32_to_cpu(cp->cp_flags) & \ (1UL << NILFS_CHECKPOINT_##flag)); \ }
@@ -595,20 +595,20 @@ enum { static inline void \ nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su) \ { \ - su->su_flags = cpu_to_le32(le32_to_cpu(su->su_flags) | \ + su->su_flags = __cpu_to_le32(__le32_to_cpu(su->su_flags) | \ (1UL << NILFS_SEGMENT_USAGE_##flag));\ } \ static inline void \ nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su) \ { \ su->su_flags = \ - cpu_to_le32(le32_to_cpu(su->su_flags) & \ + __cpu_to_le32(__le32_to_cpu(su->su_flags) & \ ~(1UL << NILFS_SEGMENT_USAGE_##flag)); \ } \ static inline int \ nilfs_segment_usage_##name(const struct nilfs_segment_usage *su) \ { \ - return !!(le32_to_cpu(su->su_flags) & \ + return !!(__le32_to_cpu(su->su_flags) & \ (1UL << NILFS_SEGMENT_USAGE_##flag)); \ }
@@ -619,15 +619,15 @@ NILFS_SEGMENT_USAGE_FNS(ERROR, error)static inline void nilfs_segment_usage_set_clean (struct nilfs_segment_usage *su) { - su->su_lastmod =cpu_to_le64 (0 ); - su->su_nblocks =cpu_to_le32 (0 ); - su->su_flags =cpu_to_le32 (0 ); + su->su_lastmod =__cpu_to_le64 (0 ); + su->su_nblocks =__cpu_to_le32 (0 ); + su->su_flags =__cpu_to_le32 (0 ); }static inline int nilfs_segment_usage_clean (const struct nilfs_segment_usage *su) { -return !le32_to_cpu (su->su_flags); +return !__le32_to_cpu (su->su_flags); }/**
Greg Kroah-Hartman
maintainerPATCH 5/47 drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT
In reply to Greg Kroah-HartmanFrom: James Morse <[email protected]>
commit 83b44fe343b5abfcb1b2261289bd0cfcfcfd60a8 upstream.
The cacheinfo structures are alloced/freed by cpu online/offline callbacks. Originally these were only used by sysfs to expose the cache topology to user space. Without any in-kernel dependencies CPUHP_AP_ONLINE_DYN was an appropriate choice.
resctrl has started using these structures to identify CPUs that share a cache. It updates its 'domain' structures from cpu online/offline callbacks. These depend on the cacheinfo structures (resctrl_online_cpu()->domain_add_cpu()->get_cache_id()->
get_cpu_cacheinfo()).
These also run as CPUHP_AP_ONLINE_DYN.
Now that there is an in-kernel dependency, move the cacheinfo work earlier so we know its done before resctrl's CPUHP_AP_ONLINE_DYN work runs.
--- drivers/base/cacheinfo.c | 3 ++- include/linux/cpuhotplug.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/base/cacheinfo.c +2 -1
@@ -653,7 +653,8 @@ static int cacheinfo_cpu_pre_down(unsignstatic int __init cacheinfo_sysfs_init (void ) { -return cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"base/cacheinfo:online" , +return cpuhp_setup_state (CPUHP_AP_BASE_CACHEINFO_ONLINE , +"base/cacheinfo:online" , cacheinfo_cpu_online, cacheinfo_cpu_pre_down); }device_initcall (cacheinfo_sysfs_init);
include/linux/cpuhotplug.h +1 -0
@@ -170,6 +170,7 @@ enum cpuhp_state {CPUHP_AP_WATCHDOG_ONLINE ,CPUHP_AP_WORKQUEUE_ONLINE ,CPUHP_AP_RCUTREE_ONLINE , +CPUHP_AP_BASE_CACHEINFO_ONLINE ,CPUHP_AP_ONLINE_DYN ,CPUHP_AP_ONLINE_DYN_END =CPUHP_AP_ONLINE_DYN +30 , CPUHP_AP_X86_HPET_ONLINE,
Greg Kroah-Hartman
maintainerPATCH 6/47 firmware: improve LSM/IMA security behaviour
In reply to Greg Kroah-HartmanFrom: Sven Van Asbroeck <[email protected]>
commit 2472d64af2d3561954e2f05365a67692bb852f2a upstream.
The firmware loader queries if LSM/IMA permits it to load firmware via the sysfs fallback. Unfortunately, the code does the opposite:
it expressly permits sysfs fw loading if security_kernel_load_data( LOADING_FIRMWARE) returns -EACCES. This happens because a zero-on-success return value is cast to a bool that's true on success.
Fix the return value handling so we get the correct behaviour.
To: Luis Chamberlain <[email protected]>
--- drivers/base/firmware_loader/fallback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/firmware_loader/fallback.c +1 -1
@@ -659,7 +659,7 @@ static bool fw_run_sysfs_fallback(enum f/* Also permit LSMs and IMA to fail firmware sysfs fallback */ ret =security_kernel_load_data (LOADING_FIRMWARE );if (ret <0 ) -return ret; +return false;return fw_force_sysfs_fallback (opt_flags); }
Greg Kroah-Hartman
maintainerPATCH 7/47 irqchip/gic-v3-its: Fix command queue pointer comparison bug
In reply to Greg Kroah-Hartman[ Upstream commit a050fa5476d418fc16b25abe168b3d38ba11e13c ]
When we run several VMs with PCI passthrough and GICv4 enabled, not pinning vCPUs, we will occasionally see below warnings in dmesg:
ITS queue timeout (65440 65504 480)
ITS cmd its_build_vmovp_cmd failed
The reason for the above issue is that in BUILD_SINGLE_CMD_FUNC:
1. Post the write command.
2. Release the lock.
3. Start to read GITS_CREADR to get the reader pointer.
4. Compare the reader pointer to the target pointer.
5. If reader pointer does not reach the target, sleep 1us and continue to try.
If we have several processors running the above concurrently, other CPUs will post write commands while the 1st CPU is waiting the completion. So we may have below issue:
phase 1:
---rd_idx-----from_idx-----to_idx--0---------
wait 1us:
phase 2:
--------------from_idx-----to_idx--0-rd_idx--
That is the rd_idx may fly ahead of to_idx, and if in case to_idx is near the wrap point, rd_idx will wrap around. So the below condition will not be met even after 1s:
if (from_idx < to_idx && rd_idx >= to_idx)
There is another theoretical issue. For a slow and busy ITS, the initial rd_idx may fall behind from_idx a lot, just as below:
---rd_idx---0--from_idx-----to_idx-----------
This will cause the wait function exit too early.
Actually, it does not make much sense to use from_idx to judge if to_idx is wrapped, but we need a initial rd_idx when lock is still acquired, and it can be used to judge whether to_idx is wrapped and the current rd_idx is wrapped.
We switch to a method of calculating the delta of two adjacent reads and accumulating it to get the sum, so that we can get the real rd_idx from the wrapped value even when the queue is almost full.
--- drivers/irqchip/irq-gic-v3-its.c | 35 ++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 11 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +24 -11
@@ -740,32 +740,43 @@ static void its_flush_cmd(struct its_node *its, struct its_cmd_block *cmd) }static int its_wait_for_range_completion (struct its_node *its, -struct its_cmd_block *from, +u64 prev_idx,struct its_cmd_block *to) { -u64 rd_idx, from_idx, to_idx; +u64 rd_idx, to_idx, linear_idx;u32 count =1000000 ;/* 1s! */ - from_idx =its_cmd_ptr_to_offset (its, from); +/* Linearize to_idx if the command set has wrapped around */ to_idx =its_cmd_ptr_to_offset (its, to); +if (to_idx < prev_idx) + to_idx +=ITS_CMD_QUEUE_SZ ; + + linear_idx = prev_idx;while (1 ) { +s64 delta; + rd_idx =readl_relaxed (its->base +GITS_CREADR ); -/* Direct case */ -if (from_idx < to_idx && rd_idx >= to_idx) -break ; +/* +* Compute the read pointer progress, taking the +* potential wrap-around into account. +*/ + delta = rd_idx - prev_idx; +if (rd_idx < prev_idx) + delta +=ITS_CMD_QUEUE_SZ ; -/* Wrapped case */ -if (from_idx >= to_idx && rd_idx >= to_idx && rd_idx < from_idx) + linear_idx += delta; +if (linear_idx >= to_idx)break ; count--;if (!count) { -pr_err_ratelimited ("ITS queue timeout (%llu %llu %llu)\n" , - from_idx, to_idx, rd_idx); +pr_err_ratelimited ("ITS queue timeout (%llu %llu)\n" , + to_idx, linear_idx);return -1 ; } + prev_idx = rd_idx;cpu_relax ();udelay (1 ); }
@@ -782,6 +793,7 @@ void name(struct its_node *its, \struct its_cmd_block *cmd, *sync_cmd, *next_cmd; \synctype *sync_obj; \unsigned long flags; \ +u64 rd_idx; \ \raw_spin_lock_irqsave (&its->lock, flags); \ \
@@ -803,10 +815,11 @@ void name(struct its_node *its, \ } \ \ post: \ + rd_idx =readl_relaxed (its->base +GITS_CREADR ); \ next_cmd =its_post_commands (its); \raw_spin_unlock_irqrestore (&its->lock, flags); \ \ -if (its_wait_for_range_completion (its, cmd, next_cmd)) \ +if (its_wait_for_range_completion (its, rd_idx, next_cmd)) \pr_err_ratelimited ("ITS cmd %ps failed\n" , builder); \ }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/47 clk: ti: clkctrl: Fix returning uninitialized data
In reply to Greg Kroah-Hartman[ Upstream commit 41b3588dba6ef4b7995735a97e47ff0aeea6c276 ]
If we do a clk_get() for a clock that does not exists, we have _ti_omap4_clkctrl_xlate() return uninitialized data if no match is found. This can be seen in some cases with SLAB_DEBUG enabled:
Unable to handle kernel paging request at virtual address 5a5a5a5a
...
clk_hw_create_clk.part.33sysc_notifier_callnotifier_call_chainblocking_notifier_call_chaindevice_add
Let's fix this by setting a found flag only when we find a match.
--- drivers/clk/ti/clkctrl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/clk/ti/clkctrl.c +5 -2
@@ -229,6 +229,7 @@ static struct clk_hw *_ti_omap4_clkctrl_xlate(struct of_phandle_args *clkspec, {struct omap_clkctrl_provider *provider = data;struct omap_clkctrl_clk *entry; +bool found = false;if (clkspec->args_count !=2 )return ERR_PTR (-EINVAL );
@@ -238,11 +239,13 @@ static struct clk_hw *_ti_omap4_clkctrl_xlate(struct of_phandle_args *clkspec,list_for_each_entry (entry, &provider->clocks, node) {if (entry->reg_offset == clkspec->args[0 ] && - entry->bit_offset == clkspec->args[1 ]) + entry->bit_offset == clkspec->args[1 ]) { + found = true;break ; + } } -if (!entry) +if (!found)return ERR_PTR (-EINVAL );return entry->clk;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/47 efi/bgrt: Drop BGRT status field reserved bits check
In reply to Greg Kroah-Hartman[ Upstream commit a483fcab38b43fb34a7f12ab1daadd3907f150e2 ]
Starting with ACPI 6.2 bits 1 and 2 of the BGRT status field are no longer reserved. These bits are now used to indicate if the image needs to be rotated before being displayed.
The first device using these bits has now shown up (the GPD MicroPC) and the reserved bits check causes us to reject the valid BGRT table on this device.
Rather then changing the reserved bits check, allowing only the 2 new bits, instead just completely remove it so that we do not end up with a similar problem when more bits are added in the future.
--- drivers/firmware/efi/efi-bgrt.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/firmware/efi/efi-bgrt.c +0 -5
@@ -50,11 +50,6 @@ void __init efi_bgrt_init(struct acpi_table_header *table) bgrt->version); goto out; } -if (bgrt->status &0xfe ) { -pr_notice ("Ignoring BGRT: reserved status bits are non-zero %u\n" , - bgrt->status); - goto out; - }if (bgrt->image_type !=0 ) {pr_notice ("Ignoring BGRT: invalid image type %u (expected 0)\n" , bgrt->image_type);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/47 perf/core: Fix perf_sample_regs_user() mm check
In reply to Greg Kroah-Hartman[ Upstream commit 085ebfe937d7a7a5df1729f35a12d6d655fea68c ]
perf_sample_regs_user() uses 'current->mm' to test for the presence of userspace, but this is insufficient, consider use_mm().
A better test is: '!(current->flags & PF_KTHREAD)', exec() clears PF_KTHREAD after it sets the new ->mm but before it drops to userspace for the first time.
Possibly obsoletes: bf05fc25f268 ("powerpc/perf: Fix oops when kthread execs user process")
--- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -5906,7 +5906,7 @@ static void perf_sample_regs_user(struct perf_regs *regs_user,if (user_mode (regs)) { regs_user->abi =perf_reg_abi (current); regs_user->regs = regs; - }else if (current->mm) { + }else if (!(current->flags &PF_KTHREAD )) {perf_get_regs_user (regs_user, regs, regs_user_copy); }else { regs_user->abi =PERF_SAMPLE_REGS_ABI_NONE ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/47 ARM: dts: gemini Fix up DNS-313 compatible string
In reply to Greg Kroah-Hartman[ Upstream commit 36558020128b1a48b7bddd5792ee70e3f64b04b0 ]
It's a simple typo in the DNS file, which was pretty serious. No scripts were working properly. Fix it up.
--- arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/gemini-dlink-dns-313.dts +1 -1
@@ -11,7 +11,7 @@ / { model = "D-Link DNS-313 1-Bay Network Storage Enclosure"; - compatible = "dlink,dir-313", "cortina,gemini"; + compatible = "dlink,dns-313", "cortina,gemini"; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/47 ARM: omap2: remove incorrect __init annotation
In reply to Greg Kroah-Hartman[ Upstream commit 27e23d8975270df6999f8b5b3156fc0c04927451 ]
omap3xxx_prm_enable_io_wakeup() is marked __init, but its caller is not, so we get a warning with clang-8:
WARNING: vmlinux.o(.text+0x343c8): Section mismatch in reference from the function omap3xxx_prm_late_init() to the function .init.text:omap3xxx_prm_enable_io_wakeup() The function omap3xxx_prm_late_init() references
the function __init omap3xxx_prm_enable_io_wakeup().
This is often because omap3xxx_prm_late_init lacks a __init
annotation or the annotation of omap3xxx_prm_enable_io_wakeup is wrong.
When building with gcc, omap3xxx_prm_enable_io_wakeup() is always inlined, so we never noticed in the past.
--- arch/arm/mach-omap2/prm3xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/prm3xxx.c +1 -1
@@ -433,7 +433,7 @@ static void omap3_prm_reconfigure_io_chain(void)* registers, and omap3xxx_prm_reconfigure_io_chain() must be called. * No return value. */ -static void __init omap3xxx_prm_enable_io_wakeup (void ) +static void omap3xxx_prm_enable_io_wakeup (void ) {if (prm_features &PRM_HAS_IO_WAKEUP ) omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/47 afs: Fix uninitialised spinlock afs_volume::cb_break_lock
In reply to Greg Kroah-Hartman[ Upstream commit 90fa9b64523a645a97edc0bdcf2d74759957eeee ]
Fix the cb_break_lock spinlock in afs_volume struct by initialising it when the volume record is allocated.
Also rename the lock to cb_v_break_lock to distinguish it from the lock of the same name in the afs_server struct.
Without this, the following trace may be observed when a volume-break callback is received:
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
CPU: 2 PID: 50 Comm: kworker/2:1 Not tainted 5.2.0-rc1-fscache+ #3045 Hardware name: ASUS All Series/H97-PLUS, BIOS 2306 10/09/2014 Workqueue: afs SRXAFSCB_CallBack Call Trace: dump_stack+0x67/0x8e register_lock_class+0x23b/0x421 ? check_usage_forwards+0x13c/0x13c __lock_acquire+0x89/0xf73 lock_acquire+0x13b/0x166 ? afs_break_callbacks+0x1b2/0x3dd _raw_write_lock+0x2c/0x36 ? afs_break_callbacks+0x1b2/0x3dd afs_break_callbacks+0x1b2/0x3dd ? trace_event_raw_event_afs_server+0x61/0xac SRXAFSCB_CallBack+0x11f/0x16c process_one_work+0x2c5/0x4ee ? worker_thread+0x234/0x2ac worker_thread+0x1d8/0x2ac ? cancel_delayed_work_sync+0xf/0xf kthread+0x11f/0x127 ? kthread_park+0x76/0x76 ret_from_fork+0x24/0x30
--- fs/afs/callback.c | 4 ++-- fs/afs/internal.h | 2 +- fs/afs/volume.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-)
fs/afs/callback.c +2 -2
@@ -276,9 +276,9 @@ static void afs_break_one_callback(struct afs_server *server,struct afs_super_info *as =AFS_FS_S (cbi->sb);struct afs_volume *volume = as->volume; -write_lock (&volume->cb_break_lock); +write_lock (&volume->cb_v_break_lock); volume->cb_v_break++; -write_unlock (&volume->cb_break_lock); +write_unlock (&volume->cb_v_break_lock); }else { data.volume =NULL ; data.fid = *fid;
fs/afs/internal.h +1 -1
@@ -477,7 +477,7 @@ struct afs_volume {unsigned int servers_seq;/* Incremented each time ->servers changes */ unsigned cb_v_break;/* Break-everything counter. */ -rwlock_t cb_break_lock; +rwlock_t cb_v_break_lock;afs_voltype_t type;/* type of volume */ short error;
fs/afs/volume.c +1 -0
@@ -47,6 +47,7 @@ static struct afs_volume *afs_alloc_volume(struct afs_mount_params *params,atomic_set (&volume->usage,1 );INIT_LIST_HEAD (&volume->proc_link);rwlock_init (&volume->servers_lock); +rwlock_init (&volume->cb_v_break_lock);memcpy (volume->name, vldb->name, vldb->name_len +1 ); slist =afs_alloc_server_list (params->cell, params->key, vldb, type_mask);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 13/47] afs: Fix uninitialised spinlock afs_volume::cb_break_lock
Hi!
Quoted 5 lines
Without this, the following trace may be observed when a volume-break callback is received:
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
I'm sure this fixes the warning...
Quoted 6 lines
fs/afs/callback.c +0
-0@@ -276,9 +276,9 @@ static void afs_break_one_callback(struct afs_server *server,struct afs_super_info *as =AFS_FS_S (cbi->sb);
fs/afs/callback.c static void afs_break_one_callback(struct afs_server *server, · line 284
Quoted 10 lines
fs/afs/callback.c +2
-2struct afs_volume *volume = as->volume; -write_lock (&volume->cb_break_lock); +write_lock (&volume->cb_v_break_lock); volume->cb_v_break++; -write_unlock (&volume->cb_break_lock); +write_unlock (&volume->cb_v_break_lock); }else { data.volume =NULL ; data.fid = *fid;
But this is the only use of the lock.
Which is strange: we have read/write lock, but we only use the write side. Readers don't take the lock, so it does not offer any protection for them.
Is that correct? Does this need to be rwlock, or would plain spinlock be enough? atomic_t?
(Problem exists in the mainline, nothing stable specific here).
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 14/47 x86/apic: Fix integer overflow on 10 bit left shift of cpu_khz
In reply to Greg Kroah-Hartman[ Upstream commit ea136a112d89bade596314a1ae49f748902f4727 ]
The left shift of unsigned int cpu_khz will overflow for large values of cpu_khz, so cast it to a long long before shifting it to avoid overvlow. For example, this can happen when cpu_khz is 4194305, i.e. ~4.2 GHz.
Addresses-Coverity: ("Unintentional integer overflow")
--- arch/x86/kernel/apic/apic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/apic/apic.c +2 -1
@@ -1452,7 +1452,8 @@ static void apic_pending_intr_clear(void)if (queued) {if (boot_cpu_has (X86_FEATURE_TSC ) && cpu_khz) { ntsc =rdtsc (); - max_loops = (cpu_khz <<10 ) - (ntsc - tsc); + max_loops = (long long )cpu_khz <<10 ; + max_loops -= ntsc - tsc; }else { max_loops--; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/47 be2net: fix link failure after ethtool offline test
In reply to Greg Kroah-Hartman[ Upstream commit 2e5db6eb3c23e5dc8171eb8f6af7a97ef9fcf3a9 ]
Certain cards in conjunction with certain switches need a little more time for link setup that results in ethtool link test failure after offline test. Patch adds a loop that waits for a link setup finish.
Changes in v2:
- added fixes header
--- .../net/ethernet/emulex/benet/be_ethtool.c | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-)
drivers/net/ethernet/emulex/benet/be_ethtool.c +22 -6
@@ -895,7 +895,7 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data) {struct be_adapter *adapter =netdev_priv (netdev); -int status; +int status, cnt;u8 link_status =0 ;if (adapter->function_caps &BE_FUNCTION_CAPS_SUPER_NIC ) {
@@ -906,6 +906,9 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test,memset (data,0 ,sizeof (u64) *ETHTOOL_TESTS_NUM ); +/* check link status before offline tests */ + link_status =netif_carrier_ok (netdev); +if (test->flags Ð_TEST_FL_OFFLINE ) {if (be_loopback_test (adapter,BE_MAC_LOOPBACK , &data[0 ]) !=0 ) test->flags |=ETH_TEST_FL_FAILED ;
@@ -926,13 +929,26 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, test->flags |=ETH_TEST_FL_FAILED ; } - status =be_cmd_link_status_query (adapter,NULL , &link_status,0 ); -if (status) { - test->flags |=ETH_TEST_FL_FAILED ; - data[4 ] =-1 ; - }else if (!link_status) { +/* link status was down prior to test */ +if (!link_status) { test->flags |=ETH_TEST_FL_FAILED ; data[4 ] =1 ; +return ; + } + +for (cnt =10 ; cnt; cnt--) { + status =be_cmd_link_status_query (adapter,NULL , &link_status, +0 ); +if (status) { + test->flags |=ETH_TEST_FL_FAILED ; + data[4 ] =-1 ; +break ; + } + +if (link_status) +break ; + +msleep_interruptible (500 ); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/47 ppp: mppe: Add softdep to arc4
In reply to Greg Kroah-Hartman[ Upstream commit aad1dcc4f011ea409850e040363dff1e59aa4175 ]
The arc4 crypto is mandatory at ppp_mppe probe time, so let's put a softdep line, so that the corresponding module gets prepared gracefully. Without this, a simple inclusion to initrd via dracut failed due to the missing dependency, for example.
--- drivers/net/ppp/ppp_mppe.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ppp/ppp_mppe.c +1 -0
@@ -63,6 +63,7 @@ MODULE_AUTHOR("Frank Cusack <[email protected]>");MODULE_DESCRIPTION ("Point-to-Point Protocol Microsoft Point-to-Point Encryption support" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_ALIAS ("ppp-compress-" __stringify(CI_MPPE )); +MODULE_SOFTDEP ("pre: arc4" );MODULE_VERSION ("1.0.2" ); static unsigned int
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/47 sis900: fix TX completion
In reply to Greg Kroah-Hartman[ Upstream commit 8ac8a01092b2added0749ef937037bf1912e13e3 ]
Since commit 605ad7f184b60cfaacbc038aa6c55ee68dee3c89 "tcp: refine TSO autosizing", outbound throughput is dramatically reduced for some connections, as sis900 is doing TX completion within idle states only.
Make TX completion happen after every transmitted packet.
Test:
netperf
before patch:
Quoted 1 line
netperf -H remote -l -2000000 -- -s 1000000
MIGRATED TCP STREAM TEST from 0.0.0.0 () port 0 AF_INET to 95.223.112.76 () port 0 AF_INET : demo
Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec
87380 327680 327680 253.44 0.06
after patch:
Quoted 1 line
netperf -H remote -l -10000000 -- -s 1000000
MIGRATED TCP STREAM TEST from 0.0.0.0 () port 0 AF_INET to 95.223.112.76 () port 0 AF_INET : demo
Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec
87380 327680 327680 5.38 14.89
Thx to Dave Miller and Eric Dumazet for helpful hints
--- drivers/net/ethernet/sis/sis900.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/sis/sis900.c +8 -8
@@ -1057,7 +1057,7 @@ sis900_open(struct net_device *net_dev)sis900_set_mode (sis_priv,HW_SPEED_10_MBPS ,FDX_CAPABLE_HALF_SELECTED );/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC);sw32 (cr, RxENA |sr32 (cr));sw32 (ier,IE );
@@ -1578,7 +1578,7 @@ static void sis900_tx_timeout(struct net_device *net_dev)sw32 (txdp, sis_priv->tx_ring_dma);/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC); }/**
@@ -1618,7 +1618,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)spin_unlock_irqrestore (&sis_priv->lock, flags);return NETDEV_TX_OK ; } - sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len); + sis_priv->tx_ring[entry].cmdsts = (OWN |INTR | skb->len);sw32 (cr, TxENA |sr32 (cr)); sis_priv->cur_tx ++;
@@ -1674,7 +1674,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance) do { status = sr32(isr); - if ((status & (HIBERR|TxURN|TxERR|TxIDLE|RxORN|RxERR|RxOK)) == 0) + if ((status & (HIBERR|TxURN|TxERR|TxIDLE|TxDESC|RxORN|RxERR|RxOK)) == 0) /* nothing intresting happened */ break; handled = 1;
@@ -1684,7 +1684,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)/* Rx interrupt */ sis900_rx (net_dev); -if (status & (TxURN | TxERR | TxIDLE)) +if (status & (TxURN | TxERR | TxIDLE | TxDESC))/* Tx interrupt */ sis900_finish_xmit (net_dev);
@@ -1896,8 +1896,8 @@ static void sis900_finish_xmit (struct net_device *net_dev)if (tx_status &OWN ) {/* The packet is not transmitted yet (owned by hardware) ! -* Note: the interrupt is generated only when Tx Machine -* is idle, so this is an almost impossible case */ +* Note: this is an almost impossible condition +* in case of TxDESC ('descriptor interrupt') */ break ; }
@@ -2473,7 +2473,7 @@ static int sis900_resume(struct pci_dev *pci_dev)sis900_set_mode (sis_priv,HW_SPEED_10_MBPS ,FDX_CAPABLE_HALF_SELECTED );/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC);sw32 (cr, RxENA |sr32 (cr));sw32 (ier,IE );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/47 ARM: dts: imx6ul: fix PWM[1-4] interrupts
In reply to Greg Kroah-Hartman[ Upstream commit 3cf10132ac8d536565f2c02f60a3aeb315863a52 ]
According to the i.MX6UL/L RM, table 3.1 "ARM Cortex A7 domain interrupt summary", the interrupts for the PWM[1-4] go from 83 to 86.
--- arch/arm/boot/dts/imx6ul.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx6ul.dtsi +4 -4
@@ -359,7 +359,7 @@ pwm1: pwm@2080000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02080000 0x4000>; - interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM1>, <&clks IMX6UL_CLK_PWM1>; clock-names = "ipg", "per";
@@ -370,7 +370,7 @@ pwm2: pwm@2084000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02084000 0x4000>; - interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM2>, <&clks IMX6UL_CLK_PWM2>; clock-names = "ipg", "per";
@@ -381,7 +381,7 @@ pwm3: pwm@2088000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02088000 0x4000>; - interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM3>, <&clks IMX6UL_CLK_PWM3>; clock-names = "ipg", "per";
@@ -392,7 +392,7 @@ pwm4: pwm@208c000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x0208c000 0x4000>; - interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM4>, <&clks IMX6UL_CLK_PWM4>; clock-names = "ipg", "per";
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/47 pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order
In reply to Greg Kroah-Hartman[ Upstream commit 6dbc6e6f58556369bf999cd7d9793586f1b0e4b4 ]
Currently probing of the mcp23s08 results in an error message "detected irqchip that is shared with multiple gpiochips:
please fix the driver"
This is due to the following:
Call to mcp23s08_irqchip_setup() with call hierarchy:mcp23s08_irqchip_setup()
gpiochip_irqchip_add_nested()
gpiochip_irqchip_add_key()
gpiochip_set_irq_hooks()
Call to devm_gpiochip_add_data() with call hierarchy:devm_gpiochip_add_data()
gpiochip_add_data_with_key()
gpiochip_add_irqchip()
gpiochip_set_irq_hooks()
The gpiochip_add_irqchip() returns immediately if there isn't a irqchip but we added a irqchip due to the previous mcp23s08_irqchip_setup() call. So it calls gpiochip_set_irq_hooks() a second time.
Fix this by moving the call to devm_gpiochip_add_data before the call to mcp23s08_irqchip_setup
--- drivers/pinctrl/pinctrl-mcp23s08.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/pinctrl-mcp23s08.c +4 -4
@@ -889,6 +889,10 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,if (ret <0 ) goto fail; + ret =devm_gpiochip_add_data (dev, &mcp->chip, mcp); +if (ret <0 ) + goto fail; + mcp->irq_controller =device_property_read_bool (dev,"interrupt-controller" );if (mcp->irq && mcp->irq_controller) {
@@ -930,10 +934,6 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, goto fail; } - ret =devm_gpiochip_add_data (dev, &mcp->chip, mcp); -if (ret <0 ) - goto fail; -if (one_regmap_config) { mcp->pinctrl_desc.name =devm_kasprintf (dev,GFP_KERNEL ,"mcp23xxx-pinctrl.%d" , raw_chip_address);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/47 dm table: dont copy from a NULL pointer in realloc_argv()
In reply to Greg Kroah-Hartman[ Upstream commit a0651926553cfe7992166432e418987760882652 ]
For the first call to realloc_argv() in dm_split_args(), old_argv is NULL and size is zero. Then memcpy is called, with the NULL old_argv as the source argument and a zero size argument. AFAIK, this is undefined behavior and generates the following warning when compiled with UBSAN on ppc64le:
In file included from ./arch/powerpc/include/asm/paca.h:19,
from ./arch/powerpc/include/asm/current.h:16,
from ./include/linux/sched.h:12,
from ./include/linux/kthread.h:6,
from drivers/md/dm-core.h:12,
from drivers/md/dm-table.c:8:In function 'memcpy',
inlined from 'realloc_argv' at drivers/md/dm-table.c:565:3,
inlined from 'dm_split_args' at drivers/md/dm-table.c:588:9:./include/linux/string.h:345:9: error: argument 2 null where non-null expected [-Werror=nonnull]
return __builtin_memcpy(p, q, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/md/dm-table.c: In function 'dm_split_args':./include/linux/string.h:345:9: note: in a call to built-in function '__builtin_memcpy'
--- drivers/md/dm-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-table.c +1 -1
@@ -562,7 +562,7 @@ static char **realloc_argv(unsigned *size, char **old_argv) gfp =GFP_NOIO ; } argv =kmalloc_array (new_size,sizeof (*argv), gfp); -if (argv) { +if (argv && old_argv) {memcpy (argv, old_argv, *size *sizeof (*argv)); *size = new_size; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/47 dm verity: use message limit for data block corruption message
In reply to Greg Kroah-Hartman[ Upstream commit 2eba4e640b2c4161e31ae20090a53ee02a518657 ]
DM verity should also use DMERR_LIMIT to limit repeat data block corruption messages.
--- drivers/md/dm-verity-target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-verity-target.c +2 -2
@@ -236,8 +236,8 @@ static int verity_handle_err(struct dm_verity *v, enum verity_block_type type,BUG (); } -DMERR ("%s: %s block %llu is corrupted" , v->data_dev->name, type_str, - block); +DMERR_LIMIT ("%s: %s block %llu is corrupted" , v->data_dev->name, + type_str, block);if (v->corrupted_errs ==DM_VERITY_MAX_CORRUPTED_ERRS )DMERR ("%s: reached maximum errors" , v->data_dev->name);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/47 x86/boot/64: Fix crash if kernel image crosses page table boundary
In reply to Greg Kroah-Hartman[ Upstream commit 81c7ed296dcd02bc0b4488246d040e03e633737a ]
A kernel which boots in 5-level paging mode crashes in a small percentage of cases if KASLR is enabled.
This issue was tracked down to the case when the kernel image unpacks in a way that it crosses an 1G boundary. The crash is caused by an overrun of the PMD page table in __startup_64() and corruption of P4D page table allocated next to it. This particular issue is not visible with 4-level paging as P4D page tables are not used.
But the P4D and the PUD calculation have similar problems.
The PMD index calculation is wrong due to operator precedence, which fails to confine the PMDs in the PMD array on wrap around.
The P4D calculation for 5-level paging and the PUD calculation calculate the first index correctly, but then blindly increment it which causes the same issue when a kernel image is located across a 512G and for 5-level paging across a 46T boundary.
This wrap around mishandling was introduced when these parts moved from assembly to C.
Restore it to the correct behaviour.
--- arch/x86/kernel/head64.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
arch/x86/kernel/head64.c +9 -8
@@ -190,18 +190,18 @@ unsigned long __head __startup_64(unsigned long physaddr, pgd[i +0 ] = (pgdval_t )p4d + pgtable_flags; pgd[i +1 ] = (pgdval_t )p4d + pgtable_flags; - i = (physaddr >>P4D_SHIFT ) %PTRS_PER_P4D ; - p4d[i +0 ] = (pgdval_t )pud + pgtable_flags; - p4d[i +1 ] = (pgdval_t )pud + pgtable_flags; + i = physaddr >>P4D_SHIFT ; + p4d[(i +0 ) %PTRS_PER_P4D ] = (pgdval_t )pud + pgtable_flags; + p4d[(i +1 ) %PTRS_PER_P4D ] = (pgdval_t )pud + pgtable_flags; }else { i = (physaddr >>PGDIR_SHIFT ) %PTRS_PER_PGD ; pgd[i +0 ] = (pgdval_t )pud + pgtable_flags; pgd[i +1 ] = (pgdval_t )pud + pgtable_flags; } - i = (physaddr >>PUD_SHIFT ) %PTRS_PER_PUD ; - pud[i +0 ] = (pudval_t )pmd + pgtable_flags; - pud[i +1 ] = (pudval_t )pmd + pgtable_flags; + i = physaddr >>PUD_SHIFT ; + pud[(i +0 ) %PTRS_PER_PUD ] = (pudval_t )pmd + pgtable_flags; + pud[(i +1 ) %PTRS_PER_PUD ] = (pudval_t )pmd + pgtable_flags; pmd_entry = __PAGE_KERNEL_LARGE_EXEC & ~_PAGE_GLOBAL;/* Filter out unsupported __PAGE_KERNEL_* bits: */
@@ -211,8 +211,9 @@ unsigned long __head __startup_64(unsigned long physaddr, pmd_entry += physaddr;for (i =0 ; i <DIV_ROUND_UP (_end - _text,PMD_SIZE ); i++) { -int idx = i + (physaddr >>PMD_SHIFT ) %PTRS_PER_PMD ; - pmd[idx] = pmd_entry + i *PMD_SIZE ; +int idx = i + (physaddr >>PMD_SHIFT ); + + pmd[idx %PTRS_PER_PMD ] = pmd_entry + i *PMD_SIZE ; }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/47 x86/boot/64: Add missing fixup_pointer() for next_early_pgt access
In reply to Greg Kroah-Hartman[ Upstream commit c1887159eb48ba40e775584cfb2a443962cf1a05 ]
__startup_64() uses fixup_pointer() to access global variables in a position-independent fashion. Access to next_early_pgt was wrapped into the helper, but one instance in the 5-level paging branch was missed.
GCC generates a R_X86_64_PC32 PC-relative relocation for the access which doesn't trigger the issue, but Clang emmits a R_X86_64_32S which leads to an invalid memory access and system reboot.
--- arch/x86/kernel/head64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/head64.c +2 -1
@@ -184,7 +184,8 @@ unsigned long __head __startup_64(unsigned long physaddr, pgtable_flags = _KERNPG_TABLE_NOENC +sme_get_me_mask ();if (la57) { - p4d =fixup_pointer (early_dynamic_pgts[next_early_pgt++], physaddr); + p4d =fixup_pointer (early_dynamic_pgts[(*next_pgt_ptr)++], + physaddr); i = (physaddr >>PGDIR_SHIFT ) %PTRS_PER_PGD ; pgd[i +0 ] = (pgdval_t )p4d + pgtable_flags;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/47 HID: chicony: add another quirk for PixArt mouse
In reply to Greg Kroah-Hartman[ Upstream commit dcf768b0ac868630e7bdb6f2f1c9fe72788012fa ]
I've spotted another Chicony PixArt mouse in the wild, which requires HID_QUIRK_ALWAYS_POLL quirk, otherwise it disconnects each minute.
USB ID of this device is 0x04f2:0x0939.
We've introduced quirks like this for other models before, so lets add this mouse too.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -265,6 +265,7 @@#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH 0xb19d#define USB_DEVICE_ID_CHICONY_WIRELESS 0x0618#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE 0x1053 +#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2 0x0939#define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123#define USB_DEVICE_ID_ASUS_AK1D 0x1125#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12 0x1421
drivers/hid/hid-quirks.c +1 -0
@@ -45,6 +45,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD), HID_QUIRK_BADPAD }, { HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK), HID_QUIRK_NOGET },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/47 HID: multitouch: Add pointstick support for ALPS Touchpad
In reply to Greg Kroah-Hartman[ Upstream commit 0a95fc733da375de0688d0f1fd3a2869a1c1d499 ]
There's a new ALPS touchpad/pointstick combo device that requires MT_CLS_WIN_8_DUAL to make its pointsitck work as a mouse.
The device can be found on HP ZBook 17 G5.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-multitouch.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -82,6 +82,7 @@#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220#define HID_DEVICE_ID_ALPS_U1 0x1215#define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C +#define HID_DEVICE_ID_ALPS_1222 0x1222#define USB_VENDOR_ID_AMI 0x046b
drivers/hid/hid-multitouch.c +4 -0
@@ -1788,6 +1788,10 @@ static const struct hid_device_id mt_devices[] = {HID_DEVICE (BUS_I2C ,HID_GROUP_MULTITOUCH_WIN_8 ,USB_VENDOR_ID_ALPS_JP , HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) }, + { .driver_data = MT_CLS_WIN_8_DUAL, +HID_DEVICE (BUS_I2C ,HID_GROUP_MULTITOUCH_WIN_8 , +USB_VENDOR_ID_ALPS_JP , + HID_DEVICE_ID_ALPS_1222) }, /* Lenovo X1 TAB Gen 2 */ { .driver_data = MT_CLS_WIN_8_DUAL,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/47 pinctrl: mediatek: Ignore interrupts that are wake only during resume
In reply to Greg Kroah-Hartman[ Upstream commit 35594bc7cecf3a78504b590e350570e8f4d7779e ]
Before suspending, mtk-eint would set the interrupt mask to the one in wake_mask. However, some of these interrupts may not have a corresponding interrupt handler, or the interrupt may be disabled.
On resume, the eint irq handler would trigger nevertheless, and irq/pm.c:irq_pm_check_wakeup would be called, which would try to call irq_disable. However, if the interrupt is not enabled (irqd_irq_disabled(&desc->irq_data) is true), the call does nothing, and the interrupt is left enabled in the eint driver.
Especially for level-sensitive interrupts, this will lead to an interrupt storm on resume.
If we detect that an interrupt is only in wake_mask, but not in cur_mask, we can just mask it out immediately (as mtk_eint_resume would do anyway at a later stage in the resume sequence, when restoring cur_mask).
--- drivers/pinctrl/mediatek/mtk-eint.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/pinctrl/mediatek/mtk-eint.c +15 -1
@@ -318,7 +318,7 @@ static void mtk_eint_irq_handler(struct irq_desc *desc)struct irq_chip *chip =irq_desc_get_chip (desc);struct mtk_eint *eint =irq_desc_get_handler_data (desc);unsigned int status, eint_num; -int offset, index, virq; +int offset, mask_offset, index, virq;void __iomem *reg =mtk_eint_get_offset (eint,0 , eint->regs->stat);int dual_edge, start_level, curr_level;
@@ -328,10 +328,24 @@ static void mtk_eint_irq_handler(struct irq_desc *desc) status =readl (reg);while (status) { offset =__ffs (status); + mask_offset = eint_num >>5 ; index = eint_num + offset; virq =irq_find_mapping (eint->domain, index); status &= ~BIT (offset); +/* +* If we get an interrupt on pin that was only required +* for wake (but no real interrupt requested), mask the +* interrupt (as would mtk_eint_resume do anyway later +* in the resume sequence). +*/ +if (eint->wake_mask[mask_offset] &BIT (offset) && + !(eint->cur_mask[mask_offset] &BIT (offset))) { +writel_relaxed (BIT (offset), reg - + eint->regs->stat + + eint->regs->mask_set); + } + dual_edge = eint->dual_edge[index];if (dual_edge) {/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/47 cpu/hotplug: Fix out-of-bounds read when setting fail state
In reply to Greg Kroah-Hartman[ Upstream commit 33d4a5a7a5b4d02915d765064b2319e90a11cbde ]
Setting invalid value to /sys/devices/system/cpu/cpuX/hotplug/fail can control struct cpuhp_step *sp address, results in the following global-out-of-bounds read.
Reproducer:
# echo -2 > /sys/devices/system/cpu/cpu0/hotplug/fail
KASAN report:
BUG: KASAN: global-out-of-bounds in write_cpuhp_fail+0x2cd/0x2e0
Read of size 8 at addr ffffffff89734438 by task bash/1941
CPU: 0 PID: 1941 Comm: bash Not tainted 5.2.0-rc6+ #31
Call Trace:
write_cpuhp_fail+0x2cd/0x2e0
dev_attr_store+0x58/0x80
sysfs_kf_write+0x13d/0x1a0
kernfs_fop_write+0x2bc/0x460
vfs_write+0x1e1/0x560
ksys_write+0x126/0x250
do_syscall_64+0xc1/0x390
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x7f05e4f4c970
The buggy address belongs to the variable:
cpu_hotplug_lock+0x98/0xa0
Memory state around the buggy address:
ffffffff89734300: fa fa fa fa 00 00 00 00 00 00 00 00 00 00 00 00
ffffffff89734380: fa fa fa fa 00 00 00 00 00 00 00 00 00 00 00 00
>ffffffff89734400: 00 00 00 00 fa fa fa fa 00 00 00 00 fa fa fa fa
^
ffffffff89734480: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffffffff89734500: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00Add a sanity check for the value written from user space.
--- kernel/cpu.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/cpu.c +3 -0
@@ -1925,6 +1925,9 @@ static ssize_t write_cpuhp_fail(struct device *dev,if (ret)return ret; +if (fail <CPUHP_OFFLINE || fail >CPUHP_ONLINE ) +return -EINVAL ; +/* * Cannot fail STARTING/DYING callbacks. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/47 pinctrl: mediatek: Update cur_mask in mask/mask ops
In reply to Greg Kroah-Hartman[ Upstream commit 9d957a959bc8c3dfe37572ac8e99affb5a885965 ]
During suspend/resume, mtk_eint_mask may be called while wake_mask is active. For example, this happens if a wake-source with an active interrupt handler wakes the system:
irq/pm.c:irq_pm_check_wakeup would disable the interrupt, so that it can be handled later on in the resume flow.
However, this may happen before mtk_eint_do_resume is called:
in this case, wake_mask is loaded, and cur_mask is restored from an older copy, re-enabling the interrupt, and causing an interrupt storm (especially for level interrupts).
Step by step, for a line that has both wake and interrupt enabled:
1. cur_mask[irq] = 1; wake_mask[irq] = 1; EINT_EN[irq] = 1 (interrupt enabled at hardware level)
2. System suspends, resumes due to that line (at this stage EINT_EN
== wake_mask)
3. irq_pm_check_wakeup is called, and disables the interrupt => EINT_EN[irq] = 0, but we still have cur_mask[irq] = 1
4. mtk_eint_do_resume is called, and restores EINT_EN = cur_mask, so it reenables EINT_EN[irq] = 1 => interrupt storm as the driver is not yet ready to handle the interrupt.
This patch fixes the issue in step 3, by recording all mask/unmask changes in cur_mask. This also avoids the need to read the current mask in eint_do_suspend, and we can remove mtk_eint_chip_read_mask function.
The interrupt will be re-enabled properly later on, sometimes after mtk_eint_do_resume, when the driver is ready to handle it.
--- drivers/pinctrl/mediatek/mtk-eint.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
drivers/pinctrl/mediatek/mtk-eint.c +4 -14
@@ -113,6 +113,8 @@ static void mtk_eint_mask(struct irq_data *d)void __iomem *reg =mtk_eint_get_offset (eint, d->hwirq, eint->regs->mask_set); + eint->cur_mask[d->hwirq >>5 ] &= ~mask; +writel (mask, reg); }
@@ -123,6 +125,8 @@ static void mtk_eint_unmask(struct irq_data *d)void __iomem *reg =mtk_eint_get_offset (eint, d->hwirq, eint->regs->mask_clr); + eint->cur_mask[d->hwirq >>5 ] |= mask; +writel (mask, reg);if (eint->dual_edge[d->hwirq])
@@ -217,19 +221,6 @@ static void mtk_eint_chip_write_mask(const struct mtk_eint *eint, } } -static void mtk_eint_chip_read_mask (const struct mtk_eint *eint, -void __iomem *base,u32 *buf) -{ -int port; -void __iomem *reg; - -for (port =0 ; port < eint->hw->ports; port++) { - reg = base + eint->regs->mask + (port <<2 ); - buf[port] = ~readl_relaxed (reg); -/* Mask is 0 when irq is enabled, and 1 when disabled. */ - } -} -static int mtk_eint_irq_request_resources (struct irq_data *d) {struct mtk_eint *eint =irq_data_get_irq_chip_data (d);
@@ -384,7 +375,6 @@ static void mtk_eint_irq_handler(struct irq_desc *desc)int mtk_eint_do_suspend (struct mtk_eint *eint) { -mtk_eint_chip_read_mask (eint, eint->base, eint->cur_mask);mtk_eint_chip_write_mask (eint, eint->base, eint->wake_mask);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/47 linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL
In reply to Greg Kroah-Hartman[ Upstream commit 8f9fab480c7a87b10bb5440b5555f370272a5d59 ]
DIV_ROUND_UP_ULL adds the two arguments and then invokes DIV_ROUND_DOWN_ULL. But on a 32bit system the addition of two 32 bit values can overflow. DIV_ROUND_DOWN_ULL does it correctly and stashes the addition into a unsigned long long so cast the result to unsigned long long here to avoid the overflow condition.
--- include/linux/kernel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/kernel.h +2 -1
@@ -118,7 +118,8 @@#define DIV_ROUND_DOWN_ULL (ll, d) \ ({ unsigned long long _tmp = (ll); do_div(_tmp, d); _tmp; }) -#define DIV_ROUND_UP_ULL (ll, d) DIV_ROUND_DOWN_ULL((ll) + (d) - 1, (d)) +#define DIV_ROUND_UP_ULL (ll, d) \ + DIV_ROUND_DOWN_ULL((unsigned long long)(ll) + (d) - 1, (d))#if BITS_PER_LONG ==32 # define DIV_ROUND_UP_SECTOR_T (ll,d) DIV_ROUND_UP_ULL(ll, d)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/47 genirq: Delay deactivation in free_irq()
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner [email protected]
commit 4001d8e8762f57d418b66e4e668601791900a1dd upstream
When interrupts are shutdown, they are immediately deactivated in the irqdomain hierarchy. While this looks obviously correct there is a subtle issue:
There might be an interrupt in flight when free_irq() is invoking the shutdown. This is properly handled at the irq descriptor / primary handler level, but the deactivation might completely disable resources which are required to acknowledge the interrupt.
Split the shutdown code and deactivate the interrupt after synchronization in free_irq(). Fixup all other usage sites where this is not an issue to invoke the combined shutdown_and_deactivate() function instead.
This still might be an issue if the interrupt in flight servicing is delayed on a remote CPU beyond the invocation of synchronize_irq(), but that cannot be handled at that level and needs to be handled in the synchronize_irq() context.
--- kernel/irq/autoprobe.c | 6 +++--- kernel/irq/chip.c | 6 ++++++ kernel/irq/cpuhotplug.c | 2 +- kernel/irq/internals.h | 1 + kernel/irq/manage.c | 10 ++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-)
kernel/irq/autoprobe.c +3 -3
@@ -90,7 +90,7 @@ unsigned long probe_irq_on(void)/* It triggered already - consider it spurious. */ if (!(desc->istate &IRQS_WAITING )) { desc->istate &= ~IRQS_AUTODETECT ; -irq_shutdown (desc); +irq_shutdown_and_deactivate (desc); }else if (i <32 ) mask |=1 << i;
@@ -127,7 +127,7 @@ unsigned int probe_irq_mask(unsigned lon mask |=1 << i; desc->istate &= ~IRQS_AUTODETECT ; -irq_shutdown (desc); +irq_shutdown_and_deactivate (desc); }raw_spin_unlock_irq (&desc->lock); }
@@ -169,7 +169,7 @@ int probe_irq_off(unsigned long val) nr_of_irqs++; } desc->istate &= ~IRQS_AUTODETECT ; -irq_shutdown (desc); +irq_shutdown_and_deactivate (desc); }raw_spin_unlock_irq (&desc->lock); }
kernel/irq/chip.c +6 -0
@@ -314,6 +314,12 @@ void irq_shutdown(struct irq_desc *desc) }irq_state_clr_started (desc); } +} + + +void irq_shutdown_and_deactivate (struct irq_desc *desc) +{ +irq_shutdown (desc);/* * This must be called even if the interrupt was never started up, * because the activation can happen before the interrupt is
kernel/irq/cpuhotplug.c +1 -1
@@ -116,7 +116,7 @@ static bool migrate_one_irq(struct irq_d*/ if (irqd_affinity_is_managed (d)) {irqd_set_managed_shutdown (d); -irq_shutdown (desc); +irq_shutdown_and_deactivate (desc);return false; } affinity = cpu_online_mask;
kernel/irq/internals.h +1 -0
@@ -80,6 +80,7 @@ extern int irq_activate_and_startup(struextern int irq_startup (struct irq_desc *desc,bool resend,bool force);extern void irq_shutdown (struct irq_desc *desc); +extern void irq_shutdown_and_deactivate (struct irq_desc *desc);extern void irq_enable (struct irq_desc *desc);extern void irq_disable (struct irq_desc *desc);extern void irq_percpu_enable (struct irq_desc *desc,unsigned int cpu);
kernel/irq/manage.c +10 -0
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/random.h> #include <linux/interrupt.h> +#include <linux/irqdomain.h> #include <linux/slab.h> #include <linux/sched.h> #include <linux/sched/rt.h>
@@ -1619,6 +1620,7 @@ static struct irqaction *__free_irq(stru/* If this was the last handler, shut down the IRQ line: */ if (!desc->action) {irq_settings_clr_disable_unlazy (desc); +/* Only shutdown. Deactivate after synchronize_hardirq() */ irq_shutdown (desc); }
@@ -1688,6 +1690,14 @@ static struct irqaction *__free_irq(stru* require it to deallocate resources over the slow bus. */ chip_bus_lock (desc); +/* +* There is no interrupt on the fly anymore. Deactivate it +* completely. +*/ +raw_spin_lock_irqsave (&desc->lock, flags); +irq_domain_deactivate_irq (&desc->irq_data); +raw_spin_unlock_irqrestore (&desc->lock, flags); +irq_release_resources (desc);chip_bus_sync_unlock (desc);irq_remove_timings (desc);
Re: [PATCH 4.19 30/47] genirq: Delay deactivation in free_irq()
Hi!
Something went wrong in this mail:
Quoted 2 lines · Greg Kroah-Hartman
From: Thomas Gleixner [email protected]
normally there should be <> around the email address. And they are in the git, and in 5.1 patch series, so I guess that is not a big deal.
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 30/47] genirq: Delay deactivation in free_irq()
Quoted 10 lines · Pavel Machek
Hi!
Something went wrong in this mail:
Quoted 2 lines · Greg Kroah-Hartman
From: Thomas Gleixner [email protected]
normally there should be <> around the email address. And they are in the git, and in 5.1 patch series, so I guess that is not a big deal.
Good catch, this is wrong, I've fixed it up in the patch file.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 31/47 genirq: Fix misleading synchronize_irq() documentation
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner [email protected]
commit 1d21f2af8571c6a6a44e7c1911780614847b0253 upstream
The function might sleep, so it cannot be called from interrupt context. Not even with care.
--- kernel/irq/manage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/irq/manage.c +2 -1
@@ -96,7 +96,8 @@ EXPORT_SYMBOL(synchronize_hardirq);* to complete before returning. If you use this function while * holding a resource the IRQ handler may need you will deadlock. * -* This function may be called - with care - from IRQ context. +* Can only be called from preemptible code as it might sleep when +* an interrupt thread is associated to @irq. */ void synchronize_irq (unsigned int irq) {
Greg Kroah-Hartman
maintainerPATCH 32/47 genirq: Add optional hardware synchronization for shutdown
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner [email protected]
commit 62e0468650c30f0298822c580f382b16328119f6 upstream
free_irq() ensures that no hardware interrupt handler is executing on a different CPU before actually releasing resources and deactivating the interrupt completely in a domain hierarchy.
But that does not catch the case where the interrupt is on flight at the hardware level but not yet serviced by the target CPU. That creates an interesing race condition:
CPU 0 CPU 1 IRQ CHIP
interrupt is raised sent to CPU1
Unable to handle
immediately
(interrupts off,
deep idle delay)
mask()
...
free()
shutdown()
synchronize_irq()
release_resources()
do_IRQ()
-> resources are not availableThat might be harmless and just trigger a spurious interrupt warning, but some interrupt chips might get into a wedged state.
Utilize the existing irq_get_irqchip_state() callback for the synchronization in free_irq().
synchronize_hardirq() is not using this mechanism as it might actually deadlock unter certain conditions, e.g. when called with interrupts disabled and the target CPU is the one on which the synchronization is invoked. synchronize_irq() uses it because that function cannot be called from non preemtible contexts as it might sleep.
No functional change intended and according to Marc the existing GIC implementations where the driver supports the callback should be able to cope with that core change. Famous last words.
--- kernel/irq/internals.h | 4 ++ kernel/irq/manage.c | 75 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 60 insertions(+), 19 deletions(-)
kernel/irq/internals.h +4 -0
@@ -95,6 +95,10 @@ static inline void irq_mark_irq(unsignedextern void irq_mark_irq (unsigned int irq);#endif +extern int __irq_get_irqchip_state (struct irq_data *data, +enum irqchip_irq_state which, +bool *state); +extern void init_kstat_irqs (struct irq_desc *desc,int node,int nr);irqreturn_t __handle_irq_event_percpu (struct irq_desc *desc,unsigned int *flags);
kernel/irq/manage.c +56 -19
136 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 33/47 x86/ioapic: Implement irq_get_irqchip_state() callback
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner [email protected]
commit dfe0cf8b51b07e56ded571e3de0a4a9382517231 upstream
When an interrupt is shut down in free_irq() there might be an inflight interrupt pending in the IO-APIC remote IRR which is not yet serviced. That means the interrupt has been sent to the target CPUs local APIC, but the target CPU is in a state which delays the servicing.
So free_irq() would proceed to free resources and to clear the vector because synchronize_hardirq() does not see an interrupt handler in progress.
That can trigger a spurious interrupt warning, which is harmless and just confuses users, but it also can leave the remote IRR in a stale state because once the handler is invoked the interrupt resources might be freed already and therefore acknowledgement is not possible anymore.
Implement the irq_get_irqchip_state() callback for the IO-APIC irq chip. The callback is invoked from free_irq() via __synchronize_hardirq(). Check the remote IRR bit of the interrupt and return 'in flight' if it is set and the interrupt is configured in level mode. For edge mode the remote IRR has no meaning.
As this is only meaningful for level triggered interrupts this won't cure the potential spurious interrupt warning for edge triggered interrupts, but the edge trigger case does not result in stale hardware state. This has to be addressed at the vector/interrupt entry level seperately.
--- arch/x86/kernel/apic/io_apic.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
arch/x86/kernel/apic/io_apic.c +46 -0
@@ -1891,6 +1891,50 @@ static int ioapic_set_affinity(struct irreturn ret; } +/* +* Interrupt shutdown masks the ioapic pin, but the interrupt might already +* be in flight, but not yet serviced by the target CPU. That means +* __synchronize_hardirq() would return and claim that everything is calmed +* down. So free_irq() would proceed and deactivate the interrupt and free +* resources. +* +* Once the target CPU comes around to service it it will find a cleared +* vector and complain. While the spurious interrupt is harmless, the full +* release of resources might prevent the interrupt from being acknowledged +* which keeps the hardware in a weird state. +* +* Verify that the corresponding Remote-IRR bits are clear. +*/ +static int ioapic_irq_get_chip_state (struct irq_data *irqd, +enum irqchip_irq_state which, +bool *state) +{ +struct mp_chip_data *mcd = irqd->chip_data; +struct IO_APIC_route_entry rentry; +struct irq_pin_list *p; + +if (which !=IRQCHIP_STATE_ACTIVE ) +return -EINVAL ; + + *state = false; +raw_spin_lock (&ioapic_lock); +for_each_irq_pin (p, mcd->irq_2_pin) { + rentry =__ioapic_read_entry (p->apic, p->pin); +/* +* The remote IRR is only valid in level trigger mode. It's +* meaning is undefined for edge triggered interrupts and +* irrelevant because the IO-APIC treats them as fire and +* forget. +*/ +if (rentry.irr && rentry.trigger) { + *state = true; +break ; + } + } +raw_spin_unlock (&ioapic_lock); +return 0 ; +} +static struct irq_chip ioapic_chip__read_mostly = { .name ="IO-APIC" , .irq_startup = startup_ioapic_irq,
@@ -1900,6 +1944,7 @@ static struct irq_chip ioapic_chip __rea .irq_eoi = ioapic_ack_level, .irq_set_affinity = ioapic_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, + .irq_get_irqchip_state = ioapic_irq_get_chip_state, .flags = IRQCHIP_SKIP_SET_WAKE, };
@@ -1912,6 +1957,7 @@ static struct irq_chip ioapic_ir_chip __ .irq_eoi = ioapic_ir_ack_level, .irq_set_affinity = ioapic_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, + .irq_get_irqchip_state = ioapic_irq_get_chip_state, .flags = IRQCHIP_SKIP_SET_WAKE, };
Greg Kroah-Hartman
maintainerPATCH 34/47 x86/irq: Handle spurious interrupt after shutdown gracefully
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner [email protected]
commit b7107a67f0d125459fe41f86e8079afd1a5e0b15 upstream
Since the rework of the vector management, warnings about spurious interrupts have been reported. Robert provided some more information and did an initial analysis. The following situation leads to these warnings:
CPU 0 CPU 1 IO_APIC
interrupt is raised sent to CPU1
Unable to handle
immediately
(interrupts off,
deep idle delay)
mask()
...
free()
shutdown()
synchronize_irq()
clear_vector()
do_IRQ()
-> vector is clearBefore the rework the vector entries of legacy interrupts were statically assigned and occupied precious vector space while most of them were unused. Due to that the above situation was handled silently because the vector was handled and the core handler of the assigned interrupt descriptor noticed that it is shut down and returned.
While this has been usually observed with legacy interrupts, this situation is not limited to them. Any other interrupt source, e.g. MSI, can cause the same issue.
After adding proper synchronization for level triggered interrupts, this can only happen for edge triggered interrupts where the IO-APIC obviously cannot provide information about interrupts in flight.
While the spurious warning is actually harmless in this case it worries users and driver developers.
Handle it gracefully by marking the vector entry as VECTOR_SHUTDOWN instead of VECTOR_UNUSED when the vector is freed up.
If that above late handling happens the spurious detector will not complain and switch the entry to VECTOR_UNUSED. Any subsequent spurious interrupt on that line will trigger the spurious warning as before.
--- arch/x86/include/asm/hw_irq.h | 3 ++- arch/x86/kernel/apic/vector.c | 4 ++-- arch/x86/kernel/irq.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
arch/x86/include/asm/hw_irq.h +2 -1
@@ -151,7 +151,8 @@ extern char irq_entries_start[];#endif #define VECTOR_UNUSED NULL -#define VECTOR_RETRIGGERED ((void *)~0UL) +#define VECTOR_SHUTDOWN ((void *)~0UL) +#define VECTOR_RETRIGGERED ((void *)~1UL)typedef struct irq_desc *vector_irq_t [NR_VECTORS ];DECLARE_PER_CPU (vector_irq_t, vector_irq);
arch/x86/kernel/apic/vector.c +2 -2
@@ -342,7 +342,7 @@ static void clear_irq_vector(struct irq_trace_vector_clear (irqd->irq, vector, apicd->cpu, apicd->prev_vector, apicd->prev_cpu); -per_cpu (vector_irq, apicd->cpu)[vector] =VECTOR_UNUSED ; +per_cpu (vector_irq, apicd->cpu)[vector] =VECTOR_SHUTDOWN ;irq_matrix_free (vector_matrix, apicd->cpu, vector, managed); apicd->vector =0 ;
@@ -351,7 +351,7 @@ static void clear_irq_vector(struct irq_if (!vector)return ; -per_cpu (vector_irq, apicd->prev_cpu)[vector] =VECTOR_UNUSED ; +per_cpu (vector_irq, apicd->prev_cpu)[vector] =VECTOR_SHUTDOWN ;irq_matrix_free (vector_matrix, apicd->prev_cpu, vector, managed); apicd->prev_vector =0 ; apicd->move_in_progress =0 ;
arch/x86/kernel/irq.c +1 -1
@@ -246,7 +246,7 @@ __visible unsigned int __irq_entry do_IRif (!handle_irq (desc, regs)) {ack_APIC_irq (); -if (desc !=VECTOR_RETRIGGERED ) { +if (desc !=VECTOR_RETRIGGERED && desc !=VECTOR_SHUTDOWN ) {pr_emerg_ratelimited ("%s: %d.%d No irq handler for vector\n" , __func__,smp_processor_id (), vector);
Greg Kroah-Hartman
maintainerPATCH 35/47 x86/irq: Seperate unused system vectors from spurious entry again
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner [email protected]
commit f8a8fe61fec8006575699559ead88b0b833d5cad upstream
Quite some time ago the interrupt entry stubs for unused vectors in the system vector range got removed and directly mapped to the spurious interrupt vector entry point.
Sounds reasonable, but it's subtly broken. The spurious interrupt vector entry point pushes vector number 0xFF on the stack which makes the whole logic in __smp_spurious_interrupt() pointless.
As a consequence any spurious interrupt which comes from a vector != 0xFF is treated as a real spurious interrupt (vector 0xFF) and not acknowledged. That subsequently stalls all interrupt vectors of equal and lower priority, which brings the system to a grinding halt.
This can happen because even on 64-bit the system vector space is not guaranteed to be fully populated. A full compile time handling of the unused vectors is not possible because quite some of them are conditonally populated at runtime.
Bring the entry stubs back, which wastes 160 bytes if all stubs are unused, but gains the proper handling back. There is no point to selectively spare some of the stubs which are known at compile time as the required code in the IDT management would be way larger and convoluted.
Do not route the spurious entries through common_interrupt and do_IRQ() as the original code did. Route it to smp_spurious_interrupt() which evaluates the vector number and acts accordingly now that the real vector numbers are handed in.
Fixup the pr_warn so the actual spurious vector (0xff) is clearly distiguished from the other vectors and also note for the vectored case whether it was pending in the ISR or not.
"Spurious APIC interrupt (vector 0xFF) on CPU#0, should never happen." "Spurious interrupt vector 0xed on CPU#1. Acked."
"Spurious interrupt vector 0xee on CPU#1. Not pending!."
--- arch/x86/entry/entry_32.S | 24 ++++++++++++++++++++++++ arch/x86/entry/entry_64.S | 30 ++++++++++++++++++++++++++---- arch/x86/include/asm/hw_irq.h | 2 ++ arch/x86/kernel/apic/apic.c | 33 ++++++++++++++++++++++----------- arch/x86/kernel/idt.c | 3 ++- 5 files changed, 76 insertions(+), 16 deletions(-)
arch/x86/entry/entry_32.S +24 -0
@@ -1098,6 +1098,30 @@ ENTRY(irq_entries_start) .endr END(irq_entries_start) +#ifdef CONFIG_X86_LOCAL_APIC + .align 8 +ENTRY(spurious_entries_start) + vector=FIRST_SYSTEM_VECTOR + .rept (NR_VECTORS - FIRST_SYSTEM_VECTOR) + pushl $(~vector+0x80) /* Note: always in signed byte range */ + vector=vector+1 + jmp common_spurious + .align 8 + .endr +END(spurious_entries_start) + +common_spurious: + ASM_CLAC + addl $-0x80, (%esp) /* Adjust vector into the [-256, -1] range */ + SAVE_ALL switch_stacks=1 + ENCODE_FRAME_POINTER + TRACE_IRQS_OFF + movl %esp, %eax + call smp_spurious_interrupt + jmp ret_from_intr +ENDPROC(common_interrupt) +#endif + /* * the CPU automatically disables interrupts when executing an IRQ vector, * so IRQ-flags tracing has to follow that:
arch/x86/entry/entry_64.S +26 -4
@@ -438,6 +438,18 @@ ENTRY(irq_entries_start) .endr END(irq_entries_start) + .align 8 +ENTRY(spurious_entries_start) + vector=FIRST_SYSTEM_VECTOR + .rept (NR_VECTORS - FIRST_SYSTEM_VECTOR) + UNWIND_HINT_IRET_REGS + pushq $(~vector+0x80) /* Note: always in signed byte range */ + jmp common_spurious + .align 8 + vector=vector+1 + .endr +END(spurious_entries_start) + .macro DEBUG_ENTRY_ASSERT_IRQS_OFF #ifdef CONFIG_DEBUG_ENTRY pushq %rax
@@ -634,10 +646,20 @@ _ASM_NOKPROBE(interrupt_entry) /* Interrupt entry/exit. */ - /* - * The interrupt stubs push (~vector+0x80) onto the stack and - * then jump to common_interrupt. - */ +/* + * The interrupt stubs push (~vector+0x80) onto the stack and + * then jump to common_spurious/interrupt. + */ +common_spurious: + addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */ + call interrupt_entry + UNWIND_HINT_REGS indirect=1 + call smp_spurious_interrupt /* rdi points to pt_regs */ + jmp ret_from_intr +END(common_spurious) +_ASM_NOKPROBE(common_spurious) + +/* common_interrupt is a hotpath. Align it */ .p2align CONFIG_X86_L1_CACHE_SHIFT common_interrupt: addq $-0x80, (%rsp) /* Adjust vector to [-256, -1] range */
arch/x86/include/asm/hw_irq.h +2 -0
@@ -150,6 +150,8 @@ extern char irq_entries_start[];#define trace_irq_entries_start irq_entries_start#endif +extern char spurious_entries_start[]; +#define VECTOR_UNUSED NULL#define VECTOR_SHUTDOWN ((void *)~0UL)#define VECTOR_RETRIGGERED ((void *)~1UL)
arch/x86/kernel/apic/apic.c +22 -11
@@ -2027,21 +2027,32 @@ __visible void __irq_entry smp_spurious_entering_irq ();trace_spurious_apic_entry (vector); +inc_irq_stat (irq_spurious_count); + +/* +* If this is a spurious interrupt then do not acknowledge +*/ +if (vector ==SPURIOUS_APIC_VECTOR ) { +/* See SDM vol 3 */ +pr_info ("Spurious APIC interrupt (vector 0xFF) on CPU#%d, should never happen.\n" , +smp_processor_id ()); + goto out; + } +/* -* Check if this really is a spurious interrupt and ACK it -* if it is a vectored one. Just in case... -* Spurious interrupts should not be ACKed. +* If it is a vectored one, verify it's set in the ISR. If set, +* acknowledge it. */ v =apic_read (APIC_ISR + ((vector & ~0x1f ) >>1 )); -if (v & (1 << (vector &0x1f ))) +if (v & (1 << (vector &0x1f ))) { +pr_info ("Spurious interrupt (vector 0x%02x) on CPU#%d. Acked\n" , + vector,smp_processor_id ());ack_APIC_irq (); - -inc_irq_stat (irq_spurious_count); - -/* see sw-dev-man vol 3, chapter 7.4.13.5 */ -pr_info ("spurious APIC interrupt through vector %02x on CPU#%d, " -"should never happen.\n" , vector,smp_processor_id ()); - + }else { +pr_info ("Spurious interrupt (vector 0x%02x) on CPU#%d. Not pending!\n" , + vector,smp_processor_id ()); + } +out:trace_spurious_apic_exit (vector);exiting_irq (); }
arch/x86/kernel/idt.c +2 -1
@@ -321,7 +321,8 @@ void __init idt_setup_apic_and_irq_gates#ifdef CONFIG_X86_LOCAL_APIC for_each_clear_bit_from (i, system_vectors,NR_VECTORS ) {set_bit (i, system_vectors); -set_intr_gate (i, spurious_interrupt); + entry = spurious_entries_start +8 * (i -FIRST_SYSTEM_VECTOR ); +set_intr_gate (i, entry); }#endif }
Greg Kroah-Hartman
maintainerPATCH 36/47 ARC: hide unused function unw_hdr_alloc
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit fd5de2721ea7d16e2b16c4049ac49f229551b290 upstream.
As kernelci.org reports, this function is not used in vdk_hs38_defconfig:
arch/arc/kernel/unwind.c:188:14: warning: 'unw_hdr_alloc' defined but not used [-Wunused-function]
--- arch/arc/kernel/unwind.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arc/kernel/unwind.c +4 -5
@@ -185,11 +185,6 @@ static void *__init unw_hdr_alloc_early( MAX_DMA_ADDRESS); } -static void *unw_hdr_alloc (unsigned long sz) -{ -return kmalloc (sz,GFP_KERNEL ); -} - static void init_unwind_table(struct unwind_table *table, const char *name, const void *core_start, unsigned long core_size, const void *init_start, unsigned long init_size,
@@ -370,6 +365,10 @@ ret_err: }#ifdef CONFIG_MODULES +static void *unw_hdr_alloc (unsigned long sz) +{ +return kmalloc (sz,GFP_KERNEL ); +}static struct unwind_table *last_table;
Greg Kroah-Hartman
maintainerPATCH 37/47 s390: fix stfle zero padding
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
commit 4f18d869ffd056c7858f3d617c71345cf19be008 upstream.
The stfle inline assembly returns the number of double words written (condition code 0) or the double words it would have written (condition code 3), if the memory array it got as parameter would have been large enough.
The current stfle implementation assumes that the array is always large enough and clears those parts of the array that have not been written to with a subsequent memset call.
If however the array is not large enough memset will get a negative length parameter, which means that memset clears memory until it gets an exception and the kernel crashes.
To fix this simply limit the maximum length. Move also the inline assembly to an extra function to avoid clobbering of register 0, which might happen because of the added min_t invocation together with code instrumentation.
The bug was introduced with commit 14375bc4eb8d ("[S390] cleanup facility list handling") but was rather harmless, since it would only write to a rather large array. It became a potential problem with commit 3ab121ab1866 ("[S390] kernel: Add z/VM LGR detection"). Since then it writes to an array with only four double words, while some machines already deliver three double words. As soon as machines have a facility bit within the fifth double a crash on IPL would happen.
--- arch/s390/include/asm/facility.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
arch/s390/include/asm/facility.h +14 -7
@@ -59,6 +59,18 @@ static inline int test_facility(unsignedreturn __test_facility (nr, &S390_lowcore.stfle_fac_list); } +static inline unsigned long __stfle_asm (u64 *stfle_fac_list,int size) +{ + register unsigned long reg0 asm("0") = size - 1; + + asmvolatile ( +".insn s,0xb2b00000,0(%1)" /* stfle */ + :"+d" (reg0) + :"a" (stfle_fac_list) + :"memory" ,"cc" ); +return reg0; +} +/** * stfle - Store facility list extended * @stfle_fac_list: array where facility list can be stored
@@ -76,13 +88,8 @@ static inline void stfle(u64 *stfle_fac_memcpy (stfle_fac_list, &S390_lowcore.stfl_fac_list,4 );if (S390_lowcore.stfl_fac_list &0x01000000 ) {/* More facility bits available with stfle */ - register unsigned long reg0 asm("0") = size - 1; - - asmvolatile (".insn s,0xb2b00000,0(%1)" /* stfle */ - :"+d" (reg0) - :"a" (stfle_fac_list) - :"memory" ,"cc" ); - nr = (reg0 +1 ) *8 ;/* # bytes stored by stfle */ + nr =__stfle_asm (stfle_fac_list, size); + nr = min_t(unsigned long, (nr + 1) * 8, size * 8); }memset ((char *) stfle_fac_list + nr,0 , size *8 - nr);preempt_enable ();
Greg Kroah-Hartman
maintainerPATCH 38/47 s390/qdio: (re-)initialize tiqdio list entries
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
commit e54e4785cb5cb4896cf4285964aeef2125612fb2 upstream.
When tiqdio_remove_input_queues() removes a queue from the tiq_list as part of qdio_shutdown(), it doesn't re-initialize the queue's list entry and the prev/next pointers go stale.
If a subsequent qdio_establish() fails while sending the ESTABLISH cmd, it calls qdio_shutdown() again in QDIO_IRQ_STATE_ERR state and tiqdio_remove_input_queues() will attempt to remove the queue entry a second time. This dereferences the stale pointers, and bad things ensue. Fix this by re-initializing the list entry after removing it from the list.
For good practice also initialize the list entry when the queue is first allocated, and remove the quirky checks that papered over this omission. Note that prior to
commit e521813468f7 ("s390/qdio: fix access to uninitialized qdio_q fields"), these checks were bogus anyway.
setup_queues_misc() clears the whole queue struct, and thus needs to re-init the prev/next pointers as well.
--- drivers/s390/cio/qdio_setup.c | 2 ++ drivers/s390/cio/qdio_thinint.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/s390/cio/qdio_setup.c +2 -0
@@ -151,6 +151,7 @@ static int __qdio_allocate_qs(struct qdireturn -ENOMEM ; } irq_ptr_qs[i] = q; +INIT_LIST_HEAD (&q->entry); }return 0 ; }
@@ -179,6 +180,7 @@ static void setup_queues_misc(struct qdi q->mask =1 << (31 - i); q->nr = i; q->handler = handler; +INIT_LIST_HEAD (&q->entry); } static void setup_storage_lists(struct qdio_q *q, struct qdio_irq *irq_ptr,
drivers/s390/cio/qdio_thinint.c +2 -2
@@ -87,14 +87,14 @@ void tiqdio_remove_input_queues(struct qstruct qdio_q *q; q = irq_ptr->input_qs[0 ]; -/* if establish triggered an error */ -if (!q || !q->entry.prev || !q->entry.next) +if (!q)return ;mutex_lock (&tiq_list_lock);list_del_rcu (&q->entry);mutex_unlock (&tiq_list_lock);synchronize_rcu (); +INIT_LIST_HEAD (&q->entry); }static inline int has_multiple_inq_on_dsci (struct qdio_irq *irq_ptr)
Greg Kroah-Hartman
maintainerPATCH 39/47 s390/qdio: dont touch the dsci in tiqdio_add_input_queues()
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
commit ac6639cd3db607d386616487902b4cc1850a7be5 upstream.
Current code sets the dsci to 0x00000080. Which doesn't make any sense, as the indicator area is located in the _left-most_ byte.
Worse: if the dsci is the _shared_ indicator, this potentially clears the indication of activity for a _different_ device. tiqdio_thinint_handler() will then have no reason to call that device's IRQ handler, and the device ends up stalling.
--- drivers/s390/cio/qdio_thinint.c | 1 - 1 file changed, 1 deletion(-)
drivers/s390/cio/qdio_thinint.c +0 -1
@@ -79,7 +79,6 @@ void tiqdio_add_input_queues(struct qdiomutex_lock (&tiq_list_lock);list_add_rcu (&irq_ptr->input_qs[0 ]->entry, &tiq_list);mutex_unlock (&tiq_list_lock); -xchg (irq_ptr->dsci,1 <<7 ); }void tiqdio_remove_input_queues (struct qdio_irq *irq_ptr)
Greg Kroah-Hartman
maintainerPATCH 40/47 crypto: talitos - move struct talitos_edesc into talitos.h
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit d44769e4ccb636e8238adbc151f25467a536711b upstream.
Moves struct talitos_edesc into talitos.h so that it can be used from any place in talitos.c
It will be required for next patch ("crypto: talitos - fix hash on SEC1")
--- drivers/crypto/talitos.c | 30 ------------------------------ drivers/crypto/talitos.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-)
drivers/crypto/talitos.c +0 -30
@@ -913,36 +913,6 @@ badkey:return -EINVAL ; } -/* -* talitos_edesc - s/w-extended descriptor -* @src_nents: number of segments in input scatterlist -* @dst_nents: number of segments in output scatterlist -* @icv_ool: whether ICV is out-of-line -* @iv_dma: dma address of iv for checking continuity and link table -* @dma_len: length of dma mapped link_tbl space -* @dma_link_tbl: bus physical address of link_tbl/buf -* @desc: h/w descriptor -* @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) -* @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) -* -* if decrypting (with authcheck), or either one of src_nents or dst_nents -* is greater than 1, an integrity check value is concatenated to the end -* of link_tbl data -*/ -struct talitos_edesc { -int src_nents; -int dst_nents; -bool icv_ool; -dma_addr_t iv_dma; -int dma_len; -dma_addr_t dma_link_tbl; -struct talitos_desc desc; -union { -struct talitos_ptr link_tbl[0 ]; -u8 buf[0 ]; - }; -}; - static void talitos_sg_unmap(struct device *dev, struct talitos_edesc *edesc, struct scatterlist *src,
drivers/crypto/talitos.h +30 -0
@@ -65,6 +65,36 @@ struct talitos_desc {#define TALITOS_DESC_SIZE (sizeof(struct talitos_desc) - sizeof(__be32)) +/* +* talitos_edesc - s/w-extended descriptor +* @src_nents: number of segments in input scatterlist +* @dst_nents: number of segments in output scatterlist +* @icv_ool: whether ICV is out-of-line +* @iv_dma: dma address of iv for checking continuity and link table +* @dma_len: length of dma mapped link_tbl space +* @dma_link_tbl: bus physical address of link_tbl/buf +* @desc: h/w descriptor +* @link_tbl: input and output h/w link tables (if {src,dst}_nents > 1) (SEC2) +* @buf: input and output buffeur (if {src,dst}_nents > 1) (SEC1) +* +* if decrypting (with authcheck), or either one of src_nents or dst_nents +* is greater than 1, an integrity check value is concatenated to the end +* of link_tbl data +*/ +struct talitos_edesc { +int src_nents; +int dst_nents; +bool icv_ool; +dma_addr_t iv_dma; +int dma_len; +dma_addr_t dma_link_tbl; +struct talitos_desc desc; +union { +struct talitos_ptr link_tbl[0 ]; +u8 buf[0 ]; + }; +}; +/** * talitos_request - descriptor submission request * @desc: descriptor pointer (kernel virtual)
Greg Kroah-Hartman
maintainerPATCH 41/47 crypto: talitos - fix hash on SEC1.
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit 58cdbc6d2263beb36954408522762bbe73169306 upstream.
On SEC1, hash provides wrong result when performing hashing in several steps with input data SG list has more than one element. This was detected with CONFIG_CRYPTO_MANAGER_EXTRA_TESTS:
[ 44.185947] alg: hash: md5-talitos test failed (wrong result) on test vector 6, cfg="random: may_sleep use_finup src_divs=[<reimport>25.88%@+8063, <flush>24.19%@+9588, 28.63%@+16333, <reimport>4.60%@+6756, 16.70%@+16281] dst_divs=[71.61%@alignmask+16361, 14.36%@+7756, 14.3%@+" [ 44.325122] alg: hash: sha1-talitos test failed (wrong result) on test vector 3, cfg="random: inplace use_final src_divs=[<flush,nosimd>16.56%@+16378, <reimport>52.0%@+16329, 21.42%@alignmask+16380, 10.2%@alignmask+16380] iv_offset=39" [ 44.493500] alg: hash: sha224-talitos test failed (wrong result) on test vector 4, cfg="random: use_final nosimd src_divs=[<reimport>52.27%@+7401, <reimport>17.34%@+16285, <flush>17.71%@+26, 12.68%@+10644] iv_offset=43" [ 44.673262] alg: hash: sha256-talitos test failed (wrong result) on test vector 4, cfg="random: may_sleep use_finup src_divs=[<reimport>60.6%@+12790, 17.86%@+1329, <reimport>12.64%@alignmask+16300, 8.29%@+15, 0.40%@+13506, <reimport>0.51%@+16322, <reimport>0.24%@+16339] dst_divs"
This is due to two issues:
- We have an overlap between the buffer used for copying the input data (SEC1 doesn't do scatter/gather) and the chained descriptor.
- Data copy is wrong when the previous hash left less than one blocksize of data to hash, implying a complement of the previous block with a few bytes from the new request.
Fix it by:
- Moving the second descriptor after the buffer, as moving the buffer after the descriptor would make it more complex for other cipher operations (AEAD, ABLKCIPHER)
- Skip the bytes taken from the new request to complete the previous one by moving the SG list forward.
--- drivers/crypto/talitos.c | 69 +++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 28 deletions(-)
drivers/crypto/talitos.c +41 -28
@@ -334,6 +334,21 @@ int talitos_submit(struct device *dev, i }EXPORT_SYMBOL (talitos_submit); +static __be32 get_request_hdr (struct talitos_request *request,bool is_sec1) +{ +struct talitos_edesc *edesc; + +if (!is_sec1) +return request->desc->hdr; + +if (!request->desc->next_desc) +return request->desc->hdr1; + + edesc = container_of(request->desc, struct talitos_edesc, desc); + +return ((struct talitos_desc *)(edesc->buf + edesc->dma_len))->hdr1; +} +/* * process what was done, notify callback of error if not */
@@ -355,12 +370,7 @@ static void flush_channel(struct device/* descriptors with their done bits set don't get the error */ rmb (); -if (!is_sec1) - hdr = request->desc->hdr; -else if (request->desc->next_desc) - hdr = (request->desc +1 )->hdr1; -else - hdr = request->desc->hdr1; + hdr =get_request_hdr (request, is_sec1);if ((hdr &DESC_HDR_DONE ) ==DESC_HDR_DONE ) status =0 ;
@@ -490,8 +500,14 @@ static u32 current_desc_hdr(struct devic } } -if (priv->chan[ch].fifo[iter].desc->next_desc == cur_desc) -return (priv->chan[ch].fifo[iter].desc +1 )->hdr; +if (priv->chan[ch].fifo[iter].desc->next_desc == cur_desc) { +struct talitos_edesc *edesc; + + edesc =container_of (priv->chan[ch].fifo[iter].desc, + struct talitos_edesc, desc); +return ((struct talitos_desc *) + (edesc->buf + edesc->dma_len))->hdr; + }return priv->chan[ch].fifo[iter].desc->hdr; }
@@ -1401,15 +1417,11 @@ static struct talitos_edesc *talitos_ede edesc->dst_nents = dst_nents; edesc->iv_dma = iv_dma; edesc->dma_len = dma_len; -if (dma_len) { -void *addr = &edesc->link_tbl[0 ]; - -if (is_sec1 && !dst) - addr +=sizeof (struct talitos_desc ); - edesc->dma_link_tbl =dma_map_single (dev, addr, +if (dma_len) + edesc->dma_link_tbl =dma_map_single (dev, &edesc->link_tbl[0 ], edesc->dma_len,DMA_BIDIRECTIONAL ); - } +return edesc; }
@@ -1676,14 +1688,16 @@ static void common_nonsnoop_hash_unmap(sstruct talitos_private *priv =dev_get_drvdata (dev);bool is_sec1 =has_ftr_sec1 (priv);struct talitos_desc *desc = &edesc->desc; -struct talitos_desc *desc2 = desc +1 ; +struct talitos_desc *desc2 = (struct talitos_desc *) + (edesc->buf + edesc->dma_len);unmap_single_talitos_ptr (dev, &edesc->desc.ptr[5 ],DMA_FROM_DEVICE );if (desc->next_desc && desc->ptr[5 ].ptr != desc2->ptr[5 ].ptr)unmap_single_talitos_ptr (dev, &desc2->ptr[5 ],DMA_FROM_DEVICE ); -talitos_sg_unmap (dev, edesc, req_ctx->psrc,NULL ,0 ,0 ); +if (req_ctx->psrc) +talitos_sg_unmap (dev, edesc, req_ctx->psrc,NULL ,0 ,0 );/* When using hashctx-in, must unmap it. */ if (from_talitos_ptr_len (&edesc->desc.ptr[1 ], is_sec1))
@@ -1750,7 +1764,6 @@ static void talitos_handle_buggy_hash(ststatic int common_nonsnoop_hash (struct talitos_edesc *edesc,struct ahash_request *areq,unsigned int length, -unsigned int offset,void (*callback) (struct device *dev,struct talitos_desc *desc,void *context,int error))
@@ -1789,9 +1802,7 @@ static int common_nonsnoop_hash(struct t sg_count = edesc->src_nents ?:1 ;if (is_sec1 && sg_count >1 ) -sg_pcopy_to_buffer (req_ctx->psrc, sg_count, - edesc->buf +sizeof (struct talitos_desc ), - length, req_ctx->nbuf); +sg_copy_to_buffer (req_ctx->psrc, sg_count, edesc->buf, length);else if (length) sg_count =dma_map_sg (dev, req_ctx->psrc, sg_count,DMA_TO_DEVICE );
@@ -1804,7 +1815,7 @@ static int common_nonsnoop_hash(struct t DMA_TO_DEVICE); }else { sg_count =talitos_sg_map (dev, req_ctx->psrc, length, edesc, - &desc->ptr[3 ], sg_count, offset,0 ); + &desc->ptr[3 ], sg_count,0 ,0 );if (sg_count >1 ) sync_needed = true; }
@@ -1828,7 +1839,8 @@ static int common_nonsnoop_hash(struct ttalitos_handle_buggy_hash (ctx, edesc, &desc->ptr[3 ]);if (is_sec1 && req_ctx->nbuf && length) { -struct talitos_desc *desc2 = desc +1 ; +struct talitos_desc *desc2 = (struct talitos_desc *) + (edesc->buf + edesc->dma_len);dma_addr_t next_desc;memset (desc2,0 ,sizeof (*desc2));
@@ -1849,7 +1861,7 @@ static int common_nonsnoop_hash(struct t DMA_TO_DEVICE);copy_talitos_ptr (&desc2->ptr[2 ], &desc->ptr[2 ], is_sec1); sg_count =talitos_sg_map (dev, req_ctx->psrc, length, edesc, - &desc2->ptr[3 ], sg_count, offset,0 ); + &desc2->ptr[3 ], sg_count,0 ,0 );if (sg_count >1 ) sync_needed = true;copy_talitos_ptr (&desc2->ptr[5 ], &desc->ptr[5 ], is_sec1);
@@ -1960,7 +1972,6 @@ static int ahash_process_req(struct ahasstruct device *dev = ctx->dev;struct talitos_private *priv =dev_get_drvdata (dev);bool is_sec1 =has_ftr_sec1 (priv); -int offset =0 ;u8 *ctx_buf = req_ctx->buf[req_ctx->buf_idx];if (!req_ctx->last && (nbytes + req_ctx->nbuf <= blocksize)) {
@@ -2000,6 +2011,8 @@ static int ahash_process_req(struct ahassg_chain (req_ctx->bufsl,2 , areq->src); req_ctx->psrc = req_ctx->bufsl; }else if (is_sec1 && req_ctx->nbuf && req_ctx->nbuf < blocksize) { +int offset; +if (nbytes_to_hash > blocksize) offset = blocksize - req_ctx->nbuf;else
@@ -2012,7 +2025,8 @@ static int ahash_process_req(struct ahassg_copy_to_buffer (areq->src, nents, ctx_buf + req_ctx->nbuf, offset); req_ctx->nbuf += offset; - req_ctx->psrc = areq->src; + req_ctx->psrc =scatterwalk_ffwd (req_ctx->bufsl, areq->src, + offset); }else req_ctx->psrc = areq->src;
@@ -2052,8 +2066,7 @@ static int ahash_process_req(struct ahasif (ctx->keylen && (req_ctx->first || req_ctx->last)) edesc->desc.hdr |=DESC_HDR_MODE0_MDEU_HMAC ; -return common_nonsnoop_hash (edesc, areq, nbytes_to_hash, offset, - ahash_done); +return common_nonsnoop_hash (edesc, areq, nbytes_to_hash, ahash_done); }static int ahash_update (struct ahash_request *areq)
Greg Kroah-Hartman
maintainerPATCH 42/47 crypto/NX: Set receive window credits to max number of CRBs in RxFIFO
In reply to Greg Kroah-HartmanFrom: Haren Myneni <[email protected]>
commit e52d484d9869eb291140545746ccbe5ffc7c9306 upstream.
System gets checkstop if RxFIFO overruns with more requests than the maximum possible number of CRBs in FIFO at the same time. The max number of requests per window is controlled by window credits. So find max CRBs from FIFO size and set it to receive window credits.
--- drivers/crypto/nx/nx-842-powernv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/crypto/nx/nx-842-powernv.c +5 -3
@@ -36,8 +36,6 @@ MODULE_ALIAS_CRYPTO("842-nx");#define WORKMEM_ALIGN (CRB_ALIGN)#define CSB_WAIT_MAX (5000)/* ms */ #define VAS_RETRIES (10) -/* # of requests allowed per RxFIFO at a time. 0 for unlimited */ -#define MAX_CREDITS_PER_RXFIFO (1024)struct nx842_workmem {/* Below fields must be properly aligned */
@@ -821,7 +819,11 @@ static int __init vas_cfg_coproc_info(st rxattr.lnotify_lpid = lpid; rxattr.lnotify_pid = pid; rxattr.lnotify_tid = tid; - rxattr.wcreds_max =MAX_CREDITS_PER_RXFIFO ; +/* +* Maximum RX window credits can not be more than #CRBs in +* RxFIFO. Otherwise, can get checkstop if RxFIFO overruns. +*/ + rxattr.wcreds_max = fifo_size /CRB_SIZE ;/* * Open a VAS receice window which is used to configure RxFIFO
Greg Kroah-Hartman
maintainerPATCH 43/47 regmap-irq: do not write mask register if mask_base is zero
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
commit 7151449fe7fa5962c6153355f9779d6be99e8e97 upstream.
If client have not provided the mask base register then do not write into the mask register.
--- drivers/base/regmap/regmap-irq.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/base/regmap/regmap-irq.c +6 -0
@@ -91,6 +91,9 @@ static void regmap_irq_sync_unlock(struc* suppress pointless writes. */ for (i =0 ; i < d->chip->num_regs; i++) { +if (!d->chip->mask_base) +continue ; + reg = d->chip->mask_base + (i * map->reg_stride * d->irq_reg_stride);if (d->chip->mask_invert) {
@@ -526,6 +529,9 @@ int regmap_add_irq_chip(struct regmap *m/* Mask all the interrupts by default */ for (i =0 ; i < chip->num_regs; i++) { d->mask_buf[i] = d->mask_buf_def[i]; +if (!chip->mask_base) +continue ; + reg = chip->mask_base + (i * map->reg_stride * d->irq_reg_stride);if (chip->mask_invert)
Greg Kroah-Hartman
maintainerPATCH 44/47 drm/udl: introduce a macro to convert dev to udl.
In reply to Greg Kroah-Hartmancommit fd96e0dba19c53c2d66f2a398716bb74df8ca85e upstream.
This just makes it easier to later embed drm into udl.
--- drivers/gpu/drm/udl/udl_drv.h | 2 ++ drivers/gpu/drm/udl/udl_fb.c | 10 +++++----- drivers/gpu/drm/udl/udl_gem.c | 2 +- drivers/gpu/drm/udl/udl_main.c | 12 ++++++------ 4 files changed, 14 insertions(+), 12 deletions(-)
drivers/gpu/drm/udl/udl_drv.h +2 -0
@@ -71,6 +71,8 @@ struct udl_device {atomic_t cpu_kcycles_used;/* transpired during pixel processing */ }; +#define to_udl (x) ((x)->dev_private) +struct udl_gem_object {struct drm_gem_object base;struct page **pages;
drivers/gpu/drm/udl/udl_fb.c +5 -5
@@ -82,7 +82,7 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, int width, int height) {struct drm_device *dev = fb->base.dev; -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int i, ret;char *cmd;cycles_t start_cycles, end_cycles;
@@ -210,7 +210,7 @@ static int udl_fb_open(struct fb_info *info, int user) {struct udl_fbdev *ufbdev = info->par;struct drm_device *dev = ufbdev->ufb.base.dev; -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);/* If the USB device is gone, we don't accept new opens */ if (drm_dev_is_unplugged (udl->ddev))
@@ -441,7 +441,7 @@ static void udl_fbdev_destroy(struct drm_device *dev,int udl_fbdev_init (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int bpp_sel = fb_bpp;struct udl_fbdev *ufbdev;int ret;
@@ -480,7 +480,7 @@ int udl_fbdev_init(struct drm_device *dev)void udl_fbdev_cleanup (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);if (!udl->fbdev)return ;
@@ -491,7 +491,7 @@ void udl_fbdev_cleanup(struct drm_device *dev)void udl_fbdev_unplug (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);struct udl_fbdev *ufbdev;if (!udl->fbdev)return ;
drivers/gpu/drm/udl/udl_gem.c +1 -1
@@ -203,7 +203,7 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev, {struct udl_gem_object *gobj;struct drm_gem_object *obj; -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int ret =0 ;mutex_lock (&udl->gem_lock);
drivers/gpu/drm/udl/udl_main.c +6 -6
@@ -29,7 +29,7 @@static int udl_parse_vendor_descriptor (struct drm_device *dev,struct usb_device *usbdev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);char *desc;char *buf;char *desc_end;
@@ -165,7 +165,7 @@ void udl_urb_completion(struct urb *urb)static void udl_free_urb_list (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int count = udl->urbs.count;struct list_head *node;struct urb_node *unode;
@@ -198,7 +198,7 @@ static void udl_free_urb_list(struct drm_device *dev)static int udl_alloc_urb_list (struct drm_device *dev,int count,size_t size) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);struct urb *urb;struct urb_node *unode;char *buf;
@@ -262,7 +262,7 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)struct urb *udl_get_urb (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int ret =0 ;struct list_head *entry;struct urb_node *unode;
@@ -295,7 +295,7 @@ struct urb *udl_get_urb(struct drm_device *dev)int udl_submit_urb (struct drm_device *dev,struct urb *urb,size_t len) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int ret;BUG_ON (len > udl->urbs.size);
@@ -370,7 +370,7 @@ int udl_drop_usb(struct drm_device *dev)void udl_driver_unload (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);drm_kms_helper_poll_fini (dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/47 drm/udl: Replace drm_dev_unref with drm_dev_put
In reply to Greg Kroah-Hartmancommit ac3b35f11a06964f5fe7f6ea9a190a28a7994704 upstream.
This patch unifies the naming of DRM functions for reference counting of struct drm_device. The resulting code is more aligned with the rest of the Linux kernel interfaces.
--- drivers/gpu/drm/udl/udl_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/udl/udl_drv.c +1 -1
@@ -95,7 +95,7 @@ static int udl_usb_probe(struct usb_interface *interface,return 0 ; err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return r; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/47 drm/udl: move to embedding drm device inside udl device.
In reply to Greg Kroah-Hartmancommit 6ecac85eadb9d4065b9038fa3d3c66d49038e14b upstream.
This should help with some of the lifetime issues, and move us away from load/unload.
--- drivers/gpu/drm/udl/udl_drv.c | 56 +++++++++++++++++++++++++++------- drivers/gpu/drm/udl/udl_drv.h | 9 +++--- drivers/gpu/drm/udl/udl_fb.c | 2 +- drivers/gpu/drm/udl/udl_main.c | 23 ++------------ 4 files changed, 53 insertions(+), 37 deletions(-)
drivers/gpu/drm/udl/udl_drv.c +45 -11
@@ -47,10 +47,16 @@ static const struct file_operations udl_driver_fops = { .llseek = noop_llseek, }; +static void udl_driver_release (struct drm_device *dev) +{ +udl_fini (dev); +udl_modeset_cleanup (dev); +drm_dev_fini (dev); +kfree (dev); +} +static struct drm_driver driver = { .driver_features =DRIVER_MODESET |DRIVER_GEM |DRIVER_PRIME , - .load = udl_driver_load, - .unload = udl_driver_unload, .release = udl_driver_release,/* gem hooks */
@@ -74,28 +80,56 @@ static struct drm_driver driver = { .patchlevel = DRIVER_PATCHLEVEL, }; +static struct udl_device *udl_driver_create (struct usb_interface *interface) +{ +struct usb_device *udev =interface_to_usbdev (interface); +struct udl_device *udl; +int r; + + udl =kzalloc (sizeof (*udl),GFP_KERNEL ); +if (!udl) +return ERR_PTR (-ENOMEM ); + + r =drm_dev_init (&udl->drm, &driver, &interface->dev); +if (r) { +kfree (udl); +return ERR_PTR (r); + } + + udl->udev = udev; + udl->drm.dev_private = udl; + + r =udl_init (udl); +if (r) { +drm_dev_fini (&udl->drm); +kfree (udl); +return ERR_PTR (r); + } + +usb_set_intfdata (interface, udl); +return udl; +} +static int udl_usb_probe (struct usb_interface *interface,const struct usb_device_id *id) { -struct usb_device *udev =interface_to_usbdev (interface); -struct drm_device *dev;int r; +struct udl_device *udl; - dev =drm_dev_alloc (&driver, &interface->dev); -if (IS_ERR (dev)) -return PTR_ERR (dev); + udl =udl_driver_create (interface); +if (IS_ERR (udl)) +return PTR_ERR (udl); - r =drm_dev_register (dev, (unsigned long )udev); + r =drm_dev_register (&udl->drm,0 );if (r) goto err_free; -usb_set_intfdata (interface, dev); -DRM_INFO ("Initialized udl on minor %d\n" , dev->primary->index); +DRM_INFO ("Initialized udl on minor %d\n" , udl->drm.primary->index);return 0 ; err_free: -drm_dev_put (dev); +drm_dev_put (&udl->drm);return r; }
drivers/gpu/drm/udl/udl_drv.h +4 -5
@@ -50,8 +50,8 @@ struct urb_list {struct udl_fbdev ;struct udl_device { +struct drm_device drm;struct device *dev; -struct drm_device *ddev;struct usb_device *udev;struct drm_crtc *crtc;
@@ -71,7 +71,7 @@ struct udl_device {atomic_t cpu_kcycles_used;/* transpired during pixel processing */ }; -#define to_udl (x) ((x)->dev_private) +#define to_udl (x) container_of(x, struct udl_device, drm)struct udl_gem_object {struct drm_gem_object base;
@@ -104,9 +104,8 @@ struct urb *udl_get_urb(struct drm_device *dev);int udl_submit_urb (struct drm_device *dev,struct urb *urb,size_t len);void udl_urb_completion (struct urb *urb); -int udl_driver_load (struct drm_device *dev,unsigned long flags); -void udl_driver_unload (struct drm_device *dev); -void udl_driver_release (struct drm_device *dev); +int udl_init (struct udl_device *udl); +void udl_fini (struct drm_device *dev);int udl_fbdev_init (struct drm_device *dev);void udl_fbdev_cleanup (struct drm_device *dev);
drivers/gpu/drm/udl/udl_fb.c +1 -1
@@ -213,7 +213,7 @@ static int udl_fb_open(struct fb_info *info, int user)struct udl_device *udl =to_udl (dev);/* If the USB device is gone, we don't accept new opens */ -if (drm_dev_is_unplugged (udl->ddev)) +if (drm_dev_is_unplugged (&udl->drm))return -ENODEV ; ufbdev->fb_count++;
drivers/gpu/drm/udl/udl_main.c +3 -20
@@ -310,20 +310,12 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)return ret; } -int udl_driver_load (struct drm_device *dev,unsigned long flags) +int udl_init (struct udl_device *udl) { -struct usb_device *udev = (void *)flags; -struct udl_device *udl; +struct drm_device *dev = &udl->drm;int ret = -ENOMEM ;DRM_DEBUG ("\n" ); - udl =kzalloc (sizeof (struct udl_device ),GFP_KERNEL ); -if (!udl) -return -ENOMEM ; - - udl->udev = udev; - udl->ddev = dev; - dev->dev_private = udl;mutex_init (&udl->gem_lock);
@@ -357,7 +349,6 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags) err:if (udl->urbs.count)udl_free_urb_list (dev); -kfree (udl);DRM_ERROR ("%d\n" , ret);return ret; }
@@ -368,7 +359,7 @@ int udl_drop_usb(struct drm_device *dev)return 0 ; } -void udl_driver_unload (struct drm_device *dev) +void udl_fini (struct drm_device *dev) {struct udl_device *udl =to_udl (dev);
@@ -378,12 +369,4 @@ void udl_driver_unload(struct drm_device *dev)udl_free_urb_list (dev);udl_fbdev_cleanup (dev); -kfree (udl); -} - -void udl_driver_release (struct drm_device *dev) -{ -udl_modeset_cleanup (dev); -drm_dev_fini (dev); -kfree (dev); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/47 x86/entry/32: Fix ENDPROC of common_spurious
In reply to Greg Kroah-Hartman[ Upstream commit 1cbec37b3f9cff074a67bef4fc34b30a09958a0a ]
common_spurious is currently ENDed erroneously. common_interrupt is used in its ENDPROC. So fix this mistake.
Found by my asm macros rewrite patchset.
--- arch/x86/entry/entry_32.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/entry/entry_32.S +1 -1
@@ -1119,7 +1119,7 @@ common_spurious: movl %esp, %eax call smp_spurious_interrupt jmp ret_from_intr -ENDPROC(common_interrupt) +ENDPROC(common_spurious) #endif /*
Signature · 1 line
2.20.1
stable-rc/linux-4.19.y boot: 127 boots: 1 failed, 124 passed with 1 offline, 1 untried/unknown (v4.19.59-48-gaa9b0c7579ba)
stable-rc/linux-4.19.y boot: 127 boots: 1 failed, 124 passed with 1 offline, 1 untried/unknown (v4.19.59-48-gaa9b0c7579ba)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.19.y/kernel/v4.19.59-48-gaa9b0c7579ba/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.19.y/kernel/v4.19.59-48-gaa9b0c7579ba/
Tree: stable-rc
Branch: linux-4.19.y
Git Describe: v4.19.59-48-gaa9b0c7579ba
Git Commit: aa9b0c7579bacf570e7e430fa563e52b6b4ab15f
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 71 unique boards, 27 SoC families, 17 builds out of 206
Boot Regressions Detected:
arm64:
defconfig:
gcc-8:
sun50i-h5-libretech-all-h3-cc:
lab-baylibre: new failure (last pass: v4.19.59)Boot Failure Detected:
arc:
hsdk_defconfig:
gcc-8:
hsdk: 1 failed lab
Offline Platforms:
arm64:
defconfig:
gcc-8
meson-gxbb-odroidc2: 1 offline lab
---
For more info write to <[email protected]>
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.60 release. There are 47 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 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.60-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.19:
12 builds: 12 pass, 0 fail
22 boots: 22 pass, 0 fail
32 tests: 32 pass, 0 failLinux version: 4.19.60-rc1-gaa9b0c7579ba
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.60 release. There are 47 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 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.60-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.19.60-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.19.y
git commit: aa9b0c7579bacf570e7e430fa563e52b6b4ab15f
git describe: v4.19.59-48-gaa9b0c7579ba
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.19-oe/build/v4.19.59-48-gaa9b0c7579ba
No regressions (compared to build v4.19.59)
No fixes (compared to build v4.19.59)
Ran 24058 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libgpiod
* libhugetlbfs
* ltp-containers-tests
* ltp-cve-tests
* ltp-hugetlb-tests
* ltp-mm-tests
* spectre-meltdown-checker-test
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-cpuhotplug-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* network-basic-tests
* perf
* v4l2-compliance
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.60 release. There are 47 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 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
Build results:
total: 156 pass: 156 fail: 0 Qemu test results: total: 364 pass: 364 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.60 release. There are 47 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 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.60-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted with no regressions on my system.
-Kelsey