linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

Hi all,

Today's linux-next merge of the powerpc-mpe tree got a conflict in
arch/powerpc/include/asm/machdep.h between commit 6e628c7d33d9
("powerpc/powernv: Reserve additional space for IOV BAR according to
the number of total_pe") from the  tree and commit 467efc2e4fdc
("powerpc: Remove shims for pci_controller_ops operations") from the
powerpc-mpe tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/include/asm/machdep.h
index 1b268044f290,5c19ac527a8e..000000000000
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@@ -240,21 -236,6 +236,11 @@@ struct machdep_calls 
  	/* Called after scan and before resource survey */
  	void (*pcibios_fixup_phb)(struct pci_controller *hose);
  
- 	/* Called during PCI resource reassignment */
- 	resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type);
- 
- 	/* Reset the secondary bus of bridge */
- 	void  (*pcibios_reset_secondary_bus)(struct pci_dev *dev);
- 
 +#ifdef CONFIG_PCI_IOV
 +	void (*pcibios_fixup_sriov)(struct pci_dev *pdev);
 +	resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);
 +#endif /* CONFIG_PCI_IOV */
 +
  	/* Called to shutdown machine specific hardware not already controlled
  	 * by other drivers.
  	 */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

Hi all,

Today's linux-next merge of the powerpc-mpe tree got a conflict in
arch/powerpc/include/asm/machdep.h between commit 6e628c7d33d9
("powerpc/powernv: Reserve additional space for IOV BAR according to
the number of total_pe") from the  tree and commit 467efc2e4fdc
("powerpc: Remove shims for pci_controller_ops operations") from the
powerpc-mpe tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/include/asm/machdep.h
index 1b268044f290,5c19ac527a8e..000000000000
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@@ -240,21 -236,6 +236,11 @@@ struct machdep_calls 
  	/* Called after scan and before resource survey */
  	void (*pcibios_fixup_phb)(struct pci_controller *hose);
  
- 	/* Called during PCI resource reassignment */
- 	resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type);
- 
- 	/* Reset the secondary bus of bridge */
- 	void  (*pcibios_reset_secondary_bus)(struct pci_dev *dev);
- 
 +#ifdef CONFIG_PCI_IOV
 +	void (*pcibios_fixup_sriov)(struct pci_dev *pdev);
 +	resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);
 +#endif /* CONFIG_PCI_IOV */
 +
  	/* Called to shutdown machine specific hardware not already controlled
  	 * by other drivers.
  	 */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1442 bytes --]

Hi all,

Today's linux-next merge of the powerpc-mpe tree got a conflict in
arch/powerpc/include/asm/machdep.h between commit 6e628c7d33d9
("powerpc/powernv: Reserve additional space for IOV BAR according to
the number of total_pe") from the  tree and commit 467efc2e4fdc
("powerpc: Remove shims for pci_controller_ops operations") from the
powerpc-mpe tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/include/asm/machdep.h
index 1b268044f290,5c19ac527a8e..000000000000
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@@ -240,21 -236,6 +236,11 @@@ struct machdep_calls 
  	/* Called after scan and before resource survey */
  	void (*pcibios_fixup_phb)(struct pci_controller *hose);
  
- 	/* Called during PCI resource reassignment */
- 	resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type);
- 
- 	/* Reset the secondary bus of bridge */
- 	void  (*pcibios_reset_secondary_bus)(struct pci_dev *dev);
- 
 +#ifdef CONFIG_PCI_IOV
 +	void (*pcibios_fixup_sriov)(struct pci_dev *pdev);
 +	resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);
 +#endif /* CONFIG_PCI_IOV */
 +
  	/* Called to shutdown machine specific hardware not already controlled
  	 * by other drivers.
  	 */

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

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

Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Wei Yang]

On Mon, Apr 13, 2015 at 01:27:15PM +1000, Stephen Rothwell wrote:
>Hi all,
>
>Today's linux-next merge of the powerpc-mpe tree got a conflict in
>arch/powerpc/include/asm/machdep.h between commit 6e628c7d33d9
>("powerpc/powernv: Reserve additional space for IOV BAR according to
>the number of total_pe") from the  tree and commit 467efc2e4fdc
>("powerpc: Remove shims for pci_controller_ops operations") from the
>powerpc-mpe tree.
>
>I fixed it up (see below) and can carry the fix as necessary (no action
>is required).

Hi, Stephen,

Thanks for your finding :-) Your fix looks good to me.

Michael & Ben,

Do I need to rebase the patch or what should I do?

