December 2018 - Linux-stable-mirror

[PATCH] ALSA: fireface: fix for state to fetch PCM frames

by Takashi Sakamoto

According to my memo at hand and saved records, writing 0x00000001 to SND_FF_REG_FETCH_PCM_FRAMES disables fetching PCM frames in corresponding channel, however current implement uses reversed logic. This results in muted volume in device side during playback. This commit corrects the bug. Cc: <stable(a)vger.kernel.org> # v4.12+ Fixes: 76fdb3a9e13a ('ALSA: fireface: add support for Fireface 400') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/fireface/ff-protocol-ff400.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/firewire/fireface/ff-protocol-ff400.c b/sound/firewire/fireface/ff-protocol-ff400.c index 8f34174ee813..fd257051d4a4 100644 --- a/sound/firewire/fireface/ff-protocol-ff400.c +++ b/sound/firewire/fireface/ff-protocol-ff400.c @@ -86,7 +86,7 @@ static int ff400_switch_fetching_mode(struct snd_ff *ff, bool enable) if (reg == NULL) return -ENOMEM; - if (enable) { + if (!enable) { /* * Each quadlet is corresponding to data channels in a data * blocks in reverse order. Precisely, quadlets for available -- 2.19.1

6 years

2
1
0 0

[PATCH] gpio: max7301: fix driver for use with CONFIG_VMAP_STACK

by Christophe Leroy

spi_read() and spi_write() require DMA-safe memory. When CONFIG_VMAP_STACK is selected, those functions cannot be used with buffers on stack. This patch replaces calls to spi_read() and spi_write() by spi_write_then_read() which doesn't require DMA-safe buffers. Fixes: 0c36ec314735 ("gpio: gpio driver for max7301 SPI GPIO expander") Cc: <stable(a)vger.kernel.org> Signed-off-by: Christophe Leroy <christophe.leroy(a)c-s.fr> --- drivers/gpio/gpio-max7301.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpio-max7301.c b/drivers/gpio/gpio-max7301.c index 68c7942d0a3c..6f7d12ba2f74 100644 --- a/drivers/gpio/gpio-max7301.c +++ b/drivers/gpio/gpio-max7301.c @@ -25,7 +25,7 @@ static int max7301_spi_write(struct device *dev, unsigned int reg, struct spi_device *spi = to_spi_device(dev); u16 word = ((reg & 0x7F) << 8) | (val & 0xFF); - return spi_write(spi, (const u8 *)&word, sizeof(word)); + return spi_write_then_read(spi, &word, sizeof(word), NULL, 0); } /* A read from the MAX7301 means two transfers; here, one message each */ @@ -37,14 +37,8 @@ static int max7301_spi_read(struct device *dev, unsigned int reg) struct spi_device *spi = to_spi_device(dev); word = 0x8000 | (reg << 8); - ret = spi_write(spi, (const u8 *)&word, sizeof(word)); - if (ret) - return ret; - /* - * This relies on the fact, that a transfer with NULL tx_buf shifts out - * zero bytes (=NOOP for MAX7301) - */ - ret = spi_read(spi, (u8 *)&word, sizeof(word)); + ret = spi_write_then_read(spi, &word, sizeof(word), &word, + sizeof(word)); if (ret) return ret; return word & 0xff; -- 2.13.3

6 years

2
1
0 0

