From patchwork Wed Apr 16 02:15:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tatyana Nikolova X-Patchwork-Id: 14053078 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10AB12BB15; Wed, 16 Apr 2025 02:16:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744769774; cv=none; b=q+2FbZyn9pbF8Mvhfva5cOUmMjoXsw3YlE3QhHsx7CH+s7uC9873FyHxkyac1ZloJakd2nNHeSsKPL61ud8EN6c42UB8SfjEPwFFVu3nn8MNUWDZUUsyPDHuFjiGWP6e3ABA50ijBT3pMzj9XjKj+iN/2F4CfW2OLjKh+Zeoq+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744769774; c=relaxed/simple; bh=8BvrqoyWkuGLWTBq31HsE3fGTiSi0Tns1abueBYwNvM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NYufoVrMdrjCSDLRU95W2sMjmbwYYOU3fBqSaZbgbpfkmGNw1kNtddfwJRwyNlN6f4NlYNpIgvTAJ4W0IUBszNGfV0WV8cN1dsPwqW2yZLDL0l6+Fmh1gNgICX209tnFd++uQmQYSmAtNPabkPtdPeZ5cH1sbMqvjGlomJEI8p4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ltSuOloW; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ltSuOloW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744769773; x=1776305773; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8BvrqoyWkuGLWTBq31HsE3fGTiSi0Tns1abueBYwNvM=; b=ltSuOloW+tMu1xC9WfIfqzL7Dhjo442CRSOZPkIMECqCQ5cAsfkI78rU Q8008w8HCzohWzj1FUddxd9vxHhJQZS5hjKmLx33okJ6lPWWHTqzmrir3 KU2ZL1tUhkNrzvfgugNByk5HP/r6X7k5wXQ3abbCdvHdWWqI0v6iEOsah 1D7SfCq7QDIVXexldmVZhptCSCDFSsdSfJ8shwp9qcVeFweSYpPeOBEPS TWyYI10zzcJmQrKqtVD8j65Lux7mkFEcINOLvgChveYCMnpMieJ/I1cwX KzX3lP0LCewl+W4XfwaZ5oClKB6tIi+PyNxjSzUgPc89vwpkpXFAihtQI Q==; X-CSE-ConnectionGUID: oGvPEBAjT4KDDg7ahJGiaA== X-CSE-MsgGUID: Ji2wcjflQjaS2fjtosOgjA== X-IronPort-AV: E=McAfee;i="6700,10204,11404"; a="50125555" X-IronPort-AV: E=Sophos;i="6.15,214,1739865600"; d="scan'208";a="50125555" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2025 19:16:12 -0700 X-CSE-ConnectionGUID: 9eSx1RFYQ7WwEyFpYPCNnQ== X-CSE-MsgGUID: NQUPF83FT/K7KSTZ1San8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,214,1739865600"; d="scan'208";a="130605790" Received: from bnkannan-mobl1.amr.corp.intel.com (HELO soc-PF51RAGT.clients.intel.com) ([10.246.114.218]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2025 19:16:11 -0700 From: Tatyana Nikolova To: jgg@nvidia.com, leon@kernel.org, intel-wired-lan@lists.osuosl.org Cc: linux-rdma@vger.kernel.org, netdev@vger.kernel.org Subject: [iwl-next v5 1/5] iidc/ice/irdma: Rename IDC header file Date: Tue, 15 Apr 2025 21:15:45 -0500 Message-ID: <20250416021549.606-2-tatyana.e.nikolova@intel.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20250416021549.606-1-tatyana.e.nikolova@intel.com> References: <20250416021549.606-1-tatyana.e.nikolova@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Dave Ertman To prepare for the IDC upgrade to support different CORE PCI drivers, rename header file from iidc.h to iidc_rdma.h since this files functionality is specifically for RDMA support. Use net/dscp.h include in irdma osdep.h and DSCP_MAX type.h, instead of iidc header and define. Reviewed-by: Przemek Kitszel Signed-off-by: Dave Ertman Signed-off-by: Tatyana Nikolova --- MAINTAINERS | 2 +- drivers/infiniband/hw/irdma/main.h | 2 +- drivers/infiniband/hw/irdma/osdep.h | 2 +- drivers/infiniband/hw/irdma/type.h | 4 ++-- drivers/net/ethernet/intel/ice/ice_idc_int.h | 2 +- include/linux/net/intel/{iidc.h => iidc_rdma.h} | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) rename include/linux/net/intel/{iidc.h => iidc_rdma.h} (97%) diff --git a/MAINTAINERS b/MAINTAINERS index 96b827049501..136309587791 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11890,7 +11890,7 @@ F: Documentation/networking/device_drivers/ethernet/intel/ F: drivers/net/ethernet/intel/ F: drivers/net/ethernet/intel/*/ F: include/linux/avf/virtchnl.h -F: include/linux/net/intel/iidc.h +F: include/linux/net/intel/*/ INTEL ETHERNET PROTOCOL DRIVER FOR RDMA M: Mustafa Ismail diff --git a/drivers/infiniband/hw/irdma/main.h b/drivers/infiniband/hw/irdma/main.h index bb0b6494ccb2..e8083b0c8cb2 100644 --- a/drivers/infiniband/hw/irdma/main.h +++ b/drivers/infiniband/hw/irdma/main.h @@ -29,7 +29,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/drivers/infiniband/hw/irdma/osdep.h b/drivers/infiniband/hw/irdma/osdep.h index 4b4f78288d12..3f73ceacccb6 100644 --- a/drivers/infiniband/hw/irdma/osdep.h +++ b/drivers/infiniband/hw/irdma/osdep.h @@ -5,8 +5,8 @@ #include #include -#include #include +#include #define STATS_TIMER_DELAY 60000 diff --git a/drivers/infiniband/hw/irdma/type.h b/drivers/infiniband/hw/irdma/type.h index 59b34afa867b..527c6da2c1ac 100644 --- a/drivers/infiniband/hw/irdma/type.h +++ b/drivers/infiniband/hw/irdma/type.h @@ -567,7 +567,7 @@ struct irdma_sc_vsi { u8 qos_rel_bw; u8 qos_prio_type; u8 stats_idx; - u8 dscp_map[IIDC_MAX_DSCP_MAPPING]; + u8 dscp_map[DSCP_MAX]; struct irdma_qos qos[IRDMA_MAX_USER_PRIORITY]; u64 hw_stats_regs[IRDMA_HW_STAT_INDEX_MAX_GEN_1]; bool dscp_mode:1; @@ -695,7 +695,7 @@ struct irdma_l2params { u16 qs_handle_list[IRDMA_MAX_USER_PRIORITY]; u16 mtu; u8 up2tc[IRDMA_MAX_USER_PRIORITY]; - u8 dscp_map[IIDC_MAX_DSCP_MAPPING]; + u8 dscp_map[DSCP_MAX]; u8 num_tc; u8 vsi_rel_bw; u8 vsi_prio_type; diff --git a/drivers/net/ethernet/intel/ice/ice_idc_int.h b/drivers/net/ethernet/intel/ice/ice_idc_int.h index 4b0c86757df9..b0c504a6408e 100644 --- a/drivers/net/ethernet/intel/ice/ice_idc_int.h +++ b/drivers/net/ethernet/intel/ice/ice_idc_int.h @@ -4,7 +4,7 @@ #ifndef _ICE_IDC_INT_H_ #define _ICE_IDC_INT_H_ -#include +#include struct ice_pf; diff --git a/include/linux/net/intel/iidc.h b/include/linux/net/intel/iidc_rdma.h similarity index 97% rename from include/linux/net/intel/iidc.h rename to include/linux/net/intel/iidc_rdma.h index 13274c3def66..0cd75404e459 100644 --- a/include/linux/net/intel/iidc.h +++ b/include/linux/net/intel/iidc_rdma.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2021, Intel Corporation. */ -#ifndef _IIDC_H_ -#define _IIDC_H_ +#ifndef _IIDC_RDMA_H_ +#define _IIDC_RDMA_H_ #include #include @@ -106,4 +106,4 @@ struct iidc_auxiliary_drv { void (*event_handler)(struct ice_pf *pf, struct iidc_event *event); }; -#endif /* _IIDC_H_*/ +#endif /* _IIDC_RDMA_H_*/