>
>-- 
>Cheers,
>Stephen Rothwell                    sfr@canb.auug.org.au
>
>diff --cc arch/powerpc/include/asm/machdep.h
>index 1b268044f290,5c19ac527a8e..000000000000
>--- a/arch/powerpc/include/asm/machdep.h
>+++ b/arch/powerpc/include/asm/machdep.h
>@@@ -240,21 -236,6 +236,11 @@@ struct machdep_calls 
>  	/* Called after scan and before resource survey */
>  	void (*pcibios_fixup_phb)(struct pci_controller *hose);
>  
>- 	/* Called during PCI resource reassignment */
>- 	resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type);
>- 
>- 	/* Reset the secondary bus of bridge */
>- 	void  (*pcibios_reset_secondary_bus)(struct pci_dev *dev);
>- 
> +#ifdef CONFIG_PCI_IOV
> +	void (*pcibios_fixup_sriov)(struct pci_dev *pdev);
> +	resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);
> +#endif /* CONFIG_PCI_IOV */
> +
>  	/* Called to shutdown machine specific hardware not already controlled
>  	 * by other drivers.
>  	 */



-- 
Richard Yang
Help you, Help me

Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Wei Yang]

On Mon, Apr 13, 2015 at 01:27:15PM +1000, Stephen Rothwell wrote:
>Hi all,
>
>Today's linux-next merge of the powerpc-mpe tree got a conflict in
>arch/powerpc/include/asm/machdep.h between commit 6e628c7d33d9
>("powerpc/powernv: Reserve additional space for IOV BAR according to
>the number of total_pe") from the  tree and commit 467efc2e4fdc
>("powerpc: Remove shims for pci_controller_ops operations") from the
>powerpc-mpe tree.
>
>I fixed it up (see below) and can carry the fix as necessary (no action
>is required).

Hi, Stephen,

Thanks for your finding :-) Your fix looks good to me.

Michael & Ben,

Do I need to rebase the patch or what should I do?

>
>-- 
>Cheers,
>Stephen Rothwell                    sfr@canb.auug.org.au
>
>diff --cc arch/powerpc/include/asm/machdep.h
>index 1b268044f290,5c19ac527a8e..000000000000
>--- a/arch/powerpc/include/asm/machdep.h
>+++ b/arch/powerpc/include/asm/machdep.h
>@@@ -240,21 -236,6 +236,11 @@@ struct machdep_calls 
>  	/* Called after scan and before resource survey */
>  	void (*pcibios_fixup_phb)(struct pci_controller *hose);
>  
>- 	/* Called during PCI resource reassignment */
>- 	resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type);
>- 
>- 	/* Reset the secondary bus of bridge */
>- 	void  (*pcibios_reset_secondary_bus)(struct pci_dev *dev);
>- 
> +#ifdef CONFIG_PCI_IOV
> +	void (*pcibios_fixup_sriov)(struct pci_dev *pdev);
> +	resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);
> +#endif /* CONFIG_PCI_IOV */
> +
>  	/* Called to shutdown machine specific hardware not already controlled
>  	 * by other drivers.
>  	 */



-- 
Richard Yang
Help you, Help me

Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

Hi,

On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>
> Hi, Stephen,
> 
> Thanks for your finding :-) Your fix looks good to me.
> 
> Michael & Ben,
> 
> Do I need to rebase the patch or what should I do?

You should have nothing to do, Michael has fixed it up when he merged
Ben's tree into his.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

Hi,

On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>
> Hi, Stephen,
> 
> Thanks for your finding :-) Your fix looks good to me.
> 
> Michael & Ben,
> 
> Do I need to rebase the patch or what should I do?

You should have nothing to do, Michael has fixed it up when he merged
Ben's tree into his.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Wei Yang]

On Mon, Apr 13, 2015 at 05:55:31PM +1000, Stephen Rothwell wrote:
>Hi,
>
>On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>>
>> Hi, Stephen,
>> 
>> Thanks for your finding :-) Your fix looks good to me.
>> 
>> Michael & Ben,
>> 
>> Do I need to rebase the patch or what should I do?
>
>You should have nothing to do, Michael has fixed it up when he merged
>Ben's tree into his.

OK, thanks :-)

>
>-- 
>Cheers,
>Stephen Rothwell                    sfr@canb.auug.org.au



-- 
Richard Yang
Help you, Help me

Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Wei Yang]

On Mon, Apr 13, 2015 at 05:55:31PM +1000, Stephen Rothwell wrote:
>Hi,
>
>On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>>
>> Hi, Stephen,
>> 
>> Thanks for your finding :-) Your fix looks good to me.
>> 
>> Michael & Ben,
>> 
>> Do I need to rebase the patch or what should I do?
>
>You should have nothing to do, Michael has fixed it up when he merged
>Ben's tree into his.

OK, thanks :-)

>
>-- 
>Cheers,
>Stephen Rothwell                    sfr@canb.auug.org.au



-- 
Richard Yang
Help you, Help me

linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]

Hi all,

Today's linux-next merge of the powerpc-mpe tree got a conflict in
arch/powerpc/platforms/powernv/pci-ioda.c between commit 6e628c7d33d9
("powerpc/powernv: Reserve additional space for IOV BAR according to
the number of total_pe") from the powerpc tree and commit 65ebf4b6370e
("powerpc/powernv: Move controller ops from ppc_md to controller_ops")
from the powerpc-mpe tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
index 5ac7c60a8801,5e917753c672..000000000000
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@@ -2808,13 -2103,9 +2809,13 @@@ static void __init pnv_pci_init_ioda_ph
  	 * the child P2P bridges) can form individual PE.
  	 */
  	ppc_md.pcibios_fixup = pnv_pci_ioda_fixup;
