From patchwork Fri Sep 22 18:38:25 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: 143920 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp210236vqu; Sat, 23 Sep 2023 07:31:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXexVzAu48AO36YVJOY7x84ZP1QzPaFGnJXgovfGuk8XT7amcbzY0u7ux4R5BtxukM/owE X-Received: by 2002:a05:6358:260b:b0:130:ebb9:4283 with SMTP id l11-20020a056358260b00b00130ebb94283mr3324033rwc.22.1695479486194; Sat, 23 Sep 2023 07:31:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695479486; cv=none; d=google.com; s=arc-20160816; b=ZKBDKDKYzz+LDHEE/Lv/71WgZPMDtBbbArKOL8SOvuqD3J2Nl6Q82eK75SRDRi+Z/c odL0RAa3TWlVgja21NRLCgzPFeTGRStcu2Bn7oIewJdXUkXImeJ/JWr3QqWu0Hj/OVwT BfTulWAWyD85uDKo9hMbcV6GvLRwThUlE+hKiVCoTVqMANprmVJKi21KpKgQN1d03Rl6 R73vZ1jJLesArfqaN3XeaLbKYs03N58La63zVz2UDsD5mFoxwAy5mdvISqv+tEYsPnEa f2jwXhW6w4inhLRL8p66jZawlYzb9Xt4meekrqXvVgimhYa+qLMt5Jp/sCHNGk6NLe+o DdOg== 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=cQftjCWBTJ6x6uiVvHaaGJe4Jx/kmjm/M2Oia3bAOeY=; fh=rrENblR9DW+P8f8MSnFC4QkpxyTeAbSNxgPLVTXlWGs=; b=hdHtZQQaCBgjB2TvqO04xpsEJUTeOcp4cb5vGvD1JfNcdN44w90BrBPJBUcFxc88kb 1+duLuTOV5TP8tohq9NClEcXr+C/FhG0fkZsCRRxDn56IrepluUUCxAicUCpoXz1YaNe EpaRB91TaHNia2aBZeZAzk9weE6S+SMfVYfQbqFYNAkbLI6UqD2Y/GdyiWxCp1RCunpS TYH8YuMFahb4thkk2XjOvHxxk+MY8zsEi5VOZH4nd5u8hZBMOMgGzMgwGYFK9AVQoeht vClyKORVsrmjX+IQE7Atp3tvTaqNaaR+ODjtKpMldhGkx87xNMc8z83ZR+W8lilDf6W0 1rDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=NdLPvKan; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id 36-20020a631564000000b00565617189e2si5969844pgv.839.2023.09.23.07.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 07:31:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=NdLPvKan; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3F33D8239DFA; Fri, 22 Sep 2023 11:39:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233663AbjIVSjD (ORCPT + 28 others); Fri, 22 Sep 2023 14:39:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233376AbjIVSit (ORCPT ); Fri, 22 Sep 2023 14:38:49 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7D905A9; Fri, 22 Sep 2023 11:38:43 -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 641DB212C5D6; Fri, 22 Sep 2023 11:38:41 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 641DB212C5D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1695407921; bh=cQftjCWBTJ6x6uiVvHaaGJe4Jx/kmjm/M2Oia3bAOeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NdLPvKan7d5gznK4d24wHQFtP8PFim0KYi2cX1ffh1HIEvbZs22gZg1rUU1KDJMZj qP5HDQs4GlO3/ek3azt0atWzSVKngIu5zBIjjSjq53HSzRWBLYVOnaTZv77wp3alCQ 6Q7SscofaYgaWsAdYI1gI9G/Qr5kDjc0k2DKtIyE= 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: patches@lists.linux.dev, mikelley@microsoft.com, kys@microsoft.com, wei.liu@kernel.org, gregkh@linuxfoundation.org, haiyangz@microsoft.com, decui@microsoft.com, apais@linux.microsoft.com, Tianyu.Lan@microsoft.com, ssengar@linux.microsoft.com, mukeshrathor@microsoft.com, stanislav.kinsburskiy@gmail.com, jinankjain@linux.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 v3 05/15] hyperv: Move hv_connection_id to hyperv-tlfs Date: Fri, 22 Sep 2023 11:38:25 -0700 Message-Id: <1695407915-12216-6-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1695407915-12216-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1695407915-12216-1-git-send-email-nunodasneves@linux.microsoft.com> X-Spam-Status: No, score=-17.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS,SPF_PASS,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 22 Sep 2023 11:39:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777839097954562193 X-GMAIL-MSGID: 1777839097954562193 The definition conflicts with one added in hvgdk.h as part of the mshv driver so must be moved to hyperv-tlfs.h. This structure should be in hyperv-tlfs.h anyway, since it is part of the TLFS document. Signed-off-by: Nuno Das Neves Acked-by: Wei Liu --- 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 a6dffb346bf2..1316584983c1 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -842,4 +842,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 a922d4526de4..2d8568708d90 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,