Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from torvalds:master #47

Merged
merged 9 commits into from
Jul 31, 2020
Merged

[pull] master from torvalds:master #47

merged 9 commits into from
Jul 31, 2020

Commits on Jul 29, 2020

  1. firmware: Fix a reference count leak.

    kobject_init_and_add() takes reference even when it fails.
    If this function returns an error, kobject_put() must be called to
    properly clean up the memory associated with the object.
    Callback function fw_cfg_sysfs_release_entry() in kobject_put()
    can handle the pointer "entry" properly.
    
    Signed-off-by: Qiushi Wu <[email protected]>
    Link: https://lore.kernel.org/r/[email protected]
    Signed-off-by: Michael S. Tsirkin <[email protected]>
    QiushiWu authored and mstsirkin committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    fe3c606 View commit details
    Browse the repository at this point in the history
  2. vhost/scsi: fix up req type endian-ness

    vhost/scsi doesn't handle type conversion correctly
    for request type when using virtio 1.0 and up for BE,
    or cross-endian platforms.
    
    Fix it up using vhost_32_to_cpu.
    
    Cc: [email protected]
    Signed-off-by: Michael S. Tsirkin <[email protected]>
    Acked-by: Jason Wang <[email protected]>
    Reviewed-by: Stefan Hajnoczi <[email protected]>
    mstsirkin committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    295c1b9 View commit details
    Browse the repository at this point in the history
  3. virtio-balloon: Document byte ordering of poison_val

    The poison_val field in the virtio_balloon_config is treated as a
    little-endian field by the host. Since we are currently only having to deal
    with a single byte poison value this isn't a problem, however if the value
    should ever expand it would cause byte ordering issues. Document that in
    the code so that we know that if the value should ever expand we need to
    byte swap the value on big-endian architectures.
    
    Signed-off-by: Alexander Duyck <[email protected]>
    Link: https://lore.kernel.org/r/[email protected]
    Signed-off-by: Michael S. Tsirkin <[email protected]>
    Acked-by: David Hildenbrand <[email protected]>
    Alexander Duyck authored and mstsirkin committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    ca72cc3 View commit details
    Browse the repository at this point in the history
  4. virtio_balloon: fix up endian-ness for free cmd id

    free cmd id is read using virtio endian, spec says all fields
    in balloon are LE. Fix it up.
    
    Fixes: 86a5597 ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT")
    Cc: [email protected]
    Signed-off-by: Michael S. Tsirkin <[email protected]>
    Acked-by: Jason Wang <[email protected]>
    Reviewed-by: Wei Wang <[email protected]>
    Acked-by: David Hildenbrand <[email protected]>
    mstsirkin committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    168c358 View commit details
    Browse the repository at this point in the history
  5. PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge

    Recently ASPM handling was changed to allow ASPM on PCIe-to-PCI/PCI-X
    bridges.  Unfortunately the ASMedia ASM1083/1085 PCIe to PCI bridge device
    doesn't seem to function properly with ASPM enabled.  On an Asus PRIME
    H270-PRO motherboard, it causes errors like these:
    
      pcieport 0000:00:1c.0: AER: PCIe Bus Error: severity=Corrected, type=Data Link Layer, (Transmitter ID)
      pcieport 0000:00:1c.0: AER:   device [8086:a292] error status/mask=00003000/00002000
      pcieport 0000:00:1c.0: AER:    [12] Timeout
      pcieport 0000:00:1c.0: AER: Corrected error received: 0000:00:1c.0
      pcieport 0000:00:1c.0: AER: can't find device of ID00e0
    
    In addition to flooding the kernel log, this also causes the machine to
    wake up immediately after suspend is initiated.
    
    The device advertises ASPM L0s and L1 support in the Link Capabilities
    register, but the ASMedia web page for ASM1083 [1] claims "No PCIe ASPM
    support".
    
    Windows 10 (build 2004) enables L0s, but it also logs correctable PCIe
    errors.
    
    Add a quirk to disable ASPM for this device.
    
    [1] https://www.asmedia.com.tw/eng/e_show_products.php?cate_index=169&item=114
    
    [bhelgaas: commit log]
    Fixes: 66ff14e ("PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges")
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=208667
    Link: https://lore.kernel.org/r/[email protected]
    Signed-off-by: Robert Hancock <[email protected]>
    Signed-off-by: Bjorn Helgaas <[email protected]>
    robhancock authored and bjorn-helgaas committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    b361663 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2020

  1. virtio-mem: Fix build error due to improper use 'select'

    As noted in:
    https://www.kernel.org/doc/Documentation/kbuild/kconfig-language.txt
    "select should be used with care. select will force a symbol to a
    value without visiting the dependencies."
    Config VIRTIO_MEM should not select CONTIG_ALLOC directly.
    Otherwise it will cause an error:
    https://bugzilla.kernel.org/show_bug.cgi?id=208245
    
    Signed-off-by: Weilong Chen <[email protected]>
    Link: https://lore.kernel.org/r/[email protected]
    Acked-by: Randy Dunlap <[email protected]> # build-tested
    Signed-off-by: Michael S. Tsirkin <[email protected]>
    Acked-by: Jason Wang <[email protected]>
    Acked-by: David Hildenbrand <[email protected]>
    Weilong Chen authored and mstsirkin committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    a96b0d0 View commit details
    Browse the repository at this point in the history
  2. Merge tag 'pci-v5.8-fixes-3' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/helgaas/pci
    
    Pull PCI fix from Bjorn Helgaas:
     "Disable ASPM on ASM1083/1085 PCIe-to-PCI bridge (Robert Hancock)"
    
    * tag 'pci-v5.8-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
      PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge
    torvalds committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    d964471 View commit details
    Browse the repository at this point in the history
  3. ARM: percpu.h: fix build error

    Fix build error for the case:
      defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6)
    
    config: keystone_defconfig
    
      CC      arch/arm/kernel/signal.o
      In file included from ../include/linux/random.h:14,
                        from ../arch/arm/kernel/signal.c:8:
      ../arch/arm/include/asm/percpu.h: In function ‘__my_cpu_offset’:
      ../arch/arm/include/asm/percpu.h:29:34: error: ‘current_stack_pointer’ undeclared (first use in this function); did you mean ‘user_stack_pointer’?
          : "Q" (*(const unsigned long *)current_stack_pointer));
                                         ^~~~~~~~~~~~~~~~~~~~~
                                         user_stack_pointer
    
    Fixes: f227e3e ("random32: update the net random state on interrupt and activity")
    Signed-off-by: Grygorii Strashko <[email protected]>
    Signed-off-by: Linus Torvalds <[email protected]>
    grygoriyS authored and torvalds committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    aa54ea9 View commit details
    Browse the repository at this point in the history
  4. Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/mst/vhost
    
    Pull virtio fixes from Michael Tsirkin:
     "A couple of last minute bugfixes"
    
    * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
      virtio-mem: Fix build error due to improper use 'select'
      virtio_balloon: fix up endian-ness for free cmd id
      virtio-balloon: Document byte ordering of poison_val
      vhost/scsi: fix up req type endian-ness
      firmware: Fix a reference count leak.
    torvalds committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    417385c View commit details
    Browse the repository at this point in the history