1. 22 Jun, 2021 8 commits
    • David S. Miller's avatar
      Merge branch 'marvell-mdio-ACPI' · 070258ef
      David S. Miller authored
      Marcin Wojtas says:
      
      ====================
      ACPI MDIO support for Marvell controllers
      
      The third version of the patchset main change is
      dropping a clock handling optimisation patch
      for mvmdio driver. Other than that it sets
      explicit dependency on FWNODE_MDIO for CONFIG_FSL_XGMAC_MDIO
      and applies minor cosmetic improvements (please see the
      'Changelog' below).
      
      The firmware ACPI description is exposed in the public github branch:
      https://github.com/semihalf-wojtas-marcin/edk2-platforms/commits/acpi-mdio-r20210613
      There is also MacchiatoBin firmware binary available for testing:
      https://drive.google.com/file/d/1eigP_aeM4wYQpEaLAlQzs3IN_w1-kQr0
      
      I'm looking forward to the comments or remarks.
      
      Best regards,
      Marcin
      
      Changelog:
      v2->v3
      * Rebase on top of net-next/master.
      * Drop "net: mvmdio: simplify clock handling" patch.
      * 1/6 - fix code block comments.
      * 2/6 - unchanged
      * 3/6 - add "depends on FWNODE_MDIO" for CONFIG_FSL_XGMAC_MDIO
      * 4/6 - drop mention about the clocks from the commit message.
      * 5/6 - unchanged
      * 6/6 - add Andrew's RB.
      
      v1->v2
      * 1/7 - new patch
      * 2/7 - new patch
      * 3/7 - new patch
      * 4/7 - new patch
      * 5/7 - remove unnecessary `if (has_acpi_companion())` and rebase onto
              the new clock handling
      * 6/7 - remove deprecated comment
      * 7/7 - no changes
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      070258ef
    • Marcin Wojtas's avatar
      net: mvpp2: remove unused 'has_phy' field · 8d909440
      Marcin Wojtas authored
      The 'has_phy' field from struct mvpp2_port is no longer used.
      Remove it.
      Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8d909440
    • Marcin Wojtas's avatar
      net: mvpp2: enable using phylink with ACPI · dfce1bab
      Marcin Wojtas authored
      Now that the MDIO and phylink are supported in the ACPI
      world, enable to use them in the mvpp2 driver. Ensure a backward
      compatibility with the firmware whose ACPI description does
      not contain the necessary elements for the proper phy handling
      and fall back to relying on the link interrupts instead.
      Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dfce1bab
    • Marcin Wojtas's avatar
      net: mvmdio: add ACPI support · c54da4c1
      Marcin Wojtas authored
      This patch introducing ACPI support for the mvmdio driver by adding
      acpi_match_table with two entries:
      
      * "MRVL0100" for the SMI operation
      * "MRVL0101" for the XSMI mode
      Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c54da4c1
    • Marcin Wojtas's avatar
      net/fsl: switch to fwnode_mdiobus_register · 33fc11f0
      Marcin Wojtas authored
      Utilize the newly added helper routine
      for registering the MDIO bus via fwnode_
      interface.
      Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      33fc11f0
    • Marcin Wojtas's avatar
      net: mdiobus: Introduce fwnode_mdbiobus_register() · 62a6ef6a
      Marcin Wojtas authored
      This patch introduces a new helper function that
      wraps acpi_/of_ mdiobus_register() and allows its
      usage via common fwnode_ interface.
      
      Fall back to raw mdiobus_register() in case CONFIG_FWNODE_MDIO
      is not enabled, in order to satisfy compatibility
      in all future user drivers.
      Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      62a6ef6a
    • Marcin Wojtas's avatar
      Documentation: ACPI: DSD: describe additional MAC configuration · 7c4d7ca8
      Marcin Wojtas authored
      Document additional MAC configuration modes which can be processed
      by the existing fwnode_ phylink helpers:
      
      * "managed" standard ACPI _DSD property [1]
      * "fixed-link" data-only subnode linked in the _DSD package via
        generic mechanism of the hierarchical data extension [2]
      
      [1] https://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf
      [2] https://github.com/UEFI/DSD-Guide/blob/main/dsd-guide.pdfSigned-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7c4d7ca8
    • Eric Dumazet's avatar
      virtio/vsock: avoid NULL deref in virtio_transport_seqpacket_allow() · 64295f0d
      Eric Dumazet authored
      Make sure the_virtio_vsock is not NULL before dereferencing it.
      
      general protection fault, probably for non-canonical address 0xdffffc0000000071: 0000 [#1] PREEMPT SMP KASAN
      KASAN: null-ptr-deref in range [0x0000000000000388-0x000000000000038f]
      CPU: 0 PID: 8452 Comm: syz-executor406 Not tainted 5.13.0-rc6-syzkaller #0
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
      RIP: 0010:virtio_transport_seqpacket_allow+0xbf/0x210 net/vmw_vsock/virtio_transport.c:503
      Code: e8 c6 d9 ab f8 84 db 0f 84 0f 01 00 00 e8 09 d3 ab f8 48 8d bd 88 03 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 04 02 84 c0 74 06 0f 8e 2a 01 00 00 44 0f b6 a5 88 03 00 00
      RSP: 0018:ffffc90003757c18 EFLAGS: 00010206
      RAX: dffffc0000000000 RBX: 0000000000000001 RCX: 0000000000000000
      RDX: 0000000000000071 RSI: ffffffff88c908e7 RDI: 0000000000000388
      RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000
      R10: ffffffff88c90a06 R11: 0000000000000000 R12: 0000000000000000
      R13: ffffffff88c90840 R14: 0000000000000000 R15: 0000000000000001
      FS:  0000000001bee300(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      CR2: 0000000020000082 CR3: 000000002847e000 CR4: 00000000001506f0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
      Call Trace:
       vsock_assign_transport+0x575/0x700 net/vmw_vsock/af_vsock.c:490
       vsock_connect+0x200/0xc00 net/vmw_vsock/af_vsock.c:1337
       __sys_connect_file+0x155/0x1a0 net/socket.c:1824
       __sys_connect+0x161/0x190 net/socket.c:1841
       __do_sys_connect net/socket.c:1851 [inline]
       __se_sys_connect net/socket.c:1848 [inline]
       __x64_sys_connect+0x6f/0xb0 net/socket.c:1848
       do_syscall_64+0x3a/0xb0 arch/x86/entry/common.c:47
       entry_SYSCALL_64_after_hwframe+0x44/0xae
      RIP: 0033:0x43ee69
      Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48
      RSP: 002b:00007ffd49e7c788 EFLAGS: 00000246 ORIG_RAX: 000000000000002a
      RAX: ffffffffffffffda RBX: 0000000000400488 RCX: 000000000043ee69
      RDX: 0000000000000010 RSI: 0000000020000080 RDI: 0000000000000003
      RBP: 0000000000402e50 R08: 0000000000000000 R09: 0000000000400488
      R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000402ee0
      R13: 0000000000000000 R14: 00000000004ac018 R15: 0000000000400488
      
      Fixes: 53efbba1 ("virtio/vsock: enable SEQPACKET for transport")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Arseny Krasnov <arseny.krasnov@kaspersky.com>
      Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
      Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      64295f0d
  2. 21 Jun, 2021 32 commits