linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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..
--- 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, [i++]);
pcie_capability_read_word(dev, PCI_EXP_SLTCTL2, [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 *)_state->cap.data[0];
pcie_capability_write_word(dev, PCI_EXP_DEVCTL, cap[i++]);
pcie_capability_write_word(dev, PCI_EXP_LNKCTL, cap[i++]);


pgprqQq4cqQFp.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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


pgp2BtwIkjt_B.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the pci tree with Linus' tree

[Mark Brown]

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..0
--- 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(_pci_drv);
  }
  


signature.asc
Description: PGP signature

Re: linux-next: manual merge of the pci tree with Linus' tree

[Thomas Petazzoni]

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, 0xF800, 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

Re: linux-next: manual merge of the pci tree with Linus' tree

[Thomas Petazzoni]

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, 0xF800, 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

Re: linux-next: manual merge of the pci tree with Linus' tree

[Lorenzo Pieralisi]

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..
> --- 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, 0xF800, 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

Re: linux-next: manual merge of the pci tree with Linus' tree

[Lorenzo Pieralisi]

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..
> --- 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, 0xF800, 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

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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..
--- 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, 0xF800, 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);


pgpcvH5m1eyP6.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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..
--- 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, 0xF800, 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);


pgpcvH5m1eyP6.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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


pgpMVyB9uOALD.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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


pgpMVyB9uOALD.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the pci tree with Linus' tree

[Rob Herring]

On Sun, Mar 25, 2018 at 8:23 PM, Stephen Rothwell  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..
> --- 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

Re: linux-next: manual merge of the pci tree with Linus' tree

[Rob Herring]

On Sun, Mar 25, 2018 at 8:23 PM, Stephen Rothwell  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..
> --- 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

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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


pgpO3Xe2FMD1o.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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


pgpO3Xe2FMD1o.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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

Re: linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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..
--- 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 },
  };
  

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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..
--- 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 },
  };
  

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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

Re: linux-next: manual merge of the pci tree with Linus' tree

[Bjorn Helgaas]

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

Re: linux-next: manual merge of the pci tree with Linus' tree

[Bjorn Helgaas]

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

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc include/linux/aer.h
index 737f90a,55bb3dc..000
--- 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_
  


pgp3R_0Fcfphi.pgp
Description: PGP signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc include/linux/aer.h
index 737f90a,55bb3dc..000
--- 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_
  


pgp3R_0Fcfphi.pgp
Description: PGP signature

Re: linux-next: manual merge of the pci tree with Linus' tree

[Bjorn Helgaas]

On Mon, Jun 3, 2013 at 7:49 PM, Stephen Rothwell  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 Rothwells...@canb.auug.org.au
>
> diff --cc drivers/acpi/pci_root.c
> index e427dc5,122b4dc..000
> --- 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc drivers/acpi/pci_root.c
index e427dc5,122b4dc..000
--- 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;


pgpnP20XurlBq.pgp
Description: PGP signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc drivers/acpi/pci_root.c
index e427dc5,122b4dc..000
--- 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;


pgpnP20XurlBq.pgp
Description: PGP signature

Re: linux-next: manual merge of the pci tree with Linus' tree

[Bjorn Helgaas]

On Mon, Jun 3, 2013 at 7:49 PM, Stephen Rothwell s...@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 Rothwells...@canb.auug.org.au

 diff --cc drivers/acpi/pci_root.c
 index e427dc5,122b4dc..000
 --- 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;
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the pci tree with Linus' tree

[Yuval Mintz]

> 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 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the pci tree with Linus' tree

[Yuval Mintz]

 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 yuval...@broadcom.com


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc drivers/rapidio/devices/tsi721.c
index 5d44252,fc22b93..000
--- 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) {


pgp2924el0HuE.pgp
Description: PGP signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 2105498,281cf3f..000
--- 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, );
 -  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)


pgpyLejQ1ATC4.pgp
Description: PGP signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 2105498,281cf3f..000
--- 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)


pgpyLejQ1ATC4.pgp
Description: PGP signature

linux-next: manual merge of the pci tree with Linus' tree

[Stephen Rothwell]

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 Rothwells...@canb.auug.org.au

diff --cc drivers/rapidio/devices/tsi721.c
index 5d44252,fc22b93..000
--- 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) {


pgp2924el0HuE.pgp
Description: PGP signature