[PATCH v2 0/2] iProc PCIe driver Kconfig changes

[PATCH v2 0/2] iProc PCIe driver Kconfig changes

[Ray Jui]

This patch series contains two patches to address iProc PCIe Kconfig related
issues. The first patch adds more protection to PCIE_IPROC so it cannot be
accidentally enabled for non-ARM based platforms. The second patch changes the
config name of the iProc PCIe platform driver from PCIE_IPROC_PLTFM to
PCIE_IPROC_PLATFORM. The driver name is also changed from pcie-iproc-pltfm.c
to pcie-iproc-platform.c so it's consistent with the config name change.

Changes from v1:
 - Changes the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c

Ray Jui (2):
  pci: iproc: fix PCIE_IPROC in Kconfig
  pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM

 drivers/pci/host/Kconfig                           |    4 +++-
 drivers/pci/host/Makefile                          |    2 +-
 .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)

-- 
1.7.9.5

[PATCH v2 1/2] pci: iproc: fix PCIE_IPROC in Kconfig

[Ray Jui]

Make PCIE_IPROC depending on both OF and ARM and default to be disabled,
so it cannot be accidentally enabled by other platforms

PCIE_IPROC is meant to be enabled by a front-end bus driver. Curenntly
it's enabled by PCIE_IPROC_PLTFM driver

Signed-off-by: Ray Jui <rjui@broadcom.com>
---
 drivers/pci/host/Kconfig |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index feccd0d..963b507 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -108,6 +108,8 @@ config PCI_VERSATILE
 
 config PCIE_IPROC
 	tristate "Broadcom iProc PCIe controller"
+	depends on OF && ARM
+	default n
 	help
 	  This enables the iProc PCIe core controller support for Broadcom's
 	  iProc family of SoCs. An appropriate bus interface driver also needs
-- 
1.7.9.5

[PATCH v2 2/2] pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM

[Ray Jui]

Change the config name of the iProc PCIe platform bus driver from
PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM. Also change the driver name
from pcie-iproc-pltfm.c to pcie-iproc-platform.c to match the config
name

Signed-off-by: Ray Jui <rjui@broadcom.com>
---
 drivers/pci/host/Kconfig                           |    2 +-
 drivers/pci/host/Makefile                          |    2 +-
 .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)

diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 963b507..1dfb567 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -115,7 +115,7 @@ config PCIE_IPROC
 	  iProc family of SoCs. An appropriate bus interface driver also needs
 	  to be enabled
 
-config PCIE_IPROC_PLTFM
+config PCIE_IPROC_PLATFORM
 	tristate "Broadcom iProc PCIe platform bus driver"
 	depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST)
 	depends on OF
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
index 2e02d20..f733b4e 100644
--- a/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@ -14,4 +14,4 @@ obj-$(CONFIG_PCI_XGENE) += pci-xgene.o
 obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o
 obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o
 obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
-obj-$(CONFIG_PCIE_IPROC_PLTFM) += pcie-iproc-pltfm.o
+obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o
diff --git a/drivers/pci/host/pcie-iproc-pltfm.c b/drivers/pci/host/pcie-iproc-platform.c
similarity index 100%
rename from drivers/pci/host/pcie-iproc-pltfm.c
rename to drivers/pci/host/pcie-iproc-platform.c
-- 
1.7.9.5

Re: [PATCH v2 0/2] iProc PCIe driver Kconfig changes

[Ray Jui]

Hi Bjorn,

Do you think the following changes are okay? If so, could you pull them in?

Thanks!

Ray

On 3/25/2015 12:08 AM, Ray Jui wrote:
> This patch series contains two patches to address iProc PCIe Kconfig related
> issues. The first patch adds more protection to PCIE_IPROC so it cannot be
> accidentally enabled for non-ARM based platforms. The second patch changes the
> config name of the iProc PCIe platform driver from PCIE_IPROC_PLTFM to
> PCIE_IPROC_PLATFORM. The driver name is also changed from pcie-iproc-pltfm.c
> to pcie-iproc-platform.c so it's consistent with the config name change.
> 
> Changes from v1:
>  - Changes the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c
> 
> Ray Jui (2):
>   pci: iproc: fix PCIE_IPROC in Kconfig
>   pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM
> 
>  drivers/pci/host/Kconfig                           |    4 +++-
>  drivers/pci/host/Makefile                          |    2 +-
>  .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
>  3 files changed, 4 insertions(+), 2 deletions(-)
>  rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)
> 

