1. 21 6月, 2022 10 次提交
  2. 20 6月, 2022 14 次提交
  3. 19 6月, 2022 9 次提交
  4. 18 6月, 2022 4 次提交
    • X
      atm: iphase: Fix typo in comment · f691b4d8
      Xiang wangx 提交于
      Delete the redundant word 'the'.
      Signed-off-by: NXiang wangx <wangxiang@cdjrlc.com>
      Link: https://lore.kernel.org/r/20220616164155.11686-1-wangxiang@cdjrlc.comSigned-off-by: NJakub Kicinski <kuba@kernel.org>
      f691b4d8
    • X
      ppp: Fix typo in comment · 959edef6
      Xiang wangx 提交于
      Delete the redundant word 'the'.
      Signed-off-by: NXiang wangx <wangxiang@cdjrlc.com>
      Link: https://lore.kernel.org/r/20220616142624.3397-1-wangxiang@cdjrlc.comSigned-off-by: NJakub Kicinski <kuba@kernel.org>
      959edef6
    • Y
      nfp: add support for .get_pauseparam() · 382f99c4
      Yinjun Zhang 提交于
      Show correct pause frame parameters for nfp. These parameters cannot
      be configured, so .set_pauseparam() is not implemented. With this
      change:
      
       #ethtool --show-pause enp1s0np0
       Pause parameters for enp1s0np0:
       Autonegotiate:  off
       RX:             on
       TX:             on
      Signed-off-by: NYinjun Zhang <yinjun.zhang@corigine.com>
      Signed-off-by: NSimon Horman <simon.horman@corigine.com>
      Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
      Link: https://lore.kernel.org/r/20220616133358.135305-1-simon.horman@corigine.comSigned-off-by: NJakub Kicinski <kuba@kernel.org>
      382f99c4
    • O
      net: dsa: ar9331: fix potential dead lock on mdio access · 7a49f219
      Oleksij Rempel 提交于
      Rework MDIO locking to avoid potential  circular locking:
      
       WARNING: possible circular locking dependency detected
       5.19.0-rc1-ar9331-00017-g3ab364c7c48c #5 Not tainted
       ------------------------------------------------------
       kworker/u2:4/68 is trying to acquire lock:
       81f3c83c (ar9331:1005:(&ar9331_mdio_regmap_config)->lock){+.+.}-{4:4}, at: regmap_write+0x50/0x8c
      
       but task is already holding lock:
       81f60494 (&bus->mdio_lock){+.+.}-{4:4}, at: mdiobus_read+0x40/0x78
      
       which lock already depends on the new lock.
      
       the existing dependency chain (in reverse order) is:
      
       -> #1 (&bus->mdio_lock){+.+.}-{4:4}:
              lock_acquire+0x2d4/0x360
              __mutex_lock+0xf8/0x384
              mutex_lock_nested+0x2c/0x38
              mdiobus_write+0x44/0x80
              ar9331_sw_bus_write+0x50/0xe4
              _regmap_raw_write_impl+0x604/0x724
              _regmap_bus_raw_write+0x9c/0xb4
              _regmap_write+0xdc/0x1a0
              _regmap_update_bits+0xf4/0x118
              _regmap_select_page+0x108/0x138
              _regmap_raw_read+0x25c/0x288
              _regmap_bus_read+0x60/0x98
              _regmap_read+0xd4/0x1b0
              _regmap_update_bits+0xc4/0x118
              regmap_update_bits_base+0x64/0x8c
              ar9331_sw_irq_bus_sync_unlock+0x40/0x6c
              __irq_set_handler+0x7c/0xac
              ar9331_sw_irq_map+0x48/0x7c
              irq_domain_associate+0x174/0x208
              irq_create_mapping_affinity+0x1a8/0x230
              ar9331_sw_probe+0x22c/0x388
              mdio_probe+0x44/0x70
              really_probe+0x200/0x424
              __driver_probe_device+0x290/0x298
              driver_probe_device+0x54/0xe4
              __device_attach_driver+0xe4/0x130
              bus_for_each_drv+0xb4/0xd8
              __device_attach+0x104/0x1a4
              bus_probe_device+0x48/0xc4
              device_add+0x600/0x800
              mdio_device_register+0x68/0xa0
              of_mdiobus_register+0x2bc/0x3c4
              ag71xx_probe+0x6e4/0x984
              platform_probe+0x78/0xd0
              really_probe+0x200/0x424
              __driver_probe_device+0x290/0x298
              driver_probe_device+0x54/0xe4
              __driver_attach+0x17c/0x190
              bus_for_each_dev+0x8c/0xd0
              bus_add_driver+0x110/0x228
              driver_register+0xe4/0x12c
              do_one_initcall+0x104/0x2a0
              kernel_init_freeable+0x250/0x288
              kernel_init+0x34/0x130
              ret_from_kernel_thread+0x14/0x1c
      
       -> #0 (ar9331:1005:(&ar9331_mdio_regmap_config)->lock){+.+.}-{4:4}:
              check_noncircular+0x88/0xc0
              __lock_acquire+0x10bc/0x18bc
              lock_acquire+0x2d4/0x360
              __mutex_lock+0xf8/0x384
              mutex_lock_nested+0x2c/0x38
              regmap_write+0x50/0x8c
              ar9331_sw_mbus_read+0x74/0x1b8
              __mdiobus_read+0x90/0xec
              mdiobus_read+0x50/0x78
              get_phy_device+0xa0/0x18c
              fwnode_mdiobus_register_phy+0x120/0x1d4
              of_mdiobus_register+0x244/0x3c4
              devm_of_mdiobus_register+0xe8/0x100
              ar9331_sw_setup+0x16c/0x3a0
              dsa_register_switch+0x7dc/0xcc0
              ar9331_sw_probe+0x370/0x388
              mdio_probe+0x44/0x70
              really_probe+0x200/0x424
              __driver_probe_device+0x290/0x298
              driver_probe_device+0x54/0xe4
              __device_attach_driver+0xe4/0x130
              bus_for_each_drv+0xb4/0xd8
              __device_attach+0x104/0x1a4
              bus_probe_device+0x48/0xc4
              deferred_probe_work_func+0xf0/0x10c
              process_one_work+0x314/0x4d4
              worker_thread+0x2a4/0x354
              kthread+0x134/0x13c
              ret_from_kernel_thread+0x14/0x1c
      
       other info that might help us debug this:
      
        Possible unsafe locking scenario:
      
              CPU0                    CPU1
              ----                    ----
         lock(&bus->mdio_lock);
                                      lock(ar9331:1005:(&ar9331_mdio_regmap_config)->lock);
                                      lock(&bus->mdio_lock);
         lock(ar9331:1005:(&ar9331_mdio_regmap_config)->lock);
      
        *** DEADLOCK ***
      
       5 locks held by kworker/u2:4/68:
        #0: 81c04eb4 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work+0x1e4/0x4d4
        #1: 81f0de78 (deferred_probe_work){+.+.}-{0:0}, at: process_one_work+0x1e4/0x4d4
        #2: 81f0a880 (&dev->mutex){....}-{4:4}, at: __device_attach+0x40/0x1a4
        #3: 80c8aee0 (dsa2_mutex){+.+.}-{4:4}, at: dsa_register_switch+0x5c/0xcc0
        #4: 81f60494 (&bus->mdio_lock){+.+.}-{4:4}, at: mdiobus_read+0x40/0x78
      
       stack backtrace:
       CPU: 0 PID: 68 Comm: kworker/u2:4 Not tainted 5.19.0-rc1-ar9331-00017-g3ab364c7c48c #5
       Workqueue: events_unbound deferred_probe_work_func
       Stack : 00000056 800d4638 81f0d64c 00000004 00000018 00000000 80a20000 80a20000
               80937590 81ef3858 81f0d760 3913578a 00000005 8045e824 81f0d600 a8db84cc
               00000000 00000000 80937590 00000a44 00000000 00000002 00000001 ffffffff
               81f0d6a4 80982d7c 0000000f 20202020 80a20000 00000001 80937590 81ef3858
               81f0d760 3913578a 00000005 00000005 00000000 03bd0000 00000000 80e00000
               ...
       Call Trace:
       [<80069db0>] show_stack+0x94/0x130
       [<8045e824>] dump_stack_lvl+0x54/0x8c
       [<800c7fac>] check_noncircular+0x88/0xc0
       [<800ca068>] __lock_acquire+0x10bc/0x18bc
       [<800cb478>] lock_acquire+0x2d4/0x360
       [<807b84c4>] __mutex_lock+0xf8/0x384
       [<807b877c>] mutex_lock_nested+0x2c/0x38
       [<804ea640>] regmap_write+0x50/0x8c
       [<80501e38>] ar9331_sw_mbus_read+0x74/0x1b8
       [<804fe9a0>] __mdiobus_read+0x90/0xec
       [<804feac4>] mdiobus_read+0x50/0x78
       [<804fcf74>] get_phy_device+0xa0/0x18c
       [<804ffeb4>] fwnode_mdiobus_register_phy+0x120/0x1d4
       [<805004f0>] of_mdiobus_register+0x244/0x3c4
       [<804f0c50>] devm_of_mdiobus_register+0xe8/0x100
       [<805017a0>] ar9331_sw_setup+0x16c/0x3a0
       [<807355c8>] dsa_register_switch+0x7dc/0xcc0
       [<80501468>] ar9331_sw_probe+0x370/0x388
       [<804ff0c0>] mdio_probe+0x44/0x70
       [<804d1848>] really_probe+0x200/0x424
       [<804d1cfc>] __driver_probe_device+0x290/0x298
       [<804d1d58>] driver_probe_device+0x54/0xe4
       [<804d2298>] __device_attach_driver+0xe4/0x130
       [<804cf048>] bus_for_each_drv+0xb4/0xd8
       [<804d200c>] __device_attach+0x104/0x1a4
       [<804d026c>] bus_probe_device+0x48/0xc4
       [<804d108c>] deferred_probe_work_func+0xf0/0x10c
       [<800a0ffc>] process_one_work+0x314/0x4d4
       [<800a17fc>] worker_thread+0x2a4/0x354
       [<800a9a54>] kthread+0x134/0x13c
       [<8006306c>] ret_from_kernel_thread+0x14/0x1c
      [
      Signed-off-by: NOleksij Rempel <o.rempel@pengutronix.de>
      Link: https://lore.kernel.org/r/20220616112550.877118-1-o.rempel@pengutronix.deSigned-off-by: NJakub Kicinski <kuba@kernel.org>
      7a49f219
  5. 17 6月, 2022 3 次提交
    • O
      net: macb: fix negative max_mtu size for sama5d3 · 46e31db5
      Oleksij Rempel 提交于
      JML register on probe will return zero . This register is configured
      later on macb_init_hw() which is called on open.
      Since we have zero, after header and FCS length subtraction we will get
      negative max_mtu size. This issue was affecting DSA drivers with MTU support
      (for example KSZ9477).
      Signed-off-by: NOleksij Rempel <o.rempel@pengutronix.de>
      Reviewed-by: NClaudiu Beznea <claudiu.beznea@microchip.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      46e31db5
    • K
      hinic: Replace memcpy() with direct assignment · 2c0ab32b
      Kees Cook 提交于
      Under CONFIG_FORTIFY_SOURCE=y and CONFIG_UBSAN_BOUNDS=y, Clang is bugged
      here for calculating the size of the destination buffer (0x10 instead of
      0x14). This copy is a fixed size (sizeof(struct fw_section_info_st)), with
      the source and dest being struct fw_section_info_st, so the memcpy should
      be safe, assuming the index is within bounds, which is UBSAN_BOUNDS's
      responsibility to figure out.
      
      Avoid the whole thing and just do a direct assignment. This results in
      no change to the executable code.
      
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Eric Dumazet <edumazet@google.com>
      Cc: Jakub Kicinski <kuba@kernel.org>
      Cc: Paolo Abeni <pabeni@redhat.com>
      Cc: Nathan Chancellor <nathan@kernel.org>
      Cc: Nick Desaulniers <ndesaulniers@google.com>
      Cc: Tom Rix <trix@redhat.com>
      Cc: Leon Romanovsky <leon@kernel.org>
      Cc: Jiri Pirko <jiri@nvidia.com>
      Cc: Vladimir Oltean <olteanv@gmail.com>
      Cc: Simon Horman <simon.horman@corigine.com>
      Cc: netdev@vger.kernel.org
      Cc: llvm@lists.linux.dev
      Link: https://github.com/ClangBuiltLinux/linux/issues/1592Signed-off-by: NKees Cook <keescook@chromium.org>
      Reviewed-by: NGustavo A. R. Silva <gustavoars@kernel.org>
      Tested-by: Nathan Chancellor <nathan@kernel.org> # build
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2c0ab32b
    • O
      net: ag71xx: fix discards 'const' qualifier warning · 225b0ed2
      Oleksij Rempel 提交于
      Current kernel will compile this driver with warnings. This patch will
      fix it.
      
      drivers/net/ethernet/atheros/ag71xx.c: In function 'ag71xx_fast_reset':
      drivers/net/ethernet/atheros/ag71xx.c:996:31: warning: passing argument 2 of 'ag71xx_hw_set
      _macaddr' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
        996 |  ag71xx_hw_set_macaddr(ag, dev->dev_addr);
            |                            ~~~^~~~~~~~~~
      drivers/net/ethernet/atheros/ag71xx.c:951:69: note: expected 'unsigned char *' but argument
       is of type 'const unsigned char *'
        951 | static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
            |                                                      ~~~~~~~~~~~~~~~^~~
      drivers/net/ethernet/atheros/ag71xx.c: In function 'ag71xx_open':
      drivers/net/ethernet/atheros/ag71xx.c:1441:32: warning: passing argument 2 of 'ag71xx_hw_se
      t_macaddr' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
       1441 |  ag71xx_hw_set_macaddr(ag, ndev->dev_addr);
            |                            ~~~~^~~~~~~~~~
      drivers/net/ethernet/atheros/ag71xx.c:951:69: note: expected 'unsigned char *' but argument
       is of type 'const unsigned char *'
        951 | static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
            |                                                      ~~~~~~~~~~~~~~~^~~
      
      Fixes: adeef3e3 ("net: constify netdev->dev_addr")
      Signed-off-by: NOleksij Rempel <o.rempel@pengutronix.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      225b0ed2