linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] powerpc/pci: remove the multi-init for pci_dn->phb
@ 2014-12-13  3:09 Wei Yang
  2014-12-14 10:57 ` Gavin Shan
  0 siblings, 1 reply; 5+ messages in thread
From: Wei Yang @ 2014-12-13  3:09 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: Wei Yang

pci_dn->phb is set to phb in update_dn_pci_info(), if succeed.

This patch removes the duplication of pci_dn->phb initialization.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
---
 arch/powerpc/kernel/pci_dn.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index ddae246..d40b579 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -382,7 +382,6 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb)
 	pdn = dn->data;
 	if (pdn) {
 		pdn->devfn = pdn->busno = -1;
-		pdn->phb = phb;
 		phb->firmware_data = pdn;
 	}
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] powerpc/pci: remove the multi-init for pci_dn->phb
  2014-12-13  3:09 [PATCH] powerpc/pci: remove the multi-init for pci_dn->phb Wei Yang
@ 2014-12-14 10:57 ` Gavin Shan
  2014-12-15  1:35   ` Wei Yang
  2014-12-15  1:45   ` [PATCH V2] " Wei Yang
  0 siblings, 2 replies; 5+ messages in thread
From: Gavin Shan @ 2014-12-14 10:57 UTC (permalink / raw)
  To: Wei Yang; +Cc: linuxppc-dev

On Sat, Dec 13, 2014 at 11:09:04AM +0800, Wei Yang wrote:
>pci_dn->phb is set to phb in update_dn_pci_info(), if succeed.
>
>This patch removes the duplication of pci_dn->phb initialization.
>
>Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
>---
> arch/powerpc/kernel/pci_dn.c |    1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
>index ddae246..d40b579 100644
>--- a/arch/powerpc/kernel/pci_dn.c
>+++ b/arch/powerpc/kernel/pci_dn.c
>@@ -382,7 +382,6 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb)
> 	pdn = dn->data;
> 	if (pdn) {
> 		pdn->devfn = pdn->busno = -1;
>-		pdn->phb = phb;
> 		phb->firmware_data = pdn;

It seems the patch bases on unmerged code because "phb->firmware_data"
isn't existing yet in upstream or ppc.next.

Thanks,
Gavin

> 	}
> 
>-- 
>1.7.9.5
>
>_______________________________________________
>Linuxppc-dev mailing list
>Linuxppc-dev@lists.ozlabs.org
>https://lists.ozlabs.org/listinfo/linuxppc-dev

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] powerpc/pci: remove the multi-init for pci_dn->phb
  2014-12-14 10:57 ` Gavin Shan
@ 2014-12-15  1:35   ` Wei Yang
  2014-12-15  1:45   ` [PATCH V2] " Wei Yang
  1 sibling, 0 replies; 5+ messages in thread
From: Wei Yang @ 2014-12-15  1:35 UTC (permalink / raw)
  To: Gavin Shan; +Cc: Wei Yang, linuxppc-dev

On Sun, Dec 14, 2014 at 09:57:42PM +1100, Gavin Shan wrote:
>On Sat, Dec 13, 2014 at 11:09:04AM +0800, Wei Yang wrote:
>>pci_dn->phb is set to phb in update_dn_pci_info(), if succeed.
>>
>>This patch removes the duplication of pci_dn->phb initialization.
>>
>>Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
>>---
>> arch/powerpc/kernel/pci_dn.c |    1 -
>> 1 file changed, 1 deletion(-)
>>
>>diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
>>index ddae246..d40b579 100644
>>--- a/arch/powerpc/kernel/pci_dn.c
>>+++ b/arch/powerpc/kernel/pci_dn.c
>>@@ -382,7 +382,6 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb)
>> 	pdn = dn->data;
>> 	if (pdn) {
>> 		pdn->devfn = pdn->busno = -1;
>>-		pdn->phb = phb;
>> 		phb->firmware_data = pdn;
>
>It seems the patch bases on unmerged code because "phb->firmware_data"
>isn't existing yet in upstream or ppc.next.
>

Oh, my mistake. I will rebase it on the latest upstream.

>Thanks,
>Gavin
>
>> 	}
>> 
>>-- 
>>1.7.9.5
>>
>>_______________________________________________
>>Linuxppc-dev mailing list
>>Linuxppc-dev@lists.ozlabs.org
>>https://lists.ozlabs.org/listinfo/linuxppc-dev

-- 
Richard Yang
Help you, Help me

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH V2] powerpc/pci: remove the multi-init for pci_dn->phb
  2014-12-14 10:57 ` Gavin Shan
  2014-12-15  1:35   ` Wei Yang
@ 2014-12-15  1:45   ` Wei Yang
  2014-12-15  3:15     ` Gavin Shan
  1 sibling, 1 reply; 5+ messages in thread
From: Wei Yang @ 2014-12-15  1:45 UTC (permalink / raw)
  To: gwshan, linuxppc-dev; +Cc: Wei Yang

pci_dn->phb is set to phb in update_dn_pci_info(), if succeed.

This patch removes the duplication of pci_dn->phb initialization.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>

V2:
   * rebase the code on v3.18
---
 arch/powerpc/kernel/pci_dn.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index 1f61fab..83df307 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -147,10 +147,8 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb)
 	/* PHB nodes themselves must not match */
 	update_dn_pci_info(dn, phb);
 	pdn = dn->data;
-	if (pdn) {
+	if (pdn)
 		pdn->devfn = pdn->busno = -1;
-		pdn->phb = phb;
-	}
 
 	/* Update dn->phb ptrs for new phb and children devices */
 	traverse_pci_devices(dn, update_dn_pci_info, phb);
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH V2] powerpc/pci: remove the multi-init for pci_dn->phb
  2014-12-15  1:45   ` [PATCH V2] " Wei Yang
@ 2014-12-15  3:15     ` Gavin Shan
  0 siblings, 0 replies; 5+ messages in thread
From: Gavin Shan @ 2014-12-15  3:15 UTC (permalink / raw)
  To: Wei Yang; +Cc: linuxppc-dev, gwshan

On Mon, Dec 15, 2014 at 09:45:00AM +0800, Wei Yang wrote:
>pci_dn->phb is set to phb in update_dn_pci_info(), if succeed.
>
>This patch removes the duplication of pci_dn->phb initialization.
>
>Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>

Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>

Thanks,
Gavin

>
>V2:
>   * rebase the code on v3.18
>---
> arch/powerpc/kernel/pci_dn.c |    4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
>index 1f61fab..83df307 100644
>--- a/arch/powerpc/kernel/pci_dn.c
>+++ b/arch/powerpc/kernel/pci_dn.c
>@@ -147,10 +147,8 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb)
> 	/* PHB nodes themselves must not match */
> 	update_dn_pci_info(dn, phb);
> 	pdn = dn->data;
>-	if (pdn) {
>+	if (pdn)
> 		pdn->devfn = pdn->busno = -1;
>-		pdn->phb = phb;
>-	}
>
> 	/* Update dn->phb ptrs for new phb and children devices */
> 	traverse_pci_devices(dn, update_dn_pci_info, phb);
>-- 
>1.7.9.5
>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-12-15  3:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-13  3:09 [PATCH] powerpc/pci: remove the multi-init for pci_dn->phb Wei Yang
2014-12-14 10:57 ` Gavin Shan
2014-12-15  1:35   ` Wei Yang
2014-12-15  1:45   ` [PATCH V2] " Wei Yang
2014-12-15  3:15     ` Gavin Shan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).