- Linux-stable-mirror - lists.linaro.org

[PATCH v2] drm/etnaviv: Fix driver unregistering

by Fabio Estevam

From: Fabio Estevam <fabio.estevam(a)nxp.com> Russell King reported: "When removing and reloading the etnaviv module, the following splat occurs: sysfs: cannot create duplicate filename '/devices/platform/etnaviv' CPU: 0 PID: 1471 Comm: modprobe Not tainted 4.17.0+ #1608 Hardware name: Marvell Dove (Cubox) Backtrace: [<c00157d4>] (dump_backtrace) from [<c0015b8c>] (show_stack+0x18/0x1c) r6:ef033e38 r5:ee07b340 r4:edb9d000 r3:00000000 [<c0015b74>] (show_stack) from [<c0620784>] (dump_stack+0x20/0x28) [<c0620764>] (dump_stack) from [<c01bcd24>] (sysfs_warn_dup+0x5c/0x70) [<c01bccc8>] (sysfs_warn_dup) from [<c01bce14>] (sysfs_create_dir_ns+0x90/0x98) ..." Commit 246774d17fc0 ("drm/etnaviv: remove the need for a gpu-subsystem DT node") introduced DRM registration via platform_device_register_simple(), but missed to call platform_device_unregister() inside etnaviv_exit(). Fix the problem by calling platform_device_unregister() inside etnaviv_exit(). While at it, also rearrange the function calls in the exit path to make them happen in the opposite order of registration. Tested on a imx6-sabresd board. Cc: <stable(a)vger.kernel.org> Fixes: 246774d17fc0 ("drm/etnaviv: remove the need for a gpu-subsystem DT node") Reported-by: Russell King <linux(a)armlinux.org.uk> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - Make the exit path symmetrical to the init path by calling platform_device_unregister() inside for_each_compatible_node() drivers/gpu/drm/etnaviv/etnaviv_drv.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index e5013a9..626ad8b 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -631,6 +631,8 @@ static struct platform_driver etnaviv_platform_driver = { }, }; +static struct platform_device *etnaviv_drm; + static int __init etnaviv_init(void) { int ret; @@ -654,7 +656,8 @@ static int __init etnaviv_init(void) if (!of_device_is_available(np)) continue; - platform_device_register_simple("etnaviv", -1, NULL, 0); + etnaviv_drm = platform_device_register_simple("etnaviv", -1, + NULL, 0); of_node_put(np); break; } @@ -665,8 +668,19 @@ module_init(etnaviv_init); static void __exit etnaviv_exit(void) { - platform_driver_unregister(&etnaviv_gpu_driver); + struct device_node *np; + + for_each_compatible_node(np, NULL, "vivante,gc") { + if (!of_device_is_available(np)) + continue; + + platform_device_unregister(etnaviv_drm); + of_node_put(np); + break; + } + platform_driver_unregister(&etnaviv_platform_driver); + platform_driver_unregister(&etnaviv_gpu_driver); } module_exit(etnaviv_exit); -- 2.7.4

7 years, 4 months

2
2
0 0

[PATCH 4.16 00/64] 4.16.18-stable review

by Greg Kroah-Hartman

