linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the pci tree with Linus' tree
@ 2020-05-14  1:02 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-05-14  1:02 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Kai-Heng Feng

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/quirks.c

between commit:

  0a8f41023e8a ("PCI: Move Apex Edge TPU class quirk to fix BAR assignment")

from Linus' tree and commit:

  68f5fc4ea9dd ("PCI: Avoid Pericom USB controller OHCI/EHCI PME# defect")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/quirks.c
index ca9ed5774eb1,7b4a98d0f0fd..000000000000
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@ -5568,9 -5568,15 +5568,22 @@@ static void pci_fixup_no_d0_pme(struct 
  }
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme);
  
 +static void apex_pci_fixup_class(struct pci_dev *pdev)
 +{
 +	pdev->class = (PCI_CLASS_SYSTEM_OTHER << 8) | pdev->class;
 +}
 +DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,
 +			       PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
++
+ /*
+  * Device [12d8:0x400e] and [12d8:0x400f]
+  * These devices advertise PME# support in all power states but don't
+  * reliably assert it.
+  */
+ static void pci_fixup_no_pme(struct pci_dev *dev)
+ {
+ 	pci_info(dev, "PME# is unreliable, disabling it\n");
+ 	dev->pme_support = 0;
+ }
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_PERICOM, 0x400e, pci_fixup_no_pme);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_PERICOM, 0x400f, pci_fixup_no_pme);

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

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2022-01-14  6:53   ` Stephen Rothwell
@ 2022-01-14  6:57     ` Sergio Paracuellos
  0 siblings, 0 replies; 44+ messages in thread
From: Sergio Paracuellos @ 2022-01-14  6:57 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, Linus Torvalds, Linux Kernel Mailing List,
	Linux Next Mailing List

On Fri, Jan 14, 2022 at 7:53 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Sergio,
>
> On Fri, 14 Jan 2022 06:48:08 +0100 Sergio Paracuellos <sergio.paracuellos@gmail.com> wrote:
> >
> > On Fri, Jan 14, 2022 at 12:45 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > diff --cc drivers/pci/controller/Kconfig
> > > index aec8c9a3488b,f7e44d9c6965..000000000000
> > > --- a/drivers/pci/controller/Kconfig
> > > +++ b/drivers/pci/controller/Kconfig
> > > @@@ -332,8 -332,8 +332,8 @@@ config PCIE_APPL
> > >           If unsure, say Y if you have an Apple Silicon system.
> > >
> > >   config PCIE_MT7621
> > >  -      tristate "MediaTek MT7621 PCIe Controller"
> > >  +      bool "MediaTek MT7621 PCIe Controller"
> >
> > This should be tristate.
> >
> > > -       depends on SOC_MT7621 || (MIPS && COMPILE_TEST)
> > > +       depends on SOC_MT7621 || COMPILE_TEST
> >
> > This is correct,
> >
> > >         select PHY_MT7621_PCI
> > >         default SOC_MT7621
> > >         help
>
> Thanks, I have fixed up my merge resolution for Monday.

Thanks for letting me know, Stephen.

Best regards,
    Sergio Paracuellos
>
> --
> Cheers,
> Stephen Rothwell

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2022-01-14  5:48 ` Sergio Paracuellos
@ 2022-01-14  6:53   ` Stephen Rothwell
  2022-01-14  6:57     ` Sergio Paracuellos
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2022-01-14  6:53 UTC (permalink / raw)
  To: Sergio Paracuellos
  Cc: Bjorn Helgaas, Linus Torvalds, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi Sergio,

On Fri, 14 Jan 2022 06:48:08 +0100 Sergio Paracuellos <sergio.paracuellos@gmail.com> wrote:
>
> On Fri, Jan 14, 2022 at 12:45 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > diff --cc drivers/pci/controller/Kconfig
> > index aec8c9a3488b,f7e44d9c6965..000000000000
> > --- a/drivers/pci/controller/Kconfig
> > +++ b/drivers/pci/controller/Kconfig
> > @@@ -332,8 -332,8 +332,8 @@@ config PCIE_APPL
> >           If unsure, say Y if you have an Apple Silicon system.
> >
> >   config PCIE_MT7621
> >  -      tristate "MediaTek MT7621 PCIe Controller"
> >  +      bool "MediaTek MT7621 PCIe Controller"  
> 
> This should be tristate.
> 
> > -       depends on SOC_MT7621 || (MIPS && COMPILE_TEST)
> > +       depends on SOC_MT7621 || COMPILE_TEST  
> 
> This is correct,
> 
> >         select PHY_MT7621_PCI
> >         default SOC_MT7621
> >         help  

Thanks, I have fixed up my merge resolution for Monday.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2022-01-13 23:45 Stephen Rothwell
@ 2022-01-14  5:48 ` Sergio Paracuellos
  2022-01-14  6:53   ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Sergio Paracuellos @ 2022-01-14  5:48 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, Linus Torvalds, Linux Kernel Mailing List,
	Linux Next Mailing List

Hi Stephen,

On Fri, Jan 14, 2022 at 12:45 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
>   drivers/pci/controller/Kconfig
>
> between commit:
>
>   aa50faff4416 ("PCI: mt7621: Convert driver into 'bool'")

This was a temporary fix for v5.16 since driver was not ready to be
compiled as a module yet and some MIPS architecture dependent code was
remaining.

>
> from Linus' tree and commit:
>
>   44ddb791f8f4 ("PCI: mt7621: Allow COMPILE_TEST for all arches")

The changes in Kconfig here are the good ones removing MIPS dependency
and allowing the driver to be compiled as a module.

>
> from the pci tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/pci/controller/Kconfig
> index aec8c9a3488b,f7e44d9c6965..000000000000
> --- a/drivers/pci/controller/Kconfig
> +++ b/drivers/pci/controller/Kconfig
> @@@ -332,8 -332,8 +332,8 @@@ config PCIE_APPL
>           If unsure, say Y if you have an Apple Silicon system.
>
>   config PCIE_MT7621
>  -      tristate "MediaTek MT7621 PCIe Controller"
>  +      bool "MediaTek MT7621 PCIe Controller"

This should be tristate.

> -       depends on SOC_MT7621 || (MIPS && COMPILE_TEST)
> +       depends on SOC_MT7621 || COMPILE_TEST

This is correct,

>         select PHY_MT7621_PCI
>         default SOC_MT7621
>         help

Best regards,
    Sergio Paracuellos

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2022-01-13 23:45 Stephen Rothwell
  2022-01-14  5:48 ` Sergio Paracuellos
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2022-01-13 23:45 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linus Torvalds, Linux Kernel Mailing List,
	Linux Next Mailing List, Sergio Paracuellos

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/controller/Kconfig

between commit:

  aa50faff4416 ("PCI: mt7621: Convert driver into 'bool'")

from Linus' tree and commit:

  44ddb791f8f4 ("PCI: mt7621: Allow COMPILE_TEST for all arches")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/controller/Kconfig
index aec8c9a3488b,f7e44d9c6965..000000000000
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@@ -332,8 -332,8 +332,8 @@@ config PCIE_APPL
  	  If unsure, say Y if you have an Apple Silicon system.
  
  config PCIE_MT7621
 -	tristate "MediaTek MT7621 PCIe Controller"
 +	bool "MediaTek MT7621 PCIe Controller"
- 	depends on SOC_MT7621 || (MIPS && COMPILE_TEST)
+ 	depends on SOC_MT7621 || COMPILE_TEST
  	select PHY_MT7621_PCI
  	default SOC_MT7621
  	help

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

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2021-08-25  0:57 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2021-08-25  0:57 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Lorenzo Pieralisi, Rahul Tanwar, Srikanth Thokala,
	Wan Ahmad Zainie

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  MAINTAINERS

between commit:

  e2f55370b422 ("MAINTAINERS: Add Rahul Tanwar as Intel LGM Gateway PCIe maintainer")

from Linus' tree and commit:

  0c87f90b4c13 ("PCI: keembay: Add support for Intel Keem Bay")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 0e03d2903c07,23e614e9c669..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14463,13 -14422,13 +14463,20 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
  F:	drivers/pci/controller/dwc/pcie-histb.c
  
+ PCIE DRIVER FOR INTEL KEEM BAY
+ M:	Srikanth Thokala <srikanth.thokala@intel.com>
+ L:	linux-pci@vger.kernel.org
+ S:	Supported
+ F:	Documentation/devicetree/bindings/pci/intel,keembay-pcie*
+ F:	drivers/pci/controller/dwc/pcie-keembay.c
+ 
 +PCIE DRIVER FOR INTEL LGM GW SOC
 +M:	Rahul Tanwar <rtanwar@maxlinear.com>
 +L:	linux-pci@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
 +F:	drivers/pci/controller/dwc/pcie-intel-gw.c
 +
  PCIE DRIVER FOR MEDIATEK
  M:	Ryder Lee <ryder.lee@mediatek.com>
  M:	Jianjun Wang <jianjun.wang@mediatek.com>

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

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2021-02-23  0:19 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2021-02-23  0:19 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/pci.c

between commit:

  40fb68c7725a ("Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume"")

from Linus' tree and commit:

  d2bb2f9e1af6 ("PCI/ASPM: Move LTR, ASPM L1SS save/restore into PCIe save/restore")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/pci.c
index b67c4327d307,13b89b1e29ed..000000000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -1434,6 -1474,9 +1474,8 @@@ static int pci_save_pcie_state(struct p
  	pcie_capability_read_word(dev, PCI_EXP_LNKCTL2, &cap[i++]);
  	pcie_capability_read_word(dev, PCI_EXP_SLTCTL2, &cap[i++]);
  
+ 	pci_save_ltr_state(dev);
 -	pci_save_aspm_l1ss_state(dev);
+ 
  	return 0;
  }
  
@@@ -1447,6 -1490,9 +1489,8 @@@ static void pci_restore_pcie_state(stru
  	if (!save_state)
  		return;
  
+ 	pci_restore_ltr_state(dev);		/* LTR enabled in DEVCTL2 */
 -	pci_restore_aspm_l1ss_state(dev);	/* ASPM L1 enabled in LNKCTL */
+ 
  	cap = (u16 *)&save_state->cap.data[0];
  	pcie_capability_write_word(dev, PCI_EXP_DEVCTL, cap[i++]);
  	pcie_capability_write_word(dev, PCI_EXP_LNKCTL, cap[i++]);

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

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2020-03-30 23:49 Stephen Rothwell
@ 2020-03-31  8:37 ` Geert Uytterhoeven
  0 siblings, 0 replies; 44+ messages in thread
