From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) (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 CC11E1E507; Sun, 5 May 2024 16:39:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.193 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714927147; cv=none; b=hGpzdvHKMvi+jBGQtl35zKtKYJRPzA1aDq1Mwbkii9DXK1qGFR/Mo5TMk4SYmGeeFGkTOGKPQgPNdv1MX/LPPI1ZB0MA1BLoqC8N3CusHj+QuYv7JpmE0rp1e6URUAHnJA+dFepJLT6LE+eEkICpJWMKRpzdlyYS/McfT6yOsbY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714927147; c=relaxed/simple; bh=mGMR3zbRHo7GcNNXrdN7F6LIT0kaOYWv3hS7+obaE1Y=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=XKFnQ1ini6Cs+SNpDsCFZtJUmEu+Xq887Q9TZOzPDnuL3xcBkpndLNr/lQeJct/1HkdWMA1DuOu8QnWPEa69kpLacjS7DK6iqdYq2CD6hb40L9H0s11lS96n/eoeL8LK8/FrIyCAQNpOl01+ARqsHTaQOMY6s/Vlal94staWJKY= 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=BLM6gx56; arc=none smtp.client-ip=217.70.183.193 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="BLM6gx56" Received: by mail.gandi.net (Postfix) with ESMTPSA id 5F375240003; Sun, 5 May 2024 16:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1714927143; 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=ZA0lJB0aUxCAoUAUeihK7wWJnfv9ZZF1p31PdCbAD+0=; b=BLM6gx560wnKO+IIUvfRT5Y5t3Jt6rBKIhk0Zf4ssRNgCRT0at1YPUy0TIqyHVxUfvuIjq Oiyn+VdtgdyOwWuZrABlpM8RIjTUVEp5D2YYlVr3562FYCLeVM8W3YNkyqx9s2aPh7ReZc jiU/4sB8PmFIDshLuGS2NfqywT+d1p+vE8BJ+qSLCN5p2rRm16G4Blk3bUXjc20wkfzcKn 0Msth0i9K0jnB1RDTUgq51ZyhGQ6JA6cnhcKvQ4yRaoRs36f4+mBNbmTXi7D8ZMoebgAZk 0AXBsd23AlCJ32zLOpGR/90cQo+0LRT+BOleE829XsXyT0fw9Jh4FHruBb4t7g== 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 04/10] ARM: orion5x: Use generic PCI Conf Type 1 helper In-Reply-To: <20240429104633.11060-5-ilpo.jarvinen@linux.intel.com> References: <20240429104633.11060-1-ilpo.jarvinen@linux.intel.com> <20240429104633.11060-5-ilpo.jarvinen@linux.intel.com> Date: Sun, 05 May 2024 18:39:00 +0200 Message-ID: <87msp4nrh7.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: > Convert orion5x PCI code to use pci_conf1_ext_addr() from PCI core to > calculate PCI Configuration Type 1 address. > > 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 | 17 ++--------------- > 1 file changed, 2 insertions(+), 15 deletions(-) > > diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c > index 6376e1db6386..8b7d67549adf 100644 > --- a/arch/arm/mach-orion5x/pci.c > +++ b/arch/arm/mach-orion5x/pci.c > @@ -216,15 +216,6 @@ static int __init pcie_setup(struct pci_sys_data *sy= s) > #define PCI_P2P_DEV_OFFS 24 > #define PCI_P2P_DEV_MASK (0x1f << PCI_P2P_DEV_OFFS) >=20=20 > -/* > - * PCI_CONF_ADDR bits > - */ > -#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) > - > /* > * Internal configuration space > */ > @@ -276,9 +267,7 @@ static int orion5x_pci_hw_rd_conf(int bus, u8 devfn, = u32 where, > unsigned long flags; > spin_lock_irqsave(&orion5x_pci_lock, flags); >=20=20 > - writel(PCI_CONF_BUS(bus) | > - PCI_CONF_DEV(PCI_SLOT(devfn)) | ORION5X_PCI_CONF_REG(where) | > - ORION5X_PCI_CONF_FUNC(PCI_FUNC(devfn)) | PCI_CONF_ADDR_EN, PCI_CONF_AD= DR); > + writel(pci_conf1_addr(bus, devfn, where, true), PCI_CONF_ADDR); >=20=20 > *val =3D readl(PCI_CONF_DATA); >=20=20 > @@ -300,9 +289,7 @@ static int orion5x_pci_hw_wr_conf(int bus, u8 devfn, = u32 where, >=20=20 > spin_lock_irqsave(&orion5x_pci_lock, flags); >=20=20 > - writel(PCI_CONF_BUS(bus) | > - PCI_CONF_DEV(PCI_SLOT(devfn)) | ORION5X_PCI_CONF_REG(where) | > - ORION5X_PCI_CONF_FUNC(PCI_FUNC(devfn)) | PCI_CONF_ADDR_EN, PCI_CONF_AD= DR); > + writel(pci_conf1_addr(bus, devfn, where, true), 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 08240C4345F for ; Sun, 5 May 2024 16:39:25 +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=hggCxF5Fxdi+US+lgmLA/4+qJz9upC+yWU5bQ9aM0oY=; b=J8Ob+qqikiQdnm BE5yXjmTRmUIR8ydj2Sv5mJ8N+lLcz+P+JC9xK3CR2yJWW+bCNZF1EMGTgwxtl+iZWOdf6PU1fjmf OAmPwxRSijj/PsuFVWRnz8ctfhN7Uvy/pPBe3D4WGQ1agRe5JUnCFontGJqI/a9JNwvvgN9QAHoj3 kY6/mYsE/wK8yEFr/IZpqt31gnYSGK+EgjZMPCzuqSDG57ipznMEoJn1ajdYVZiMPnNgPGC+7tyLS 0zsmRxs7K1Xwv0YttZIHNgE+/SUatvx9W97nZZa02IXDV2tJmvPH3Uek9HDC6vMP+9UoUxMBC+GUf UBkEeCayu7PReGONKvZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s3etI-00000004ozY-1YQ0; Sun, 05 May 2024 16:39:08 +0000 Received: from relay1-d.mail.gandi.net ([217.70.183.193]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s3etE-00000004oxu-3Xsk for linux-arm-kernel@lists.infradead.org; Sun, 05 May 2024 16:39:06 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id 5F375240003; Sun, 5 May 2024 16:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1714927143; 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=ZA0lJB0aUxCAoUAUeihK7wWJnfv9ZZF1p31PdCbAD+0=; b=BLM6gx560wnKO+IIUvfRT5Y5t3Jt6rBKIhk0Zf4ssRNgCRT0at1YPUy0TIqyHVxUfvuIjq Oiyn+VdtgdyOwWuZrABlpM8RIjTUVEp5D2YYlVr3562FYCLeVM8W3YNkyqx9s2aPh7ReZc jiU/4sB8PmFIDshLuGS2NfqywT+d1p+vE8BJ+qSLCN5p2rRm16G4Blk3bUXjc20wkfzcKn 0Msth0i9K0jnB1RDTUgq51ZyhGQ6JA6cnhcKvQ4yRaoRs36f4+mBNbmTXi7D8ZMoebgAZk 0AXBsd23AlCJ32zLOpGR/90cQo+0LRT+BOleE829XsXyT0fw9Jh4FHruBb4t7g== 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 04/10] ARM: orion5x: Use generic PCI Conf Type 1 helper In-Reply-To: <20240429104633.11060-5-ilpo.jarvinen@linux.intel.com> References: <20240429104633.11060-1-ilpo.jarvinen@linux.intel.com> <20240429104633.11060-5-ilpo.jarvinen@linux.intel.com> Date: Sun, 05 May 2024 18:39:00 +0200 Message-ID: <87msp4nrh7.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_093905_176119_60CDD2FC X-CRM114-Status: GOOD ( 12.80 ) 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+ IENvbnZlcnQgb3Jpb241eCBQQ0kgY29kZSB0byB1c2UgcGNpX2NvbmYxX2V4dF9hZGRyKCkgZnJv bSBQQ0kgY29yZSB0bwo+IGNhbGN1bGF0ZSBQQ0kgQ29uZmlndXJhdGlvbiBUeXBlIDEgYWRkcmVz cy4KPgo+IFNpZ25lZC1vZmYtYnk6IElscG8gSsOkcnZpbmVuIDxpbHBvLmphcnZpbmVuQGxpbnV4 LmludGVsLmNvbT4KCkFja2VkLWJ5OiBHcmVnb3J5IENMRU1FTlQgPGdyZWdvcnkuY2xlbWVudEBi b290bGluLmNvbT4KCkFzIHNvbWUgb3RoZXIgcGF0Y2hlcyBvZiB0aGUgc2VyaWVzIGRlcGVuZCBv biBwYXRjaGVzIGluIHRoZSBQQ0llCnN1YnN5c3RlbSwgdGhlIGJlc3QgYXBwcm9hY2ggd291bGQg YmUgdG8gbGV0IHlvdSBhcHBseSB0aGUgc2VyaWVzCnRocm91Z2ggdGhlIFBDSWUgc3Vic3lzdGVt LgoKVGhhbmtzLAoKR3JlZ29yeQoKPiAtLS0KPiAgYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3BjaS5j IHwgMTcgKystLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygr KSwgMTUgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1vcmlvbjV4 L3BjaS5jIGIvYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3BjaS5jCj4gaW5kZXggNjM3NmUxZGI2Mzg2 Li44YjdkNjc1NDlhZGYgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3BjaS5j Cj4gKysrIGIvYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3BjaS5jCj4gQEAgLTIxNiwxNSArMjE2LDYg QEAgc3RhdGljIGludCBfX2luaXQgcGNpZV9zZXR1cChzdHJ1Y3QgcGNpX3N5c19kYXRhICpzeXMp Cj4gICNkZWZpbmUgUENJX1AyUF9ERVZfT0ZGUwkJMjQKPiAgI2RlZmluZSBQQ0lfUDJQX0RFVl9N QVNLCQkoMHgxZiA8PCBQQ0lfUDJQX0RFVl9PRkZTKQo+ICAKPiAtLyoKPiAtICogUENJX0NPTkZf QUREUiBiaXRzCj4gLSAqLwo+IC0jZGVmaW5lIE9SSU9ONVhfUENJX0NPTkZfUkVHKHJlZykJKChy ZWcpICYgMHhmYykKPiAtI2RlZmluZSBPUklPTjVYX1BDSV9DT05GX0ZVTkMoZnVuYykJKCgoZnVu YykgJiAweDMpIDw8IDgpCj4gLSNkZWZpbmUgUENJX0NPTkZfREVWKGRldikJCSgoKGRldikgJiAw eDFmKSA8PCAxMSkKPiAtI2RlZmluZSBQQ0lfQ09ORl9CVVMoYnVzKQkJKCgoYnVzKSAmIDB4ZmYp IDw8IDE2KQo+IC0jZGVmaW5lIFBDSV9DT05GX0FERFJfRU4JCSgxIDw8IDMxKQo+IC0KPiAgLyoK PiAgICogSW50ZXJuYWwgY29uZmlndXJhdGlvbiBzcGFjZQo+ICAgKi8KPiBAQCAtMjc2LDkgKzI2 Nyw3IEBAIHN0YXRpYyBpbnQgb3Jpb241eF9wY2lfaHdfcmRfY29uZihpbnQgYnVzLCB1OCBkZXZm biwgdTMyIHdoZXJlLAo+ICAJdW5zaWduZWQgbG9uZyBmbGFnczsKPiAgCXNwaW5fbG9ja19pcnFz YXZlKCZvcmlvbjV4X3BjaV9sb2NrLCBmbGFncyk7Cj4gIAo+IC0Jd3JpdGVsKFBDSV9DT05GX0JV UyhidXMpIHwKPiAtCQlQQ0lfQ09ORl9ERVYoUENJX1NMT1QoZGV2Zm4pKSB8IE9SSU9ONVhfUENJ X0NPTkZfUkVHKHdoZXJlKSB8Cj4gLQkJT1JJT041WF9QQ0lfQ09ORl9GVU5DKFBDSV9GVU5DKGRl dmZuKSkgfCBQQ0lfQ09ORl9BRERSX0VOLCBQQ0lfQ09ORl9BRERSKTsKPiArCXdyaXRlbChwY2lf Y29uZjFfYWRkcihidXMsIGRldmZuLCB3aGVyZSwgdHJ1ZSksIFBDSV9DT05GX0FERFIpOwo+ICAK PiAgCSp2YWwgPSByZWFkbChQQ0lfQ09ORl9EQVRBKTsKPiAgCj4gQEAgLTMwMCw5ICsyODksNyBA QCBzdGF0aWMgaW50IG9yaW9uNXhfcGNpX2h3X3dyX2NvbmYoaW50IGJ1cywgdTggZGV2Zm4sIHUz MiB3aGVyZSwKPiAgCj4gIAlzcGluX2xvY2tfaXJxc2F2ZSgmb3Jpb241eF9wY2lfbG9jaywgZmxh Z3MpOwo+ICAKPiAtCXdyaXRlbChQQ0lfQ09ORl9CVVMoYnVzKSB8Cj4gLQkJUENJX0NPTkZfREVW KFBDSV9TTE9UKGRldmZuKSkgfCBPUklPTjVYX1BDSV9DT05GX1JFRyh3aGVyZSkgfAo+IC0JCU9S SU9ONVhfUENJX0NPTkZfRlVOQyhQQ0lfRlVOQyhkZXZmbikpIHwgUENJX0NPTkZfQUREUl9FTiwg UENJX0NPTkZfQUREUik7Cj4gKwl3cml0ZWwocGNpX2NvbmYxX2FkZHIoYnVzLCBkZXZmbiwgd2hl cmUsIHRydWUpLCBQQ0lfQ09ORl9BRERSKTsKPiAgCj4gIAlpZiAoc2l6ZSA9PSA0KSB7Cj4gIAkJ X19yYXdfd3JpdGVsKHZhbCwgUENJX0NPTkZfREFUQSk7Cj4gLS0gCj4gMi4zOS4yCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVs IG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDov L2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==