April 2018 - Linux-stable-mirror

[PATCH v2 1/2] pinctrl/samsung: Correct EINTG banks order

by Paweł Chmiel

All banks with GPIO interrupts should be at beginning of bank array and without any other types of banks between them. This order is expected by exynos_eint_gpio_irq, when doing interrupt group to bank translation. Otherwise, kernel NULL pointer dereference would happen when trying to handle interrupt, due to wrong bank being looked up. Observed on s5pv210, when trying to handle gpj0 interrupt, where kernel was mapping it to gpi bank. Cc: stable(a)vger.kernel.org Fixes: 023e06dfa6882f500b9c86fd61f0b1913aa07f36 ("pinctrl: exynos: add exynos5410 SoC specific data") Fixes: 608a26a7bc04a39cfd7041f31ca2b2100113d14e ("pinctrl: Add s5pv210 support to pinctrl-exynos) Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel(a)gmail.com> --- Changes from v1: - Limit changes to s5pv210 and Exynos5410. Exynos3250 will be handled later. - Added cc stable - Added fixes tag --- drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-exynos-arm.c b/drivers/pinctrl/samsung/pinctrl-exynos-arm.c index 90c2744..4f4ae66 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos-arm.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos-arm.c @@ -105,12 +105,12 @@ static const struct samsung_pin_bank_data s5pv210_pin_bank[] __initconst = { EXYNOS_PIN_BANK_EINTG(7, 0x1c0, "gpg1", 0x38), EXYNOS_PIN_BANK_EINTG(7, 0x1e0, "gpg2", 0x3c), EXYNOS_PIN_BANK_EINTG(7, 0x200, "gpg3", 0x40), - EXYNOS_PIN_BANK_EINTN(7, 0x220, "gpi"), EXYNOS_PIN_BANK_EINTG(8, 0x240, "gpj0", 0x44), EXYNOS_PIN_BANK_EINTG(6, 0x260, "gpj1", 0x48), EXYNOS_PIN_BANK_EINTG(8, 0x280, "gpj2", 0x4c), EXYNOS_PIN_BANK_EINTG(8, 0x2a0, "gpj3", 0x50), EXYNOS_PIN_BANK_EINTG(5, 0x2c0, "gpj4", 0x54), + EXYNOS_PIN_BANK_EINTN(7, 0x220, "gpi"), EXYNOS_PIN_BANK_EINTN(8, 0x2e0, "mp01"), EXYNOS_PIN_BANK_EINTN(4, 0x300, "mp02"), EXYNOS_PIN_BANK_EINTN(8, 0x320, "mp03"), @@ -630,7 +630,6 @@ static const struct samsung_pin_bank_data exynos5410_pin_banks0[] __initconst = EXYNOS_PIN_BANK_EINTG(4, 0x100, "gpc3", 0x20), EXYNOS_PIN_BANK_EINTG(7, 0x120, "gpc1", 0x24), EXYNOS_PIN_BANK_EINTG(7, 0x140, "gpc2", 0x28), - EXYNOS_PIN_BANK_EINTN(2, 0x160, "gpm5"), EXYNOS_PIN_BANK_EINTG(8, 0x180, "gpd1", 0x2c), EXYNOS_PIN_BANK_EINTG(8, 0x1A0, "gpe0", 0x30), EXYNOS_PIN_BANK_EINTG(2, 0x1C0, "gpe1", 0x34), @@ -641,6 +640,7 @@ static const struct samsung_pin_bank_data exynos5410_pin_banks0[] __initconst = EXYNOS_PIN_BANK_EINTG(2, 0x260, "gpg2", 0x48), EXYNOS_PIN_BANK_EINTG(4, 0x280, "gph0", 0x4c), EXYNOS_PIN_BANK_EINTG(8, 0x2A0, "gph1", 0x50), + EXYNOS_PIN_BANK_EINTN(2, 0x160, "gpm5"), EXYNOS_PIN_BANK_EINTN(8, 0x2C0, "gpm7"), EXYNOS_PIN_BANK_EINTN(6, 0x2E0, "gpy0"), EXYNOS_PIN_BANK_EINTN(4, 0x300, "gpy1"), -- 2.7.4

6 years, 7 months

4
3
0 0

[PATCH] libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs

by Hans de Goede

Richard Jones has reported that using med_power_with_dipm on a T450s with a Sandisk SD7UB3Q256G1001 SSD (firmware version X2180501) is causing the machine to hang. Switching the LPM to max_performance fixes this, so it seems that this Sandisk SSD does not handle LPM well. Note in the past there have been bug-reports about the following Sandisk models not working with min_power, so we may need to extend the quirk list in the future: name - firmware Sandisk SD6SB2M512G1022I - X210400 Sandisk SD6PP4M-256G-1006 - A200906 Cc: stable(a)vger.kernel.org Cc: Richard W.M. Jones <rjones(a)redhat.com> Reported-and-tested-by: Richard W.M. Jones <rjones(a)redhat.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/ata/libata-core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 6e400ff2b5db..68596bd4cf06 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4552,6 +4552,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { /* This specific Samsung model/firmware-rev does not handle LPM well */ { "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM, }, + /* Sandisk devices which are known to not handle LPM well */ + { "SanDisk SD7UB3Q*G1001", NULL, ATA_HORKAGE_NOLPM, }, + /* devices that don't properly handle queued TRIM commands */ { "Micron_M500_*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, -- 2.17.0

6 years, 7 months

2
1
0 0

Linux 4.14.36

by Greg KH

I'm announcing the release of the 4.14.36 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm/boot/dts/at91sam9g25.dtsi | 2 arch/arm/boot/dts/da850-lego-ev3.dts | 4 arch/arm/boot/dts/exynos5250.dtsi | 8 arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 24 + arch/arm/boot/dts/sama5d4.dtsi | 2 arch/arm/mach-exynos/pm.c | 6 arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 arch/mips/include/asm/uaccess.h | 11 arch/mips/lib/memset.S | 11 arch/powerpc/include/asm/barrier.h | 3 arch/powerpc/include/asm/opal.h | 3 arch/powerpc/include/asm/synch.h | 4 arch/powerpc/kernel/dt_cpu_ftrs.c | 12 arch/powerpc/kernel/eeh_pe.c | 3 arch/powerpc/kernel/kprobes.c | 30 +- arch/powerpc/kernel/machine_kexec_file_64.c | 2 arch/powerpc/lib/feature-fixups.c | 2 arch/powerpc/mm/hash_utils_64.c | 6 arch/powerpc/platforms/powernv/opal-nvram.c | 11 arch/powerpc/platforms/pseries/lpar.c | 8 arch/powerpc/sysdev/xive/native.c | 4 arch/s390/hypfs/inode.c | 2 arch/um/os-Linux/file.c | 1 arch/um/os-Linux/signal.c | 3 arch/x86/um/stub_segv.c | 3 arch/x86/xen/enlighten_pv.c | 8 drivers/acpi/nfit/core.c | 18 - drivers/acpi/video_detect.c | 9 drivers/base/regmap/regmap.c | 2 drivers/char/random.c | 84 +++++- drivers/char/tpm/tpm-interface.c | 4 drivers/clk/bcm/clk-bcm2835.c | 8 drivers/clk/mediatek/clk-mt2701.c | 15 - drivers/clk/mvebu/armada-38x.c | 14 - drivers/clk/renesas/clk-sh73a0.c | 6 drivers/cpufreq/cppc_cpufreq.c | 3 drivers/dma/at_xdmac.c | 4 drivers/extcon/extcon-intel-cht-wc.c | 11 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 drivers/gpu/drm/amd/amdgpu/si.c | 67 ++++ drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 drivers/gpu/drm/i915/i915_reg.h | 10 drivers/gpu/drm/i915/intel_sprite.c | 81 ++++- drivers/gpu/drm/radeon/radeon_device.c | 4 drivers/gpu/drm/radeon/si_dpm.c | 4 drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 23 - drivers/hid/hid-core.c | 10 drivers/hid/hid-input.c | 27 + drivers/hid/hid-multitouch.c | 5 drivers/hid/hid-rmi.c | 4 drivers/hid/hidraw.c | 5 drivers/hid/i2c-hid/i2c-hid.c | 13 drivers/hid/wacom_sys.c | 4 drivers/hid/wacom_wac.c | 76 +++-- drivers/i2c/busses/i2c-i801.c | 16 + drivers/infiniband/core/ucma.c | 3 drivers/infiniband/hw/mlx5/mr.c | 2 drivers/infiniband/sw/rxe/rxe_verbs.c | 5 drivers/infiniband/ulp/srp/ib_srp.c | 18 - drivers/iommu/intel-svm.c | 1 drivers/irqchip/irq-gic-common.c | 9 drivers/md/dm-crypt.c | 66 ++++ drivers/media/platform/vivid/vivid-vid-common.c | 3 drivers/media/platform/vsp1/vsp1_wpf.c | 2 drivers/misc/cxl/cxllib.c | 85 +++--- drivers/mmc/host/jz4740_mmc.c | 2 drivers/mmc/host/sdhci-pci-core.c | 25 + drivers/mmc/host/tmio_mmc_core.c | 2 drivers/mtd/ubi/block.c | 2 drivers/mtd/ubi/build.c | 11 drivers/mtd/ubi/fastmap-wl.c | 1 drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 62 ++++ drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 195 ++++++++++++-- drivers/net/xen-netfront.c | 7 drivers/nvdimm/dimm.c | 8 drivers/nvdimm/namespace_devs.c | 4 drivers/pci/hotplug/acpiphp_glue.c | 23 + drivers/pci/quirks.c | 4 drivers/phy/allwinner/phy-sun4i-usb.c | 10 drivers/pwm/pwm-rcar.c | 8 drivers/soc/mediatek/mtk-scpsys.c | 2 drivers/spi/spi-atmel.c | 8 drivers/spi/spi.c | 19 - drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c | 6 drivers/staging/media/lirc/lirc_zilog.c | 9 drivers/thermal/imx_thermal.c | 6 drivers/thunderbolt/icm.c | 10 drivers/thunderbolt/nhi.c | 1 drivers/thunderbolt/switch.c | 9 drivers/tty/n_tty.c | 6 drivers/tty/tty_io.c | 9 drivers/usb/core/generic.c | 9 drivers/usb/dwc3/core.c | 3 drivers/usb/dwc3/dwc3-pci.c | 2 drivers/usb/dwc3/gadget.c | 43 +-- drivers/usb/gadget/function/f_midi.c | 3 drivers/usb/gadget/u_f.h | 2 drivers/usb/gadget/udc/core.c | 3 drivers/usb/musb/musb_gadget_ep0.c | 14 - drivers/vfio/pci/vfio_pci_config.c | 29 +- drivers/watchdog/f71808e_wdt.c | 2 fs/autofs4/root.c | 2 fs/cifs/Kconfig | 1 fs/cifs/cifsencrypt.c | 85 +----- fs/cifs/cifsfs.c | 1 fs/cifs/cifsglob.h | 3 fs/cifs/cifsproto.h | 5 fs/cifs/inode.c | 33 ++ fs/cifs/link.c | 27 - fs/cifs/misc.c | 54 +++ fs/cifs/smb2ops.c | 15 - fs/cifs/smb2pdu.c | 8 fs/cifs/smb2proto.h | 3 fs/cifs/smb2transport.c | 97 ++---- fs/cifs/smbencrypt.c | 27 - fs/ext4/balloc.c | 3 fs/ext4/ext4_jbd2.c | 7 fs/ext4/ialloc.c | 47 --- fs/ext4/inode.c | 11 fs/ext4/ioctl.c | 8 fs/ext4/super.c | 21 - fs/ext4/xattr.c | 121 ++++---- fs/ext4/xattr.h | 11 fs/fs-writeback.c | 7 fs/jbd2/journal.c | 30 +- fs/jffs2/super.c | 2 fs/namespace.c | 3 fs/notify/fanotify/fanotify.c | 34 +- fs/orangefs/super.c | 5 fs/reiserfs/journal.c | 2 fs/ubifs/super.c | 14 - fs/udf/unicode.c | 6 include/dt-bindings/clock/mt2701-clk.h | 3 include/linux/backing-dev-defs.h | 5 include/linux/backing-dev.h | 30 +- include/linux/blk_types.h | 5 include/linux/compiler-clang.h | 3 include/linux/compiler-gcc.h | 12 include/linux/hid.h | 15 - include/linux/hmm.h | 9 include/linux/tty.h | 1 include/sound/pcm_oss.h | 1 include/uapi/linux/random.h | 3 ipc/shm.c | 23 + kernel/resource.c | 3 kernel/trace/ring_buffer.c | 5 mm/filemap.c | 9 mm/hmm.c | 3 mm/ksm.c | 7 mm/page-writeback.c | 18 - mm/slab.c | 3 net/dsa/tag_brcm.c | 3 net/dsa/tag_dsa.c | 3 net/dsa/tag_edsa.c | 3 net/dsa/tag_ksz.c | 3 net/dsa/tag_lan9303.c | 3 net/dsa/tag_mtk.c | 3 net/dsa/tag_qca.c | 3 net/dsa/tag_trailer.c | 3 net/sunrpc/rpc_pipe.c | 1 sound/core/oss/pcm_oss.c | 186 ++++++++++--- sound/core/pcm.c | 8 sound/core/rawmidi_compat.c | 18 - sound/pci/hda/hda_intel.c | 3 sound/pci/hda/patch_realtek.c | 3 sound/soc/codecs/ssm2602.c | 19 - sound/soc/soc-topology.c | 23 + sound/usb/line6/midi.c | 2 virt/kvm/arm/vgic/vgic-its.c | 15 - 179 files changed, 1840 insertions(+), 801 deletions(-) Aaron Armstrong Skomra (1): HID: wacom: bluetooth: send exit report for recent Bluetooth devices Aaron Ma (3): HID: i2c-hid: fix size check and type usage HID: Fix hid_report_len usage HID: core: Fix size as type u32 Al Viro (5): jffs2_kill_sb(): deal with failed allocations hypfs_kill_super(): deal with failed allocations orangefs_kill_sb(): deal with allocation failures rpc_pipefs: fix double-dput() Don't leak MNT_INTERNAL away from internal mounts Alex Deucher (4): drm/amdgpu: Add an ATPX quirk for hybrid laptop drm/amdgpu/sdma: fix mask in emit_pipeline_sync drm/amdgpu: Fix PCIe lane width calculation drm/amdgpu/si: implement get/set pcie_lanes asic callback Alex Smith (1): mmc: jz4740: Fix race condition in IRQ mask update Alex Williamson (1): vfio/pci: Virtualize Maximum Read Request Size Amir Goldstein (1): fanotify: fix logic of events on child Andrew Lunn (1): net: dsa: Discard frames from unused ports Andrew Morton (1): fs/reiserfs/journal.c: add missing resierfs_warning() arg Aniruddha Banerjee (1): irqchip/gic: Take lock when updating irq type Arnd Bergmann (1): clk: fix false-positive Wmaybe-uninitialized warning Aurelien Aptel (2): CIFS: refactor crypto shash/sdesc allocation&free CIFS: add sha512 secmech Bart Van Assche (3): RDMA/rxe: Fix an out-of-bounds read IB/srp: Fix srp_abort() IB/srp: Fix completion vector assignment algorithm Bas Nieuwenhuizen (1): drm/amdgpu: Fix always_valid bos multiple LRU insertions. Benjamin Herrenschmidt (1): powerpc/xive: Fix trying to "push" an already active pool VP Boris Brezillon (1): clk: bcm2835: De-assert/assert PLL reset signal when appropriate Chen-Yu Tsai (1): phy: allwinner: sun4i-usb: poll vbus changes on A23/A33 when driving VBUS Chris Chiu (1): tpm: self test failure should not cause suspend to fail Claudio Imbrenda (1): mm/ksm.c: fix inconsistent accounting of zero pages Dan Carpenter (1): regmap: Fix reversed bounds check in regmap_raw_write() Dan Williams (4): libnvdimm, dimm: fix dpa reservation vs uninitialized label area libnvdimm, namespace: use a safe lookup for dimm device name nfit, address-range-scrub: fix scrub in-progress reporting nfit: skip region registration for incomplete control regions Daniel Kurtz (1): mmc: sdhci-pci: Only do AMD tuning for HS200 David Lechner (1): ARM: dts: da850-lego-ev3: Fix battery voltage gpio David Wang (1): ALSA: hda - New VIA controller suppor no-snoop path Dmitry Torokhov (1): HID: input: fix battery level reporting on BT mice Eric Biggers (2): ipc/shm: fix use-after-free of shm file via remap_file_pages() ext4: limit xattr size to INT_MAX Eryu Guan (1): ext4: protect i_disksize update by i_data_sem in direct write path Eugen Hristev (1): spi: atmel: init FIFOs before spi enable Fabián Inostroza (1): ALSA: line6: Use correct endpoint type for midi output Felipe Balbi (2): usb: gadget: udc: core: update usb_ep_queue() documentation usb: dwc3: gadget: never call ->complete() from ->ep_queue() Frederic Barrat (1): cxl: Fix possible deadlock when processing page faults from cxllib George Cherian (1): cpufreq: CPPC: Use transition_delay_us depending transition_latency Greg Kroah-Hartman (1): Linux 4.14.36 Greg Thelen (1): writeback: safer lock nesting Gustavo A. R. Silva (1): CIFS: fix sha512 check in cifs_crypto_secmech_release Hans Verkuil (2): media: atomisp_fops.c: disable atomisp_compat_ioctl32 media: vivid: check if the cec_adapter is valid Hans de Goede (2): ACPI / video: Add quirk to force acpi-video backlight on Samsung 670Z5E extcon: intel-cht-wc: Set direction and drv flags for V5 boost GPIO Heinrich Schuchardt (1): usb: musb: gadget: misplaced out of bounds check Hui Wang (2): ALSA: hda/realtek - set PINCFG_HEADSET_MIC to parse_flags ALSA: hda/realtek - adjust the location of one mic Ian Kent (1): autofs: mount point create should honour passed in mode Igor Pylypiv (1): watchdog: f71808e_wdt: Fix WD_EN register read James Kelly (1): ASoC: ssm2602: Replace reg_default_raw with reg_default Jan Kara (1): udf: Fix leak of UTF-16 surrogates into encoded strings Jarkko Nikula (1): spi: Fix unregistration of controller with fixed SPI bus number Jason A. Donenfeld (1): um: Compile with modern headers Jason Andryuk (2): x86/xen: Delay get_cpu_cap until stack canary is established xen-netfront: Fix hang on device removal Jean Delvare (2): i2c: i801: Save register SMBSLVCMD value only once i2c: i801: Restore configuration at shutdown Jerome Brunet (1): ARM64: dts: meson: reduce odroid-c2 eMMC maximum rate Jérôme Glisse (2): mm/hmm: fix header file if/else/endif maze mm/hmm: hmm_pfns_bad() was accessing wrong struct Kees Cook (1): task_struct: only use anon struct under randstruct plugin Kieran Bingham (1): media: vsp1: Fix BRx conditional path in WPF Krzysztof Mazur (1): um: Use POSIX ucontext_t instead of struct ucontext Leon Romanovsky (1): RDMA/mlx5: Protect from NULL pointer derefence Liam Girdwood (1): ASoC: topology: Fix kcontrol name string handling Lu Baolu (1): iommu/vt-d: Fix a potential memory leak Luca Coelho (2): iwlwifi: add shared clock PHY config flag for some devices iwlwifi: add a bunch of new 9000 PCI IDs Marc Zyngier (2): KVM: arm/arm64: vgic-its: Fix potential overrun in vgic_copy_lpi_list drm/rockchip: Clear all interrupts before requesting the IRQ Marek Szyprowski (2): ARM: EXYNOS: Fix coupled CPU idle freeze on Exynos4210 ARM: dts: exynos: Fix IOMMU support for GScaler devices on Exynos5250 Masaharu Hayakawa (1): mmc: tmio: Fix error handling when issuing CMD23 Matt Redfearn (4): MIPS: uaccess: Add micromips clobbers to bzero invocation MIPS: memset.S: EVA & fault support for small_memset MIPS: memset.S: Fix return of __clear_user from Lpartial_fixup MIPS: memset.S: Fix clobber of v1 in last_fixup Matthew Wilcox (1): mm/filemap.c: fix NULL pointer in page_cache_tree_insert() Maxime Chevallier (1): spi: Fix scatterlist elements size in spi_map_buf Maxime Jayat (1): dmaengine: at_xdmac: fix rare residue corruption Michael Ellerman (1): powerpc/lib: Fix off-by-one in alternate feature patching Michael Neuling (1): powerpc/eeh: Fix enabling bridge MMIO windows Mika Westerberg (5): ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status() thunderbolt: Wait a bit longer for ICM to authenticate the active NVM thunderbolt: Serialize PCIe tunnel creation with PCI rescan thunderbolt: Resume control channel after hibernation image is created thunderbolt: Prevent crash when ICM firmware is not running Mikhail Lappo (1): thermal: imx: Fix race condition in imx_thermal_probe() Mikulas Patocka (2): block: use 32-bit blk_status_t on Alpha dm crypt: limit the number of allocated pages Naveen N. Rao (1): powerpc/kprobes: Fix call trace due to incorrect preempt count Nicholas Piggin (5): powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write() powerpc/64s: Fix dt_cpu_ftrs to have restore_cpu clear unwanted LPCR bits powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently powerpc/powernv: define a standard delay for OPAL_BUSY type retry loops powerpc/powernv: Fix OPAL NVRAM driver OPAL_BUSY loops Nico Sneck (1): drm/radeon: add PX quirk for Asus K73TK Nicolas Ferre (1): ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property Paul Mackerras (1): powerpc/64: Call H_REGISTER_PROC_TBL when running as a HPT guest on POWER9 Paul Parsons (1): drm/radeon: Fix PCIe lane width calculation Richard Genoud (1): clk: mvebu: armada-38x: add support for missing clocks Richard Weinberger (3): ubifs: Check ubifs_wbuf_sync() return code ubi: fastmap: Don't flush fastmap work on detach ubi: Reject MLC NAND Rodrigo Rivas Costa (1): HID: hidraw: Fix crash on HIDIOCGFEATURE with a destroyed device Roger Quadros (1): usb: dwc3: prevent setting PRTCAP to OTG from debugfs Roland Dreier (1): RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device Romain Izard (1): ubi: Fix error for write access Ronnie Sahlberg (2): cifs: fix memory leak in SMB2_open() fix smb3-encryption breakage when CONFIG_DEBUG_SG=y Ryo Kodama (1): pwm: rcar: Fix a condition to prevent mismatch value setting to duty Santiago Esteban (1): ARM: dts: at91: sama5d4: fix pinctrl compatible string Sean Wang (4): arm: dts: mt7623: fix USB initialization fails on bananapi-r2 soc: mediatek: fix the mistaken pointer accessed when subdomains are added clk: mediatek: fix PWM clock source by adding a fixed-factor clock dt-bindings: clock: mediatek: add binding for fixed-factor clock axisel_d4 Sean Young (2): Revert "media: lirc_zilog: driver only sends LIRCCODE" media: staging: lirc_zilog: incorrect reference counting Sinan Kaya (1): PCI: Mark Broadcom HT1100 and HT2000 Root Port Extended Tags as broken Steve French (1): smb3: Fix root directory when server returns inode number of zero Steven Rostedt (VMware) (1): ring-buffer: Check if memory is available before allocation Takashi Iwai (8): resource: fix integer overflow at reallocation ALSA: pcm: Fix UAF at PCM release via PCM timer access ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation ALSA: pcm: Avoid potential races between OSS ioctls and read/write ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams ALSA: pcm: Fix mutex unbalance in OSS emulation ioctls ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation ALSA: rawmidi: Fix missing input substream checks in compat ioctls Tejun Heo (1): tty: make n_tty_read() always abort if hangup is in progress Theodore Ts'o (16): random: use a tighter cap in credit_entropy_bits_safe() jbd2: if the journal is aborted then don't allow update of the log tail ext4: shutdown should not prevent get_write_access ext4: eliminate sleep from shutdown ioctl ext4: pass -ESHUTDOWN code to jbd2 layer ext4: don't update checksum of new initialized bitmaps ext4: fail ext4_iget for root directory if unallocated ext4: always initialize the crc32c checksum driver ext4: don't allow r/w mounts if metadata blocks overlap the superblock ext4: move call to ext4_error() into ext4_xattr_check_block() ext4: add bounds checking to ext4_xattr_find_entry() ext4: add extra checks to ext4_xattr_block_get() random: fix crng_ready() test random: use a different mixing algorithm for add_device_randomness() random: crng_reseed() should lock the crng instance that it is modifying random: add new ioctl RNDRESEEDCRNG Thiago Jung Bauermann (1): powerpc/kexec_file: Fix error code when trying to load kdump kernel Thinh Nguyen (1): usb: dwc3: pci: Properly cleanup resource Ville Syrjälä (1): drm/i915: Correctly handle limited range YCbCr data on VLV/CHV Vlastimil Babka (1): mm, slab: reschedule cache_reap() on the same CPU Yavuz, Tuba (1): USB: gadget: f_midi: fixing a possible double-free in f_midi Zhengjun Xing (1): USB:fix USB3 devices behind USB3 hubs not resuming at hibernate thaw

6 years, 7 months

4
19
0 0

console: Drop added "static" for newport_con

by Dmitry Shmidt

Please add this patch to stable 4.14 commit f54450ad1942287cc76b38021c0441fc4901d2de Author: Kees Cook <keescook(a)chromium.org> Date: Tue Feb 27 13:11:21 2018 -0800 console: Drop added "static" for newport_con Commit 4fe505119778 ("console: Expand dummy functions for CFI") accidentally added "static" to newport_con instance of struct consw, while trying to normalize the declarations. This, however, needed to stay non-static as it has an extern. Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Fixes: 4fe505119778 ("console: Expand dummy functions for CFI") Signed-off-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>

6 years, 8 months

2
4
0 0

[PATCHES] Networking

by David Miller

Please queue up the following networking bug fixes for v4.14 and v4.16 -stable, respectively. Thank you.

6 years, 8 months

2
1
0 0

[GIT PULL] commits for Linux 3.18

by Sasha Levin

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi Greg, Pleae pull commits for Linux 3.18 . I've sent a review request for all commits over a week ago and all comments were addressed. Thanks, Sasha ===== The following changes since commit 9764536dc592144beee43c987fef45d2e91ca55c: Linux 3.18.102 (2018-03-24 10:57:35 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-3.18-15042018 for you to fetch changes up to 75df115d69ca70bd7ebd8e0db11c2411abe3dce1: irqchip/gic-v3: Change pr_debug message to pr_devel (2018-04-15 11:02:31 -0400) - ---------------------------------------------------------------- for-greg-3.18-15042018 - ---------------------------------------------------------------- Alex Estrin (1): IB/ipoib: Fix for potential no-carrier state Alex Williamson (1): PCI: Add function 1 DMA alias quirk for Marvell 9128 Alexey Dobriyan (1): proc: fix /proc/*/map_files lookup Alexey Khoroshilov (1): vmlfb: Fix error handling in cr_pll_init() Anna-Maria Gleixner (1): tracing/hrtimer: Fix tracing bugs by taking all clock bases and modes into account Arnd Bergmann (4): xen: avoid type warning in xchg_xen_ulong scsi: fas216: fix sense buffer initialization x86/power: Fix swsusp_arch_resume prototype cifs: silence compiler warnings showing up with gcc-8.0.0 Benoît Thébaudeau (1): mmc: sdhci-esdhc: Add SDHCI_QUIRK_32BIT_DMA_ADDR Bjorn Helgaas (2): PCI: Correct PCI_STD_RESOURCE_END usage PCI: Enable ECRC only if device supports it Bob Moore (1): ACPICA: Disassembler: Abort on an invalid/unknown AML opcode Chen Yu (1): ACPI: processor_perflib: Do not send _PPC change notification if not ready Chris Packham (1): mtd: handle partitioning on devices with 0 erasesize Chris Wilson (1): e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails Christian Lamparter (1): net: emac: fix reset timeout with AR8035 phy Christoph Hellwig (1): PCI: Protect pci_error_handlers->reset_notify() usage with device_lock() Coly Li (1): bcache: properly set task state in bch_writeback_thread() Dan Carpenter (5): x86/nmi: Fix timeout test in test_nmi_ipi() scsi: bnx2i: missing error code in bnx2i_ep_connect() libertas: Fix lbs_prb_rsp_limit_set() ASoC: au1x: Fix timeout tests in au1xac97c_ac97_read() HID: roccat: prevent an out of bounds read in kovaplus_profile_activated() Dave Martin (3): arm64: ptrace: Fix VFP register dumping in compat coredumps arm64: ptrace: Avoid setting compat FP[SC]R to garbage if get_user fails arm64: ptrace: Fix incorrect get_user() use in compat_vfp_set() Eric Biggers (1): KEYS: put keyring if install_session_keyring_to_cred() fails Guenter Roeck (1): watchdog: sp5100_tco: Fix watchdog disable bit Hari Bathini (1): powerpc/fadump: avoid duplicates in crash memory ranges Hector Martin (1): firewire-ohci: work around oversized DMA reads on JMicron controllers Jacob Keller (1): ixgbe: avoid permanent lock of *_PTP_TX_IN_PROGRESS Jag Raman (1): sparc64: ldc abort during vds iso boot Jake Daryll Obina (1): jffs2: Fix use-after-free bug in jffs2_iget()'s error handling path James Smart (2): scsi: lpfc: Fix return value of board_mode store routine in case of online failure scsi: lpfc: Fix crash after firmware flash when IO is running. Jan Chochol (1): nfs: Do not convert nfs_idmap_cache_timeout to jiffies Jan Höppner (1): s390/dasd: Display read-only attribute correctly Jean Delvare (2): firmware: dmi_scan: Check DMI structure length firmware: dmi_scan: Fix handling of empty DMI strings Jia-Ju Bai (1): scsi: megaraid: Fix a sleep-in-atomic bug Johan Hovold (1): scsi: sun_esp: fix device reference leaks João Paulo Rechi Vita (1): platform/x86: acer-wmi: Detect RF Button capability Kees Cook (1): scsi: csiostor: Avoid content leaks and casts Kirill A. Shutemov (1): asm-generic: provide generic_pmdp_establish() Leon Romanovsky (1): RDMA/mlx5: Avoid memory leak in case of XRCD dealloc failure Liu Bo (1): Btrfs: skip commit transaction if we don't have enough pinned bytes Liwei Song (1): i2c: ismt: fix wrong device address when unmap the data buffer Lorenzo Bianconi (1): iio: magnetometer: st_magn_spi: fix spi_device_id table Luc Van Oostenryck (2): arm64: pass machine size to sparse arm64: pass endianness info to sparse Luis R. Rodriguez (1): fs: warn in case userspace lied about modprobe return Lv Zheng (2): ACPICA: Events: Add runtime stub support for event APIs ACPI: EC: Fix EC command visibility for dynamic debug Marcel Holtmann (1): Bluetooth: Send HCI Set Event Mask Page 2 command only when needed Marcelo Ricardo Leitner (1): sctp: adjust ssthresh when transport is idle Marcin Nowakowski (2): MIPS: mm: fixed mappings: correct initialisation MIPS: kprobes: flush_insn_slot should flush only if probe initialised Mark Salter (1): irqchip/gic-v3: Change pr_debug message to pr_devel Mateusz Jurczyk (1): caif: Add sockaddr length check before accessing sa_family in connect handler Mathieu Larouche (1): drm/mgag200: Fix to always set HiPri for G200e4 V2 Matt Redfearn (1): MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS Mel Gorman (1): mm: pin address_space before dereferencing it while isolating an LRU page Michael Neuling (1): powerpc: Fix /proc/cpuinfo revision for POWER9 DD2 Mintz, Yuval (1): bnx2x: Allow vfs to disable txvlan offload Namhyung Kim (1): perf tests: Decompress kernel module before objdump Nikolay Borisov (1): btrfs: Fix out of bounds access in btrfs_search_slot Paolo Bonzini (1): kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl Paul Burton (2): MIPS: CPS: Prevent multi-core with dcache aliasing MIPS: Handle tlbex-tlbp race condition Peter Zijlstra (1): perf/core: Correct event creation with PERF_FORMAT_GROUP Roopa Prabhu (1): vxlan: dont migrate permanent fdb entries during learn Ross Lagerwall (1): xen/grant-table: Use put_page instead of free_page Serhey Popovych (2): fib_rules: Resolve goto rules target on delete veth: Be more robust on network device creation when no attributes Steven Rostedt (VMware) (1): tools lib traceevent: Fix get_field_str() for dynamic strings Sujith Pandel (1): PCI: Add domain number check to find_smbios_instance_string() Suzuki K Poulose (1): irqchip/gic-v3: Honor forced affinity setting Tahsin Erdogan (1): ext4: change fast symlink test to not rely on i_blocks Takashi Iwai (1): ALSA: timer: Wrap with spinlock for queue access Tang Junhui (3): bcache: fix for allocator and register thread race bcache: fix for data collapse after re-attaching an attached device bcache: return attach error when no cache set exist Ulf Magnusson (3): kconfig: Don't leak main menus during parsing kconfig: Fix automatic menu creation mem leak kconfig: Fix expr_free() E_NOT leak Vlad Yasevich (1): macvlan: Do not return error when setting the same mac address WANG Cong (1): net_sched: move tcf_lock down after gen_replace_estimator() Xin Long (2): sctp: fix recursive locking warning in sctp_do_peeloff dccp: call inet_add_protocol after register_pernet_subsys in dccp_v4_init Xose Vazquez Perez (1): scsi: devinfo: fix format of the device list Yisheng Xie (2): mm/mempolicy: fix the check of nodemask from user mm/mempolicy: add nodes_empty check in SYSC_migrate_pages Yuyang Du (2): usb: usbip tool: Check the return of get_nports() usb: usbip tool: Fix refresh_imported_device_list() hayeswang (1): r8152: add byte_enable for ocp_read_word function mulhern (1): dm thin: fix documentation relative to low water mark threshold piaojun (2): ocfs2: return -EROFS to mount.ocfs2 if inode block is invalid ocfs2/acl: use 'ip_xattr_sem' to protect getting extended attribute Documentation/device-mapper/thin-provisioning.txt | 8 ++-- arch/arm/include/asm/xen/events.h | 2 +- arch/arm64/Makefile | 4 +- arch/arm64/kernel/ptrace.c | 25 ++++++++----- arch/mips/include/asm/kprobes.h | 3 +- arch/mips/kernel/smp-cps.c | 8 ++-- arch/mips/mm/pgtable-32.c | 6 +-- arch/mips/mm/tlbex.c | 38 ++++++++++++++++++- arch/mips/txx9/rbtx4939/setup.c | 4 +- arch/powerpc/kernel/fadump.c | 15 +++++++- arch/powerpc/kernel/setup-common.c | 4 ++ arch/sparc/kernel/ldc.c | 7 +++- arch/x86/kernel/nmi_selftest.c | 2 +- arch/x86/kvm/x86.c | 7 ++-- arch/x86/power/hibernate_32.c | 2 +- arch/x86/power/hibernate_64.c | 2 +- drivers/acpi/acpica/evxfevnt.c | 18 +++++++++ drivers/acpi/acpica/psobject.c | 14 +++++++ drivers/acpi/ec.c | 2 +- drivers/acpi/processor_perflib.c | 2 +- drivers/firewire/ohci.c | 8 +++- drivers/firmware/dmi_scan.c | 45 +++++++++++++---------- drivers/gpu/drm/mgag200/mgag200_mode.c | 9 ++++- drivers/hid/hid-roccat-kovaplus.c | 2 + drivers/i2c/busses/i2c-ismt.c | 2 +- drivers/iio/magnetometer/st_magn_spi.c | 2 - drivers/infiniband/hw/mlx5/qp.c | 5 +-- drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 ++ drivers/irqchip/irq-gic-v3.c | 9 ++++- drivers/md/bcache/alloc.c | 4 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/btree.c | 9 +++-- drivers/md/bcache/super.c | 23 +++++++++--- drivers/md/bcache/sysfs.c | 11 ++++-- drivers/md/bcache/writeback.c | 7 +++- drivers/mmc/host/sdhci-esdhc.h | 1 + drivers/mtd/mtdpart.c | 26 ++++++++----- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 19 ++++++++-- drivers/net/ethernet/ibm/emac/core.c | 26 +++++++++++-- drivers/net/ethernet/intel/e1000e/netdev.c | 7 +++- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 +++++++--- drivers/net/macvlan.c | 4 ++ drivers/net/usb/r8152.c | 4 +- drivers/net/veth.c | 4 +- drivers/net/vxlan.c | 2 +- drivers/net/wireless/libertas/mesh.c | 5 ++- drivers/pci/pci-label.c | 7 +++- drivers/pci/pci.c | 26 +++++++++---- drivers/pci/probe.c | 5 +++ drivers/pci/quirks.c | 4 +- drivers/platform/x86/acer-wmi.c | 7 ++++ drivers/s390/block/dasd_devmap.c | 19 +++++++--- drivers/scsi/arm/fas216.c | 2 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 3 +- drivers/scsi/csiostor/csio_lnode.c | 43 +++++++++++++--------- drivers/scsi/lpfc/lpfc_attr.c | 2 + drivers/scsi/lpfc/lpfc_sli.c | 2 +- drivers/scsi/megaraid/megaraid_mm.c | 2 +- drivers/scsi/scsi_devinfo.c | 7 ++-- drivers/scsi/sun_esp.c | 9 ++++- drivers/video/fbdev/vermilion/cr_pll.c | 1 + drivers/watchdog/sp5100_tco.h | 2 +- drivers/xen/grant-table.c | 4 +- fs/btrfs/ctree.c | 12 ++++-- fs/btrfs/extent-tree.c | 2 +- fs/cifs/cifssmb.c | 4 +- fs/ext4/inode.c | 20 ++++++---- fs/filesystems.c | 4 +- fs/jffs2/fs.c | 1 - fs/nfs/nfs4sysctl.c | 2 +- fs/ocfs2/acl.c | 6 +++ fs/ocfs2/super.c | 5 +-- fs/ocfs2/xattr.c | 2 + fs/proc/base.c | 29 ++++++++++++++- include/asm-generic/pgtable.h | 15 ++++++++ include/linux/suspend.h | 2 + include/trace/events/timer.h | 20 ++++++++-- kernel/events/core.c | 15 +++++--- kernel/power/power.h | 3 -- mm/mempolicy.c | 33 ++++++++++++++--- mm/vmscan.c | 14 ++++++- net/bluetooth/hci_core.c | 17 ++++++++- net/caif/caif_socket.c | 4 ++ net/core/fib_rules.c | 21 +++++++---- net/dccp/ipv4.c | 17 +++++---- net/sched/act_police.c | 8 ++-- net/sctp/socket.c | 4 +- net/sctp/transport.c | 2 + scripts/kconfig/expr.c | 2 +- scripts/kconfig/menu.c | 1 + scripts/kconfig/zconf.y | 33 ++++++++++++----- security/keys/process_keys.c | 7 ++-- sound/core/timer.c | 4 ++ sound/soc/au1x/ac97c.c | 6 +-- tools/lib/traceevent/parse-filter.c | 10 ++++- tools/perf/tests/code-reading.c | 20 +++++++++- tools/usb/usbip/libsrc/vhci_driver.c | 36 ++++++++++++++---- 97 files changed, 712 insertions(+), 246 deletions(-) -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAlrTxkkACgkQ3qZv95d3 LNyfOg/+Ic6vtNSD5e34LVX9jQWJUG1rJNUoROLI+2ETel16nT2z3hNV2zgeOXeM z1bDWVnk3hctBzOujNThLI5Y2L9cYl/AeysI5GWwAVVXjdZhEpJNvNuVwuJTEcEF iwnx7ufyTqDboJaDDB3EfrVd1gadLQ7joTFxWFgNf2cgbeHUPpXIfdXeHEUfJNPf WOYYYh5He6KN/SobsU9HD1lMycY9FdGxpGfN3gQyRFiWvL4GfZA1ObNk9Gr50JZT +6SeyuoAFOwWTjmrTFIl1kFm9xCQlsKV+JRTD2ghqwRkT1NgtX9l+qXnKBOEFhrq KnWn0wKihLDKrQWF2JXP6O2I1MOw/oFyjzQ/PWUkYrSKRYmIsrB83N8QG038CT4l lapt6HVKZIRMPNfM0vRo8ZoNagA7T9O3zQp7fA0aLlvyQQOibPH4e1dQ6nXo+cnT aP8s3nZsJZtrR0hR3/1TG3gH4EBEhNdFL/Z2CshsjA4EROEOrzk+nFBu1pcOD+2M giPI6xkjZykm5ARJzX7Osf9AttunxKvptH6S5ZxP4vD/mm/TS8bSGmlm0DZo9tbU CFxeJiEP1ZevRfJa7HzpCX3dMqJAmF/zzFzjDZWegktvhB3m5wSDPMvsUX+gUPvm RCaINjNzHljDI7IW4GvW8843Aj4Ssvhgu+eTjFXp+HQxPpnWf+I= =AqXj -----END PGP SIGNATURE-----

6 years, 8 months

3
3
0 0

Cherry-pick 55cc11da6989 for 4.16.y?

by Takashi Iwai

Hi Greg, could you cherry-pick the commit 55cc11da6989 Revert "ath10k: send (re)assoc peer command when NSS changed" for 4.16.y? We've got a regression report on openSUSE Tumbleweed, and this upstream commit was confirmed to fix the issue: http://bugzilla.suse.com/show_bug.cgi?id=1090458 Thanks! Takashi

6 years, 8 months

2
1
0 0

Please apply commit 028daf801173 to v4.14.y

by Sinan Kaya

Hi Greg, Upstream commit 028daf801173 ("i40e: Fix attach VF to VM issue") fixes a virtualization issue for i40e based adapters. problem description below from the commit: 'Fix for "Resource temporarily unavailable" problem when virsh is trying to attach a device to VM. When the VF driver is loaded on host and virsh is trying to attach it to the VM and set a MAC address, it ends with a race condition between i40e_reset_vf and i40e_ndo_set_vf_mac functions. The bug is fixed by adding polling in i40e_ndo_set_vf_mac function For when the VF is in Reset mode.' Please apply commit 028daf801173 to fix the resulting regression. Thanks, Sinan -- Sinan Kaya Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.

6 years, 8 months

2
2
0 0

[PATCH stable] drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs

by Neil Armstrong

commit 9c305eb442f3b371fc722ade827bbf673514123e upstream The Amlogic Meson GX SoCs, embedded the v2.01a controller, has been also identified needing this workaround. This patch adds the corresponding version to enable a single iteration for this specific version. Fixes: be41fc55f1aa ("drm: bridge: dw-hdmi: Handle overflow workaround based on device version") Acked-by: Archit Taneja <architt(a)codeaurora.org> [narmstrong: s/identifies/identified and rebased against Jernej's change] Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> Link: https://patchwork.freedesktop.org/patch/msgid/1519386277-25902-1-git-send-e… [narmstrong: v4.14 to v4.16 backport] Cc: <stable(a)vger.kernel.org> # 4.14.x --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index bf14214..4db31b8 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1634,6 +1634,8 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) * (and possibly on the platform). So far only i.MX6Q (v1.30a) and * i.MX6DL (v1.31a) have been identified as needing the workaround, with * 4 and 1 iterations respectively. + * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing + * the workaround with a single iteration. */ switch (hdmi->version) { @@ -1641,6 +1643,7 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) count = 4; break; case 0x131a: + case 0x201a: count = 1; break; default: -- 2.7.4

6 years, 8 months

2
1
0 0

FAILED: patch "[PATCH] s390: add support for IBM z14 Model ZR1" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 451239eb3d397bd197a79cc3aab943da41ba0905 Mon Sep 17 00:00:00 2001 From: Heiko Carstens <heiko.carstens(a)de.ibm.com> Date: Fri, 13 Apr 2018 14:04:24 +0200 Subject: [PATCH] s390: add support for IBM z14 Model ZR1 Just add the new machine type number to the two places that matter. Cc: <stable(a)vger.kernel.org> # v4.14+ Signed-off-by: Heiko Carstens <heiko.carstens(a)de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky(a)de.ibm.com> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index beccb58a82e5..199ac3e4da1d 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -286,12 +286,12 @@ config MARCH_Z13 older machines. config MARCH_Z14 - bool "IBM z14" + bool "IBM z14 ZR1 and z14" select HAVE_MARCH_Z14_FEATURES help - Select this to enable optimizations for IBM z14 (3906 series). - The kernel will be slightly faster but will not work on older - machines. + Select this to enable optimizations for IBM z14 ZR1 and z14 (3907 + and 3906 series). The kernel will be slightly faster but will not + work on older machines. endchoice diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c index c5bc3f209652..5ee27dc9a10c 100644 --- a/arch/s390/kernel/perf_cpum_cf_events.c +++ b/arch/s390/kernel/perf_cpum_cf_events.c @@ -583,6 +583,7 @@ __init const struct attribute_group **cpumf_cf_event_group(void) model = cpumcf_z13_pmu_event_attr; break; case 0x3906: + case 0x3907: model = cpumcf_z14_pmu_event_attr; break; default: diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index fc3b4aa185cc..d82a9ec64ea9 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -821,6 +821,7 @@ static int __init setup_hwcaps(void) strcpy(elf_platform, "z13"); break; case 0x3906: + case 0x3907: strcpy(elf_platform, "z14"); break; }

6 years, 8 months

4
3
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2018