---------------- NOTE: This will be the last 4.16.y release. After this release, this tree will be end-of-life. You should have moved to the 4.17.y tree by now. ---------------- This is the start of the stable review cycle for the 4.16.18 release. There are 64 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 Tue Jun 26 14:27:22 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.16.18-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.16.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.16.18-rc1 Vlastimil Babka <vbabka(a)suse.cz> mm, page_alloc: do not break __GFP_THISNODE by zonelist reset Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> fs/binfmt_misc.c: do not allow offset overflow Michael S. Tsirkin <mst(a)redhat.com> vhost: fix info leak due to uninitialized memory Jason Gerecke <killertofu(a)gmail.com> HID: wacom: Correct logical maximum Y for 2nd-gen Intuos Pro large Even Xu <even.xu(a)intel.com> HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation Martin Brandenburg <martin(a)omnibond.com> orangefs: report attributes_mask and attributes for statx Martin Brandenburg <martin(a)omnibond.com> orangefs: set i_size on new symlink Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: fw: harden page loading code Tony Luck <tony.luck(a)intel.com> x86/intel_rdt: Enable CMT and MBM on new Skylake stepping Thomas Gleixner <tglx(a)linutronix.de> genirq/migration: Avoid out of line call if pending is not set Thomas Gleixner <tglx(a)linutronix.de> genirq/affinity: Defer affinity setting if irq chip is busy Thomas Gleixner <tglx(a)linutronix.de> genirq/generic_pending: Do not lose pending affinity update Thomas Gleixner <tglx(a)linutronix.de> irq_remapping: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/platform/uv: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/ioapic: Use apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/apic: Provide apic_ack_irq() Thomas Gleixner <tglx(a)linutronix.de> x86/apic/vector: Prevent hlist corruption and leaks Dou Liyang <douly.fnst(a)cn.fujitsu.com> x86/vector: Fix the args of vector_alloc tracepoint Stefan Potyra <Stefan.Potyra(a)elektrobit.com> w1: mxc_w1: Enable clock before calling clk_get_rate() on it Keith Busch <keith.busch(a)intel.com> nvme/pci: Sync controller reset for AER slot_reset Hans de Goede <hdegoede(a)redhat.com> libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Dan Carpenter <dan.carpenter(a)oracle.com> libata: zpodd: small read overflow in eject_tray() Chen Yu <yu.c.chen(a)intel.com> cpufreq: governors: Fix long idle detection logic in load calculation Suman Anna <s-anna(a)ti.com> cpufreq: ti-cpufreq: Fix an incorrect error return value Tao Wang <kevin.wangtao(a)hisilicon.com> cpufreq: Fix new policy initialization during limits updates via sysfs Tejun Heo <tj(a)kernel.org> bdi: Move cgroup bdi_writeback to a dedicated low concurrency workqueue Roman Pen <roman.penyaev(a)profitbricks.com> blk-mq: reinit q->tag_set_list entry only after grace period Josef Bacik <jbacik(a)fb.com> nbd: use bd_set_size when updating disk size Josef Bacik <jbacik(a)fb.com> nbd: update size when connected Josef Bacik <jbacik(a)fb.com> nbd: fix nbd device deletion Shirish Pargaonkar <shirishpargaonkar(a)gmail.com> cifs: For SMB2 security informaion query, check for minimum sized security descriptor instead of sizeof FileAllInformation class Mark Syms <mark.syms(a)citrix.com> CIFS: 511c54a2f69195b28afb9dd119f03787b1625bb4 adds a check for session expiry Steve French <stfrench(a)microsoft.com> smb3: on reconnect set PreviousSessionId field Steve French <stfrench(a)microsoft.com> smb3: fix various xid leaks Tony Luck <tony.luck(a)intel.com> x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read() Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP ProBook 640 G4 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP EliteBook 830 G5 Bo Chen <chenbo(a)pdx.edu> ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant - Add fixup for HP Z2 G4 workstation Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Disable the quirk for Nura headset Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode pages for device replace Su Yue <suy.fnst(a)cn.fujitsu.com> btrfs: return error value if create_io_em failed in cow_file_range Omar Sandoval <osandov(a)fb.com> Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2() Omar Sandoval <osandov(a)fb.com> Btrfs: fix clone vs chattr NODATASUM race Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> driver core: Don't ignore class_dir_create_and_add() failure. Jan Kara <jack(a)suse.cz> ext4: fix fencepost error in check for inode count overflow during resize Theodore Ts'o <tytso(a)mit.edu> ext4: correctly handle a zero-length xattr with a non-zero e_value_offs Theodore Ts'o <tytso(a)mit.edu> ext4: bubble errors from ext4_find_inline_data_nolock() up to ext4_iget() Theodore Ts'o <tytso(a)mit.edu> ext4: do not allow external inodes for inline data Lukas Czerner <lczerner(a)redhat.com> ext4: update mtime in ext4_punch_hole even if no blocks are released Jan Kara <jack(a)suse.cz> ext4: fix hole length detection in ext4_ind_map_blocks() Daniel Borkmann <daniel(a)iogearbox.net> tls: fix use-after-free in tls_push_record Dexuan Cui <decui(a)microsoft.com> hv_netvsc: Fix a network regression after ifdown/ifup Willem de Bruijn <willemb(a)google.com> net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan Paolo Abeni <pabeni(a)redhat.com> udp: fix rx queue len reported by diag and proc interface Cong Wang <xiyou.wangcong(a)gmail.com> socket: close race condition between sock_close() and sockfs_setattr() Frank van der Linden <fllinden(a)amazon.com> tcp: verify the checksum of the first data segment in a new connection Davide Caratti <dcaratti(a)redhat.com> net/sched: act_simple: fix parsing of TCA_DEF_DATA Alvaro Gamez Machado <alvaro.gamez(a)hazent.com> net: phy: dp83822: use BMCR_ANENABLE instead of BMSR_ANEGCAPABLE for DP83620 Zhouyang Jia <jiazhouyang09(a)gmail.com> net: dsa: add error handling for pskb_trim_rcsum Julian Anastasov <ja(a)ssi.bg> ipv6: allow PMTU exceptions to local routes Bjørn Mork <bjorn(a)mork.no> cdc_ncm: avoid padding beyond end of skb Xiangning Yu <yuxiangning(a)gmail.com> bonding: re-evaluate force_primary when the primary slave name changes ------------- Diffstat: Makefile | 4 +- arch/x86/include/asm/apic.h | 2 + arch/x86/include/asm/trace/irq_vectors.h | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 18 ++++++- arch/x86/kernel/cpu/intel_rdt.c | 2 + arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- arch/x86/platform/uv/uv_irq.c | 7 +-- block/blk-mq.c | 3 +- drivers/ata/libata-core.c | 3 -- drivers/ata/libata-zpodd.c | 2 +- drivers/base/core.c | 14 +++++- drivers/block/nbd.c | 17 ++++++- drivers/cpufreq/cpufreq.c | 2 + drivers/cpufreq/cpufreq_governor.c | 12 ++--- drivers/cpufreq/ti-cpufreq.c | 2 +- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 +++------ drivers/hid/wacom_sys.c | 8 +++ drivers/iommu/amd_iommu.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/iommu/irq_remapping.c | 5 -- drivers/iommu/irq_remapping.h | 2 - drivers/net/bonding/bond_options.c | 1 + drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/phy/dp83848.c | 35 ++++++++++--- drivers/net/tap.c | 5 +- drivers/net/tun.c | 3 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/virtio_net.c | 3 +- drivers/net/wireless/intel/iwlwifi/fw/paging.c | 49 ++++++++++++++++--- drivers/nvme/host/pci.c | 11 ++++- drivers/vhost/vhost.c | 3 ++ drivers/w1/masters/mxc_w1.c | 20 +++++--- fs/binfmt_misc.c | 12 +++-- fs/btrfs/inode.c | 4 +- fs/btrfs/ioctl.c | 18 ++++--- fs/btrfs/scrub.c | 2 +- fs/cifs/cifsacl.h | 14 ++++++ fs/cifs/smb2ops.c | 68 ++++++++++++++++++-------- fs/cifs/smb2pdu.c | 4 +- fs/ext4/indirect.c | 14 ++++-- fs/ext4/inline.c | 6 +++ fs/ext4/inode.c | 46 +++++++++-------- fs/ext4/resize.c | 2 +- fs/ext4/xattr.c | 2 +- fs/orangefs/inode.c | 7 +++ fs/orangefs/namei.c | 7 +++ include/linux/irq.h | 7 ++- include/linux/virtio_net.h | 11 ++--- include/net/transp_v6.h | 11 ++++- include/net/udp.h | 5 ++ kernel/irq/manage.c | 37 +++++++++++++- kernel/irq/migration.c | 31 +++++++----- mm/backing-dev.c | 18 ++++++- mm/page_alloc.c | 1 - net/dsa/tag_trailer.c | 3 +- net/ipv4/tcp_ipv4.c | 4 ++ net/ipv4/udp.c | 2 +- net/ipv4/udp_diag.c | 2 +- net/ipv6/datagram.c | 6 +-- net/ipv6/route.c | 3 -- net/ipv6/tcp_ipv6.c | 4 ++ net/ipv6/udp.c | 3 +- net/packet/af_packet.c | 4 +- net/sched/act_simple.c | 15 +++--- net/socket.c | 18 +++++-- net/tls/tls_sw.c | 26 +++++----- sound/pci/hda/hda_controller.c | 4 +- sound/pci/hda/patch_conexant.c | 3 ++ sound/pci/hda/patch_realtek.c | 6 ++- sound/usb/quirks-table.h | 5 ++ 71 files changed, 498 insertions(+), 210 deletions(-)