[PATCH 4.14 00/89] 4.14.89-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.89 release. There are 89 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun Dec 16 11:57:01 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.89-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.89-rc1 Piotr Stankiewicz <piotr.stankiewicz(a)intel.com> IB/hfi1: Fix an out-of-bounds access in get_hw_stats Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Fixed headphone issue for ALC700 Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: fireface: fix reference to wrong register for clock configuration Guenter Roeck <linux(a)roeck-us.net> staging: speakup: Replace strncpy with memcpy Tigran Mkrtchyan <tigran.mkrtchyan(a)desy.de> flexfiles: enforce per-mirror stateid only for v4 DSes Davidlohr Bueso <dave(a)stgolabs.net> lib/rbtree-test: lower default params Petr Mladek <pmladek(a)suse.com> printk: Wake klogd when passing console_lock owner Sergey Senozhatsky <sergey.senozhatsky.work(a)gmail.com> printk: Never set console_may_schedule in console_trylock() Petr Mladek <pmladek(a)suse.com> printk: Hide console waiter logic into helpers Steven Rostedt (VMware) <rostedt(a)goodmis.org> printk: Add console owner and waiter logic to load balance console writes Sasha Levin <sashal(a)kernel.org> Revert "printk: Never set console_may_schedule in console_trylock()" Pan Bian <bianpan2016(a)163.com> ocfs2: fix potential use after free Qian Cai <cai(a)gmx.us> debugobjects: avoid recursive calls with kmemleak Pan Bian <bianpan2016(a)163.com> hfsplus: do not free node before using Pan Bian <bianpan2016(a)163.com> hfs: do not free node before using Wei Yang <richard.weiyang(a)gmail.com> mm/page_alloc.c: fix calculation of pgdat->nr_zones Larry Chen <lchen(a)suse.com> ocfs2: fix deadlock caused by ocfs2_defrag_extent() Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> ACPI/IORT: Fix iort_get_platform_device_domain() uninitialized pointer value Sagi Grimberg <sagi(a)grimberg.me> nvme: flush namespace scanning work just before removing namespaces Colin Ian King <colin.king(a)canonical.com> fscache, cachefiles: remove redundant variable 'cache' NeilBrown <neilb(a)suse.com> fscache: fix race between enablement and dropping of object Kees Cook <keescook(a)chromium.org> pstore/ram: Correctly calculate usable PRZ bytes Igor Druzhinin <igor.druzhinin(a)citrix.com> Revert "xen/balloon: Mark unallocated host memory as UNUSABLE" Srikanth Boddepalli <boddepalli.srikanth(a)gmail.com> xen: xlate_mmu: add missing header to fix 'W=1' warning Y.C. Chen <yc_chen(a)aspeedtech.com> drm/ast: fixed reading monitor EDID not stable issue shaoyunl <shaoyun.liu(a)amd.com> drm/amdgpu: Add delay after enable RLC ucode Pan Bian <bianpan2016(a)163.com> net: hisilicon: remove unexpected free_netdev Josh Elsasser <jelsasser(a)appneta.com> ixgbe: recognize 1000BaseLX SFP modules as 1Gbps Yunjian Wang <wangyunjian(a)huawei.com> igb: fix uninitialized variables Kiran Kumar Modukuri <kiran.modukuri(a)gmail.com> cachefiles: Fix page leak in cachefiles_read_backing_file while vmscan is active Taehee Yoo <ap420073(a)gmail.com> netfilter: nf_tables: deactivate expressions in rule replecement routine Marek Szyprowski <m.szyprowski(a)samsung.com> usb: gadget: u_ether: fix unsafe list iteration Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com> net: thunderx: fix NULL pointer dereference in nic_remove Yi Wang <wang.yi59(a)zte.com.cn> x86/kvm/vmx: fix old-style function declaration Yi Wang <wang.yi59(a)zte.com.cn> KVM: x86: fix empty-body warnings Artemy Kovalyov <artemyko(a)mellanox.com> IB/mlx5: Fix page fault handling for MW Alin Nastac <alin.nastac(a)gmail.com> netfilter: ipv6: Preserve link scope traffic original oif Christian Hewitt <christianshewitt(a)gmail.com> drm/meson: add support for 1080p25 mode Aaro Koskinen <aaro.koskinen(a)iki.fi> USB: omap_udc: fix rejection of out transfers when DMA is used Aaro Koskinen <aaro.koskinen(a)iki.fi> USB: omap_udc: fix USB gadget functionality on Palm Tungsten E Aaro Koskinen <aaro.koskinen(a)iki.fi> USB: omap_udc: fix omap_udc_start() on 15xx machines Aaro Koskinen <aaro.koskinen(a)iki.fi> USB: omap_udc: fix crashes on probe error and module removal Aaro Koskinen <aaro.koskinen(a)iki.fi> USB: omap_udc: use devm_request_irq() Xin Long <lucien.xin(a)gmail.com> ipvs: call ip_vs_dst_notifier earlier than ipv6_dev_notf Martynas Pumputis <m(a)lambda.lt> bpf: fix check of allowed specifiers in bpf_trace_printk Pan Bian <bianpan2016(a)163.com> exportfs: do not read dentry after free Peter Ujfalusi <peter.ujfalusi(a)ti.com> ASoC: omap-dmic: Add pm_qos handling to avoid overruns with CPU_IDLE Peter Ujfalusi <peter.ujfalusi(a)ti.com> ASoC: omap-mcpdm: Add pm_qos handling to avoid under/overruns with CPU_IDLE Peter Ujfalusi <peter.ujfalusi(a)ti.com> ASoC: omap-mcbsp: Fix latency value calculation for pm_qos Kamal Heib <kamalheib1(a)gmail.com> RDMA/rdmavt: Fix rvt_create_ah function signature Majd Dibbiny <majd(a)mellanox.com> RDMA/mlx5: Fix fence type for IB_WR_LOCAL_INV WR Robbie Ko <robbieko(a)synology.com> Btrfs: send, fix infinite loop due to directory rename dependencies Romain Izard <romain.izard.pro(a)gmail.com> ARM: dts: at91: sama5d2: use the divided clock for SMC Artem Savkov <asavkov(a)redhat.com> objtool: Fix segfault in .cold detection with -ffunction-sections Artem Savkov <asavkov(a)redhat.com> objtool: Fix double-free in .cold detection error path Trent Piepho <tpiepho(a)impinj.com> PCI: imx6: Fix link training status detection in link up check Jiri Olsa <jolsa(a)kernel.org> perf tools: Restore proper cwd on return from mnt namespace Huacai Chen <chenhc(a)lemote.com> hwmon: (w83795) temp4_type has writable permission Taehee Yoo <ap420073(a)gmail.com> netfilter: xt_hashlimit: fix a possible memory leak in htable_create() Hans de Goede <hdegoede(a)redhat.com> iio/hid-sensors: Fix IIO_CHAN_INFO_RAW returning wrong values for signed numbers Tzung-Bi Shih <tzungbi(a)google.com> ASoC: dapm: Recalculate audio map forcely when card instantiated Peter Ujfalusi <peter.ujfalusi(a)ti.com> ASoC: omap-abe-twl6040: Fix missing audio card caused by deferred probing Nicolin Chen <nicoleotsuka(a)gmail.com> hwmon: (ina2xx) Fix current value calculation Thomas Richter <tmricht(a)linux.ibm.com> s390/cpum_cf: Reject request for sampling in event initialization Richard Fitzgerald <rf(a)opensource.cirrus.com> ASoC: wm_adsp: Fix dma-unsafe read of scratch registers Nicolin Chen <nicoleotsuka(a)gmail.com> hwmon (ina2xx) Fix NULL id pointer in probe() Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix use-after-free when deleting compat expressions Florian Westphal <fw(a)strlen.de> selftests: add script to stress-test nft packet path vs. control plane YueHaibing <yuehaibing(a)huawei.com> sysv: return 'err' instead of 0 in __sysv_write_inode Janusz Krzysztofik <jmkrzyszt(a)gmail.com> ARM: OMAP1: ams-delta: Fix possible use of uninitialized field Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-somlv: Fix interrupt on mmc3_dat1 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> staging: rtl8723bs: Fix the return value in case of error in 'rtw_wx_read32()' Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: rsnd: fixup clock start checker Nathan Chancellor <natechancellor(a)gmail.com> ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup Jason Wang <jasowang(a)redhat.com> virtio-net: keep vnet header zeroed after processing XDP Nicolas Dichtel <nicolas.dichtel(a)6wind.com> tun: forbid iface creation with rtnl ops Yuchung Cheng <ycheng(a)google.com> tcp: fix NULL ref in tail loss probe Eric Dumazet <edumazet(a)google.com> tcp: Do not underestimate rwnd_limited Xin Long <lucien.xin(a)gmail.com> sctp: kfree_rcu asoc Eric Dumazet <edumazet(a)google.com> rtnetlink: ndo_dflt_fdb_dump() only work for ARPHRD_ETHER devices Christoph Paasch <cpaasch(a)apple.com> net: Prevent invalid access to skb->prev in __qdisc_drop_all Heiner Kallweit <hkallweit1(a)gmail.com> net: phy: don't allow __set_phy_supported to add unsupported modes Eran Ben Elisha <eranbe(a)mellanox.com> net/mlx4_en: Change min MTU size to ETH_MIN_MTU Tarick Bedeir <tarick(a)google.com> net/mlx4_core: Correctly set PFC param if global pause is turned off. Su Yanjun <suyj.fnst(a)cn.fujitsu.com> net: 8139cp: fix a BUG triggered by changing mtu with network traffic Shmulik Ladkani <shmulik(a)metanetworks.com> ipv6: sr: properly initialize flowi6 prior passing to ip6_route_output Stefano Brivio <sbrivio(a)redhat.com> neighbour: Avoid writing before skb->head in neigh_hh_output() Stefano Brivio <sbrivio(a)redhat.com> ipv6: Check available headroom in ip6_xmit() even without options Jiri Wiesner <jwiesner(a)suse.com> ipv4: ipv6: netfilter: Adjust the frag mem limit when truesize changes ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/logicpd-som-lv.dtsi | 2 +- arch/arm/boot/dts/sama5d2.dtsi | 2 +- arch/arm/mach-omap1/board-ams-delta.c | 3 + arch/arm/mach-omap2/prm44xx.c | 2 +- arch/s390/kernel/perf_cpum_cf.c | 2 + arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/vmx.c | 8 +- arch/x86/xen/enlighten.c | 78 ---------- arch/x86/xen/setup.c | 6 +- drivers/acpi/arm64/iort.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 +- drivers/gpu/drm/ast/ast_mode.c | 36 ++++- drivers/gpu/drm/meson/meson_venc.c | 1 + drivers/hid/hid-sensor-custom.c | 2 +- drivers/hid/hid-sensor-hub.c | 13 +- drivers/hwmon/ina2xx.c | 6 +- drivers/hwmon/w83795.c | 2 +- drivers/iio/accel/hid-sensor-accel-3d.c | 5 +- drivers/iio/gyro/hid-sensor-gyro-3d.c | 5 +- drivers/iio/humidity/hid-sensor-humidity.c | 3 +- drivers/iio/light/hid-sensor-als.c | 8 +- drivers/iio/light/hid-sensor-prox.c | 8 +- drivers/iio/magnetometer/hid-sensor-magn-3d.c | 8 +- drivers/iio/orientation/hid-sensor-incl-3d.c | 8 +- drivers/iio/pressure/hid-sensor-press.c | 8 +- drivers/iio/temperature/hid-sensor-temperature.c | 3 +- drivers/infiniband/hw/hfi1/chip.c | 3 +- drivers/infiniband/hw/hfi1/hfi.h | 2 + drivers/infiniband/hw/hfi1/verbs.c | 2 +- drivers/infiniband/hw/mlx5/odp.c | 1 + drivers/infiniband/hw/mlx5/qp.c | 19 +-- drivers/infiniband/sw/rdmavt/ah.c | 4 +- drivers/infiniband/sw/rdmavt/ah.h | 3 +- drivers/net/ethernet/cavium/thunder/nic_main.c | 3 + drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +- drivers/net/ethernet/intel/igb/e1000_i210.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 - drivers/net/ethernet/realtek/8139cp.c | 5 + drivers/net/phy/phy_device.c | 19 ++- drivers/net/tun.c | 6 +- drivers/net/virtio_net.c | 14 +- drivers/nvme/host/core.c | 4 +- drivers/pci/dwc/pci-imx6.c | 10 +- drivers/rtc/rtc-hid-sensor-time.c | 2 +- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 2 +- drivers/staging/speakup/kobjects.c | 4 +- drivers/usb/gadget/function/u_ether.c | 11 +- drivers/usb/gadget/udc/omap_udc.c | 88 ++++-------- drivers/xen/balloon.c | 65 ++------- drivers/xen/xlate_mmu.c | 1 + fs/btrfs/send.c | 11 +- fs/cachefiles/rdwr.c | 9 +- fs/exportfs/expfs.c | 2 +- fs/fscache/object.c | 3 + fs/hfs/btree.c | 3 +- fs/hfsplus/btree.c | 3 +- fs/nfs/flexfilelayout/flexfilelayout.c | 6 +- fs/ocfs2/export.c | 2 +- fs/ocfs2/move_extents.c | 47 +++--- fs/pstore/ram.c | 15 +- fs/sysv/inode.c | 2 +- include/linux/hid-sensor-hub.h | 4 +- include/linux/pstore.h | 5 +- include/net/neighbour.h | 28 +++- include/net/sctp/structs.h | 2 + include/xen/balloon.h | 5 - kernel/printk/printk.c | 160 ++++++++++++++++++++- kernel/trace/bpf_trace.c | 8 +- lib/debugobjects.c | 5 +- lib/interval_tree_test.c | 4 +- lib/rbtree_test.c | 2 +- mm/page_alloc.c | 4 +- net/core/rtnetlink.c | 3 + net/ipv4/ip_fragment.c | 7 + net/ipv4/tcp_output.c | 17 ++- net/ipv6/ip6_output.c | 42 +++--- net/ipv6/netfilter.c | 3 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 8 +- net/ipv6/reassembly.c | 8 +- net/ipv6/seg6_iptunnel.c | 1 + net/netfilter/ipvs/ip_vs_ctl.c | 3 + net/netfilter/nf_tables_api.c | 20 +-- net/netfilter/nft_compat.c | 3 +- net/netfilter/xt_hashlimit.c | 9 +- net/sched/sch_netem.c | 3 + net/sctp/associola.c | 2 +- sound/firewire/fireface/ff-protocol-ff400.c | 2 +- sound/pci/hda/patch_realtek.c | 33 +++++ sound/soc/codecs/wm_adsp.c | 37 ++--- sound/soc/omap/omap-abe-twl6040.c | 67 ++++----- sound/soc/omap/omap-dmic.c | 9 ++ sound/soc/omap/omap-mcbsp.c | 6 +- sound/soc/omap/omap-mcpdm.c | 43 +++++- sound/soc/sh/rcar/ssi.c | 2 +- sound/soc/soc-core.c | 1 + tools/objtool/elf.c | 19 ++- tools/perf/util/namespaces.c | 17 ++- tools/perf/util/namespaces.h | 1 + tools/testing/selftests/Makefile | 1 + tools/testing/selftests/netfilter/Makefile | 6 + tools/testing/selftests/netfilter/config | 2 + .../selftests/netfilter/nft_trans_stress.sh | 78 ++++++++++ 106 files changed, 820 insertions(+), 483 deletions(-)

