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;
Date:   Thu, 15 Dec 2022 13:06:29 +0100
From:   Thierry Reding <treding@nvidia.com>
To:     Serge Semin <Sergey.Semin@baikalelectronics.ru>
Cc:     Bjorn Helgaas <helgaas@kernel.org>, Rob Herring <robh@kernel.org>,
        Vidya Sagar <vidyas@nvidia.com>,
        Jon Hunter <jonathanh@nvidia.com>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Pieralisi <lpieralisi@kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the pci tree with the arm-soc tree
Message-ID: <Y5sNxY1ibaSK5lND@orome>
References: <20221213195313.GA200257@bhelgaas>
 <20221213200733.GA201693@bhelgaas>
 <20221213233649.zmmiskezdponleuc@mobilestation>
 <Y5nfr+AXofk9Ch2m@orome>
 <20221214220735.5fv6agbkwamvfmbv@mobilestation>
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="LSp9OVivsvvQ9GYN"
Content-Disposition: inline
In-Reply-To: <20221214220735.5fv6agbkwamvfmbv@mobilestation>
User-Agent: Mutt/2.2.9 (2022-11-12)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CqMTy6Jz0nyTOube9DTpoV7+/mYR4D9FA4MhGMphErbUKhcd+6L/2eTuJjmx?=
 =?us-ascii?Q?zAsVfCC8yv/v+TcBpZ5spDmfThJGv1RItRcSK2DELvPAgs1v2mUEXVxR5aUL?=
 =?us-ascii?Q?FqR4sqsPi/Xi+3SaYZqJIhOrVZtCaRATJwv0qhKWMeFOtvC+kaIL2ACt9Nvg?=
 =?us-ascii?Q?v02w5lBq9mOJYeDrMFkHm9gJJZiZBxYYQekHOTd2dAFaxU9EJJnQNiExzzUO?=
 =?us-ascii?Q?h66MgnJD1q8pFlXyHFznoHPS1AJxTNVbi+gerU4Rj9wGmzutIZt71CB5jhka?=
 =?us-ascii?Q?Zh30mamVV9/7p858QQhSqLO0wZ5+luZXM80vb3awpYmByD3g4djIkWu17GC+?=
 =?us-ascii?Q?EMm/3zF564rA+lyfnbk+3cZgHqnF+MY9L1y+44UC39iZ9li3JRbEQgdTBZbq?=
 =?us-ascii?Q?SNe1d1MZzYYdvweruZr6oHv8vATp4VynrtewZPWvaa5ia1EzKKMD4MKjz5QP?=
 =?us-ascii?Q?KANL1+R5DxcueYtB/s17bV5PvcFNnaUGSKdP9LLHgLnrQn5Iq4CUdKewz7ne?=
 =?us-ascii?Q?XLk73blIFTnhjBBANf6kgUtOsdQsZZDgs3Wn+i1rPcWFd0YI+Dp0dAHotViv?=
 =?us-ascii?Q?SyLRl+Mg3D1jKm91SWNY2kean+FsNBLiDvn62Oe12H2nc0BDQZulBHYpv2Wl?=
 =?us-ascii?Q?ONm8wkpINXfeY5K4fqrrM7dkJND2rfU/FWLPbUWvxnpG6fQFmj234bOMFIvU?=
 =?us-ascii?Q?IkuvyvRPqXCKT5KIssOQKxEdvf5KNDhhSu3SJRvFmyHesAbfs6q8kYcQC474?=
 =?us-ascii?Q?sdEu2MpiN2DD+L0SUXdgJTrPWY4tuZQ5nP7utwNJVdmVoVpz+K6gWqID3yVG?=
 =?us-ascii?Q?ufbH5dLGrn2ntHHjm5eeL/hI1+s2st0rFlYYkFS1hJGsHlAjKTNstZh40ilx?=
 =?us-ascii?Q?ecGaIBIVjip5kCQRsJnmW2PnAR/if8PgJ9P7c8sra1IoRpOv2rY3C3Pd/bCH?=
 =?us-ascii?Q?9lRWpAlCE7NCQwr1zw6HEKX6eMl3wEmQSXXJOd43FDCp9Eqwum2symHdxw3o?=
 =?us-ascii?Q?lrsIXB1XuJV0Ky/6x0a0L4ARu1ytkzGwamXTsDxt58mFq2HhSAN1U0hyd9UY?=
 =?us-ascii?Q?jvLLkCsl6E0T1TQ15h5mp3dzDjiG5qS4WcDS4Jfchwmb1RvW0wBiZj4mUu4E?=
 =?us-ascii?Q?m9yUfO1ejJGd0oazIsZtnm8PYonAdiLchzZfb2GUyLpbpjQuAGwuD9lRd8fr?=
 =?us-ascii?Q?Kwd6jLMOKCvyup1u39glESW1CX6sS9nOAJlJnbWACyx0rq5zTR1Fbiux+be2?=
 =?us-ascii?Q?/WI0dDgW1SHOXph5HsP5zSezIQp3CjyZcMHQheDvCA+GOzwR88nZcl7Wofdx?=
 =?us-ascii?Q?razP7RDB4o/v5va+7xRgKLIPds5bnftn3hWNiNHTkswjp7Fj/iKmSwBuGTne?=
 =?us-ascii?Q?iyP9Lzo7Ww+PtsTySJZLdRkadmrmKaFGHr0EwX1ykgpK9M6tBNb21ibVymxp?=
 =?us-ascii?Q?gDL15SYCk1hVCPu0X8e64TMYud0/v+i0r3LBYZW1Kw6Li8e3oiV1MVOaXi/0?=
 =?us-ascii?Q?yA1n8dohzmWcQlVf3kbz8hWODD/E0oww4Lp22pGaL5GjxEkiLg8cHWDbkbej?=
 =?us-ascii?Q?wxY7fQInyZiRST/7ZGB4EL8fOr8rYkXABtCo2hDCGANl76FhH3NxkMXHvTZr?=
 =?us-ascii?Q?651Awu1aD/+aICusUaVhh941P6lBz11/0FfYhUsSqPew?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ba7f00b3-2586-4aab-b57d-08dade94d0d4