7 years, 4 months

3
65
0 0

[PATCH 4.14 00/52] 4.14.52-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.52 release. There are 52 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 Tue Jun 26 14:27:24 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.52-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.52-rc1 Vlastimil Babka <vbabka(a)suse.cz> mm, page_alloc: do not break __GFP_THISNODE by zonelist reset Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> fs/binfmt_misc.c: do not allow offset overflow Michael S. Tsirkin <mst(a)redhat.com> vhost: fix info leak due to uninitialized memory Jason Gerecke <killertofu(a)gmail.com> HID: wacom: Correct logical maximum Y for 2nd-gen Intuos Pro large Even Xu <even.xu(a)intel.com> HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation Martin Brandenburg <martin(a)omnibond.com> orangefs: report attributes_mask and attributes for statx Martin Brandenburg <martin(a)omnibond.com> orangefs: set i_size on new symlink Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: fw: harden page loading code Tony Luck <tony.luck(a)intel.com> x86/intel_rdt: Enable CMT and MBM on new Skylake stepping Stefan Potyra <Stefan.Potyra(a)elektrobit.com> w1: mxc_w1: Enable clock before calling clk_get_rate() on it Hans de Goede <hdegoede(a)redhat.com> libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Dan Carpenter <dan.carpenter(a)oracle.com> libata: zpodd: small read overflow in eject_tray() Chen Yu <yu.c.chen(a)intel.com> cpufreq: governors: Fix long idle detection logic in load calculation Tao Wang <kevin.wangtao(a)hisilicon.com> cpufreq: Fix new policy initialization during limits updates via sysfs Tejun Heo <tj(a)kernel.org> bdi: Move cgroup bdi_writeback to a dedicated low concurrency workqueue Roman Pen <roman.penyaev(a)profitbricks.com> blk-mq: reinit q->tag_set_list entry only after grace period Josef Bacik <jbacik(a)fb.com> nbd: use bd_set_size when updating disk size Josef Bacik <jbacik(a)fb.com> nbd: update size when connected Josef Bacik <jbacik(a)fb.com> nbd: fix nbd device deletion Shirish Pargaonkar <shirishpargaonkar(a)gmail.com> cifs: For SMB2 security informaion query, check for minimum sized security descriptor instead of sizeof FileAllInformation class Mark Syms <mark.syms(a)citrix.com> CIFS: 511c54a2f69195b28afb9dd119f03787b1625bb4 adds a check for session expiry Steve French <stfrench(a)microsoft.com> smb3: on reconnect set PreviousSessionId field Steve French <stfrench(a)microsoft.com> smb3: fix various xid leaks Tony Luck <tony.luck(a)intel.com> x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read() Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP ProBook 640 G4 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP EliteBook 830 G5 Bo Chen <chenbo(a)pdx.edu> ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant - Add fixup for HP Z2 G4 workstation Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode pages for device replace Su Yue <suy.fnst(a)cn.fujitsu.com> btrfs: return error value if create_io_em failed in cow_file_range Omar Sandoval <osandov(a)fb.com> Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2() Omar Sandoval <osandov(a)fb.com> Btrfs: fix clone vs chattr NODATASUM race Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> driver core: Don't ignore class_dir_create_and_add() failure. Jan Kara <jack(a)suse.cz> ext4: fix fencepost error in check for inode count overflow during resize Theodore Ts'o <tytso(a)mit.edu> ext4: correctly handle a zero-length xattr with a non-zero e_value_offs Theodore Ts'o <tytso(a)mit.edu> ext4: bubble errors from ext4_find_inline_data_nolock() up to ext4_iget() Theodore Ts'o <tytso(a)mit.edu> ext4: do not allow external inodes for inline data Lukas Czerner <lczerner(a)redhat.com> ext4: update mtime in ext4_punch_hole even if no blocks are released Jan Kara <jack(a)suse.cz> ext4: fix hole length detection in ext4_ind_map_blocks() Trond Myklebust <trond.myklebust(a)primarydata.com> NFSv4.1: Fix up replays of interrupted requests Daniel Borkmann <daniel(a)iogearbox.net> tls: fix use-after-free in tls_push_record Dexuan Cui <decui(a)microsoft.com> hv_netvsc: Fix a network regression after ifdown/ifup Willem de Bruijn <willemb(a)google.com> net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan Paolo Abeni <pabeni(a)redhat.com> udp: fix rx queue len reported by diag and proc interface Cong Wang <xiyou.wangcong(a)gmail.com> socket: close race condition between sock_close() and sockfs_setattr() Frank van der Linden <fllinden(a)amazon.com> tcp: verify the checksum of the first data segment in a new connection Davide Caratti <dcaratti(a)redhat.com> net/sched: act_simple: fix parsing of TCA_DEF_DATA Zhouyang Jia <jiazhouyang09(a)gmail.com> net: dsa: add error handling for pskb_trim_rcsum Julian Anastasov <ja(a)ssi.bg> ipv6: allow PMTU exceptions to local routes Bjørn Mork <bjorn(a)mork.no> cdc_ncm: avoid padding beyond end of skb Xiangning Yu <yuxiangning(a)gmail.com> bonding: re-evaluate force_primary when the primary slave name changes ------------- Diffstat: Makefile | 4 +- arch/x86/kernel/cpu/intel_rdt.c | 2 + arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- block/blk-mq.c | 3 +- drivers/ata/libata-core.c | 3 - drivers/ata/libata-zpodd.c | 2 +- drivers/base/core.c | 14 ++- drivers/block/nbd.c | 17 ++- drivers/cpufreq/cpufreq.c | 2 + drivers/cpufreq/cpufreq_governor.c | 12 +- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 ++-- drivers/hid/wacom_sys.c | 8 ++ drivers/net/bonding/bond_options.c | 1 + drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/tap.c | 5 +- drivers/net/tun.c | 3 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/virtio_net.c | 3 +- drivers/net/wireless/intel/iwlwifi/fw/paging.c | 49 ++++++-- drivers/vhost/vhost.c | 3 + drivers/w1/masters/mxc_w1.c | 20 ++-- fs/binfmt_misc.c | 12 +- fs/btrfs/inode.c | 4 +- fs/btrfs/ioctl.c | 18 +-- fs/btrfs/scrub.c | 2 +- fs/cifs/cifsacl.h | 14 +++ fs/cifs/smb2ops.c | 68 ++++++++---- fs/cifs/smb2pdu.c | 4 +- fs/ext4/indirect.c | 14 ++- fs/ext4/inline.c | 6 + fs/ext4/inode.c | 46 ++++---- fs/ext4/resize.c | 2 +- fs/ext4/xattr.c | 2 +- fs/nfs/nfs4_fs.h | 2 +- fs/nfs/nfs4proc.c | 148 +++++++++++++++++-------- fs/orangefs/inode.c | 7 ++ fs/orangefs/namei.c | 7 ++ include/linux/virtio_net.h | 11 +- include/net/transp_v6.h | 11 +- include/net/udp.h | 5 + mm/backing-dev.c | 18 ++- mm/page_alloc.c | 1 - net/dsa/tag_trailer.c | 3 +- net/ipv4/tcp_ipv4.c | 4 + net/ipv4/udp.c | 2 +- net/ipv4/udp_diag.c | 2 +- net/ipv6/datagram.c | 6 +- net/ipv6/route.c | 3 - net/ipv6/tcp_ipv6.c | 4 + net/ipv6/udp.c | 3 +- net/packet/af_packet.c | 4 +- net/sched/act_simple.c | 15 +-- net/socket.c | 18 ++- net/tls/tls_sw.c | 26 ++--- sound/pci/hda/hda_controller.c | 4 +- sound/pci/hda/patch_conexant.c | 3 + sound/pci/hda/patch_realtek.c | 6 +- 57 files changed, 473 insertions(+), 215 deletions(-)