- 	ppc_md.pcibios_enable_device_hook = pnv_pci_enable_device_hook;
- 	ppc_md.pcibios_window_alignment = pnv_pci_window_alignment;
- 	ppc_md.pcibios_reset_secondary_bus = pnv_pci_reset_secondary_bus;
+ 	pnv_pci_controller_ops.enable_device_hook = pnv_pci_enable_device_hook;
+ 	pnv_pci_controller_ops.window_alignment = pnv_pci_window_alignment;
+ 	pnv_pci_controller_ops.reset_secondary_bus = pnv_pci_reset_secondary_bus;
 +#ifdef CONFIG_PCI_IOV
 +	ppc_md.pcibios_fixup_sriov = pnv_pci_ioda_fixup_iov_resources;
 +	ppc_md.pcibios_iov_resource_alignment = pnv_pci_iov_resource_alignment;
 +#endif /* CONFIG_PCI_IOV */
  	pci_add_flags(PCI_REASSIGN_ALL_RSRC);
  
  	/* Reset IODA tables to a clean state */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]

Hi all,

Today's linux-next merge of the powerpc-mpe tree got a conflict in
arch/powerpc/platforms/powernv/pci-ioda.c between commit 6e628c7d33d9
("powerpc/powernv: Reserve additional space for IOV BAR according to
the number of total_pe") from the powerpc tree and commit 65ebf4b6370e
("powerpc/powernv: Move controller ops from ppc_md to controller_ops")
from the powerpc-mpe tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
index 5ac7c60a8801,5e917753c672..000000000000
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@@ -2808,13 -2103,9 +2809,13 @@@ static void __init pnv_pci_init_ioda_ph
  	 * the child P2P bridges) can form individual PE.
  	 */
  	ppc_md.pcibios_fixup = pnv_pci_ioda_fixup;
- 	ppc_md.pcibios_enable_device_hook = pnv_pci_enable_device_hook;
- 	ppc_md.pcibios_window_alignment = pnv_pci_window_alignment;
- 	ppc_md.pcibios_reset_secondary_bus = pnv_pci_reset_secondary_bus;
+ 	pnv_pci_controller_ops.enable_device_hook = pnv_pci_enable_device_hook;
+ 	pnv_pci_controller_ops.window_alignment = pnv_pci_window_alignment;
+ 	pnv_pci_controller_ops.reset_secondary_bus = pnv_pci_reset_secondary_bus;
 +#ifdef CONFIG_PCI_IOV
 +	ppc_md.pcibios_fixup_sriov = pnv_pci_ioda_fixup_iov_resources;
 +	ppc_md.pcibios_iov_resource_alignment = pnv_pci_iov_resource_alignment;
 +#endif /* CONFIG_PCI_IOV */
  	pci_add_flags(PCI_REASSIGN_ALL_RSRC);
  
  	/* Reset IODA tables to a clean state */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the powerpc-mpe tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]

Hi all,

Today's linux-next merge of the powerpc-mpe tree got a conflict in
arch/powerpc/platforms/powernv/pci-ioda.c between commit 6e628c7d33d9
("powerpc/powernv: Reserve additional space for IOV BAR according to
the number of total_pe") from the powerpc tree and commit 65ebf4b6370e
("powerpc/powernv: Move controller ops from ppc_md to controller_ops")
from the powerpc-mpe tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
index 5ac7c60a8801,5e917753c672..000000000000
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@@ -2808,13 -2103,9 +2809,13 @@@ static void __init pnv_pci_init_ioda_ph
  	 * the child P2P bridges) can form individual PE.
  	 */
  	ppc_md.pcibios_fixup = pnv_pci_ioda_fixup;
- 	ppc_md.pcibios_enable_device_hook = pnv_pci_enable_device_hook;
- 	ppc_md.pcibios_window_alignment = pnv_pci_window_alignment;
- 	ppc_md.pcibios_reset_secondary_bus = pnv_pci_reset_secondary_bus;
+ 	pnv_pci_controller_ops.enable_device_hook = pnv_pci_enable_device_hook;
+ 	pnv_pci_controller_ops.window_alignment = pnv_pci_window_alignment;
+ 	pnv_pci_controller_ops.reset_secondary_bus = pnv_pci_reset_secondary_bus;
 +#ifdef CONFIG_PCI_IOV
 +	ppc_md.pcibios_fixup_sriov = pnv_pci_ioda_fixup_iov_resources;
 +	ppc_md.pcibios_iov_resource_alignment = pnv_pci_iov_resource_alignment;
 +#endif /* CONFIG_PCI_IOV */
  	pci_add_flags(PCI_REASSIGN_ALL_RSRC);
  
  	/* Reset IODA tables to a clean state */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]