Skip to contentSkip to conversation

pci: pcie_fsl: add support for none PCIe devices

PATCH New Heiko Schocher 2 participants 6 messages Oct 9, 2019 – Oct 14, 2019 PCI

lore
Share & tools
lore
#0 lore raw

cover pci: pcie_fsl: add support for none PCIe devices

add support for devices with compatible property:
"fsl,mpc8540-pci". Unfortunately we can not change the property name, as already defined in linux.

This patch superseeds patch [1]:
http://patchwork.ozlabs.org/patch/1132418/

While working to integrate comments from Z.q. Hou to patch [1], I thought it may is the better idea, to use the already existing pcie_fsl driver and work in support for pci devices. Please comment!

If it is no good idea, I have also a v2 of [1] with the comments from Z.q. Hou worked in ready to post...

Travis build:
https://travis-ci.org/hsdenx/u-boot-test/builds/595057579
(sheevaplug fails, but this is on discussion on list)

Heiko Schocher (3):
pci: pcie_fsl: use pci_conv_size_to_32()
pci: pcie_fsl: reorder addr check function
pci: pcie_fsl: add support for "fsl,mpc8540-pci"

 drivers/pci/pcie_fsl.c | 68 +++++++++++++++++++-----------------------
 drivers/pci/pcie_fsl.h |  1 +
 2 files changed, 32 insertions(+), 37 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/3 pci: pcie_fsl: use pci_conv_size_to_32()

simplify read/write functions and use pci_conv_size_to_32().

---

 drivers/pci/pcie_fsl.c | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)
drivers/pci/pcie_fsl.c +2 -33
index ab25aeee73..ada6e12e2f 100644
@@ -58,21 +58,8 @@ static int fsl_pcie_read_config(struct udevice *bus, pci_dev_t bdf,
 	bdf = bdf - PCI_BDF(bus->seq, 0, 0);
 	val = bdf | (offset & 0xfc) | ((offset & 0xf00) << 16) | 0x80000000;
 	out_be32(&regs->cfg_addr, val);
-
 	sync();
-
-	switch (size) {
-	case PCI_SIZE_8:
-		*valuep = in_8((u8 *)&regs->cfg_data + (offset & 3));
-		break;
-	case PCI_SIZE_16:
-		*valuep = in_le16((u16 *)((u8 *)&regs->cfg_data +
-			  (offset & 2)));
-		break;
-	case PCI_SIZE_32:
-		*valuep = in_le32(&regs->cfg_data);
-		break;
-	}
+	*valuep = pci_conv_32_to_size(in_le32(&regs->cfg_data), offset, size);
 
 	return 0;
 }
