From patchwork Fri Sep 18 23:42:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 260578 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02D44C43463 for ; Fri, 18 Sep 2020 23:43:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C444721734 for ; Fri, 18 Sep 2020 23:43:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726236AbgIRXnK (ORCPT ); Fri, 18 Sep 2020 19:43:10 -0400 Received: from mga03.intel.com ([134.134.136.65]:59399 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726009AbgIRXnI (ORCPT ); Fri, 18 Sep 2020 19:43:08 -0400 IronPort-SDR: 24KhGhzHbXaY1Tft820QJ3wag65RXjBSmOIpQpVwrLOjzn7TnydqD1GFxwXRTgJ0GLaWhIle1q caYF5MM8osGw== X-IronPort-AV: E=McAfee;i="6000,8403,9748"; a="160113140" X-IronPort-AV: E=Sophos;i="5.77,276,1596524400"; d="scan'208";a="160113140" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 16:43:04 -0700 IronPort-SDR: sjWOjUBkWSI9Aw1i4rvDrP0QruMWi5jv+gBpWt5c0Vd8H1tk6sIIHmty+fE0IOxPDL3RZbKUoM LspCj37p4VjA== X-IronPort-AV: E=Sophos;i="5.77,276,1596524400"; d="scan'208";a="332840547" Received: from jekeller-desk.amr.corp.intel.com ([10.166.241.4]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 16:43:04 -0700 From: Jacob Keller To: netdev@vger.kernel.org Cc: Jacob Keller , Jiri Pirko , Jakub Kicinski , Jonathan Corbet , Michael Chan , Bin Luo , Saeed Mahameed , Leon Romanovsky , Ido Schimmel , Danielle Ratson , Shannon Nelson Subject: [net-next v7 0/5] devlink flash update overwrite mask Date: Fri, 18 Sep 2020 16:42:03 -0700 Message-Id: <20200918234208.1060371-1-jacob.e.keller@intel.com> X-Mailer: git-send-email 2.28.0.497.g54e85e7af1ac MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This series introduces support for a new attribute to the flash update command: DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK. This attribute is a bitfield which allows userspace to specify what set of subfields to overwrite when performing a flash update for a device. The intention is to support the ability to control the behavior of overwriting the configuration and identifying fields in the Intel ice device flash update process. This is necessary as the firmware layout for the ice device includes some settings and configuration within the same flash section as the main firmware binary. This series, and the accompanying iproute2 series, introduce support for the attribute. Once applied, the overwrite support can be be invoked via devlink: # overwrite settings devlink dev flash pci/0000:af:00.0 file firmware.bin overwrite settings # overwrite identifiers and settings devlink dev flash pci/0000:af:00.0 file firmware.bin overwrite settings overwrite identifiers To aid in the safe addition of new parameters, first some refactoring is done to the .flash_update function: its parameters are converted from a series of function arguments into a structure. This makes it easier to add the new parameter without changing the signature of the .flash_update handler in the future. Additionally, a "supported_flash_update_params" field is added to devlink_ops. This field is similar to the ethtool "supported_coalesc_params" field. The devlink core will now check that the DEVLINK_SUPPORT_FLASH_UPDATE_COMPONENT bit is set before forwarding the component attribute. Similarly, the new overwrite attribute will also require a supported bit. Doing these refactors will aid in adding any other attributes in the future, and creates a good pattern for other interfaces to use in the future. By requiring drivers to opt-in, we reduce the risk of accidentally breaking drivers when ever we add an additional parameter. We also reduce boiler plate code in drivers which do not support the parameters. Cc: Jiri Pirko Cc: Jakub Kicinski Cc: Jonathan Corbet Cc: Michael Chan Cc: Bin Luo Cc: Saeed Mahameed Cc: Leon Romanovsky Cc: Ido Schimmel Cc: Danielle Ratson Cc: Shannon Nelson Changes since v6 * Rebased to current net-next to resolve conflicts * Added changes to the ionic driver that recently merged flash update support * Fixed the changes for mlxsw to apply to core instead of spectrum.c after the recent refactor. * Picked up the review tags from Jakub Changes since v5 * Fix *all* of the BIT usage to use _BITUL() (thanks Jakub!) Changes since v4 * Renamed nla_overwrite to nla_overwrite_mask at Jiri's suggestion * Added "by this device" to the netlink error messages for unsupported attributes * Removed use of BIT() in the uapi header * Fixed the commit message for the netdevsim patch * Picked up Jakub's reviewed tag. Jacob Keller (5): devlink: check flash_update parameter support in net core devlink: convert flash_update to use params structure devlink: introduce flash update overwrite mask netdevsim: add support for flash_update overwrite mask ice: add support for flash update overwrite mask .../networking/devlink/devlink-flash.rst | 28 +++++++++++++ Documentation/networking/devlink/ice.rst | 31 ++++++++++++++ .../net/ethernet/broadcom/bnxt/bnxt_devlink.c | 19 ++++----- .../net/ethernet/huawei/hinic/hinic_devlink.c | 8 +--- drivers/net/ethernet/intel/ice/ice_devlink.c | 34 ++++++++++----- .../net/ethernet/intel/ice/ice_fw_update.c | 16 ++++++- .../net/ethernet/intel/ice/ice_fw_update.h | 2 +- .../net/ethernet/mellanox/mlx5/core/devlink.c | 8 +--- drivers/net/ethernet/mellanox/mlxsw/core.c | 12 ++---- .../net/ethernet/netronome/nfp/nfp_devlink.c | 9 ++-- .../ethernet/pensando/ionic/ionic_devlink.c | 8 +--- drivers/net/netdevsim/dev.c | 23 ++++++---- drivers/net/netdevsim/netdevsim.h | 1 + include/net/devlink.h | 35 +++++++++++++++- include/uapi/linux/devlink.h | 23 ++++++++++ net/core/devlink.c | 42 +++++++++++++++---- .../drivers/net/netdevsim/devlink.sh | 21 ++++++++++ 17 files changed, 247 insertions(+), 73 deletions(-) base-commit: 5f3666e8394580179b81dd90bf8b930efaf5138e Acked-by: Shannon Nelson