RE: [PATCH V10] powerpc/fsl-pci: Unify pci/pcie initialization code

-----Original Message-----
From: Michael Neuling [mailto:mikey@neuling.org]
Sent: Tuesday, September 18, 2012 5:56 PM
To: Jia Hongtao-B38951
Cc: linuxppc-dev@lists.ozlabs.org; galak@kernel.crashing.org; Wood Scott-
B07421; benh@kernel.crashing.org; linux-next@vger.kernel.org
Subject: Re: [PATCH V10] powerpc/fsl-pci: Unify pci/pcie initialization
code
=20

quoted

+static int __devinit fsl_pci_probe(struct platform_device *pdev) {
+	int ret;
+	struct device_node *node;
+	struct pci_controller *hose;
+
+	node =3D pdev->dev.of_node;
+	ret =3D fsl_add_bridge(node, fsl_pci_primary =3D=3D node);

 #ifdef CONFIG_SWIOTLB
-	/*
-	 * if we couldn't map all of DRAM via the dma windows
-	 * we need SWIOTLB to handle buffers located outside of
-	 * dma capable memory region
-	 */
-	if (memblock_end_of_DRAM() - 1 > max)
-		ppc_swiotlb_enable =3D 1;
+	if (ret =3D=3D 0) {
+		hose =3D pci_find_hose_for_OF_device(pdev->dev.of_node);
+
+		/*
+		 * if we couldn't map all of DRAM via the dma windows
+		 * we need SWIOTLB to handle buffers located outside of
+		 * dma capable memory region
+		 */
+		if (memblock_end_of_DRAM() - 1 > hose->dma_window_base_cur +
+				hose->dma_window_size)
+			ppc_swiotlb_enable =3D 1;
+	}
 #endif
+
+	mpc85xx_pci_err_probe(pdev);
+
+	return 0;
+}

=20
This breaks when CONFIG_SWIOTLB is disabled (chroma_defconfig hit this
next-20120918), but think this could also hit in Linus tree:
=20
  arch/powerpc/sysdev/fsl_pci.c: In function 'fsl_pci_probe':
  arch/powerpc/sysdev/fsl_pci.c:867:25: error: unused variable 'hose' [-
Werror=3Dunused-variable]
  cc1: all warnings being treated as errors
=20
Mikey

You are right, it's a problem.
I already send a patch to fix this.
Pls refer to http://patchwork.ozlabs.org/patch/184673/

Thanks for your response.

- Hongtao.