From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53297C54EE9 for ; Mon, 19 Sep 2022 09:06:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229792AbiISJGk (ORCPT ); Mon, 19 Sep 2022 05:06:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229762AbiISJGi (ORCPT ); Mon, 19 Sep 2022 05:06:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 312337679; Mon, 19 Sep 2022 02:06:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E201AB80B17; Mon, 19 Sep 2022 09:06:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80776C433C1; Mon, 19 Sep 2022 09:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663578394; bh=dTBQ7T1QioQLJ8cwIP5KWmbjaen9neD2VS2nvDARryw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=qXXZoYJcoNLSIxyFydSIf4PXN9j8G46Eg4wvruqpVOjsvxFW60YcyiCiTX1zpGNiN GU0FrXt4rB3ykDU3/oahFgG/KojGqNFEABHfscNst7lsyZFsXGHMMzj65KAcWcdzXD DDh+glhfp6wiZjbDEyZ9mxRgo2D+OQnJo2uD5QZQTsuhxpCf+DWfKeFK1lZ96AlBFs rKQ3mRE0Mo+YFA76CAWJsGQheFEiuL3PR8RIGvrbyWGy8JtKXauKfUaPDmMmTmUiSu L+usZiXLhQZU511Qr8HOEJ7bLp8PRK0ku3/ZlWfR8lxS4mUMT1fshSxrtQzF7S0db0 lQMmR2sXUj9aA== Received: from 185-176-101-241.host.sccbroadband.ie ([185.176.101.241] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oaChb-00B1Vp-Nh; Mon, 19 Sep 2022 10:06:32 +0100 Date: Mon, 19 Sep 2022 10:04:30 +0100 Message-ID: <87fsgnlopt.wl-maz@kernel.org> From: Marc Zyngier To: Catalin Marinas , Will Deacon , Stephen Rothwell Cc: Christoffer Dall , Linux Kernel Mailing List , Linux Next Mailing List , Mark Brown , Oliver Upton Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree In-Reply-To: <20220919140531.3741d146@canb.auug.org.au> References: <20220919140531.3741d146@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.176.101.241 X-SA-Exim-Rcpt-To: catalin.marinas@arm.com, will@kernel.org, sfr@canb.auug.org.au, cdall@cs.columbia.edu, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, broonie@kernel.org, oliver.upton@linux.dev X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, Thanks for the heads up. On Mon, 19 Sep 2022 05:05:31 +0100, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in: > > arch/arm64/kvm/sys_regs.c > > between commit: > > 55adc08d7e64 ("arm64/sysreg: Add _EL1 into ID_AA64PFR0_EL1 definition names") > > from the arm64 tree and commit: > > cdd5036d048c ("KVM: arm64: Drop raz parameter from read_id_reg()") > > from the kvm-arm tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/kvm/sys_regs.c > index 2ef1121ab844,9569772cf09a..000000000000 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@@ -1208,9 -1210,9 +1210,9 @@@ static int set_id_aa64pfr0_el1(struct k > return -EINVAL; > > /* We can only differ with CSV[23], and anything else is an error */ > - val ^= read_id_reg(vcpu, rd, false); > + val ^= read_id_reg(vcpu, rd); > - val &= ~((0xFUL << ID_AA64PFR0_CSV2_SHIFT) | > - (0xFUL << ID_AA64PFR0_CSV3_SHIFT)); > + val &= ~((0xFUL << ID_AA64PFR0_EL1_CSV2_SHIFT) | > + (0xFUL << ID_AA64PFR0_EL1_CSV3_SHIFT)); > if (val) > return -EINVAL; Catalin, Will: in order to avoid further conflicts, I've taken the liberty to merge the arm64/for-next/sysreg branch into kvmarm/next. Let me know if that's a problem. Also, I've resolved the conflict in a slightly different way. Not that the above was wrong in any way, but we might as well fix it in a more idiomatic way: /* We can only differ with CSV[23], and anything else is an error */ val ^= read_id_reg(vcpu, rd); - val &= ~((0xFUL << ID_AA64PFR0_CSV2_SHIFT) | - (0xFUL << ID_AA64PFR0_CSV3_SHIFT)); + val &= ~(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_CSV2) | + ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_CSV3)); if (val) return -EINVAL; Thanks, M. -- Without deviation from the norm, progress is not possible.