From patchwork Thu Jul 27 19:54:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuno Das Neves X-Patchwork-Id: 127138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp1340930vqo; Thu, 27 Jul 2023 13:13:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlEGmU0/wWav7v1JIxh1GYmbNyAeXyALP/3PDPO7Lihe5MqJwIfTRaZwuUnkiZhV31wzoIq0 X-Received: by 2002:a17:90a:fe8e:b0:267:f5d1:1dd3 with SMTP id co14-20020a17090afe8e00b00267f5d11dd3mr314362pjb.11.1690488807194; Thu, 27 Jul 2023 13:13:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690488807; cv=none; d=google.com; s=arc-20160816; b=Pasdd8I2nf5lNBSDBDupIp/f3Z/rwE09IMhtQB/VpGvKPL7Rvu09y6WJ0FxoOgG5QI Xdtj2Muf2jW8e08fPlQSPE1LM47HS2fJCmhyuasmJ11uDeOeFoB0L68U3Jc0NwF/dq/1 FxKNk0zgfEsfOFZrQ4SqVeOq2Q0TqeR3a3HeSvbx92SdbAlHXT8A/yT091sQ42PTaDvD 1Ld9a013vv7saOdEpantjfVLsotrb/WRuPMS60VjlLxADQ1o+kERJZvZQ1eBulKnychp vS8o0ZAciRHDt12WCuBOYq3fDgfeZKwXhJxQNax/x6COdl8WMpFibgCmhMVKwzGoAmfN M2bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature:dkim-filter; bh=Yk5+xfQ4GUhK2we00/EFmDlHTEtrC/sgxQtYBPWgxXk=; fh=y8tS7hHyMnVm4J/EG8JBk7xmqgMCnIiFB1dTM3zggRY=; b=iIekkiaKCKzRKo+SNTozIOVJ1JLjYcBKASiNmVwm63jxK9gggeJEefiAk9KgJbWE+A ITmr1XhwobVuM+sC0v4b62burc7YOGBdxYg8jOYt9FfopxYSGSv49hh9g1G6o3QcP7Ff rdIy73aztjhel8BsvBneIbR+0/itZHeONDKzx8+cR7U1fUfWPS1b0QNGwISpJxSPto+/ 575ylUhLSi89LtY6uVAXV/5xBcOeN6jerFEq7tN9LclCUC9HjfpW5JLR9R/3p18Qimce GXy3mGWuqlqDAof7ahvKW6U7EZxT0SVIiR9ibNTxucwe5NGyDtbUFeY84lboqVoJtRBm Q6Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="q/PmR/NS"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e9-20020a17090a728900b0025c02c13dfbsi3242609pjg.100.2023.07.27.13.12.45; Thu, 27 Jul 2023 13:13:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b="q/PmR/NS"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232473AbjG0TzO (ORCPT + 99 others); Thu, 27 Jul 2023 15:55:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231946AbjG0TzA (ORCPT ); Thu, 27 Jul 2023 15:55:00 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0F3B530CD; Thu, 27 Jul 2023 12:54:59 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id E0F542383EE6; Thu, 27 Jul 2023 12:54:56 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com E0F542383EE6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1690487696; bh=Yk5+xfQ4GUhK2we00/EFmDlHTEtrC/sgxQtYBPWgxXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q/PmR/NSgY2rfdijSaBye87ZCo3VtrDRemsdy0umYpZTnjqKX+Qg2HdS4hjt4iHr1 EN73IN9c/d7RzgdSgHT4e4K7ZcsBjmKcWjcELTmmRps4Zc9LWReQicNXhpEhlu5AIV oYoAUf1ZZE9baY7SkdsZoe0a9jFlGvJWK42FhxUw= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org Cc: mikelley@microsoft.com, kys@microsoft.com, wei.liu@kernel.org, haiyangz@microsoft.com, decui@microsoft.com, ssengar@linux.microsoft.com, mukeshrathor@microsoft.com, stanislav.kinsburskiy@gmail.com, jinankjain@linux.microsoft.com, apais@linux.microsoft.com, Tianyu.Lan@microsoft.com, vkuznets@redhat.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, will@kernel.org, catalin.marinas@arm.com Subject: [PATCH 05/15] hyperv: Move hv_connection_id to hyperv-tlfs Date: Thu, 27 Jul 2023 12:54:40 -0700 Message-Id: <1690487690-2428-6-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1690487690-2428-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1690487690-2428-1-git-send-email-nunodasneves@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772605991517356512 X-GMAIL-MSGID: 1772605991517356512 This structure should be in hyperv-tlfs.h anyway, since it is part of the TLFS document. The definition conflicts with one added in hvgdk.h as part of the mshv driver so must be moved to hyperv-tlfs.h. Signed-off-by: Nuno Das Neves --- include/asm-generic/hyperv-tlfs.h | 9 +++++++++ include/linux/hyperv.h | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h index 373f26efa18a..8fc5e5a9d7cb 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -845,4 +845,13 @@ struct hv_mmio_write_input { u8 data[HV_HYPERCALL_MMIO_MAX_DATA_LENGTH]; } __packed; +/* Define connection identifier type. */ +union hv_connection_id { + u32 asu32; + struct { + u32 id:24; + u32 reserved:8; + } u; +}; + #endif diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index bfbc37ce223b..f90de5abcd50 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -748,15 +748,6 @@ struct vmbus_close_msg { struct vmbus_channel_close_channel msg; }; -/* Define connection identifier type. */ -union hv_connection_id { - u32 asu32; - struct { - u32 id:24; - u32 reserved:8; - } u; -}; - enum vmbus_device_type { HV_IDE = 0, HV_SCSI,