From patchwork Tue May 16 02:55:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nelson, Shannon" X-Patchwork-Id: 13242500 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 0948E522E for ; Tue, 16 May 2023 02:55:52 +0000 (UTC) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98F5B3C1F for ; Mon, 15 May 2023 19:55:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SWhY84oyL0/4WYNem7Xx1E6W4lDRvLPUcfZqMqfYw7EnpuR286giwjKBCGWR5ksT10i+3yAjwPgfIyFiyAbWwZAMcwM5xRQBUYFwTyDP8wz2SYDFp9epiBjcmNQs5bN7BdRnhEELFcFuDAEMTNSIIgNyAv/VBSCYHokVvbO0gsPD9m9+e3/Th+CN9x4zobBPTXabJn8Cw3vzTyzzrka16leKCN4B657V4HN9xgZtvtlKqpB0JDKmstG3dZuG87GnDPV53Sq9+7DPrbrr/0itw/fj2BYk1EVCSh6oYAzUlfRtix7+edxDsGpckJo1SxUjkd+QyDmqbzjm2QdWuBr/EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bjLTOwD8kyi9Vm6e95kDwSNjpbT8accAL9JbwovDCuo=; b=gEcpRk3quEv/zc1cRvqUaWSTX1ZXwKDSZj+pbO58ivgNxS4jIXTslJbJUMWP7EmLwcfIz/rdN6qlK/4RvP4QksPrn1D6VQNmJqw18oApYcVDnxsViCzCfg9O4sFILzFNWnScZE6p5v992udrZQP0IrwIr99bac3XOese9wtv4QjWSk9tstD/fpvXIXoXDL9isLmV9d0uYXC5zCXp8WnnfVciIdF2zYStqVRgOT5/sMcjrReibg4wrVi72U6TNz5xxDKP8nGCc+qvj+SrhTfbkBa8bR8KMs1w3+co25XPMkHn6yp3q5i7puzpyUEXLD9tPfy6r9cVmnaRTftmVTdyHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bjLTOwD8kyi9Vm6e95kDwSNjpbT8accAL9JbwovDCuo=; b=Zm5gcfD9KeMpdD4rS/CSm6Vdj6fNN8xildEENNqxl1OgIIuZ0hJIZJIESo1dMpXvxyC2Zc/JSOQtqM3hPMkq0qquG7W/hQZeEEBrT9D2OcGNIkm/XwsKsrXHuV4U77+AnkTRFQKUSsaGSyNDN1awTnFicCErA/4OBOabOphFaUA= Received: from SJ0PR03CA0027.namprd03.prod.outlook.com (2603:10b6:a03:33a::32) by CY5PR12MB6155.namprd12.prod.outlook.com (2603:10b6:930:25::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.33; Tue, 16 May 2023 02:55:48 +0000 Received: from DM6NAM11FT096.eop-nam11.prod.protection.outlook.com (2603:10b6:a03:33a:cafe::48) by SJ0PR03CA0027.outlook.office365.com (2603:10b6:a03:33a::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30 via Frontend Transport; Tue, 16 May 2023 02:55:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT096.mail.protection.outlook.com (10.13.173.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6411.15 via Frontend Transport; Tue, 16 May 2023 02:55:47 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 15 May 2023 21:55:45 -0500 From: Shannon Nelson To: , , , , , CC: , Subject: [PATCH v6 virtio 04/11] pds_vdpa: move enum from common to adminq header Date: Mon, 15 May 2023 19:55:14 -0700 Message-ID: <20230516025521.43352-5-shannon.nelson@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230516025521.43352-1-shannon.nelson@amd.com> References: <20230516025521.43352-1-shannon.nelson@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT096:EE_|CY5PR12MB6155:EE_ X-MS-Office365-Filtering-Correlation-Id: 9feb6a4f-8841-4074-9f39-08db55b90d15 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pE13Q+6qleRhmh6hRWWC3fZjwNyV4JFzd55fO5MOI1ceOf9i2UgsJqkel+icCcySqXbhhKHn2PEhBFYHFeFk/WdVm5quhWUXGMGRchp+ie88fonzypOcGJxZoXbpRRvqhfWkgDnGacbG9XdzA1u+26Pj77Ndbmx6GawAG5JxKEsGnLMe2b8zcRpn0frSDNwtFW46JZUiZ/yi8XDb1OHcg5maYQg7KXZxvPUeE3VrS7Xp6VBZYHD9uWcHKxRb7PIp7oUi8TsqCyAq5G6G87VecHdDoJjAcEZPJmCcUunLpAX+5AmO/+zdlAjPfV3ghWGDb+89Dxm95IKEv80jLGpAbBCkH+wNuJ1slXdl66RWkgk5QDPc/iHOFE8Oew3levPfAapRBEAnVoOkIGhrdvPzk+WiSs9VD79nmdddyg7LsBWaLSzw+XbN3nC1ME5XGPIArBPJqK/x6EjzLiGIFTS2I+91+uLLdEjqL0Hg/MkZ+qXFFZmTiZ6VyRxrsUZZ+4Fxk20QY6LRl2qcsGj9jzHm90Q54Ht3mke2A4pMemKE6+YU+74MEVDwnXi1GBcpx6XOw776nImNP2HkzcRGghznZ+iqsnKwHRY2joQpwz7soXKEQMX7XkEV8OEWIaKfVRinaQIMbIP43kGPULm7Vy0fxYWoQgTJZMMfZXOHAdkitJ66l/wXc5VSLSW6yQgNRYESn603Zi5kZB7wGQHm/W7iquTmwDhBtIUHnl0EIgCGocgK1NsXgg6q88ISdGNkSP5083l7NvwIdVomR/nFDq0uqA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(376002)(39860400002)(136003)(346002)(396003)(451199021)(36840700001)(46966006)(40470700004)(26005)(1076003)(40460700003)(47076005)(36756003)(426003)(336012)(36860700001)(40480700001)(2616005)(81166007)(86362001)(83380400001)(82310400005)(356005)(82740400003)(186003)(16526019)(54906003)(110136005)(44832011)(478600001)(2906002)(316002)(41300700001)(5660300002)(8676002)(4326008)(8936002)(70586007)(70206006)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 02:55:47.9107 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9feb6a4f-8841-4074-9f39-08db55b90d15 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT096.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6155 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net The pds_core_logical_qtype enum and IFNAMSIZ are not needed in the common PDS header, only needed when working with the adminq, so move them to the adminq header. Note: This patch might conflict with pds_vfio patches that are in review, depending on which patchset gets pulled first. Signed-off-by: Shannon Nelson Acked-by: Jason Wang --- include/linux/pds/pds_adminq.h | 21 +++++++++++++++++++++ include/linux/pds/pds_common.h | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/linux/pds/pds_adminq.h b/include/linux/pds/pds_adminq.h index 98a60ce87b92..61b0a8634e1a 100644 --- a/include/linux/pds/pds_adminq.h +++ b/include/linux/pds/pds_adminq.h @@ -222,6 +222,27 @@ enum pds_core_lif_type { PDS_CORE_LIF_TYPE_DEFAULT = 0, }; +#define PDS_CORE_IFNAMSIZ 16 + +/** + * enum pds_core_logical_qtype - Logical Queue Types + * @PDS_CORE_QTYPE_ADMINQ: Administrative Queue + * @PDS_CORE_QTYPE_NOTIFYQ: Notify Queue + * @PDS_CORE_QTYPE_RXQ: Receive Queue + * @PDS_CORE_QTYPE_TXQ: Transmit Queue + * @PDS_CORE_QTYPE_EQ: Event Queue + * @PDS_CORE_QTYPE_MAX: Max queue type supported + */ +enum pds_core_logical_qtype { + PDS_CORE_QTYPE_ADMINQ = 0, + PDS_CORE_QTYPE_NOTIFYQ = 1, + PDS_CORE_QTYPE_RXQ = 2, + PDS_CORE_QTYPE_TXQ = 3, + PDS_CORE_QTYPE_EQ = 4, + + PDS_CORE_QTYPE_MAX = 16 /* don't change - used in struct size */ +}; + /** * union pds_core_lif_config - LIF configuration * @state: LIF state (enum pds_core_lif_state) diff --git a/include/linux/pds/pds_common.h b/include/linux/pds/pds_common.h index 2a0d1669cfd0..435c8e8161c2 100644 --- a/include/linux/pds/pds_common.h +++ b/include/linux/pds/pds_common.h @@ -41,27 +41,6 @@ enum pds_core_vif_types { #define PDS_VDPA_DEV_NAME PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_VDPA_STR -#define PDS_CORE_IFNAMSIZ 16 - -/** - * enum pds_core_logical_qtype - Logical Queue Types - * @PDS_CORE_QTYPE_ADMINQ: Administrative Queue - * @PDS_CORE_QTYPE_NOTIFYQ: Notify Queue - * @PDS_CORE_QTYPE_RXQ: Receive Queue - * @PDS_CORE_QTYPE_TXQ: Transmit Queue - * @PDS_CORE_QTYPE_EQ: Event Queue - * @PDS_CORE_QTYPE_MAX: Max queue type supported - */ -enum pds_core_logical_qtype { - PDS_CORE_QTYPE_ADMINQ = 0, - PDS_CORE_QTYPE_NOTIFYQ = 1, - PDS_CORE_QTYPE_RXQ = 2, - PDS_CORE_QTYPE_TXQ = 3, - PDS_CORE_QTYPE_EQ = 4, - - PDS_CORE_QTYPE_MAX = 16 /* don't change - used in struct size */ -}; - int pdsc_register_notify(struct notifier_block *nb); void pdsc_unregister_notify(struct notifier_block *nb); void *pdsc_get_pf_struct(struct pci_dev *vf_pdev);