[PATCH]: MIPS: PCI: Add pre_enable hook, minor readability fixes

[PATCH]: MIPS: PCI: Add pre_enable hook, minor readability fixes

[Joshua Kinard]

From: Joshua Kinard <kumba@gentoo.org>

This patch adds a hook "pre_enable", to the core MIPS PCI code.  It is
used by the IP30 Port to setup the PCI resources prior to probing the
BRIDGE and detecting available PCI devices.  It also adds some minor
whitespace to improve readability.

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
---
 arch/mips/include/asm/pci.h |    3 +++
 arch/mips/pci/pci.c         |   10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

linux-mips-pci-pre_enable.patch
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index d969299..b51ccbd 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -43,6 +43,9 @@ struct pci_controller {
 	   and XFree86. Eventually will be removed. */
 	unsigned int need_domain_info;
 
+	/* called in pcibios_enable_resources */
+	int (*pre_enable)(struct pci_controller *, struct pci_dev *, int);
+
 	int iommu;
 
 	/* Optional access methods for reading/writing the bus number
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index b8a0bf5..af17c16 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -261,14 +261,19 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
 	u16 cmd, old_cmd;
 	int idx;
 	struct resource *r;
+	struct pci_controller *hose = (struct pci_controller *)dev->sysdata;
 
 	pci_read_config_word(dev, PCI_COMMAND, &cmd);
 	old_cmd = cmd;
-	for (idx=0; idx < PCI_NUM_RESOURCES; idx++) {
+	for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
 		/* Only set up the requested stuff */
-		if (!(mask & (1<<idx)))
+		if (!(mask & (1 << idx)))
 			continue;
 
+		if(hose->pre_enable)
+			if(hose->pre_enable(hose, dev, idx) < 0)
+				return -EINVAL;
+
 		r = &dev->resource[idx];
 		if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
 			continue;
@@ -291,6 +296,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
 		       pci_name(dev), old_cmd, cmd);
 		pci_write_config_word(dev, PCI_COMMAND, cmd);
 	}
+
 	return 0;
 }
 

Re: [PATCH]: MIPS: PCI: Add pre_enable hook, minor readability fixes

[Sergei Shtylyov]

Hello.

On 5/25/2015 8:41 AM, Joshua Kinard wrote:

> From: Joshua Kinard <kumba@gentoo.org>

> This patch adds a hook "pre_enable", to the core MIPS PCI code.  It is
> used by the IP30 Port to setup the PCI resources prior to probing the
> BRIDGE and detecting available PCI devices.  It also adds some minor
> whitespace to improve readability.

> Signed-off-by: Joshua Kinard <kumba@gentoo.org>
[...]

> diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
> index b8a0bf5..af17c16 100644
> --- a/arch/mips/pci/pci.c
> +++ b/arch/mips/pci/pci.c
> @@ -261,14 +261,19 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
>   	u16 cmd, old_cmd;
>   	int idx;
>   	struct resource *r;
> +	struct pci_controller *hose = (struct pci_controller *)dev->sysdata;
>
>   	pci_read_config_word(dev, PCI_COMMAND, &cmd);
>   	old_cmd = cmd;
> -	for (idx=0; idx < PCI_NUM_RESOURCES; idx++) {
> +	for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
>   		/* Only set up the requested stuff */
> -		if (!(mask & (1<<idx)))
> +		if (!(mask & (1 << idx)))
>   			continue;
>
> +		if(hose->pre_enable)
> +			if(hose->pre_enable(hose, dev, idx) < 0)

    Space required after *if*; please run your patches thru scripts/checkpatch.pl.

WBR, Sergei

Re: [PATCH]: MIPS: PCI: Add pre_enable hook, minor readability fixes

[Joshua Kinard]

On 05/25/2015 09:09, Sergei Shtylyov wrote:
> Hello.
> 
> On 5/25/2015 8:41 AM, Joshua Kinard wrote:
> 
>> From: Joshua Kinard <kumba@gentoo.org>
> 
>> This patch adds a hook "pre_enable", to the core MIPS PCI code.  It is
>> used by the IP30 Port to setup the PCI resources prior to probing the
>> BRIDGE and detecting available PCI devices.  It also adds some minor
>> whitespace to improve readability.
> 
>> Signed-off-by: Joshua Kinard <kumba@gentoo.org>
> [...]
> 
>> diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
>> index b8a0bf5..af17c16 100644
>> --- a/arch/mips/pci/pci.c
>> +++ b/arch/mips/pci/pci.c
>> @@ -261,14 +261,19 @@ static int pcibios_enable_resources(struct pci_dev
>> *dev, int mask)
>>       u16 cmd, old_cmd;
>>       int idx;
>>       struct resource *r;
>> +    struct pci_controller *hose = (struct pci_controller *)dev->sysdata;
>>
>>       pci_read_config_word(dev, PCI_COMMAND, &cmd);
>>       old_cmd = cmd;
>> -    for (idx=0; idx < PCI_NUM_RESOURCES; idx++) {
>> +    for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
>>           /* Only set up the requested stuff */
>> -        if (!(mask & (1<<idx)))
>> +        if (!(mask & (1 << idx)))
>>               continue;
>>
>> +        if(hose->pre_enable)
>> +            if(hose->pre_enable(hose, dev, idx) < 0)
> 
>    Space required after *if*; please run your patches thru scripts/checkpatch.pl.
> 
> WBR, Sergei

Whoops, thanks for catching that!  I cleaned up a lot of the original IP30 code
and added a lot of the needed whitespace, but I apparently missed this bit.
I'll send a v2 shortly.

--J