7 years, 4 months

3
53
0 0

[PATCH 4.9 00/39] 4.9.110-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.110 release. There are 39 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 Tue Jun 26 15:23:25 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.110-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.110-rc1 Thadeu Lima de Souza Cascardo <cascardo(a)canonical.com> fs/binfmt_misc.c: do not allow offset overflow Michael S. Tsirkin <mst(a)redhat.com> vhost: fix info leak due to uninitialized memory Even Xu <even.xu(a)intel.com> HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation Martin Brandenburg <martin(a)omnibond.com> orangefs: set i_size on new symlink Stefan Potyra <Stefan.Potyra(a)elektrobit.com> w1: mxc_w1: Enable clock before calling clk_get_rate() on it Hans de Goede <hdegoede(a)redhat.com> libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Dan Carpenter <dan.carpenter(a)oracle.com> libata: zpodd: small read overflow in eject_tray() Colin Ian King <colin.king(a)canonical.com> libata: zpodd: make arrays cdb static, reduces object code size Tao Wang <kevin.wangtao(a)hisilicon.com> cpufreq: Fix new policy initialization during limits updates via sysfs Steve French <stfrench(a)microsoft.com> smb3: on reconnect set PreviousSessionId field Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP ProBook 640 G4 Dennis Wassenberg <dennis.wassenberg(a)secunet.com> ALSA: hda: add dock and led support for HP EliteBook 830 G5 Bo Chen <chenbo(a)pdx.edu> ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Qu Wenruo <wqu(a)suse.com> btrfs: scrub: Don't use inode pages for device replace Omar Sandoval <osandov(a)fb.com> Btrfs: fix memory and mount leak in btrfs_ioctl_rm_dev_v2() Omar Sandoval <osandov(a)fb.com> Btrfs: fix clone vs chattr NODATASUM race Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> driver core: Don't ignore class_dir_create_and_add() failure. Jan Kara <jack(a)suse.cz> ext4: fix fencepost error in check for inode count overflow during resize Lukas Czerner <lczerner(a)redhat.com> ext4: update mtime in ext4_punch_hole even if no blocks are released Jan Kara <jack(a)suse.cz> ext4: fix hole length detection in ext4_ind_map_blocks() Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - New codec support for ALC257 Frank van der Linden <fllinden(a)amazon.com> tcp: verify the checksum of the first data segment in a new connection Davide Caratti <dcaratti(a)redhat.com> net/sched: act_simple: fix parsing of TCA_DEF_DATA Julian Anastasov <ja(a)ssi.bg> ipv6: allow PMTU exceptions to local routes Xiangning Yu <yuxiangning(a)gmail.com> bonding: re-evaluate force_primary when the primary slave name changes Daniel Glöckner <dg(a)emlix.com> usb: musb: fix remote wakeup racing with suspend Liu Bo <bo.li.liu(a)oracle.com> Btrfs: make raid6 rebuild retry more Eric Dumazet <edumazet(a)google.com> tcp: do not overshoot window_clamp in tcp_rcv_space_adjust() Sasha Levin <Alexander.Levin(a)microsoft.com> Revert "Btrfs: fix scrub to repair raid6 corruption" Damien Thébault <damien.thebault(a)vitec.com> net: dsa: b53: Add BCM5389 support Finn Thain <fthain(a)telegraphics.com.au> net/sonic: Use dma_mapping_error() João Paulo Rechi Vita <jprvita(a)gmail.com> platform/x86: asus-wmi: Fix NULL pointer dereference Josh Hill <josh(a)joshuajhill.com> net: qmi_wwan: Add Netgear Aircard 779S Ivan Bornyakov <brnkv.i1(a)gmail.com> atm: zatm: fix memcmp casting Hao Wei Tee <angelsl(a)in04.sg> iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs Julian Anastasov <ja(a)ssi.bg> ipvs: fix buffer overflow with sync daemon and service Paolo Abeni <pabeni(a)redhat.com> netfilter: ebtables: handle string from userspace with care Eric Dumazet <edumazet(a)google.com> xfrm6: avoid potential infinite loop in _decode_session6() Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> objtool: update .gitignore file ------------- Diffstat: Documentation/devicetree/bindings/net/dsa/b53.txt | 1 + Makefile | 4 +-- drivers/ata/libata-core.c | 3 -- drivers/ata/libata-zpodd.c | 4 +-- drivers/atm/zatm.c | 4 +-- drivers/base/core.c | 14 +++++++-- drivers/cpufreq/cpufreq.c | 2 ++ drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 +++++--------- drivers/net/bonding/bond_options.c | 1 + drivers/net/dsa/b53/b53_common.c | 13 ++++++++ drivers/net/dsa/b53/b53_mdio.c | 5 +++- drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/ethernet/natsemi/sonic.c | 2 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 +++---- drivers/platform/x86/asus-wmi.c | 23 ++++++++------- drivers/usb/musb/musb_host.c | 5 +++- drivers/usb/musb/musb_host.h | 7 +++-- drivers/usb/musb/musb_virthub.c | 25 +++++++++------- drivers/vhost/vhost.c | 3 ++ drivers/w1/masters/mxc_w1.c | 20 ++++++++----- fs/binfmt_misc.c | 12 ++++++-- fs/btrfs/ioctl.c | 18 +++++++----- fs/btrfs/scrub.c | 2 +- fs/cifs/smb2pdu.c | 1 + fs/ext4/indirect.c | 14 ++++++--- fs/ext4/inode.c | 36 +++++++++++------------ fs/ext4/resize.c | 2 +- fs/orangefs/namei.c | 7 +++++ net/bridge/netfilter/ebtables.c | 3 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 4 +++ net/ipv6/route.c | 3 -- net/ipv6/tcp_ipv6.c | 4 +++ net/ipv6/xfrm6_policy.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 21 +++++++++---- net/sched/act_simple.c | 15 ++++------ sound/pci/hda/hda_controller.c | 4 ++- sound/pci/hda/patch_conexant.c | 2 ++ sound/pci/hda/patch_realtek.c | 8 +++++ tools/objtool/.gitignore | 2 +- 41 files changed, 212 insertions(+), 120 deletions(-)