From: Geert Uytterhoeven @ 2020-03-31  8:37 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, Linux Next Mailing List,
	Linux Kernel Mailing List, Kuppuswamy Sathyanarayanan,
	Anirudh Venkataramanan, Jeff Kirsher

On Tue, Mar 31, 2020 at 1:52 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the pci tree got a conflict in:
>
>   drivers/net/ethernet/intel/ice/ice_main.c
>
> between commit:
>
>   19cce2c6f6dc ("ice: Make print statements more compact")

FWIW, that doesn't really look like an improvement to me, as the long
lines are now broken by my editor, making them harder to read...

>
> from Linus' tree and commit:
>
>   894020fdd88c ("PCI/AER: Rationalize error status register clearing")
>
> from the pci tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/net/ethernet/intel/ice/ice_main.c
> index 5ef28052c0f8,effca3fa92e0..000000000000
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@@ -3458,9 -3495,10 +3458,9 @@@ static pci_ers_result_t ice_pci_err_slo
>                         result = PCI_ERS_RESULT_DISCONNECT;
>         }
>
> -       err = pci_cleanup_aer_uncorrect_error_status(pdev);
> +       err = pci_aer_clear_nonfatal_status(pdev);
>         if (err)
> -               dev_dbg(&pdev->dev, "pci_cleanup_aer_uncorrect_error_status failed, error %d\n",
>  -              dev_dbg(&pdev->dev,
>  -                      "pci_aer_clear_nonfatal_status() failed, error %d\n",
> ++              dev_dbg(&pdev->dev, "pci_aer_clear_nonfatal_status() failed, error %d\n",
>                         err);
>                 /* non-fatal, continue */

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2020-03-30 23:49 Stephen Rothwell
  2020-03-31  8:37 ` Geert Uytterhoeven
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2020-03-30 23:49 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Kuppuswamy Sathyanarayanan, Anirudh Venkataramanan, Jeff Kirsher

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/net/ethernet/intel/ice/ice_main.c

between commit:

  19cce2c6f6dc ("ice: Make print statements more compact")

from Linus' tree and commit:

  894020fdd88c ("PCI/AER: Rationalize error status register clearing")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
index 5ef28052c0f8,effca3fa92e0..000000000000
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@@ -3458,9 -3495,10 +3458,9 @@@ static pci_ers_result_t ice_pci_err_slo
  			result = PCI_ERS_RESULT_DISCONNECT;
  	}
  
- 	err = pci_cleanup_aer_uncorrect_error_status(pdev);
+ 	err = pci_aer_clear_nonfatal_status(pdev);
  	if (err)
- 		dev_dbg(&pdev->dev, "pci_cleanup_aer_uncorrect_error_status failed, error %d\n",
 -		dev_dbg(&pdev->dev,
 -			"pci_aer_clear_nonfatal_status() failed, error %d\n",
++		dev_dbg(&pdev->dev, "pci_aer_clear_nonfatal_status() failed, error %d\n",
  			err);
  		/* non-fatal, continue */
  

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

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2020-03-24 23:58 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-03-24 23:58 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Kishon Vijay Abraham I, Lorenzo Pieralisi, Lukas Bulwahn

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  MAINTAINERS

between commit:

  5901b51f3e5d ("MAINTAINERS: Correct Cadence PCI driver path")

from Linus' tree and commit:

  11be8af70d86 ("dt-bindings: PCI: Convert PCIe Host/Endpoint in Cadence platform to DT schema")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index d8fc7bb5f784,fc2fc22dbc8b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12754,8 -12739,8 +12754,8 @@@ PCI DRIVER FOR CADENCE PCIE I
  M:	Tom Joseph <tjoseph@cadence.com>
  L:	linux-pci@vger.kernel.org
  S:	Maintained
- F:	Documentation/devicetree/bindings/pci/cdns,*.txt
+ F:	Documentation/devicetree/bindings/pci/cdns,*
 -F:	drivers/pci/controller/pcie-cadence*
 +F:	drivers/pci/controller/cadence/
  
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:	Minghuan Lian <minghuan.Lian@nxp.com>

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

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2019-09-19 12:33 Mark Brown
  0 siblings, 0 replies; 44+ messages in thread
From: Mark Brown @ 2019-09-19 12:33 UTC (permalink / raw)
  To: Bjorn Helgaas, Haiyang Zhang, Lorenzo Pieralisi
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/controller/pci-hyperv.c

between commits:

  348dd93e40c1 ("PCI: hv: Add a Hyper-V PCI interface driver for software backchannel interface")
  467a3bb97432 ("PCI: hv: Allocate a named fwnode instead of an address-based one")

from Linus' tree and commit:

  be700103efd1 ("PCI: hv: Detect and fix Hyper-V PCI domain number collision")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/pci/controller/pci-hyperv.c
index 0ca73c851e0fb,3a56de6b2ec2c..0000000000000
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@@ -2820,7 -2563,7 +2862,8 @@@ static int hv_pci_probe(struct hv_devic
  			const struct hv_vmbus_device_id *dev_id)
  {
  	struct hv_pcibus_device *hbus;
 +	char *name;
+ 	u16 dom_req, dom;
  	int ret;
  
  	/*
@@@ -3058,11 -2810,9 +3121,14 @@@ static void __exit exit_hv_pci_drv(void
  
  static int __init init_hv_pci_drv(void)
  {
 +	/* Initialize PCI block r/w interface */
 +	hvpci_block_ops.read_block = hv_read_config_block;
 +	hvpci_block_ops.write_block = hv_write_config_block;
 +	hvpci_block_ops.reg_blk_invalidate = hv_register_block_invalidate;
 +
+ 	/* Set the invalid domain number's bit, so it will not be used */
+ 	set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);
+ 
  	return vmbus_driver_register(&hv_pci_drv);
  }
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2018-07-20  9:15 ` Lorenzo Pieralisi
@ 2018-07-20 10:49   ` Thomas Petazzoni
  0 siblings, 0 replies; 44+ messages in thread
From: Thomas Petazzoni @ 2018-07-20 10:49 UTC (permalink / raw)
  To: Lorenzo Pieralisi
  Cc: Stephen Rothwell, Bjorn Helgaas, Linux-Next Mailing List,
	Linux Kernel Mailing List, Sergei Shtylyov, Evan Wang

Hello,

On Fri, 20 Jul 2018 10:15:53 +0100, Lorenzo Pieralisi wrote:

> >   		switch (resource_type(res)) {
> >   		case IORESOURCE_IO:
> > - 			advk_pcie_set_ob_win(pcie, 1,
> > - 					     upper_32_bits(res->start),
> > - 					     lower_32_bits(res->start),
> > - 					     0,	0xF8000000, 0,
> > - 					     lower_32_bits(res->start),
> > - 					     OB_PCIE_IO);
> >  -			err = pci_remap_iospace(res, iobase);
> >  +			err = devm_pci_remap_iospace(dev, res, iobase);
> >   			if (err) {
> >   				dev_warn(dev, "error %d: failed to map resource %pR\n",
> >   					 err, res);  
> 
> Hi Stephen,
> 
> thanks for fixing this up, the fix looks fine to me (Thomas please
> confirm), if it is I would ask Bjorn please to send it upstream when the
> time for the PCI pull request comes.

I confirm that the fix looks good to me. Thanks Stephen for fixing it
up.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2018-07-20  1:03 Stephen Rothwell
@ 2018-07-20  9:15 ` Lorenzo Pieralisi
  2018-07-20 10:49   ` Thomas Petazzoni
  0 siblings, 1 reply; 44+ messages in thread
From: Lorenzo Pieralisi @ 2018-07-20  9:15 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, Linux-Next Mailing List,
	Linux Kernel Mailing List, Sergei Shtylyov, Evan Wang,
	Thomas Petazzoni

On Fri, Jul 20, 2018 at 11:03:10AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pci tree got a conflict in:
> 
>   drivers/pci/controller/pci-aardvark.c
> 
> between commit:
> 
>   1df3e5b3feeb ("PCI: aardvark: Fix I/O space page leak")
> 
> from Linus' tree and commit:
> 
>   6df6ba974a55 ("PCI: aardvark: Remove PCIe outbound window configuration")
> 
> from the pci tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/pci/controller/pci-aardvark.c
> index 0fae816fba39,d5030cd06197..000000000000
> --- a/drivers/pci/controller/pci-aardvark.c
> +++ b/drivers/pci/controller/pci-aardvark.c
> @@@ -843,13 -809,7 +809,7 @@@ static int advk_pcie_parse_request_of_p
>   
>   		switch (resource_type(res)) {
>   		case IORESOURCE_IO:
> - 			advk_pcie_set_ob_win(pcie, 1,
> - 					     upper_32_bits(res->start),
> - 					     lower_32_bits(res->start),
> - 					     0,	0xF8000000, 0,
> - 					     lower_32_bits(res->start),
> - 					     OB_PCIE_IO);
>  -			err = pci_remap_iospace(res, iobase);
>  +			err = devm_pci_remap_iospace(dev, res, iobase);
>   			if (err) {
>   				dev_warn(dev, "error %d: failed to map resource %pR\n",
>   					 err, res);

Hi Stephen,

thanks for fixing this up, the fix looks fine to me (Thomas please
confirm), if it is I would ask Bjorn please to send it upstream when the
time for the PCI pull request comes.

Thanks,
Lorenzo

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2018-07-20  1:03 Stephen Rothwell
  2018-07-20  9:15 ` Lorenzo Pieralisi
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2018-07-20  1:03 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Sergei Shtylyov, Evan Wang, Lorenzo Pieralisi, Thomas Petazzoni

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/controller/pci-aardvark.c

between commit:

  1df3e5b3feeb ("PCI: aardvark: Fix I/O space page leak")

from Linus' tree and commit:

  6df6ba974a55 ("PCI: aardvark: Remove PCIe outbound window configuration")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/controller/pci-aardvark.c
index 0fae816fba39,d5030cd06197..000000000000
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@@ -843,13 -809,7 +809,7 @@@ static int advk_pcie_parse_request_of_p
  
  		switch (resource_type(res)) {
  		case IORESOURCE_IO:
- 			advk_pcie_set_ob_win(pcie, 1,
- 					     upper_32_bits(res->start),
- 					     lower_32_bits(res->start),
- 					     0,	0xF8000000, 0,
- 					     lower_32_bits(res->start),
- 					     OB_PCIE_IO);
 -			err = pci_remap_iospace(res, iobase);
 +			err = devm_pci_remap_iospace(dev, res, iobase);
  			if (err) {
  				dev_warn(dev, "error %d: failed to map resource %pR\n",
  					 err, res);

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

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2018-04-03  2:29 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2018-04-03  2:29 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Casey Leedom,
	Arjun Vynipadath, Ganesh Goudar, David S. Miller

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/quirks.c

between commit:

  7dcf688d4c78 ("PCI/cxgb4: Extend T3 PCI quirk to T4+ devices")

from Linus' tree and commit:

  996058573b22 ("PCI/VPD: Move VPD quirks to vpd.c")

from the pci tree.

I fixed it up (I removed the section from this file and added the
following merge fix patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Apr 2018 12:17:20 +1000
Subject: [PATCH] PCI/cxgb4: merge fix up for move of quirk_chelsio_extend_vpd()

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/vpd.c | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
index 00b8b5d37056..8617565ba561 100644
--- a/drivers/pci/vpd.c
+++ b/drivers/pci/vpd.c
@@ -617,19 +617,28 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
 
 static void quirk_chelsio_extend_vpd(struct pci_dev *dev)
 {
-	pci_set_vpd_size(dev, 8192);
+	int chip = (dev->device & 0xf000) >> 12;
+	int func = (dev->device & 0x0f00) >>  8;
+	int prod = (dev->device & 0x00ff) >>  0;
+
+	/*
+	 * If this is a T3-based adapter, there's a 1KB VPD area at offset
+	 * 0xc00 which contains the preferred VPD values.  If this is a T4 or
+	 * later based adapter, the special VPD is at offset 0x400 for the
+	 * Physical Functions (the SR-IOV Virtual Functions have no VPD
+	 * Capabilities).  The PCI VPD Access core routines will normally
+	 * compute the size of the VPD by parsing the VPD Data Structure at
+	 * offset 0x000.  This will result in silent failures when attempting
+	 * to accesses these other VPD areas which are beyond those computed
+	 * limits.
+	 */
+	if (chip == 0x0 && prod >= 0x20)
+		pci_set_vpd_size(dev, 8192);
+	else if (chip >= 0x4 && func < 0x8)
+		pci_set_vpd_size(dev, 2048);
 }
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x20, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x21, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x22, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x23, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x24, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x25, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x26, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x30, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x31, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x32, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x35, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x36, quirk_chelsio_extend_vpd);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, 0x37, quirk_chelsio_extend_vpd);
+
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
+			quirk_chelsio_extend_vpd);
+
 #endif
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2018-03-26  1:23 Stephen Rothwell
@ 2018-03-27 16:19 ` Rob Herring
  0 siblings, 0 replies; 44+ messages in thread
From: Rob Herring @ 2018-03-27 16:19 UTC (permalink / raw)
  To: Stephen Rothwell, Bjorn Helgaas
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Guenter Roeck, Lorenzo Pieralisi

On Sun, Mar 25, 2018 at 8:23 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
>   include/linux/of_pci.h
>
> between commit:
>
>   a6f1086e29e9 ("PCI: Move of_irq_parse_and_map_pci() declaration under OF_IRQ")

My series was based on top of this commit because of this conflict.

> from Linus' tree and commit:
>
>   effab67ffe90 ("PCI: Move private DT related functions into private header")
>
> from the pci tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/linux/of_pci.h
> index 091033a6b836,41155181ecbd..000000000000
> --- a/include/linux/of_pci.h
> +++ b/include/linux/of_pci.h
> @@@ -13,9 -13,7 +13,6 @@@ struct device_node
>   struct device_node *of_pci_find_child_device(struct device_node *parent,
>                                              unsigned int devfn);
>   int of_pci_get_devfn(struct device_node *np);
> - int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
> - int of_get_pci_domain_nr(struct device_node *node);
> - int of_pci_get_max_link_speed(struct device_node *node);
>  -int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
>   void of_pci_check_probe_only(void);
>   int of_pci_map_rid(struct device_node *np, u32 rid,
>                    const char *map_name, const char *map_mask_name,
> @@@ -32,18 -30,12 +29,6 @@@ static inline int of_pci_get_devfn(stru
>         return -EINVAL;
>   }
>
> - static inline int
> - of_pci_parse_bus_range(struct device_node *node, struct resource *res)
> - {
> -       return -EINVAL;
> - }
> -
> --static inline int
> - of_get_pci_domain_nr(struct device_node *node)
>  -of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
> --{
> -       return -1;
>  -      return 0;
> --}
> --
>   static inline int of_pci_map_rid(struct device_node *np, u32 rid,
>                         const char *map_name, const char *map_mask_name,
>                         struct device_node **target, u32 *id_out)
> @@@ -54,33 -46,4 +39,13 @@@
>   static inline void of_pci_check_probe_only(void) { }
>   #endif
>
>  +#if IS_ENABLED(CONFIG_OF_IRQ)
>  +int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
>  +#else
>  +static inline int
>  +of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
>  +{
>  +      return 0;
>  +}
>  +#endif
> -
> - #if defined(CONFIG_OF_ADDRESS)
> - int of_pci_get_host_bridge_resources(struct device_node *dev,
> -                       unsigned char busno, unsigned char bus_max,
> -                       struct list_head *resources, resource_size_t *io_base);
> - #else
> - static inline int of_pci_get_host_bridge_resources(struct device_node *dev,
> -                       unsigned char busno, unsigned char bus_max,
> -                       struct list_head *resources, resource_size_t *io_base)
> - {
> -       return -EINVAL;
> - }
> - #endif
> -
>   #endif

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2018-03-26  1:23 Stephen Rothwell
  2018-03-27 16:19 ` Rob Herring
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2018-03-26  1:23 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Guenter Roeck, Rob Herring, Lorenzo Pieralisi

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  include/linux/of_pci.h

between commit:

  a6f1086e29e9 ("PCI: Move of_irq_parse_and_map_pci() declaration under OF_IRQ")

from Linus' tree and commit:

  effab67ffe90 ("PCI: Move private DT related functions into private header")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/of_pci.h
index 091033a6b836,41155181ecbd..000000000000
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@@ -13,9 -13,7 +13,6 @@@ struct device_node
  struct device_node *of_pci_find_child_device(struct device_node *parent,
  					     unsigned int devfn);
  int of_pci_get_devfn(struct device_node *np);
- int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
- int of_get_pci_domain_nr(struct device_node *node);
- int of_pci_get_max_link_speed(struct device_node *node);
 -int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
  void of_pci_check_probe_only(void);
  int of_pci_map_rid(struct device_node *np, u32 rid,
  		   const char *map_name, const char *map_mask_name,
@@@ -32,18 -30,12 +29,6 @@@ static inline int of_pci_get_devfn(stru
  	return -EINVAL;
  }
  
- static inline int
- of_pci_parse_bus_range(struct device_node *node, struct resource *res)
- {
- 	return -EINVAL;
- }
- 
--static inline int
- of_get_pci_domain_nr(struct device_node *node)
 -of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
--{
- 	return -1;
 -	return 0;
--}
--
  static inline int of_pci_map_rid(struct device_node *np, u32 rid,
  			const char *map_name, const char *map_mask_name,
  			struct device_node **target, u32 *id_out)
@@@ -54,33 -46,4 +39,13 @@@
  static inline void of_pci_check_probe_only(void) { }
  #endif
  
 +#if IS_ENABLED(CONFIG_OF_IRQ)
 +int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
 +#else
 +static inline int
 +of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
 +{
 +	return 0;
 +}
 +#endif
- 
- #if defined(CONFIG_OF_ADDRESS)
- int of_pci_get_host_bridge_resources(struct device_node *dev,
- 			unsigned char busno, unsigned char bus_max,
- 			struct list_head *resources, resource_size_t *io_base);
- #else
- static inline int of_pci_get_host_bridge_resources(struct device_node *dev,
- 			unsigned char busno, unsigned char bus_max,
- 			struct list_head *resources, resource_size_t *io_base)
- {
- 	return -EINVAL;
- }
- #endif
- 
  #endif

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

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2017-06-26  0:51 Stephen Rothwell
@ 2017-07-03  2:58 ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-07-03  2:58 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Alex Deucher

Hi all,

With the merge window opening, just a reminder that this conflict still
exists.

On Mon, 26 Jun 2017 10:51:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Bjorn,
> 
> Today's linux-next merge of the pci tree got a conflict in:
> 
>   drivers/gpu/drm/radeon/radeon_device.c
> 
> between commit:
> 
>   4eb59793cca0 ("drm/radeon: add a PX quirk for another K53TK variant")
> 
> from Linus' tree and commit:
> 
>   22c21de73087 ("drm/radeon: make MacBook Pro d3_delay quirk more generic")
> 
> from the pci tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/gpu/drm/radeon/radeon_device.c
> index 0a6444d72000,aecaafbc8417..000000000000
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@@ -136,12 -135,6 +135,10 @@@ static struct radeon_px_quirk radeon_px
>   	 * https://bugzilla.kernel.org/show_bug.cgi?id=51381
>   	 */
>   	{ PCI_VENDOR_ID_ATI, 0x6840, 0x1043, 0x2122, RADEON_PX_QUIRK_DISABLE_PX },
>  +	/* Asus K53TK laptop with AMD A6-3420M APU and Radeon 7670m GPU
>  +	 * https://bugs.freedesktop.org/show_bug.cgi?id=101491
>  +	 */
>  +	{ PCI_VENDOR_ID_ATI, 0x6741, 0x1043, 0x2122, RADEON_PX_QUIRK_DISABLE_PX },
> - 	/* macbook pro 8.2 */
> - 	{ PCI_VENDOR_ID_ATI, 0x6741, PCI_VENDOR_ID_APPLE, 0x00e2, RADEON_PX_QUIRK_LONG_WAKEUP },
>   	{ 0, 0, 0, 0, 0 },
>   };
>   

-- 
Cheers,
Stephen Rothwell

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2017-06-26  0:51 Stephen Rothwell
  2017-07-03  2:58 ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2017-06-26  0:51 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Alex Deucher

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/gpu/drm/radeon/radeon_device.c

between commit:

  4eb59793cca0 ("drm/radeon: add a PX quirk for another K53TK variant")

from Linus' tree and commit:

  22c21de73087 ("drm/radeon: make MacBook Pro d3_delay quirk more generic")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/radeon/radeon_device.c
index 0a6444d72000,aecaafbc8417..000000000000
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@@ -136,12 -135,6 +135,10 @@@ static struct radeon_px_quirk radeon_px
  	 * https://bugzilla.kernel.org/show_bug.cgi?id=51381
  	 */
  	{ PCI_VENDOR_ID_ATI, 0x6840, 0x1043, 0x2122, RADEON_PX_QUIRK_DISABLE_PX },
 +	/* Asus K53TK laptop with AMD A6-3420M APU and Radeon 7670m GPU
 +	 * https://bugs.freedesktop.org/show_bug.cgi?id=101491
 +	 */
 +	{ PCI_VENDOR_ID_ATI, 0x6741, 0x1043, 0x2122, RADEON_PX_QUIRK_DISABLE_PX },
- 	/* macbook pro 8.2 */
- 	{ PCI_VENDOR_ID_ATI, 0x6741, PCI_VENDOR_ID_APPLE, 0x00e2, RADEON_PX_QUIRK_LONG_WAKEUP },
  	{ 0, 0, 0, 0, 0 },
  };
  

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2016-12-08 23:44 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2016-12-08 23:44 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: linux-next, linux-kernel, Stephen Hemminger, Thomas Gleixner

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/msi.c

between commit:

  62c61514191b ("doc: Add missing parameter for msi_setup")

from Linus' tree and commit:

  67f1e4473857 ("PCI/MSI: Document new parameter for msi_capability_init()")

from the pci tree.

I fixed it up (I just used the pci tree version) and can carry the fix
as necessary. This is now fixed as far as linux-next is concerned, but
any non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2016-06-23  1:44 Stephen Rothwell
@ 2016-06-23 16:43 ` Bjorn Helgaas
  0 siblings, 0 replies; 44+ messages in thread
From: Bjorn Helgaas @ 2016-06-23 16:43 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, linux-next, linux-kernel, Johannes Thumshirn, Jens Axboe

On Thu, Jun 23, 2016 at 11:44:29AM +1000, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> Today's linux-next merge of the pci tree got a conflict in:
> 
>   drivers/nvme/host/pci.c
> 
> between commit:
> 
>   edb50a5403d2 ("NVMe: Only release requested regions")
> 
> from Linus' tree and commit:
> 
>   a1f447b35b72 ("NVMe: Use pci_(request|release)_mem_regions")
> 
> from the pci tree.
> 
> I fixed it up (I just used the pci tree version of this file) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

Thanks for the heads-up.  I think using the pci tree version is the
correct resolution.

Bjorn

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2016-06-23  1:44 Stephen Rothwell
  2016-06-23 16:43 ` Bjorn Helgaas
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2016-06-23  1:44 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: linux-next, linux-kernel, Johannes Thumshirn, Jens Axboe

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/nvme/host/pci.c

between commit:

  edb50a5403d2 ("NVMe: Only release requested regions")

from Linus' tree and commit:

  a1f447b35b72 ("NVMe: Use pci_(request|release)_mem_regions")

from the pci tree.

I fixed it up (I just used the pci tree version of this file) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2016-01-20 23:33 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2016-01-20 23:33 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: linux-next, linux-kernel, Jakub Kicinski, David S. Miller,
	Jason S. McMullan

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  include/linux/pci_ids.h

between commit:

  2d1e0254ef83 ("pci_ids: add Netronome Systems vendor")

from Linus' tree and commit:

  a755e169031d ("PCI: Add Netronome vendor and device IDs")

from the pci tree.

I fixed it up (the latter is just a superset of the former) and can
carry the fix as necessary (no action
is required).

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

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2013-06-17  1:42 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2013-06-17  1:42 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: linux-next, linux-kernel, Lance Ortiz, Tony Luck, Betty Dall

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
include/linux/aer.h between commit 37448adfc7ce ("aerdrv: Move
cper_print_aer() call out of interrupt context") from Linus' tree and
commit fde41b9fa2d0 ("PCI/AER: Remove "extern" from function
declarations") from the pci 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 include/linux/aer.h
index 737f90a,55bb3dc..0000000
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@@ -49,11 -53,10 +53,10 @@@ static inline int pci_cleanup_aer_uncor
  }
  #endif
  
- extern void cper_print_aer(struct pci_dev *dev,
- 			   int cper_severity, struct aer_capability_regs *aer);
- extern int cper_severity_to_aer(int cper_severity);
- extern void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
- 			      int severity,
- 			      struct aer_capability_regs *aer_regs);
 -void cper_print_aer(const char *prefix, struct pci_dev *dev, int cper_severity,
++void cper_print_aer(struct pci_dev *dev, int cper_severity,
+ 		    struct aer_capability_regs *aer);
+ int cper_severity_to_aer(int cper_severity);
+ void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
 -		       int severity);
++		       int severity, struct aer_capability_regs *aer_regs);
  #endif //_AER_H_
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2013-06-04  1:49 Stephen Rothwell
@ 2013-06-04  2:11 ` Bjorn Helgaas
  0 siblings, 0 replies; 44+ messages in thread
From: Bjorn Helgaas @ 2013-06-04  2:11 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next list, linux-kernel, Yinghai Lu, Jiang Liu

On Mon, Jun 3, 2013 at 7:49 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/acpi/pci_root.c between commit 3f327e39b4b8 ("PCI: acpiphp:
> Re-enumerate devices when host bridge receives Bus Check") from Linus'
> tree and commit 6dc7d22c6738 ("PCI/ACPI: Use dev_printk(),
> acpi_handle_print(), pr_xxx() when possible") from the pci tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks perfect, thanks!

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/acpi/pci_root.c
> index e427dc5,122b4dc..0000000
> --- a/drivers/acpi/pci_root.c
> +++ b/drivers/acpi/pci_root.c
> @@@ -639,11 -620,9 +620,11 @@@ static void _handle_hotplug_event_root(
>         switch (type) {
>         case ACPI_NOTIFY_BUS_CHECK:
>                 /* bus enumerate */
> -               printk(KERN_DEBUG "%s: Bus check notify on %s\n", __func__,
> -                                (char *)buffer.pointer);
> +               acpi_handle_printk(KERN_DEBUG, handle,
> +                                  "Bus check notify on %s\n", __func__);
>  -              if (!root)
>  +              if (root)
>  +                      acpiphp_check_host_bridge(handle);
>  +              else
>                         handle_root_bridge_insertion(handle);
>
>                 break;

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2013-06-04  1:49 Stephen Rothwell
  2013-06-04  2:11 ` Bjorn Helgaas
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2013-06-04  1:49 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: linux-next, linux-kernel, Yinghai Lu, Jiang Liu

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
drivers/acpi/pci_root.c between commit 3f327e39b4b8 ("PCI: acpiphp:
Re-enumerate devices when host bridge receives Bus Check") from Linus'
tree and commit 6dc7d22c6738 ("PCI/ACPI: Use dev_printk(),
acpi_handle_print(), pr_xxx() when possible") from the pci 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 drivers/acpi/pci_root.c
index e427dc5,122b4dc..0000000
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@@ -639,11 -620,9 +620,11 @@@ static void _handle_hotplug_event_root(
  	switch (type) {
  	case ACPI_NOTIFY_BUS_CHECK:
  		/* bus enumerate */
- 		printk(KERN_DEBUG "%s: Bus check notify on %s\n", __func__,
- 				 (char *)buffer.pointer);
+ 		acpi_handle_printk(KERN_DEBUG, handle,
+ 				   "Bus check notify on %s\n", __func__);
 -		if (!root)
 +		if (root)
 +			acpiphp_check_host_bridge(handle);
 +		else
  			handle_root_bridge_insertion(handle);
  
  		break;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2012-09-04  1:59 Stephen Rothwell
@ 2012-09-04  6:57 ` Yuval Mintz
  0 siblings, 0 replies; 44+ messages in thread
From: Yuval Mintz @ 2012-09-04  6:57 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, linux-next, linux-kernel, Ariel Elior,
	Eilon Greenstein, Jiang Liu, David S. Miller

> Today's linux-next merge of the pci tree got a conflict in
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
> 8eee694c3e66 ("bnx2x: fix unload previous driver flow when flr-capable")
> from Linus' tree and commit 2a80eebcbf3e ("bnx2x: Use PCI Express
> Capability accessors") from the pci tree.
> 
> The former removes the function updated by the latter, so I just removed
> the function (see below) and can carry the fix as necessary.

Acked-by: Yuval Mintz <yuvalmin@broadcom.com>

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2012-09-04  2:04 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2012-09-04  2:04 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: linux-next, linux-kernel, Alexandre Bounine, Andrew Morton, Jiang Liu

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
drivers/rapidio/devices/tsi721.c between commit 9a9a9a7adafe
("rapidio/tsi721: fix unused variable compiler warning") from Linus' tree
and commit 5cdaaf8a11ba ("rapdio/tsi721: Use PCI Express Capability
accessors") from the pci 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 drivers/rapidio/devices/tsi721.c
index 5d44252,fc22b93..0000000
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@@ -2219,9 -2212,8 +2219,7 @@@ static int __devinit tsi721_probe(struc
  				  const struct pci_device_id *id)
  {
  	struct tsi721_device *priv;
- 	int cap;
 -	int i;
  	int err;
- 	u32 regval;
  
  	priv = kzalloc(sizeof(struct tsi721_device), GFP_KERNEL);
  	if (priv == NULL) {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2012-09-04  1:59 Stephen Rothwell
  2012-09-04  6:57 ` Yuval Mintz
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2012-09-04  1:59 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: linux-next, linux-kernel, Yuval Mintz, Ariel Elior,
	Eilon Greenstein, Jiang Liu, David S. Miller

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
8eee694c3e66 ("bnx2x: fix unload previous driver flow when flr-capable")
from Linus' tree and commit 2a80eebcbf3e ("bnx2x: Use PCI Express
Capability accessors") from the pci tree.

The former removes the function updated by the latter, so I just removed
the function (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 2105498,281cf3f..0000000
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -9372,29 -9378,28 +9366,25 @@@ static int __devinit bnx2x_prev_mark_pa
  	return rc;
  }
  
 -static bool __devinit bnx2x_can_flr(struct bnx2x *bp)
 -{
 -	u32 cap;
 -	struct pci_dev *dev = bp->pdev;
 -
 -	pcie_capability_read_dword(dev, PCI_EXP_DEVCAP, &cap);
 -	if (!(cap & PCI_EXP_DEVCAP_FLR))
 -		return false;
 -
 -	return true;
 -}
 -
  static int __devinit bnx2x_do_flr(struct bnx2x *bp)
  {
- 	int i, pos;
+ 	int i;
  	u16 status;
  	struct pci_dev *dev = bp->pdev;
  
 -	/* probe the capability first */
 -	if (bnx2x_can_flr(bp))
 -		return -ENOTTY;
 +
 +	if (CHIP_IS_E1x(bp)) {
 +		BNX2X_DEV_INFO("FLR not supported in E1/E1H\n");
 +		return -EINVAL;
 +	}
 +
 +	/* only bootcode REQ_BC_VER_4_INITIATE_FLR and onwards support flr */
 +	if (bp->common.bc_ver < REQ_BC_VER_4_INITIATE_FLR) {
 +		BNX2X_ERR("FLR not supported by BC_VER: 0x%x\n",
 +			  bp->common.bc_ver);
 +		return -EINVAL;
 +	}
  
- 	pos = pci_pcie_cap(dev);
- 	if (!pos)
- 		return -ENOTTY;
- 
  	/* Wait for Transaction Pending bit clean */
  	for (i = 0; i < 4; i++) {
  		if (i)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2012-06-25  2:31 Stephen Rothwell
  2012-06-25  6:32 ` huang ying
@ 2012-06-25 14:14 ` Alan Stern
  1 sibling, 0 replies; 44+ messages in thread
From: Alan Stern @ 2012-06-25 14:14 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, linux-next, linux-kernel, Greg Kroah-Hartman,
	Huang Ying, Zheng Yan

On Mon, 25 Jun 2012, Stephen Rothwell wrote:

> Hi Bjorn,
> 
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/pci.c between commit c2fb8a3fa255 ("USB: add
> NO_D3_DURING_SLEEP flag and revert 151b61284776be2") from Linus' tree and
> commit 448bd857d48e ("PCI/PM: add PCIe runtime D3cold support") from the
> pci tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/pci/pci.c
> index 77cb54a,3f8b74f..0000000
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@@ -1744,11 -1803,10 +1803,15 @@@ int pci_prepare_to_sleep(struct pci_de
>   	if (target_state == PCI_POWER_ERROR)
>   		return -EIO;
>   
> + 	/* D3cold during system suspend/hibernate is not supported */
> + 	if (target_state > PCI_D3hot)
> + 		target_state = PCI_D3hot;
> + 
>  +	/* Some devices mustn't be in D3 during system sleep */
>  +	if (target_state == PCI_D3hot &&
>  +			(dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))
>  +		return 0;
>  +
>   	pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
>   
>   	error = pci_set_power_state(dev, target_state);

This looks right to me too.

Alan Stern

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2012-06-25  2:31 Stephen Rothwell
@ 2012-06-25  6:32 ` huang ying
  2012-06-25 14:14 ` Alan Stern
  1 sibling, 0 replies; 44+ messages in thread
From: huang ying @ 2012-06-25  6:32 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, linux-next, linux-kernel, Alan Stern,
	Greg Kroah-Hartman, Huang Ying, Zheng Yan

Hi, Stephen,

On Mon, Jun 25, 2012 at 10:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/pci.c between commit c2fb8a3fa255 ("USB: add
> NO_D3_DURING_SLEEP flag and revert 151b61284776be2") from Linus' tree and
> commit 448bd857d48e ("PCI/PM: add PCIe runtime D3cold support") from the
> pci tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/pci/pci.c
> index 77cb54a,3f8b74f..0000000
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@@ -1744,11 -1803,10 +1803,15 @@@ int pci_prepare_to_sleep(struct pci_de
>        if (target_state == PCI_POWER_ERROR)
>                return -EIO;
>
> +       /* D3cold during system suspend/hibernate is not supported */
> +       if (target_state > PCI_D3hot)
> +               target_state = PCI_D3hot;
> +
>  +      /* Some devices mustn't be in D3 during system sleep */
>  +      if (target_state == PCI_D3hot &&
>  +                      (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))
>  +              return 0;
>  +
>        pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
>
>        error = pci_set_power_state(dev, target_state);

I found this conflict during development too.  I think the fixing is
correct.  Thanks.

Best Regards,
Huang Ying

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2012-06-25  2:31 Stephen Rothwell
  2012-06-25  6:32 ` huang ying
  2012-06-25 14:14 ` Alan Stern
  0 siblings, 2 replies; 44+ messages in thread
From: Stephen Rothwell @ 2012-06-25  2:31 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: linux-next, linux-kernel, Alan Stern, Greg Kroah-Hartman,
	Huang Ying, Zheng Yan

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/pci.c between commit c2fb8a3fa255 ("USB: add
NO_D3_DURING_SLEEP flag and revert 151b61284776be2") from Linus' tree and
commit 448bd857d48e ("PCI/PM: add PCIe runtime D3cold support") from the
pci tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pci/pci.c
index 77cb54a,3f8b74f..0000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -1744,11 -1803,10 +1803,15 @@@ int pci_prepare_to_sleep(struct pci_de
  	if (target_state == PCI_POWER_ERROR)
  		return -EIO;
  
+ 	/* D3cold during system suspend/hibernate is not supported */
+ 	if (target_state > PCI_D3hot)
+ 		target_state = PCI_D3hot;
+ 
 +	/* Some devices mustn't be in D3 during system sleep */
 +	if (target_state == PCI_D3hot &&
 +			(dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))
 +		return 0;
 +
  	pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
  
  	error = pci_set_power_state(dev, target_state);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2012-06-19  1:15 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2012-06-19  1:15 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: linux-next, linux-kernel, Alan Stern, Jan Kiszka

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/quirks.c between commit c2fb8a3fa255 ("USB: add
NO_D3_DURING_SLEEP flag and revert 151b61284776be2") from Linus' tree and
commit fbebb9fd2258 ("PCI: add infrastructure for devices with broken
INTx masking") from the pci tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pci/quirks.c
index 9478f72,a2d9d33..0000000
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@ -2930,31 -2930,19 +2930,45 @@@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_I
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
  
  /*
 + * The Intel 6 Series/C200 Series chipset's EHCI controllers on many
 + * ASUS motherboards will cause memory corruption or a system crash
 + * if they are in D3 while the system is put into S3 sleep.
 + */
 +static void __devinit asus_ehci_no_d3(struct pci_dev *dev)
 +{
 +	const char *sys_info;
 +	static const char good_Asus_board[] = "P8Z68-V";
 +
 +	if (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP)
 +		return;
 +	if (dev->subsystem_vendor != PCI_VENDOR_ID_ASUSTEK)
 +		return;
 +	sys_info = dmi_get_system_info(DMI_BOARD_NAME);
 +	if (sys_info && memcmp(sys_info, good_Asus_board,
 +			sizeof(good_Asus_board) - 1) == 0)
 +		return;
 +
 +	dev_info(&dev->dev, "broken D3 during system sleep on ASUS\n");
 +	dev->dev_flags |= PCI_DEV_FLAGS_NO_D3_DURING_SLEEP;
 +	device_set_wakeup_capable(&dev->dev, false);
 +}
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c26, asus_ehci_no_d3);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c2d, asus_ehci_no_d3);
 +
++/*
+  * Some devices may pass our check in pci_intx_mask_supported if
+  * PCI_COMMAND_INTX_DISABLE works though they actually do not properly
+  * support this feature.
+  */
+ static void __devinit quirk_broken_intx_masking(struct pci_dev *dev)
+ {
+ 	dev->broken_intx_masking = 1;
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CHELSIO, 0x0030,
+ 			 quirk_broken_intx_masking);
+ DECLARE_PCI_FIXUP_HEADER(0x1814, 0x0601, /* Ralink RT2800 802.11n PCI */
+ 			 quirk_broken_intx_masking);
+ 
  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
  			  struct pci_fixup *end)
  {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2010-12-20  2:08 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2010-12-20  2:08 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, linux-kernel, Bjorn Helgaas

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

Hi Jesse,

Today's linux-next merge of the pci tree got a conflicts in
arch/x86/kernel/resource.c arch/x86/pci/i386.c kernel/resource.c between
various commits from Linus' tree and similar commits from the pci tree.

I just used the versions from Linus' tree and assume that the pci tree
needs to be resynced.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2009-12-07  0:25 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2009-12-07  0:25 UTC (permalink / raw)
  To: Jesse Barnes
  Cc: linux-next, linux-kernel, FUJITA Tomonori, Ingo Molnar,
	Chris Wright, Linus

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/dmar.c between commit
75f1cdf1dda92cae037ec848ae63690d91913eac ("x86: Handle HW IOMMU
initialization failure gracefully") from Linus' tree and commit
5d990b627537e59a3a2f039ff588a4750e9c1a6a ("PCI: add pci_request_acs")
from the pci tree.

Just context changes.  I fxied it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pci/dmar.c
index 416f6ac,0e98f6b..0000000
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -645,13 -613,13 +645,16 @@@ void __init detect_intel_iommu(void
  			       "x2apic and Intr-remapping.\n");
  #endif
  #ifdef CONFIG_DMAR
- 		if (ret && !no_iommu && !iommu_detected && !dmar_disabled)
 -		if (ret && !no_iommu && !iommu_detected && !swiotlb &&
 -		    !dmar_disabled) {
++		if (ret && !no_iommu && !iommu_detected && !dmar_disabled) {
  			iommu_detected = 1;
+ 			/* Make sure ACS will be enabled */
+ 			pci_request_acs();
+ 		}
  #endif
 +#ifdef CONFIG_X86
 +		if (ret)
 +			x86_init.iommu.iommu_init = intel_iommu_init;
 +#endif
  	}
  	early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
  	dmar_tbl = NULL;

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2009-12-07  0:25 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2009-12-07  0:25 UTC (permalink / raw)
  To: Jesse Barnes
  Cc: linux-next, linux-kernel, FUJITA Tomonori, Ingo Molnar,
	Chris Wright, Linus

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
arch/x86/kernel/amd_iommu_init.c between commit
ea1b0d3945c7374849235b6ecaea1191ee1d9d50 ("x86: amd_iommu: Convert
amd_iommu_detect() to use iommu_init hook") from Linus' tree and commit
5d990b627537e59a3a2f039ff588a4750e9c1a6a ("PCI: add pci_request_acs")
from the pci tree.

I did a fixup (see below) but I have no confidence in it.  Please check.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/kernel/amd_iommu_init.c
index 7ffc399,e60530a..0000000
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@@ -1335,7 -1326,12 +1335,9 @@@ void __init amd_iommu_detect(void
  	if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
  		iommu_detected = 1;
  		amd_iommu_detected = 1;
 -#ifdef CONFIG_GART_IOMMU
 -		gart_iommu_aperture_disabled = 1;
 -		gart_iommu_aperture = 0;
 -#endif
 +		x86_init.iommu.iommu_init = amd_iommu_init;
+ 		/* Make sure ACS will be enabled */
+ 		pci_request_acs();
  	}
  }
  

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2009-10-14  0:05 Stephen Rothwell
  2009-10-14  0:38 ` Jesse Barnes
@ 2009-10-14  7:41 ` David Woodhouse
  1 sibling, 0 replies; 44+ messages in thread
From: David Woodhouse @ 2009-10-14  7:41 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Jesse Barnes, linux-next, linux-kernel, Tejun Heo

On Wed, 2009-10-14 at 01:05 +0100, Stephen Rothwell wrote:
> ++device_initcall(pci_init); 

That puts it _after_ some device drivers have already started up.
Possibly not what was intended?

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2009-10-14  0:38 ` Jesse Barnes
@ 2009-10-14  2:10   ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2009-10-14  2:10 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, linux-kernel, David Woodhouse, Tejun Heo

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

Hi Jesse,

On Tue, 13 Oct 2009 17:38:42 -0700 Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Ah, thanks.  I'll check it out and update my linux-next branch.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2009-10-14  0:05 Stephen Rothwell
@ 2009-10-14  0:38 ` Jesse Barnes
  2009-10-14  2:10   ` Stephen Rothwell
  2009-10-14  7:41 ` David Woodhouse
  1 sibling, 1 reply; 44+ messages in thread
From: Jesse Barnes @ 2009-10-14  0:38 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, David Woodhouse, Tejun Heo

On Wed, 14 Oct 2009 11:05:32 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/pci.c between commit
> 8d86fb2c80ec376b35ae64ac858d406ae1d42a3f ("Rename pci_init() to
> pci_apply_final_quirks(), move it to quirks.c") from Linus' tree and
> commit b20dd110d21aac94b3f4063cffbcf9718656ce51 ("PCI: determine CLS
> more intelligently") from the pci tree.
> 
> I fixed it up by removing the bits of pci_init() that had been moved
> and leaving the newly added bits where they are.  Hopefully this will
> be ok since the moved bits are actually run earlier now.  Obviously,
> there is probably a better fix ...

Ah, thanks.  I'll check it out and update my linux-next branch.

-- 
Jesse Barnes, Intel Open Source Technology Center

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2009-10-14  0:05 Stephen Rothwell
  2009-10-14  0:38 ` Jesse Barnes
  2009-10-14  7:41 ` David Woodhouse
  0 siblings, 2 replies; 44+ messages in thread
From: Stephen Rothwell @ 2009-10-14  0:05 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, linux-kernel, David Woodhouse, Tejun Heo

Hi Jesse,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/pci.c between commit 8d86fb2c80ec376b35ae64ac858d406ae1d42a3f
("Rename pci_init() to pci_apply_final_quirks(), move it to quirks.c")
from Linus' tree and commit b20dd110d21aac94b3f4063cffbcf9718656ce51
("PCI: determine CLS more intelligently") from the pci tree.

I fixed it up by removing the bits of pci_init() that had been moved and
leaving the newly added bits where they are.  Hopefully this will be ok
since the moved bits are actually run earlier now.  Obviously, there is
probably a better fix ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pci/pci.c
index 4e4c295,a6e22fd..0000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -2723,6 -2724,45 +2724,45 @@@ int __attribute__ ((weak)) pci_ext_cfg_
  	return 1;
  }
  
+ static int __devinit pci_init(void)
+ {
+ 	struct pci_dev *dev = NULL;
+ 	u8 cls = 0;
+ 	u8 tmp;
+ 
+ 	if (pci_cache_line_size)
+ 		printk(KERN_DEBUG "PCI: CLS %u bytes\n",
+ 		       pci_cache_line_size << 2);
+ 
+ 	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
 -		pci_fixup_device(pci_fixup_final, dev);
+ 		/*
+ 		 * If arch hasn't set it explicitly yet, use the CLS
+ 		 * value shared by all PCI devices.  If there's a
+ 		 * mismatch, fall back to the default value.
+ 		 */
+ 		if (!pci_cache_line_size) {
+ 			pci_read_config_byte(dev, PCI_CACHE_LINE_SIZE, &tmp);
+ 			if (!cls)
+ 				cls = tmp;
+ 			if (!tmp || cls == tmp)
+ 				continue;
+ 
+ 			printk(KERN_DEBUG "PCI: CLS mismatch (%u != %u), "
+ 			       "using %u bytes\n", cls << 2, tmp << 2,
+ 			       pci_dfl_cache_line_size << 2);
+ 			pci_cache_line_size = pci_dfl_cache_line_size;
+ 		}
+ 	}
+ 	if (!pci_cache_line_size) {
+ 		printk(KERN_DEBUG "PCI: CLS %u bytes, default %u\n",
+ 		       cls << 2, pci_dfl_cache_line_size << 2);
+ 		pci_cache_line_size = cls;
+ 	}
+ 
+ 	return 0;
+ }
++device_initcall(pci_init);
+ 
  static int __init pci_setup(char *str)
  {
  	while (str) {

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2009-06-30  2:16   ` Matthew Wilcox
@ 2009-06-30 16:00     ` Jesse Barnes
  0 siblings, 0 replies; 44+ messages in thread
From: Jesse Barnes @ 2009-06-30 16:00 UTC (permalink / raw)
  To: Matthew Wilcox; +Cc: Stephen Rothwell, linux-next, linux-kernel, Alex Chiang

On Mon, 29 Jun 2009 19:16:13 -0700
Matthew Wilcox <willy@linux.intel.com> wrote:

> On Mon, Jun 29, 2009 at 07:01:35PM -0700, Jesse Barnes wrote:
> > On Tue, 30 Jun 2009 11:56:38 +1000
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > Hi Jesse,
> > > 
> > > Today's linux-next merge of the pci tree got conflicts in
> > > arch/ia64/include/asm/pci.h, arch/mn10300/include/asm/pci.h and
> > > include/asm-generic/pci.h between commit
> > > a6c140969b4685f9b9f6773c0760f55ca66d1825 ("Delete
> > > pcibios_select_root") from Linus' tree and commit
> > > a53cd7419b22c14b5a1e6859a940fb6bfa77963f ("PCI: remove
> > > pcibios_scan_all_fns()") from the pci tree.
> > > 
> > > Just context changes (adjacent removals).  I fixed it up (see
> > > below) and can carry the fix for a while.
> > 
> > Ah ok, thanks.  That'll get fixed up after I send the current
> > for-linus bits over and refresh my PCI tree.
> 
> I think you need to pull from Linus' tree before you send the bits
> over -- that's a conflict between Linus' tree and your tree, and you
> don't want to annoy Linus by making him merge them ;-)

Ah but I don't want to annoy Linus by merging either.  In fact, he's
stated explicitly several times that I should *not* pull his tree into
mine, either by rebasing or merging; his position is that pulling an
old tree from me should be fine, since no one else should have commits
in the PCI area, or if they do they'll be trivial and he'll fix them
up.

-- 
Jesse Barnes, Intel Open Source Technology Center

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2009-06-30  2:01 ` Jesse Barnes
@ 2009-06-30  2:16   ` Matthew Wilcox
  2009-06-30 16:00     ` Jesse Barnes
  0 siblings, 1 reply; 44+ messages in thread
From: Matthew Wilcox @ 2009-06-30  2:16 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: Stephen Rothwell, linux-next, linux-kernel, Alex Chiang

On Mon, Jun 29, 2009 at 07:01:35PM -0700, Jesse Barnes wrote:
> On Tue, 30 Jun 2009 11:56:38 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi Jesse,
> > 
> > Today's linux-next merge of the pci tree got conflicts in
> > arch/ia64/include/asm/pci.h, arch/mn10300/include/asm/pci.h and
> > include/asm-generic/pci.h between commit
> > a6c140969b4685f9b9f6773c0760f55ca66d1825 ("Delete
> > pcibios_select_root") from Linus' tree and commit
> > a53cd7419b22c14b5a1e6859a940fb6bfa77963f ("PCI: remove
> > pcibios_scan_all_fns()") from the pci tree.
> > 
> > Just context changes (adjacent removals).  I fixed it up (see below)
> > and can carry the fix for a while.
> 
> Ah ok, thanks.  That'll get fixed up after I send the current for-linus
> bits over and refresh my PCI tree.

I think you need to pull from Linus' tree before you send the bits over
-- that's a conflict between Linus' tree and your tree, and you don't
want to annoy Linus by making him merge them ;-)

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

* Re: linux-next: manual merge of the pci tree with Linus' tree
  2009-06-30  1:56 Stephen Rothwell
@ 2009-06-30  2:01 ` Jesse Barnes
  2009-06-30  2:16   ` Matthew Wilcox
  0 siblings, 1 reply; 44+ messages in thread
From: Jesse Barnes @ 2009-06-30  2:01 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Matthew Wilcox, Alex Chiang

On Tue, 30 Jun 2009 11:56:38 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jesse,
> 
> Today's linux-next merge of the pci tree got conflicts in
> arch/ia64/include/asm/pci.h, arch/mn10300/include/asm/pci.h and
> include/asm-generic/pci.h between commit
> a6c140969b4685f9b9f6773c0760f55ca66d1825 ("Delete
> pcibios_select_root") from Linus' tree and commit
> a53cd7419b22c14b5a1e6859a940fb6bfa77963f ("PCI: remove
> pcibios_scan_all_fns()") from the pci tree.
> 
> Just context changes (adjacent removals).  I fixed it up (see below)
> and can carry the fix for a while.

Ah ok, thanks.  That'll get fixed up after I send the current for-linus
bits over and refresh my PCI tree.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

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

* linux-next: manual merge of the pci tree with Linus' tree
@ 2009-06-30  1:56 Stephen Rothwell
  2009-06-30  2:01 ` Jesse Barnes
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2009-06-30  1:56 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: linux-next, linux-kernel, Matthew Wilcox, Alex Chiang

Hi Jesse,

Today's linux-next merge of the pci tree got conflicts in
arch/ia64/include/asm/pci.h, arch/mn10300/include/asm/pci.h and
include/asm-generic/pci.h between commit
a6c140969b4685f9b9f6773c0760f55ca66d1825 ("Delete pcibios_select_root")
from Linus' tree and commit a53cd7419b22c14b5a1e6859a940fb6bfa77963f
("PCI: remove pcibios_scan_all_fns()") from the pci tree.

Just context changes (adjacent removals).  I fixed it up (see below) and
can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/ia64/include/asm/pci.h
index fcfca56,55281aa..0000000
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@@ -135,7 -134,18 +134,6 @@@ extern void pcibios_resource_to_bus(str
  extern void pcibios_bus_to_resource(struct pci_dev *dev,
  		struct resource *res, struct pci_bus_region *region);
  
- #define pcibios_scan_all_fns(a, b)	0
 -static inline struct resource *
 -pcibios_select_root(struct pci_dev *pdev, struct resource *res)
 -{
 -	struct resource *root = NULL;
 -
 -	if (res->flags & IORESOURCE_IO)
 -		root = &ioport_resource;
 -	if (res->flags & IORESOURCE_MEM)
 -		root = &iomem_resource;
 -
 -	return root;
 -}
  
  #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
  static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
diff --cc arch/mn10300/include/asm/pci.h
index 35d2ed6,de52a27..0000000
--- a/arch/mn10300/include/asm/pci.h
+++ b/arch/mn10300/include/asm/pci.h
@@@ -102,7 -106,18 +102,6 @@@ extern void pcibios_bus_to_resource(str
  				    struct resource *res,
  				    struct pci_bus_region *region);
  
- #define pcibios_scan_all_fns(a, b)	0
 -static inline struct resource *
 -pcibios_select_root(struct pci_dev *pdev, struct resource *res)
 -{
 -	struct resource *root = NULL;
 -
 -	if (res->flags & IORESOURCE_IO)
 -		root = &ioport_resource;
 -	if (res->flags & IORESOURCE_MEM)
 -		root = &iomem_resource;
 -
 -	return root;
 -}
  
  static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
  {
diff --cc include/asm-generic/pci.h
index b4326b5,095cca8..0000000
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@@ -30,7 -30,18 +30,6 @@@ pcibios_bus_to_resource(struct pci_dev 
  	res->end = region->end;
  }
  
- #define pcibios_scan_all_fns(a, b)	0
 -static inline struct resource *
 -pcibios_select_root(struct pci_dev *pdev, struct resource *res)
 -{
 -	struct resource *root = NULL;
 -
 -	if (res->flags & IORESOURCE_IO)
 -		root = &ioport_resource;
 -	if (res->flags & IORESOURCE_MEM)
 -		root = &iomem_resource;
 -
 -	return root;
 -}
  
  #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
  static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

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

end of thread, other threads:[~2022-01-14  6:58 UTC | newest]

Thread overview: 44+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-14  1:02 linux-next: manual merge of the pci tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2022-01-13 23:45 Stephen Rothwell
2022-01-14  5:48 ` Sergio Paracuellos
2022-01-14  6:53   ` Stephen Rothwell
2022-01-14  6:57     ` Sergio Paracuellos
2021-08-25  0:57 Stephen Rothwell
2021-02-23  0:19 Stephen Rothwell
2020-03-30 23:49 Stephen Rothwell
2020-03-31  8:37 ` Geert Uytterhoeven
2020-03-24 23:58 Stephen Rothwell
2019-09-19 12:33 Mark Brown
2018-07-20  1:03 Stephen Rothwell
2018-07-20  9:15 ` Lorenzo Pieralisi
2018-07-20 10:49   ` Thomas Petazzoni
2018-04-03  2:29 Stephen Rothwell
2018-03-26  1:23 Stephen Rothwell
2018-03-27 16:19 ` Rob Herring
2017-06-26  0:51 Stephen Rothwell
2017-07-03  2:58 ` Stephen Rothwell
2016-12-08 23:44 Stephen Rothwell
2016-06-23  1:44 Stephen Rothwell
2016-06-23 16:43 ` Bjorn Helgaas
2016-01-20 23:33 Stephen Rothwell
2013-06-17  1:42 Stephen Rothwell
2013-06-04  1:49 Stephen Rothwell
2013-06-04  2:11 ` Bjorn Helgaas
2012-09-04  2:04 Stephen Rothwell
2012-09-04  1:59 Stephen Rothwell
2012-09-04  6:57 ` Yuval Mintz
2012-06-25  2:31 Stephen Rothwell
2012-06-25  6:32 ` huang ying
2012-06-25 14:14 ` Alan Stern
2012-06-19  1:15 Stephen Rothwell
2010-12-20  2:08 Stephen Rothwell
2009-12-07  0:25 Stephen Rothwell
2009-12-07  0:25 Stephen Rothwell
2009-10-14  0:05 Stephen Rothwell
2009-10-14  0:38 ` Jesse Barnes
2009-10-14  2:10   ` Stephen Rothwell
2009-10-14  7:41 ` David Woodhouse
2009-06-30  1:56 Stephen Rothwell
2009-06-30  2:01 ` Jesse Barnes
2009-06-30  2:16   ` Matthew Wilcox
2009-06-30 16:00     ` Jesse Barnes

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).