Re: [PATCH v2 0/2] iProc PCIe driver Kconfig changes

[Bjorn Helgaas]

On Fri, Mar 27, 2015 at 09:24:05AM -0700, Ray Jui wrote:
> Hi Bjorn,
> 
> Do you think the following changes are okay? If so, could you pull them in?
> 
> Thanks!

Hi Ray,

I'm a little bit lost because these patches don't apply on top of what I
currently have in my pci/host-iproc branch.   I haven't merged that branch
into "next yet, so can you just repost the entire set of all the iproc
stuff, based on v4.0-rc1?  Then I'll just merge the final stuff with no
fixups.

Bjorn

> On 3/25/2015 12:08 AM, Ray Jui wrote:
> > This patch series contains two patches to address iProc PCIe Kconfig related
> > issues. The first patch adds more protection to PCIE_IPROC so it cannot be
> > accidentally enabled for non-ARM based platforms. The second patch changes the
> > config name of the iProc PCIe platform driver from PCIE_IPROC_PLTFM to
> > PCIE_IPROC_PLATFORM. The driver name is also changed from pcie-iproc-pltfm.c
> > to pcie-iproc-platform.c so it's consistent with the config name change.
> > 
> > Changes from v1:
> >  - Changes the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c
> > 
> > Ray Jui (2):
> >   pci: iproc: fix PCIE_IPROC in Kconfig
> >   pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM
> > 
> >  drivers/pci/host/Kconfig                           |    4 +++-
> >  drivers/pci/host/Makefile                          |    2 +-
> >  .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
> >  3 files changed, 4 insertions(+), 2 deletions(-)
> >  rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)
> > 

Re: [PATCH v2 0/2] iProc PCIe driver Kconfig changes

[Ray Jui]

Hi Bjorn,

Okay I'll send out a new patch set based on v4.0-rc1 today. The new
patch set will be with subject:

[PATCH v8 0/4] pci: iproc: Add Broadcom iProc PCIe support

Thanks,

Ray

On 4/8/2015 10:13 AM, Bjorn Helgaas wrote:
> On Fri, Mar 27, 2015 at 09:24:05AM -0700, Ray Jui wrote:
>> Hi Bjorn,
>>
>> Do you think the following changes are okay? If so, could you pull them in?
>>
>> Thanks!
> 
> Hi Ray,
> 
> I'm a little bit lost because these patches don't apply on top of what I
> currently have in my pci/host-iproc branch.   I haven't merged that branch
> into "next yet, so can you just repost the entire set of all the iproc
> stuff, based on v4.0-rc1?  Then I'll just merge the final stuff with no
> fixups.
> 
> Bjorn
> 
>> On 3/25/2015 12:08 AM, Ray Jui wrote:
>>> This patch series contains two patches to address iProc PCIe Kconfig related
>>> issues. The first patch adds more protection to PCIE_IPROC so it cannot be
>>> accidentally enabled for non-ARM based platforms. The second patch changes the
>>> config name of the iProc PCIe platform driver from PCIE_IPROC_PLTFM to
>>> PCIE_IPROC_PLATFORM. The driver name is also changed from pcie-iproc-pltfm.c
>>> to pcie-iproc-platform.c so it's consistent with the config name change.
>>>
>>> Changes from v1:
>>>  - Changes the driver name from pcie-iproc-pltfm.c to pcie-iproc-platform.c
>>>
>>> Ray Jui (2):
>>>   pci: iproc: fix PCIE_IPROC in Kconfig
>>>   pci: iproc: change PCIE_IPROC_PLTFM to PCIE_IPROC_PLATFORM
>>>
>>>  drivers/pci/host/Kconfig                           |    4 +++-
>>>  drivers/pci/host/Makefile                          |    2 +-
>>>  .../{pcie-iproc-pltfm.c => pcie-iproc-platform.c}  |    0
>>>  3 files changed, 4 insertions(+), 2 deletions(-)
>>>  rename drivers/pci/host/{pcie-iproc-pltfm.c => pcie-iproc-platform.c} (100%)
>>>