7 years, 4 months

4
38
0 0

[PATCH v3 03/17] arm64: dts: marvell: fix CP110 ICU node size

by Miquel Raynal

ICU size in CP110 is not 0x10 but at least 0x440 bytes long (from the specification). Fixes: 6ef84a827c37 ("arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K") Cc: stable(a)vger.kernel.org Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi index 7dabe25f6774..1c6ff8197a88 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi @@ -149,7 +149,7 @@ CP110_LABEL(icu): interrupt-controller@1e0000 { compatible = "marvell,cp110-icu"; - reg = <0x1e0000 0x10>; + reg = <0x1e0000 0x440>; #interrupt-cells = <3>; interrupt-controller; msi-parent = <&gicp>; -- 2.14.1

7 years, 4 months

2
2
0 0

[PATCH] Revert "mm: page_alloc: skip over regions of invalid pfns where possible"

by Daniel Vacek

This reverts commit b92df1de5d289c0b5d653e72414bf0850b8511e0. The commit is meant to be a boot init speed up skipping the loop in memmap_init_zone() for invalid pfns. But given some specific memory mapping on x86_64 (or more generally theoretically anywhere but on arm with CONFIG_HAVE_ARCH_PFN_VALID) the implementation also skips valid pfns which is plain wrong and causes 'kernel BUG at mm/page_alloc.c:1389!' crash> log | grep -e BUG -e RIP -e Call.Trace -e move_freepages_block -e rmqueue -e freelist -A1 kernel BUG at mm/page_alloc.c:1389! invalid opcode: 0000 [#1] SMP -- RIP: 0010:[<ffffffff8118833e>] [<ffffffff8118833e>] move_freepages+0x15e/0x160 RSP: 0018:ffff88054d727688 EFLAGS: 00010087 -- Call Trace: [<ffffffff811883b3>] move_freepages_block+0x73/0x80 [<ffffffff81189e63>] __rmqueue+0x263/0x460 [<ffffffff8118c781>] get_page_from_freelist+0x7e1/0x9e0 [<ffffffff8118caf6>] __alloc_pages_nodemask+0x176/0x420 -- RIP [<ffffffff8118833e>] move_freepages+0x15e/0x160 RSP <ffff88054d727688> crash> page_init_bug -v | grep RAM <struct resource 0xffff88067fffd2f8> 1000 - 9bfff System RAM (620.00 KiB) <struct resource 0xffff88067fffd3a0> 100000 - 430bffff System RAM ( 1.05 GiB = 1071.75 MiB = 1097472.00 KiB) <struct resource 0xffff88067fffd410> 4b0c8000 - 4bf9cfff System RAM ( 14.83 MiB = 15188.00 KiB) <struct resource 0xffff88067fffd480> 4bfac000 - 646b1fff System RAM (391.02 MiB = 400408.00 KiB) <struct resource 0xffff88067fffd560> 7b788000 - 7b7fffff System RAM (480.00 KiB) <struct resource 0xffff88067fffd640> 100000000 - 67fffffff System RAM ( 22.00 GiB) crash> page_init_bug | head -6 <struct resource 0xffff88067fffd560> 7b788000 - 7b7fffff System RAM (480.00 KiB) <struct page 0xffffea0001ede200> 1fffff00000000 0 <struct pglist_data 0xffff88047ffd9000> 1 <struct zone 0xffff88047ffd9800> DMA32 4096 1048575 <struct page 0xffffea0001ede200> 505736 505344 <struct page 0xffffea0001ed8000> 505855 <struct page 0xffffea0001edffc0> <struct page 0xffffea0001ed8000> 0 0 <struct pglist_data 0xffff88047ffd9000> 0 <struct zone 0xffff88047ffd9000> DMA 1 4095 <struct page 0xffffea0001edffc0> 1fffff00000400 0 <struct pglist_data 0xffff88047ffd9000> 1 <struct zone 0xffff88047ffd9800> DMA32 4096 1048575 BUG, zones differ! crash> kmem -p 77fff000 78000000 7b5ff000 7b600000 7b787000 7b788000 PAGE PHYSICAL MAPPING INDEX CNT FLAGS ffffea0001e00000 78000000 0 0 0 0 ffffea0001ed7fc0 7b5ff000 0 0 0 0 ffffea0001ed8000 7b600000 0 0 0 0 <<<< ffffea0001ede1c0 7b787000 0 0 0 0 ffffea0001ede200 7b788000 0 0 1 1fffff00000000 Fixes: b92df1de5d28 ("mm: page_alloc: skip over regions of invalid pfns where possible") Signed-off-by: Daniel Vacek <neelx(a)redhat.com> Acked-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Mel Gorman <mgorman(a)techsingularity.net> Cc: Pavel Tatashin <pasha.tatashin(a)oracle.com> Cc: Paul Burton <paul.burton(a)imgtec.com> Cc: stable(a)vger.kernel.org --- include/linux/memblock.h | 1 - mm/memblock.c | 28 ---------------------------- mm/page_alloc.c | 11 +---------- 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 8be5077efb5f..f92ea7783652 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -187,7 +187,6 @@ int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn, unsigned long *end_pfn); void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, unsigned long *out_end_pfn, int *out_nid); -unsigned long memblock_next_valid_pfn(unsigned long pfn, unsigned long max_pfn); /** * for_each_mem_pfn_range - early memory pfn range iterator diff --git a/mm/memblock.c b/mm/memblock.c index b6ba6b7adadc..48376bd33274 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1101,34 +1101,6 @@ void __init_memblock __next_mem_pfn_range(int *idx, int nid, *out_nid = r->nid; } -unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn, - unsigned long max_pfn) -{ - struct memblock_type *type = &memblock.memory; - unsigned int right = type->cnt; - unsigned int mid, left = 0; - phys_addr_t addr = PFN_PHYS(++pfn); - - do { - mid = (right + left) / 2; - - if (addr < type->regions[mid].base) - right = mid; - else if (addr >= (type->regions[mid].base + - type->regions[mid].size)) - left = mid + 1; - else { - /* addr is within the region, so pfn is valid */ - return pfn; - } - } while (left < right); - - if (right == type->cnt) - return -1UL; - else - return PHYS_PFN(type->regions[right].base); -} - /** * memblock_set_node - set node ID on memblock regions * @base: base of area to set node ID for diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 635d7dd29d7f..e4566a3f8083 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5356,17 +5356,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, if (context != MEMMAP_EARLY) goto not_early; - if (!early_pfn_valid(pfn)) { -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP - /* - * Skip to the pfn preceding the next valid one (or - * end_pfn), such that we hit a valid pfn (or end_pfn) - * on our next iteration of the loop. - */ - pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1; -#endif + if (!early_pfn_valid(pfn)) continue; - } if (!early_pfn_in_nid(pfn, nid)) continue; if (!update_defer_init(pgdat, pfn, end_pfn, &nr_initialised)) -- 2.16.2

7 years, 4 months

3
4
0 0

patch "staging: android: ion: Return an ERR_PTR in ion_map_kernel" added to staging-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled staging: android: ion: Return an ERR_PTR in ion_map_kernel to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 0a2bc00341dcfcc793c0dbf4f8d43adf60458b05 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott(a)redhat.com> Date: Mon, 11 Jun 2018 11:06:53 -0700 Subject: staging: android: ion: Return an ERR_PTR in ion_map_kernel The expected return value from ion_map_kernel is an ERR_PTR. The error path for a vmalloc failure currently just returns NULL, triggering a warning in ion_buffer_kmap_get. Encode the vmalloc failure as an ERR_PTR. Reported-by: syzbot+55b1d9f811650de944c6(a)syzkaller.appspotmail.com Signed-off-by: Laura Abbott <labbott(a)redhat.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/android/ion/ion_heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index e8c440329708..31db510018a9 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -30,7 +30,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap, struct page **tmp = pages; if (!pages) - return NULL; + return ERR_PTR(-ENOMEM); if (buffer->flags & ION_FLAG_CACHED) pgprot = PAGE_KERNEL; -- 2.18.0

7 years, 4 months

1
0
0 0

patch "usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From d5a4f93511b7000183c0d528739b824752139f79 Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen(a)nxp.com> Date: Tue, 12 Jun 2018 09:53:01 +0800 Subject: usb: typec: tcpm: fix logbuffer index is wrong if _tcpm_log is re-entered The port->logbuffer_head may be wrong if the two processes enters _tcpm_log at the mostly same time. The 2nd process enters _tcpm_log before the 1st process update the index, then the 2nd process will not allocate logbuffer, when the 2nd process tries to use log buffer, the index has already updated by the 1st process, so it will get NULL pointer for updated logbuffer, the error message like below: tcpci 0-0050: Log buffer index 6 is NULL Cc: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: Guenter Roeck <linux(a)roeck-us.net> Cc: Jun Li <jun.li(a)nxp.com> Signed-off-by: Peter Chen <peter.chen(a)nxp.com> Reviewed-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Guenter Roeck <linux(a)roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/tcpm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c index 0dfd755020f4..d961f1ec0e08 100644 --- a/drivers/usb/typec/tcpm.c +++ b/drivers/usb/typec/tcpm.c @@ -418,17 +418,18 @@ static void _tcpm_log(struct tcpm_port *port, const char *fmt, va_list args) u64 ts_nsec = local_clock(); unsigned long rem_nsec; + mutex_lock(&port->logbuffer_lock); if (!port->logbuffer[port->logbuffer_head]) { port->logbuffer[port->logbuffer_head] = kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL); - if (!port->logbuffer[port->logbuffer_head]) + if (!port->logbuffer[port->logbuffer_head]) { + mutex_unlock(&port->logbuffer_lock); return; + } } vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args); - mutex_lock(&port->logbuffer_lock); - if (tcpm_log_full(port)) { port->logbuffer_head = max(port->logbuffer_head - 1, 0); strcpy(tmpbuffer, "overflow"); -- 2.18.0

7 years, 4 months

1
0
0 0

patch "usb: cdc_acm: Add quirk for Uniden UBC125 scanner" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: cdc_acm: Add quirk for Uniden UBC125 scanner to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 4a762569a2722b8a48066c7bacf0e1dc67d17fa1 Mon Sep 17 00:00:00 2001 From: Houston Yaroschoff <hstn(a)4ever3.net> Date: Mon, 11 Jun 2018 12:39:09 +0200 Subject: usb: cdc_acm: Add quirk for Uniden UBC125 scanner Uniden UBC125 radio scanner has USB interface which fails to work with cdc_acm driver: usb 1-1.5: new full-speed USB device number 4 using xhci_hcd cdc_acm 1-1.5:1.0: Zero length descriptor references cdc_acm: probe of 1-1.5:1.0 failed with error -22 Adding the NO_UNION_NORMAL quirk for the device fixes the issue: usb 1-4: new full-speed USB device number 15 using xhci_hcd usb 1-4: New USB device found, idVendor=1965, idProduct=0018 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: UBC125XLT usb 1-4: Manufacturer: Uniden Corp. usb 1-4: SerialNumber: 0001 cdc_acm 1-4:1.0: ttyACM0: USB ACM device `lsusb -v` of the device: Bus 001 Device 015: ID 1965:0018 Uniden Corporation Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 2 Communications bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 64 idVendor 0x1965 Uniden Corporation idProduct 0x0018 bcdDevice 0.01 iManufacturer 1 Uniden Corp. iProduct 2 UBC125XLT iSerial 3 0001 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 48 bNumInterfaces 2 bConfigurationValue 1 iConfiguration 0 bmAttributes 0x80 (Bus Powered) MaxPower 500mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 1 bInterfaceClass 2 Communications bInterfaceSubClass 2 Abstract (modem) bInterfaceProtocol 0 None iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x87 EP 7 IN bmAttributes 3 Transfer Type Interrupt Synch Type None Usage Type Data wMaxPacketSize 0x0008 1x 8 bytes bInterval 10 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 0 bNumEndpoints 2 bInterfaceClass 10 CDC Data bInterfaceSubClass 0 Unused bInterfaceProtocol 0 iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x81 EP 1 IN bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0040 1x 64 bytes bInterval 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x02 EP 2 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0040 1x 64 bytes bInterval 0 Device Status: 0x0000 (Bus Powered) Signed-off-by: Houston Yaroschoff <hstn(a)4ever3.net> Cc: stable <stable(a)vger.kernel.org> Acked-by: Oliver Neukum <oneukum(a)suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/class/cdc-acm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 7b366a6c0b49..998b32d0167e 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1758,6 +1758,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x11ca, 0x0201), /* VeriFone Mx870 Gadget Serial */ .driver_info = SINGLE_RX_URB, }, + { USB_DEVICE(0x1965, 0x0018), /* Uniden UBC125XLT */ + .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ + }, { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ }, -- 2.18.0