X-MS-Exchange-CrossTenant-AuthSource: DM8PR12MB5413.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2022 12:06:38.0546
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5VseP1TbPkVW7ayMdlZRKHXXLljXh7xJH9eXJWQckmSu097CGACJNFwZ6c2tHqj9dJ4wabmK3HWESP1wvwSrKw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4533
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        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
        autolearn=no 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--LSp9OVivsvvQ9GYN
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Dec 15, 2022 at 01:07:35AM +0300, Serge Semin wrote:
> On Wed, Dec 14, 2022 at 03:37:35PM +0100, Thierry Reding wrote:
> > On Wed, Dec 14, 2022 at 02:36:49AM +0300, Serge Semin wrote:
> > > On Tue, Dec 13, 2022 at 02:07:33PM -0600, Bjorn Helgaas wrote:
> > > > On Tue, Dec 13, 2022 at 01:53:13PM -0600, Bjorn Helgaas wrote:
> > > > > On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote:
> > > > > > On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> > > > > > > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > > > > > > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell =
wrote:
> > > > > > > > > Hi all,
> > > > > > > > >=20
> > > > > > > > > Today's linux-next merge of the pci tree got a conflict i=
n:
> > > > > > > > >=20
> > > > > > > > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > > > > > > >=20
> > > > > > > > > between commit:
> > > > > > > > >=20
> > > > > > > > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM sup=
port")
> > > > > > > > >=20
> > > > > > > > > from the arm-soc tree and commit:
> > > > > > > > >=20
> > > > > > > > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names=
 common properties")