6 years

10
102
0 0

[PATCH] mtd: rawnand: marvell: prevent timeouts on a loaded machine

by Miquel Raynal

marvell_nfc_wait_op() waits for completion during 'timeout_ms' milliseconds before throwing an error. While the logic is fine, the value of 'timeout_ms' is given by the core and actually correspond to the maximum time the NAND chip will take to complete the operation. Assuming there is no overhead in the propagation of the interrupt signal to the the NAND controller (through the Ready/Busy line), this delay does not take into account the latency of the operating system. For instance, for a page write, the delay given by the core is rounded up to 1ms. Hence, when the machine is over loaded, there is chances that this timeout will be reached. There are two ways to solve this issue that are not incompatible: 1/ Enlarge the timeout value (if so, how much?). 2/ Check after the waiting method if we did not miss any interrupt because of the OS latency (an interrupt is still pending). In this case, we assume the operation exited successfully. We choose the second approach that is a must in all cases, with the possibility to also modify the timeout value to be, e.g. at least 1 second in all cases. Fixes: 02f26ecf8c77 ("mtd: nand: add reworked Marvell NAND controller driver") Cc: stable(a)vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- drivers/mtd/nand/raw/marvell_nand.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c index e6c3739cea73..bc0eef4ade4f 100644 --- a/drivers/mtd/nand/raw/marvell_nand.c +++ b/drivers/mtd/nand/raw/marvell_nand.c @@ -514,9 +514,14 @@ static void marvell_nfc_enable_int(struct marvell_nfc *nfc, u32 int_mask) writel_relaxed(reg & ~int_mask, nfc->regs + NDCR); } -static void marvell_nfc_clear_int(struct marvell_nfc *nfc, u32 int_mask) +static int marvell_nfc_clear_int(struct marvell_nfc *nfc, u32 int_mask) { + u32 reg; + + reg = readl_relaxed(nfc->regs + NDSR); writel_relaxed(int_mask, nfc->regs + NDSR); + + return reg & int_mask; } static void marvell_nfc_force_byte_access(struct nand_chip *chip, @@ -683,6 +688,7 @@ static int marvell_nfc_wait_cmdd(struct nand_chip *chip) static int marvell_nfc_wait_op(struct nand_chip *chip, unsigned int timeout_ms) { struct marvell_nfc *nfc = to_marvell_nfc(chip->controller); + int pending; int ret; /* Timeout is expressed in ms */ @@ -695,8 +701,13 @@ static int marvell_nfc_wait_op(struct nand_chip *chip, unsigned int timeout_ms) ret = wait_for_completion_timeout(&nfc->complete, msecs_to_jiffies(timeout_ms)); marvell_nfc_disable_int(nfc, NDCR_RDYM); - marvell_nfc_clear_int(nfc, NDSR_RDY(0) | NDSR_RDY(1)); - if (!ret) { + pending = marvell_nfc_clear_int(nfc, NDSR_RDY(0) | NDSR_RDY(1)); + + /* + * In case the interrupt was not served in the required time frame, + * check if the ISR was not served or if something went actually wrong. + */ + if (ret && !pending) { dev_err(nfc->dev, "Timeout waiting for RB signal\n"); return -ETIMEDOUT; } -- 2.19.1

6 years

2
2
0 0

[PATCH v2] x86: vdso: Pass --eh-frame-hdr to ld

by Alistair Strachan

Commit 379d98ddf413 ("x86: vdso: Use $LD instead of $CC to link") accidentally broke unwinding from userspace, because ld would strip the .eh_frame sections when linking. Originally, the compiler would implicitly add --eh-frame-hdr when invoking the linker, but when this Makefile was converted from invoking ld via the compiler, to invoking it directly (like vmlinux does), the flag was missed. (The EH_FRAME section is important for the VDSO shared libraries, but not for vmlinux.) Fix the problem by explicitly specifying --eh-frame-hdr, which restores parity with the old method. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201741 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1659295 Reported-by: Florian Weimer <fweimer(a)redhat.com> Reported-by: Carlos O'Donell <carlos(a)redhat.com> Reported-by: "H. J. Lu" <hjl.tools(a)gmail.com> Tested-by: Laura Abbott <labbott(a)redhat.com> Fixes: 379d98ddf413 ("x86: vdso: Use $LD instead of $CC to link") Cc: stable(a)vger.kernel.org Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: "H. Peter Anvin" <hpa(a)zytor.com> Cc: X86 ML <x86(a)kernel.org> Cc: Joel Fernandes <joel(a)joelfernandes.org> Cc: kernel-team(a)android.com Signed-off-by: Alistair Strachan <astrachan(a)google.com> --- v2: Updated commit message, no changes to the code arch/x86/entry/vdso/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 141d415a8c80..c3d7ccd25381 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -171,7 +171,8 @@ quiet_cmd_vdso = VDSO $@ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ - $(call ld-option, --build-id) -Bsymbolic + $(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \ + -Bsymbolic GCOV_PROFILE := n # -- 2.20.0.405.gbc1bbc6f85-goog

6 years

2
1
0 0

[PATCH v2] mtd: rawnand: omap2: Pass the parent of pdev to dma_request_chan()

by Boris Brezillon

Commit e1e6255c311b ("mtd: rawnand: omap2: convert driver to nand_scan()") moved part of the init code in the ->attach_chip hook and at the same time changed the struct device object passed to dma_request_chan() (&pdev->dev instead of pdev->dev.parent). Fixes: e1e6255c311b ("mtd: rawnand: omap2: convert driver to nand_scan()") Reported-by: Alexander Sverdlin <alexander.sverdlin(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Boris Brezillon <boris.brezillon(a)bootlin.com> --- Changes in v2: - Fix the prefix --- drivers/mtd/nand/raw/omap2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c index 886d05c391ef..68e8b9f7f372 100644 --- a/drivers/mtd/nand/raw/omap2.c +++ b/drivers/mtd/nand/raw/omap2.c @@ -1944,7 +1944,7 @@ static int omap_nand_attach_chip(struct nand_chip *chip) case NAND_OMAP_PREFETCH_DMA: dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); - info->dma = dma_request_chan(dev, "rxtx"); + info->dma = dma_request_chan(dev->parent, "rxtx"); if (IS_ERR(info->dma)) { dev_err(dev, "DMA engine request failed\n"); -- 2.17.1

6 years

3
2
0 0

[PATCH] mtd: rawnand: Fix JEDEC detection

by Boris Brezillon

nand_jedec_detect() should return 1 when the PARAM page parsing succeeds, otherwise the core considers JEDEC detection failed and falls back to ID-based detection. Fixes: 480139d9229e ("mtd: rawnand: get rid of the JEDEC parameter page in nand_chip") Cc: <stable(a)vger.kernel.org> Signed-off-by: Boris Brezillon <boris.brezillon(a)bootlin.com> --- drivers/mtd/nand/raw/nand_jedec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mtd/nand/raw/nand_jedec.c b/drivers/mtd/nand/raw/nand_jedec.c index 5c26492c841d..38b5dc22cb30 100644 --- a/drivers/mtd/nand/raw/nand_jedec.c +++ b/drivers/mtd/nand/raw/nand_jedec.c @@ -107,6 +107,8 @@ int nand_jedec_detect(struct nand_chip *chip) pr_warn("Invalid codeword size\n"); } + ret = 1; + free_jedec_param_page: kfree(p); return ret; -- 2.17.1

6 years

2
3
0 0

[PATCH 3/3] ALSA: firewire-lib: use the same print format for 'without_header' tracepoints

by Takashi Sakamoto

An initial commit to add tracepoints for packets without CIP headers uses different print formats for added tracepoints. However this is not convenient for users/developers to prepare debug tools. This commit uses the same format for the two tracepoints. Cc: <stable(a)vger.kernel.org> # v4.12+ Fixes: b164d2fd6e49 ('ALSA: firewire_lib: add tracepoints for packets without CIP headers') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp-stream-trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h index c05b3da0aa1c..ac20acf48fc6 100644 --- a/sound/firewire/amdtp-stream-trace.h +++ b/sound/firewire/amdtp-stream-trace.h @@ -131,7 +131,7 @@ TRACE_EVENT(in_packet_without_header, __entry->index = index; ), TP_printk( - "%02u %04u %04x %04x %02d %03u %3u %3u %02u %01u %02u", + "%02u %04u %04x %04x %02d %03u %02u %03u %02u %01u %02u", __entry->second, __entry->cycle, __entry->src, -- 2.19.1

6 years

1
0
0 0

[PATCH 2/3] ALSA: firewire-lib: fix wrong assignment for 'out_packet_without_header' tracepoint

by Takashi Sakamoto

An initial commit to add tracepoints for packets without CIP headers introduces a wrong assignment to 'data_blocks' value of 'out_packet_without_header' tracepoint. This commit fixes the bug. Cc: <stable(a)vger.kernel.org> # v4.12+ Fixes: b164d2fd6e49 ('ALSA: firewire_lib: add tracepoints for packets without CIP headers') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp-stream-trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h index 54cdd4ffa9ce..c05b3da0aa1c 100644 --- a/sound/firewire/amdtp-stream-trace.h +++ b/sound/firewire/amdtp-stream-trace.h @@ -169,7 +169,7 @@ TRACE_EVENT(out_packet_without_header, __entry->dest = fw_parent_device(s->unit)->node_id; __entry->payload_quadlets = payload_length / 4; __entry->data_blocks = data_blocks, - __entry->data_blocks = s->data_block_counter, + __entry->data_block_counter = s->data_block_counter, __entry->packet_index = s->packet_index; __entry->irq = !!in_interrupt(); __entry->index = index; -- 2.19.1

6 years

1
0
0 0

[PATCH 1/3] ALSA: firewire-lib: fix wrong handling payload_length as payload_quadlet

by Takashi Sakamoto

In IEC 61883-1/6 engine of ALSA firewire stack, a packet handler has a second argument for 'the number of bytes in payload of isochronous packet'. However, an incoming packet handler without CIP header uses the value as 'the number of quadlets in the payload'. This brings userspace applications to receive the number of PCM frames as four times against real time. This commit fixes the bug. Cc: <stable(a)vger.kernel.org> # v4.12+ Fixes: 3b196c394dd ('ALSA: firewire-lib: add no-header packet processing') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp-stream.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 9be76c808fcc..3ada55ed5381 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -654,15 +654,17 @@ static int handle_in_packet(struct amdtp_stream *s, } static int handle_in_packet_without_header(struct amdtp_stream *s, - unsigned int payload_quadlets, unsigned int cycle, + unsigned int payload_length, unsigned int cycle, unsigned int index) { __be32 *buffer; + unsigned int payload_quadlets; unsigned int data_blocks; struct snd_pcm_substream *pcm; unsigned int pcm_frames; buffer = s->buffer.packets[s->packet_index].buffer; + payload_quadlets = payload_length / 4; data_blocks = payload_quadlets / s->data_block_quadlets; trace_in_packet_without_header(s, cycle, payload_quadlets, data_blocks, -- 2.19.1

6 years

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2018