@@ -84,9 +71,6 @@ static int fsl_pcie_write_config(struct udevice *bus, pci_dev_t bdf,
 	struct fsl_pcie *pcie = dev_get_priv(bus);
 	ccsr_fsl_pci_t *regs = pcie->regs;
 	u32 val;
-	u8 val_8;
-	u16 val_16;
-	u32 val_32;
 
 	if (fsl_pcie_addr_valid(pcie, bdf))
 		return 0;
@@ -94,23 +78,8 @@ static int fsl_pcie_write_config(struct udevice *bus, pci_dev_t bdf,
 	bdf = bdf - PCI_BDF(bus->seq, 0, 0);
 	val = bdf | (offset & 0xfc) | ((offset & 0xf00) << 16) | 0x80000000;
 	out_be32(&regs->cfg_addr, val);
-
 	sync();
-
-	switch (size) {
-	case PCI_SIZE_8:
-		val_8 = value;
-		out_8((u8 *)&regs->cfg_data + (offset & 3), val_8);
-		break;
-	case PCI_SIZE_16:
-		val_16 = value;
-		out_le16((u16 *)((u8 *)&regs->cfg_data + (offset & 2)), val_16);
-		break;
-	case PCI_SIZE_32:
-		val_32 = value;
-		out_le32(&regs->cfg_data, val_32);
-		break;
-	}
+	out_le32(&regs->cfg_data, pci_conv_size_to_32(0, value, offset, size));
 
 	return 0;
 }
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/3 pci: pcie_fsl: reorder addr check function

In reply to Heiko Schocher

reorder checks in fsl_pcie_addr_valid(). Check first stuff, we also can check when we use driver for PCI devices.

---

 drivers/pci/pcie_fsl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/pcie_fsl.c +3 -3
index ada6e12e2f..05b2522dac 100644
@@ -30,13 +30,13 @@ static int fsl_pcie_addr_valid(struct fsl_pcie *pcie, pci_dev_t bdf)
 	if (PCI_BUS(bdf) < bus->seq)
 		return -EINVAL;
 
-	if (PCI_BUS(bdf) > bus->seq && (!fsl_pcie_link_up(pcie) || pcie->mode))
+	if (PCI_BUS(bdf) == (bus->seq + 1) && (PCI_DEV(bdf) > 0))
 		return -EINVAL;
 
-	if (PCI_BUS(bdf) == bus->seq && (PCI_DEV(bdf) > 0 || PCI_FUNC(bdf) > 0))
+	if (PCI_BUS(bdf) > bus->seq && (!fsl_pcie_link_up(pcie) || pcie->mode))
 		return -EINVAL;
 
-	if (PCI_BUS(bdf) == (bus->seq + 1) && (PCI_DEV(bdf) > 0))
+	if (PCI_BUS(bdf) == bus->seq && (PCI_DEV(bdf) > 0 || PCI_FUNC(bdf) > 0))
 		return -EINVAL;
 
 	return 0;
Signature · 1 line
2.21.0
#3 lore raw

PATCH 3/3 pci: pcie_fsl: add support for "fsl, mpc8540-pci"

In reply to Heiko Schocher

add support for "fsl,mpc8540-pci":

- add flag "ispci" in struct fsl_pcie_data so we can code out differences to existing devices without breaking them

- changes if ispci is set:
- in fsl_pcie_addr_valid() check only common checks
- fsl_pcie_link_up( returns always 1
- in inbound setup, add flag PIWAR_MEM_2G
- set pcie->enabled always to 1

---

 drivers/pci/pcie_fsl.c | 27 ++++++++++++++++++++++++++-
 drivers/pci/pcie_fsl.h |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)
drivers/pci/pcie_fsl.c +26 -1
index 05b2522dac..3c207e761e 100644
@@ -23,6 +23,7 @@ static int fsl_pcie_link_up(struct fsl_pcie *pcie);
 static int fsl_pcie_addr_valid(struct fsl_pcie *pcie, pci_dev_t bdf)
 {
 	struct udevice *bus = pcie->bus;
+	struct fsl_pcie_data *info = pcie->info;
 
 	if (!pcie->enabled)
 		return -ENXIO;
@@ -33,6 +34,9 @@ static int fsl_pcie_addr_valid(struct fsl_pcie *pcie, pci_dev_t bdf)
 	if (PCI_BUS(bdf) == (bus->seq + 1) && (PCI_DEV(bdf) > 0))
 		return -EINVAL;
 
+	if (info->ispci)
+		return 0;
+
 	if (PCI_BUS(bdf) > bus->seq && (!fsl_pcie_link_up(pcie) || pcie->mode))
 		return -EINVAL;
 
@@ -161,9 +165,13 @@ static int fsl_pcie_hose_write_config_dword(struct fsl_pcie *pcie, uint offset,
 
 static int fsl_pcie_link_up(struct fsl_pcie *pcie)
 {
+	struct fsl_pcie_data *info = pcie->info;
 	ccsr_fsl_pci_t *regs = pcie->regs;
 	u16 ltssm;
 
+	if (info->ispci)
+		return 1;
+
 	if (pcie->block_rev >= PEX_IP_BLK_REV_3_0) {
 		ltssm = (in_be32(&regs->pex_csr0)
 			& PEX_CSR0_LTSSM_MASK) >> PEX_CSR0_LTSSM_SHIFT;
@@ -251,6 +259,7 @@ static int fsl_pcie_setup_inbound_win(struct fsl_pcie *pcie, int idx,
 				      bool pf, u64 phys, u64 bus_addr,
 				      pci_size_t size)
 {
+	struct fsl_pcie_data *info = pcie->info;
 	ccsr_fsl_pci_t *regs = pcie->regs;
 	pit_t *pi = &regs->pit[idx];
 	u32 sz = (__ilog2_u64(size) - 1);
@@ -275,6 +284,10 @@ static int fsl_pcie_setup_inbound_win(struct fsl_pcie *pcie, int idx,
 	flag |= PIWAR_EN | PIWAR_READ_SNOOP | PIWAR_WRITE_SNOOP;
 	if (pf)
 		flag |= PIWAR_PF;
+
+	if (info->ispci)
+		flag |= PIWAR_MEM_2G;
+
 	out_be32(&pi->piwar, flag | sz);
 
 	return 0;
@@ -508,6 +521,7 @@ static int fsl_pcie_init_ep(struct fsl_pcie *pcie)
 static int fsl_pcie_probe(struct udevice *dev)
 {
 	struct fsl_pcie *pcie = dev_get_priv(dev);
+	struct fsl_pcie_data *info = pcie->info;
 	ccsr_fsl_pci_t *regs = pcie->regs;
 	u16 val_16;
 
@@ -515,7 +529,10 @@ static int fsl_pcie_probe(struct udevice *dev)
 	pcie->block_rev = in_be32(&regs->block_rev1);
 
 	list_add(&pcie->list, &fsl_pcie_list);
-	pcie->enabled = is_serdes_configured(PCIE1 + pcie->idx);
+	if (info->ispci)
+		pcie->enabled = 1;
+	else
+		pcie->enabled = is_serdes_configured(PCIE1 + pcie->idx);
 	if (!pcie->enabled) {
 		printf("PCIe%d: %s disabled\n", pcie->idx, dev->name);
 		return 0;
@@ -579,6 +596,13 @@ static const struct dm_pci_ops fsl_pcie_ops = {
 	.write_config	= fsl_pcie_write_config,
 };
 
+static struct fsl_pcie_data mpc85xx_data = {
+	.block_offset = 0x8000,
+	.block_offset_mask = 0xffff,
+	.stride = 0x1000,
+	.ispci = 1,
+};
+
 static struct fsl_pcie_data p1_p2_data = {
 	.block_offset = 0xa000,
 	.block_offset_mask = 0xffff,
@@ -598,6 +622,7 @@ static struct fsl_pcie_data t2080_data = {
 };
 
 static const struct udevice_id fsl_pcie_ids[] = {
+	{ .compatible = "fsl,mpc8540-pci", .data = (ulong)&mpc85xx_data },
 	{ .compatible = "fsl,pcie-mpc8548", .data = (ulong)&p1_p2_data },
 	{ .compatible = "fsl,pcie-p1_p2", .data = (ulong)&p1_p2_data },
 	{ .compatible = "fsl,pcie-p2041", .data = (ulong)&p2041_data },
drivers/pci/pcie_fsl.h +1 -0
index dc8368d559..ef1b1ac8d4 100644
@@ -47,6 +47,7 @@ struct fsl_pcie_data {
 	u32 block_offset;		/* Offset from CCSR of 1st controller */
 	u32 block_offset_mask;		/* Mask out the CCSR base */
 	u32 stride;			/* Offset stride between controllers */
+	int ispci;			/* if PCI only */
 };
 
 struct fsl_pcie {
Signature · 1 line
2.21.0
#4 lore raw

cover pci: pcie_fsl: add support for none PCIe devices

In reply to Heiko Schocher

Hi Heiko,

Quoted 21 lines

-----Original Message-----
From: Heiko Schocher <[email protected]>
Sent: 2019年10月9日 12:37
To: U-Boot Mailing List <[email protected]>
Cc: Heiko Schocher <[email protected]>; Bin Meng <[email protected]>; Z.q. Hou <[email protected]>; Prabhakar X <[email protected]>; Z.q. Hou <[email protected]>
Subject: [PATCH 0/3] pci: pcie_fsl: add support for none PCIe devices

add support for devices with compatible property:
"fsl,mpc8540-pci". Unfortunately we can not change the property name, as already defined in linux.

This patch superseeds patch [1]:
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch
work.ozlabs.org%2Fpatch%2F1132418%2F&amp;data=02%7C01%7CZhiqian g.Hou%40nxp.com%7Cf3882a7d460748c51be308d74c726590%7C686ea1d3 bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637061926547234336&amp;sda ta=oxZBn89GDmItT5Orj1re2ASlVWa33H1BprL1Rxg%2FPDg%3D&amp;reserv ed=0

Quoted 6 lines

While working to integrate comments from Z.q. Hou to patch [1], I thought it may is the better idea, to use the already existing pcie_fsl driver and work in support for pci devices. Please comment!

If it is no good idea, I have also a v2 of [1] with the comments from Z.q. Hou worked in ready to post...

I don't think it is a good idea to add PCI controller support into PCIe controller driver, see the drivers/pci/fsl_pci_init.c, which support both PCI and PCIe controllers, but it is not readable :(. So I think it is better to separate the PCI driver into a new file just like you did in V1.

Thanks,
Zhiqiang

Quoted 21 lines

Travis build:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftravis
-ci.org%2Fhsdenx%2Fu-boot-test%2Fbuilds%2F595057579&amp;data=02%7 C01%7CZhiqiang.Hou%40nxp.com%7Cf3882a7d460748c51be308d74c72659 0%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63706192654723 4336&amp;sdata=3amAx0BH9zoY8MjT3GnVfmde4EJuqvYql7lO%2Fs9E15Q% 3D&amp;reserved=0
(sheevaplug fails, but this is on discussion on list)

Heiko Schocher (3):
pci: pcie_fsl: use pci_conv_size_to_32()
pci: pcie_fsl: reorder addr check function
pci: pcie_fsl: add support for "fsl,mpc8540-pci"

 drivers/pci/pcie_fsl.c | 68 +++++++++++++++++++-----------------------
 drivers/pci/pcie_fsl.h |  1 +
 2 files changed, 32 insertions(+), 37 deletions(-)

--
2.21.0

#5 lore raw

cover pci: pcie_fsl: add support for none PCIe devices

Hello Z.q. Hou,

Am 11.10.2019 um 05:16 schrieb Z.q. Hou:

Quoted 27 lines

Hi Heiko,

Quoted 25 lines

-----Original Message-----
From: Heiko Schocher <[email protected]>
Sent: 2019年10月9日 12:37
To: U-Boot Mailing List <[email protected]>
Cc: Heiko Schocher <[email protected]>; Bin Meng <[email protected]>; Z.q. Hou <[email protected]>; Prabhakar X <[email protected]>; Z.q. Hou <[email protected]>
Subject: [PATCH 0/3] pci: pcie_fsl: add support for none PCIe devices

add support for devices with compatible property:
"fsl,mpc8540-pci". Unfortunately we can not change the property name, as already defined in linux.

This patch superseeds patch [1]:
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch
work.ozlabs.org%2Fpatch%2F1132418%2F&amp;data=02%7C01%7CZhiqian g.Hou%40nxp.com%7Cf3882a7d460748c51be308d74c726590%7C686ea1d3 bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637061926547234336&amp;sda ta=oxZBn89GDmItT5Orj1re2ASlVWa33H1BprL1Rxg%2FPDg%3D&amp;reserv ed=0

While working to integrate comments from Z.q. Hou to patch [1], I thought it may is the better idea, to use the already existing pcie_fsl driver and work in support for pci devices. Please comment!

Quoted 7 lines
Quoted 2 lines

If it is no good idea, I have also a v2 of [1] with the comments from Z.q. Hou worked in ready to post...

I don't think it is a good idea to add PCI controller support into PCIe controller driver, see the drivers/pci/fsl_pci_init.c, which support both PCI and PCIe controllers, but it is not readable :(. So I think it is better to separate the PCI driver into a new file just like you did in V1.

Ok, fine, I send it soon!

bye,
Heiko

Quoted 26 lines

Thanks,
Zhiqiang

Quoted 21 lines

Travis build:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftravis
-ci.org%2Fhsdenx%2Fu-boot-test%2Fbuilds%2F595057579&amp;data=02%7 C01%7CZhiqiang.Hou%40nxp.com%7Cf3882a7d460748c51be308d74c72659 0%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63706192654723 4336&amp;sdata=3amAx0BH9zoY8MjT3GnVfmde4EJuqvYql7lO%2Fs9E15Q% 3D&amp;reserved=0
(sheevaplug fails, but this is on discussion on list)

Heiko Schocher (3):
pci: pcie_fsl: use pci_conv_size_to_32()
pci: pcie_fsl: reorder addr check function
pci: pcie_fsl: add support for "fsl,mpc8540-pci"

  drivers/pci/pcie_fsl.c | 68 +++++++++++++++++++-----------------------
  drivers/pci/pcie_fsl.h |  1 +
  2 files changed, 32 insertions(+), 37 deletions(-)

--
2.21.0

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de