> > > > > > > > >=20
> > > > > > > > > from the pci tree.
> > > > > > > > >=20
> > > > > > > > > I didn't know how to fix this up, so I just used the latt=
er (and so lost
> > > > > > > > > the addition of "ecam").
> > > > > > > >=20
> > > > > > > > Did I miss a suggested resolution for this?
> > > > > >=20
> > > > > > > We had a brief discussion about this in another thread. So ba=
sically
> > > > > > > Stephen's resolution is fine here and the plan is to instead =
add the
> > > > > > > ECAM bits that the Tegra patch does in a separate patch on to=
p of
> > > > > > > Serge's patch. I should get around to sending that patch tomo=
rrow.
> > > > > >=20
> > > > > > Actually the discussion still goes. I haven't got a respond to =
my
> > > > > > last suggestion which seems to me more reasonable than extendin=
g the
> > > > > > DT-bindings with another vendor-specific reg-name. @Bjorn, plea=
se join
> > > > > > the discussion here:
> > > > > > https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonat=
hanh@nvidia.com/
> > > > >=20
> > >=20
> > > > > Sorry, it's really too late for discussion.  I need to send the v=
6.2
> > > > > pull request today or at the very latest, tomorrow, so the only t=
hing
> > > > > to decide is how to resolve the merge conflict in the simplest
> > > > > possible way.  Unless there's a very compelling reason to resolve=
 it
> > > > > differently than Stephen did, that's going to be the answer.
> > >=20
> > > Sigh... One more redundant vendor-specific name. I wish I was in the
> > > Cc-list of the original series.
> > >=20
> > > >=20
> > > > To be more specific, the current answer is this (which is the same =
as
> > > > what's in next-20221213):
> > > >=20
> > > >   https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree=
/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml?id=3Df64171fdd171
> > >=20
> > > Thanks. I've got it from the @Stephen message. @Thierry will submit a
> > > new patch with the same 'ecam'-names change rebased on top of the
> > > updated DT-schema.
> >=20
>=20
> > If Rob doesn't mind this being broken in linux-next for a few more days,
> > I can discuss this internally with our PCI and UEFI teams and find out
> > if your proposal could be made to work.
>=20
> That would be awesome if you managed to work with the already defined
> 'config' reg-name so the DT-schema would look a bit cleaner. Thanks
> in advance.

Looks like Linus has now pulled this in and resolved the conflict
himself. I think there is some benefit in "ecam" being more specific
than "config" and with ECAM being a PCIe standard mapping, it doesn't
seem like it's worth overcomplicating things by overloading the meaning
of "config".

Thierry

--LSp9OVivsvvQ9GYN
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmObDcMACgkQ3SOs138+
s6HdDBAAgn9ECxpC+S2bftxloqfL+QXcJy0O6lFSiTHUT7bHM7RcWw6mJPcno2X9
dCthjOygQSyiwuatyksQ0Z4MuYeVbWIZffaWNeMh4jV3MEt4olVJS7Nmg0Uy3QnE
Jrl7/jyQluG6j4kRDtcRekGQDUXmLd3FPX8MEEhFlUg4FpgsjhgOCNMJ3piaQbFo
LBglfBPPFnfg2aaUu0//fNo9V9cACQoj4XTmE2pmA8n4HHVLlpbdUXZR5YQMYbcf
5BwZ02J2NvVrWZX5zKjuohMkNuFTOaYfUts33/kuCv+fhQgGBPxwPEiOf21HJyVw
KKTmFga7WRBa6BgYsV/uYXis2ZeR1FEhJ5AArQukKvF5rFGJ4VwUZfs8osxOY0X3
KMOE9f6jiWI1cjp1r/E3bS9Zuyt1eTds8ZvGrKth1LTXPKgv+34VxmM7wfUyA8QO
TJev0KT6NDYqd//RUZ6pj9SFADltcDZpsfiSrGYvR2a/Mx83wxoL3I1xHpCKKlK1
RLfPvLWOMRmsSFIYSVpCDxQ0Gag6Si53EW/Tw+5ilZjmGuHQxzrADxZSB4JFf+ji
yZlONa81gcfghSiveF7uvjOltlnarOwfQqBpO8f7lWSmC/Sj+qq+/xCTlguKormb
+zINTJmewBVv+2Vr41iSxPecVzJ9K6fvny39aAqO5mRMRK6UVtg=
=nbiA
-----END PGP SIGNATURE-----

--LSp9OVivsvvQ9GYN--