From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) (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 BA8D01DFED; Sun, 5 May 2024 16:38:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714927107; cv=none; b=ievTbJCFLjAuaORt1Swjb16fjY0ijP5RH30xzPinVAyHz7KHcfjXZqWBKcVJIkfUQN9xlyk+Fhm9aRIjJtZR5PElVPTq7LphvKXQoy/4niMk5CoBXjO0nQNBZjRfsU+xupXlasw1+aJhOCpfTLB077x4kpdIAe5yXgxoBxXeNHQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714927107; c=relaxed/simple; bh=+xOR+0GX3YwzMPsUnWygOmvVOIUlJnwfc2+rsVX2hA0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=ZpqmndoQvhnyjlr0eKO3cU985mTowPRa1bN1F+Hf8gLE7ET/yDDXAQ4fE6NLL2NtNzrPMuU8dTQvOqRgMbMYWO2RpbsTDMW+tc7Ke3wXaBFncjTl0i/klZlZLXb1tyfIHvAhYSF+wS9dRieJswotq49OZyeeUnIHbHePlhjSvs0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=LAXSVRlI; arc=none smtp.client-ip=217.70.183.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="LAXSVRlI" Received: by mail.gandi.net (Postfix) with ESMTPSA id E201140008; Sun, 5 May 2024 16:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1714927097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2cdjuqsEJ8kja5JmwM2ue6CnHi+bPlWRpdtthK0+QAg=; b=LAXSVRlI687CHT8QKZZk4hTxF16H22fVxnJiIPsw6aCuyzcepB0P3HiHrYD1l3wBirJ1qj Hw+7TV4hdMbEFcPZH3pYJcCjBypUTsOc1sncS/2ONlyWmskDEjNdxhIrts7orgIbW4/zrz ze637xqW7iKbBoe2r1yeNc0HsmKRJO18ojL/H0dX2gt9vKAJx1A7LzrwoiN8va/5Ar4ypv PUD6dtmYgaObb3E5THHBdsTIoJo22mK1G5ZeQYnGeeYTIuFcT+/n+o16hC2hYs+OdSEn1W ifWLrtU782tSLX+qMChxRNaQ1ClbGaBlanonLV4UH0mH56yeRjC84n7yAmvbkw== From: Gregory CLEMENT To: Ilpo =?utf-8?Q?J=C3=A4rvinen?= , linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Andrew Lunn , Sebastian Hesselbarth , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ilpo =?utf-8?Q?J=C3=A4rvinen?= Subject: Re: [PATCH 01/10] ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of the way In-Reply-To: <20240429104633.11060-2-ilpo.jarvinen@linux.intel.com> References: <20240429104633.11060-1-ilpo.jarvinen@linux.intel.com> <20240429104633.11060-2-ilpo.jarvinen@linux.intel.com> Date: Sun, 05 May 2024 18:38:14 +0200 Message-ID: <87seywnrih.fsf@BLaptop.bootlin.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: gregory.clement@bootlin.com Ilpo J=C3=A4rvinen writes: > orion5x defines PCI_CONF_REG() and PCI_CONF_FUNC() that are problematic > because PCI core is going to introduce defines with the same names. > > Add ORION5X prefix to those defines to avoid name conflicts. > > Note: as this is part of series that replaces the code in question > anyway, only bare minimum renaming is done and other similarly named > macros are not touched. > > Signed-off-by: Ilpo J=C3=A4rvinen Acked-by: Gregory CLEMENT As some other patches of the series depend on patches in the PCIe subsystem, the best approach would be to let you apply the series through the PCIe subsystem. Thanks, Gregory > --- > arch/arm/mach-orion5x/pci.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c > index 3313bc5a63ea..77ddab90f448 100644 > --- a/arch/arm/mach-orion5x/pci.c > +++ b/arch/arm/mach-orion5x/pci.c > @@ -219,8 +219,8 @@ static int __init pcie_setup(struct pci_sys_data *sys) > /* > * PCI_CONF_ADDR bits > */ > -#define PCI_CONF_REG(reg) ((reg) & 0xfc) > -#define PCI_CONF_FUNC(func) (((func) & 0x3) << 8) > +#define ORION5X_PCI_CONF_REG(reg) ((reg) & 0xfc) > +#define ORION5X_PCI_CONF_FUNC(func) (((func) & 0x3) << 8) > #define PCI_CONF_DEV(dev) (((dev) & 0x1f) << 11) > #define PCI_CONF_BUS(bus) (((bus) & 0xff) << 16) > #define PCI_CONF_ADDR_EN (1 << 31) > @@ -277,8 +277,8 @@ static int orion5x_pci_hw_rd_conf(int bus, int dev, u= 32 func, > spin_lock_irqsave(&orion5x_pci_lock, flags); >=20=20 > writel(PCI_CONF_BUS(bus) | > - PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | > - PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); > + PCI_CONF_DEV(dev) | ORION5X_PCI_CONF_REG(where) | > + ORION5X_PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); >=20=20 > *val =3D readl(PCI_CONF_DATA); >=20=20 > @@ -301,8 +301,8 @@ static int orion5x_pci_hw_wr_conf(int bus, int dev, u= 32 func, > spin_lock_irqsave(&orion5x_pci_lock, flags); >=20=20 > writel(PCI_CONF_BUS(bus) | > - PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | > - PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); > + PCI_CONF_DEV(dev) | ORION5X_PCI_CONF_REG(where) | > + ORION5X_PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); >=20=20 > if (size =3D=3D 4) { > __raw_writel(val, PCI_CONF_DATA); > --=20 > 2.39.2 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9BBFCC4345F for ; Sun, 5 May 2024 16:38:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=z/di8+tlrPWYxPBb8JKPBjZoigvPGHjKnxCh2KJqjzQ=; b=i3AZntDllCstPz 95FtvBKy+FuHDB6UiTxHqu8eWo2AMn7/BGlftDsuiMLRqjYWELnpzvt4yq8TUL8SWG+mWbVPcMc5L GnBKrvGf/5dmLy6hazF2H+cLGT/wMQWROYbnbGNXPXxZfHY6lDtUK4Vf9aLSVC24DMIjqpcv1Abvi pHNocZQ5t4Y9cvH9EewRFGaEnlfHlWJSwMhr21w3/leUy+u0CMBOJDHu/BJJewZumXM+UTe8VLm1L 1wi9aqCHs34BETyUOVwFF1rNVHTdMNYvWnYpPWi9LNz1KDU3GLuVwBaUAIkGVC+y/+0aLwhSixSeE yLC1E+6pUh3Y8jFmJItg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s3ese-00000004onH-0FCP; Sun, 05 May 2024 16:38:28 +0000 Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s3esZ-00000004omK-3H1Y for linux-arm-kernel@lists.infradead.org; Sun, 05 May 2024 16:38:25 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id E201140008; Sun, 5 May 2024 16:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1714927097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2cdjuqsEJ8kja5JmwM2ue6CnHi+bPlWRpdtthK0+QAg=; b=LAXSVRlI687CHT8QKZZk4hTxF16H22fVxnJiIPsw6aCuyzcepB0P3HiHrYD1l3wBirJ1qj Hw+7TV4hdMbEFcPZH3pYJcCjBypUTsOc1sncS/2ONlyWmskDEjNdxhIrts7orgIbW4/zrz ze637xqW7iKbBoe2r1yeNc0HsmKRJO18ojL/H0dX2gt9vKAJx1A7LzrwoiN8va/5Ar4ypv PUD6dtmYgaObb3E5THHBdsTIoJo22mK1G5ZeQYnGeeYTIuFcT+/n+o16hC2hYs+OdSEn1W ifWLrtU782tSLX+qMChxRNaQ1ClbGaBlanonLV4UH0mH56yeRjC84n7yAmvbkw== From: Gregory CLEMENT To: Ilpo =?utf-8?Q?J=C3=A4rvinen?= , linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Andrew Lunn , Sebastian Hesselbarth , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ilpo =?utf-8?Q?J=C3=A4rvinen?= Subject: Re: [PATCH 01/10] ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of the way In-Reply-To: <20240429104633.11060-2-ilpo.jarvinen@linux.intel.com> References: <20240429104633.11060-1-ilpo.jarvinen@linux.intel.com> <20240429104633.11060-2-ilpo.jarvinen@linux.intel.com> Date: Sun, 05 May 2024 18:38:14 +0200 Message-ID: <87seywnrih.fsf@BLaptop.bootlin.com> MIME-Version: 1.0 X-GND-Sasl: gregory.clement@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240505_093824_387600_3C486334 X-CRM114-Status: GOOD ( 15.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SWxwbyBKw6RydmluZW4gPGlscG8uamFydmluZW5AbGludXguaW50ZWwuY29tPiB3cml0ZXM6Cgo+ IG9yaW9uNXggZGVmaW5lcyBQQ0lfQ09ORl9SRUcoKSBhbmQgUENJX0NPTkZfRlVOQygpIHRoYXQg YXJlIHByb2JsZW1hdGljCj4gYmVjYXVzZSBQQ0kgY29yZSBpcyBnb2luZyB0byBpbnRyb2R1Y2Ug ZGVmaW5lcyB3aXRoIHRoZSBzYW1lIG5hbWVzLgo+Cj4gQWRkIE9SSU9ONVggcHJlZml4IHRvIHRo b3NlIGRlZmluZXMgdG8gYXZvaWQgbmFtZSBjb25mbGljdHMuCj4KPiBOb3RlOiBhcyB0aGlzIGlz IHBhcnQgb2Ygc2VyaWVzIHRoYXQgcmVwbGFjZXMgdGhlIGNvZGUgaW4gcXVlc3Rpb24KPiBhbnl3 YXksIG9ubHkgYmFyZSBtaW5pbXVtIHJlbmFtaW5nIGlzIGRvbmUgYW5kIG90aGVyIHNpbWlsYXJs eSBuYW1lZAo+IG1hY3JvcyBhcmUgbm90IHRvdWNoZWQuCj4KPiBTaWduZWQtb2ZmLWJ5OiBJbHBv IErDpHJ2aW5lbiA8aWxwby5qYXJ2aW5lbkBsaW51eC5pbnRlbC5jb20+CgpBY2tlZC1ieTogR3Jl Z29yeSBDTEVNRU5UIDxncmVnb3J5LmNsZW1lbnRAYm9vdGxpbi5jb20+CgpBcyBzb21lIG90aGVy IHBhdGNoZXMgb2YgdGhlIHNlcmllcyBkZXBlbmQgb24gcGF0Y2hlcyBpbiB0aGUgUENJZQpzdWJz eXN0ZW0sIHRoZSBiZXN0IGFwcHJvYWNoIHdvdWxkIGJlIHRvIGxldCB5b3UgYXBwbHkgdGhlIHNl cmllcwp0aHJvdWdoIHRoZSBQQ0llIHN1YnN5c3RlbS4KClRoYW5rcywKCkdyZWdvcnkKPiAtLS0K PiAgYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3BjaS5jIHwgMTIgKysrKysrLS0tLS0tCj4gIDEgZmls ZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0 IGEvYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3BjaS5jIGIvYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3Bj aS5jCj4gaW5kZXggMzMxM2JjNWE2M2VhLi43N2RkYWI5MGY0NDggMTAwNjQ0Cj4gLS0tIGEvYXJj aC9hcm0vbWFjaC1vcmlvbjV4L3BjaS5jCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3Bj aS5jCj4gQEAgLTIxOSw4ICsyMTksOCBAQCBzdGF0aWMgaW50IF9faW5pdCBwY2llX3NldHVwKHN0 cnVjdCBwY2lfc3lzX2RhdGEgKnN5cykKPiAgLyoKPiAgICogUENJX0NPTkZfQUREUiBiaXRzCj4g ICAqLwo+IC0jZGVmaW5lIFBDSV9DT05GX1JFRyhyZWcpCQkoKHJlZykgJiAweGZjKQo+IC0jZGVm aW5lIFBDSV9DT05GX0ZVTkMoZnVuYykJCSgoKGZ1bmMpICYgMHgzKSA8PCA4KQo+ICsjZGVmaW5l IE9SSU9ONVhfUENJX0NPTkZfUkVHKHJlZykJKChyZWcpICYgMHhmYykKPiArI2RlZmluZSBPUklP TjVYX1BDSV9DT05GX0ZVTkMoZnVuYykJKCgoZnVuYykgJiAweDMpIDw8IDgpCj4gICNkZWZpbmUg UENJX0NPTkZfREVWKGRldikJCSgoKGRldikgJiAweDFmKSA8PCAxMSkKPiAgI2RlZmluZSBQQ0lf Q09ORl9CVVMoYnVzKQkJKCgoYnVzKSAmIDB4ZmYpIDw8IDE2KQo+ICAjZGVmaW5lIFBDSV9DT05G X0FERFJfRU4JCSgxIDw8IDMxKQo+IEBAIC0yNzcsOCArMjc3LDggQEAgc3RhdGljIGludCBvcmlv bjV4X3BjaV9od19yZF9jb25mKGludCBidXMsIGludCBkZXYsIHUzMiBmdW5jLAo+ICAJc3Bpbl9s b2NrX2lycXNhdmUoJm9yaW9uNXhfcGNpX2xvY2ssIGZsYWdzKTsKPiAgCj4gIAl3cml0ZWwoUENJ X0NPTkZfQlVTKGJ1cykgfAo+IC0JCVBDSV9DT05GX0RFVihkZXYpIHwgUENJX0NPTkZfUkVHKHdo ZXJlKSB8Cj4gLQkJUENJX0NPTkZfRlVOQyhmdW5jKSB8IFBDSV9DT05GX0FERFJfRU4sIFBDSV9D T05GX0FERFIpOwo+ICsJCVBDSV9DT05GX0RFVihkZXYpIHwgT1JJT041WF9QQ0lfQ09ORl9SRUco d2hlcmUpIHwKPiArCQlPUklPTjVYX1BDSV9DT05GX0ZVTkMoZnVuYykgfCBQQ0lfQ09ORl9BRERS X0VOLCBQQ0lfQ09ORl9BRERSKTsKPiAgCj4gIAkqdmFsID0gcmVhZGwoUENJX0NPTkZfREFUQSk7 Cj4gIAo+IEBAIC0zMDEsOCArMzAxLDggQEAgc3RhdGljIGludCBvcmlvbjV4X3BjaV9od193cl9j b25mKGludCBidXMsIGludCBkZXYsIHUzMiBmdW5jLAo+ICAJc3Bpbl9sb2NrX2lycXNhdmUoJm9y aW9uNXhfcGNpX2xvY2ssIGZsYWdzKTsKPiAgCj4gIAl3cml0ZWwoUENJX0NPTkZfQlVTKGJ1cykg fAo+IC0JCVBDSV9DT05GX0RFVihkZXYpIHwgUENJX0NPTkZfUkVHKHdoZXJlKSB8Cj4gLQkJUENJ X0NPTkZfRlVOQyhmdW5jKSB8IFBDSV9DT05GX0FERFJfRU4sIFBDSV9DT05GX0FERFIpOwo+ICsJ CVBDSV9DT05GX0RFVihkZXYpIHwgT1JJT041WF9QQ0lfQ09ORl9SRUcod2hlcmUpIHwKPiArCQlP UklPTjVYX1BDSV9DT05GX0ZVTkMoZnVuYykgfCBQQ0lfQ09ORl9BRERSX0VOLCBQQ0lfQ09ORl9B RERSKTsKPiAgCj4gIAlpZiAoc2l6ZSA9PSA0KSB7Cj4gIAkJX19yYXdfd3JpdGVsKHZhbCwgUENJ X0NPTkZfREFUQSk7Cj4gLS0gCj4gMi4zOS4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1h cm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcv bWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==