7 years, 4 months

1
0
0 0

patch "usb: typec: ucsi: Fix for incorrect status data issue" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: ucsi: Fix for incorrect status data issue to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 68816e16b4789f2d05e77b6dcb77564cf5d6a8d8 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Date: Thu, 21 Jun 2018 16:43:19 +0300 Subject: usb: typec: ucsi: Fix for incorrect status data issue According to UCSI Specification, Connector Change Event only means a change in the Connector Status and Operation Mode fields of the STATUS data structure. So any other change should create another event. Unfortunately on some platforms the firmware acting as PPM (platform policy manager - usually embedded controller firmware) still does not report any other status changes if there is a connector change event. So if the connector power or data role was changed when a device was plugged to the connector, the driver does not get any indication about that. The port will show wrong roles if that happens. To fix the issue, always checking the data and power role together with a connector change event. Fixes: c1b0bc2dabfa ("usb: typec: Add support for UCSI interface") Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/ucsi/ucsi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index bd5cca5632b3..8d0a6fe748bd 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -350,6 +350,19 @@ static void ucsi_connector_change(struct work_struct *work) } if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) { + typec_set_pwr_role(con->port, con->status.pwr_dir); + + switch (con->status.partner_type) { + case UCSI_CONSTAT_PARTNER_TYPE_UFP: + typec_set_data_role(con->port, TYPEC_HOST); + break; + case UCSI_CONSTAT_PARTNER_TYPE_DFP: + typec_set_data_role(con->port, TYPEC_DEVICE); + break; + default: + break; + } + if (con->status.connected) ucsi_register_partner(con); else -- 2.18.0

7 years, 4 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror