linux-next: manual merge of the net-next tree with the pci tree

linux-next: manual merge of the net-next tree with the pci tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/iwlwifi/pcie/trans.c between commit b9d146e30a2d
("iwlwifi: collapse wrapper for pcie_capability_read_word()") from the
pci tree and commit 7afe3705cd4e ("iwlwifi: continue clean up -
pcie/trans.c") from the net-next 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/net/wireless/iwlwifi/pcie/trans.c
index 1dfa6be,f6c21e7..0000000
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -670,8 -94,10 +94,8 @@@ static void iwl_pcie_set_pwr_vmain(stru
  
  /* PCI registers */
  #define PCI_CFG_RETRY_TIMEOUT	0x041
 -#define PCI_CFG_LINK_CTRL_VAL_L0S_EN	0x01
 -#define PCI_CFG_LINK_CTRL_VAL_L1_EN	0x02
  
- static void iwl_apm_config(struct iwl_trans *trans)
+ static void iwl_pcie_apm_config(struct iwl_trans *trans)
  {
  	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
  	u16 lctl;
@@@ -684,20 -110,19 +108,17 @@@
  	 * If not (unlikely), enable L0S, so there is at least some
  	 *    power savings, even without L1.
  	 */
- 
  	pcie_capability_read_word(trans_pcie->pci_dev, PCI_EXP_LNKCTL, &lctl);
 -
 -	if ((lctl & PCI_CFG_LINK_CTRL_VAL_L1_EN) ==
 -				PCI_CFG_LINK_CTRL_VAL_L1_EN) {
 +	if (lctl & PCI_EXP_LNKCTL_ASPM_L1) {
  		/* L1-ASPM enabled; disable(!) L0S */
  		iwl_set_bit(trans, CSR_GIO_REG, CSR_GIO_REG_VAL_L0S_ENABLED);
- 		dev_printk(KERN_INFO, trans->dev,
- 			   "L1 Enabled; Disabling L0S\n");
+ 		dev_info(trans->dev, "L1 Enabled; Disabling L0S\n");
  	} else {
  		/* L1-ASPM disabled; enable(!) L0S */
  		iwl_clear_bit(trans, CSR_GIO_REG, CSR_GIO_REG_VAL_L0S_ENABLED);
- 		dev_printk(KERN_INFO, trans->dev,
- 			   "L1 Disabled; Enabling L0S\n");
+ 		dev_info(trans->dev, "L1 Disabled; Enabling L0S\n");
  	}
 -	trans->pm_support = !(lctl & PCI_CFG_LINK_CTRL_VAL_L0S_EN);
 +	trans->pm_support = !(lctl & PCI_EXP_LNKCTL_ASPM_L0S);
  }
  
  /*

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

RE: linux-next: manual merge of the net-next tree with the pci tree

[Grumbach, Emmanuel]

> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/iwlwifi/pcie/trans.c between commit b9d146e30a2d
> ("iwlwifi: collapse wrapper for pcie_capability_read_word()") from the pci
> tree and commit 7afe3705cd4e ("iwlwifi: continue clean up -
> pcie/trans.c") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action is
> required).
> 
Looks right - thanks Stephen!
---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

linux-next: manual merge of the net-next tree with the pci tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net-next tree got conflicts in:

  drivers/pci/Kconfig
  drivers/pci/controller/pci-hyperv.c

between commit:

  f58ba5e3f686 ("PCI: pci-hyperv: Fix build errors on non-SYSFS config")
  44b1ece783ff ("PCI: hv: Detect and fix Hyper-V PCI domain number collision")

from the pci tree and commit:

  348dd93e40c1 ("PCI: hv: Add a Hyper-V PCI interface driver for software backchannel interface")

from the net-next 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/Kconfig
index 232042722261,c313de96a357..000000000000
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@@ -181,7 -181,8 +181,8 @@@ config PCI_LABE
  
  config PCI_HYPERV
          tristate "Hyper-V PCI Frontend"
 -        depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64
 +        depends on X86_64 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && SYSFS
+ 	select PCI_HYPERV_INTERFACE
          help
            The PCI device frontend driver allows the kernel to import arbitrary
            PCI devices from a PCI backend to support PCI driver domains.
diff --cc drivers/pci/controller/pci-hyperv.c
index 3a56de6b2ec2,9c93ac2215b7..000000000000
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@@ -2810,9 -3050,11 +3113,14 @@@ static void __exit exit_hv_pci_drv(void
  
  static int __init init_hv_pci_drv(void)
  {
 +	/* Set the invalid domain number's bit, so it will not be used */
 +	set_bit(HVPCI_DOM_INVALID, hvpci_dom_map);
 +
+ 	/* 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;
+ 
  	return vmbus_driver_register(&hv_pci_drv);
  }
  

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

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

[Stephen Rothwell]

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

Hi all,

On Tue, 3 Apr 2018 13:14:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> 
> between commit:
> 
>   2907938d2375 ("net/mlx5e: Use pcie_bandwidth_available() to compute bandwidth")
> 
> from the pci tree and commit:
> 
>   0608d4dbaf4e ("net/mlx5e: Unify slow PCI heuristic")
> 
> from the net-next 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/mellanox/mlx5/core/en_main.c
> index 884337f88589,0aab3afc6885..000000000000
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> @@@ -3880,16 -4026,50 +4033,20 @@@ void mlx5e_build_default_indir_rqt(u32 
>   		indirection_rqt[i] = i % num_channels;
>   }
>   
> - static bool cqe_compress_heuristic(u32 link_speed, u32 pci_bw)
>  -static int mlx5e_get_pci_bw(struct mlx5_core_dev *mdev, u32 *pci_bw)
>  -{
>  -	enum pcie_link_width width;
>  -	enum pci_bus_speed speed;
>  -	int err = 0;
>  -
>  -	err = pcie_get_minimum_link(mdev->pdev, &speed, &width);
>  -	if (err)
>  -		return err;
>  -
>  -	if (speed == PCI_SPEED_UNKNOWN || width == PCIE_LNK_WIDTH_UNKNOWN)
>  -		return -EINVAL;
>  -
>  -	switch (speed) {
>  -	case PCIE_SPEED_2_5GT:
>  -		*pci_bw = 2500 * width;
>  -		break;
>  -	case PCIE_SPEED_5_0GT:
>  -		*pci_bw = 5000 * width;
>  -		break;
>  -	case PCIE_SPEED_8_0GT:
>  -		*pci_bw = 8000 * width;
>  -		break;
>  -	default:
>  -		return -EINVAL;
>  -	}
>  -
>  -	return 0;
>  -}
>  -
> + static bool slow_pci_heuristic(struct mlx5_core_dev *mdev)
>   {
> - 	return (link_speed && pci_bw &&
> - 		(pci_bw < 40000) && (pci_bw < link_speed));
> - }
> + 	u32 link_speed = 0;
> + 	u32 pci_bw = 0;
>   
> - static bool hw_lro_heuristic(u32 link_speed, u32 pci_bw)
> - {
> - 	return !(link_speed && pci_bw &&
> - 		 (pci_bw <= 16000) && (pci_bw < link_speed));
> + 	mlx5e_get_max_linkspeed(mdev, &link_speed);
>  -	mlx5e_get_pci_bw(mdev, &pci_bw);
> ++	pci_bw = pcie_bandwidth_available(mdev->pdev, NULL, NULL, NULL);
> + 	mlx5_core_dbg_once(mdev, "Max link speed = %d, PCI BW = %d\n",
> + 			   link_speed, pci_bw);
> + 
> + #define MLX5E_SLOW_PCI_RATIO (2)
> + 
> + 	return link_speed && pci_bw &&
> + 		link_speed > MLX5E_SLOW_PCI_RATIO * pci_bw;
>   }
>   
>   void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)

This is now a conflict between the pci tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the net-next tree with the pci tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/net/ethernet/mellanox/mlx5/core/en_main.c

between commit:

  2907938d2375 ("net/mlx5e: Use pcie_bandwidth_available() to compute bandwidth")

from the pci tree and commit:

  0608d4dbaf4e ("net/mlx5e: Unify slow PCI heuristic")

from the net-next 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/mellanox/mlx5/core/en_main.c
index 884337f88589,0aab3afc6885..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@@ -3880,16 -4026,50 +4033,20 @@@ void mlx5e_build_default_indir_rqt(u32 
  		indirection_rqt[i] = i % num_channels;
  }
  
- static bool cqe_compress_heuristic(u32 link_speed, u32 pci_bw)
 -static int mlx5e_get_pci_bw(struct mlx5_core_dev *mdev, u32 *pci_bw)
 -{
 -	enum pcie_link_width width;
 -	enum pci_bus_speed speed;
 -	int err = 0;
 -
 -	err = pcie_get_minimum_link(mdev->pdev, &speed, &width);
 -	if (err)
 -		return err;
 -
 -	if (speed == PCI_SPEED_UNKNOWN || width == PCIE_LNK_WIDTH_UNKNOWN)
 -		return -EINVAL;
 -
 -	switch (speed) {
 -	case PCIE_SPEED_2_5GT:
 -		*pci_bw = 2500 * width;
 -		break;
 -	case PCIE_SPEED_5_0GT:
 -		*pci_bw = 5000 * width;
 -		break;
 -	case PCIE_SPEED_8_0GT:
 -		*pci_bw = 8000 * width;
 -		break;
 -	default:
 -		return -EINVAL;
 -	}
 -
 -	return 0;
 -}
 -
+ static bool slow_pci_heuristic(struct mlx5_core_dev *mdev)
  {
- 	return (link_speed && pci_bw &&
- 		(pci_bw < 40000) && (pci_bw < link_speed));
- }
+ 	u32 link_speed = 0;
+ 	u32 pci_bw = 0;
  
- static bool hw_lro_heuristic(u32 link_speed, u32 pci_bw)
- {
- 	return !(link_speed && pci_bw &&
- 		 (pci_bw <= 16000) && (pci_bw < link_speed));
+ 	mlx5e_get_max_linkspeed(mdev, &link_speed);
 -	mlx5e_get_pci_bw(mdev, &pci_bw);
++	pci_bw = pcie_bandwidth_available(mdev->pdev, NULL, NULL, NULL);
+ 	mlx5_core_dbg_once(mdev, "Max link speed = %d, PCI BW = %d\n",
+ 			   link_speed, pci_bw);
+ 
+ #define MLX5E_SLOW_PCI_RATIO (2)
+ 
+ 	return link_speed && pci_bw &&
+ 		link_speed > MLX5E_SLOW_PCI_RATIO * pci_bw;
  }
  
  void mlx5e_set_tx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode)

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

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

[Stephen Rothwell]

Hi all,

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

On Wed, 21 Jun 2017 11:54:43 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/net/wireless/marvell/mwifiex/pcie.c
> 
> between commit:
> 
>   c336cc0ee4eb ("PCI: Split ->reset_notify() method into ->reset_prepare() and ->reset_done()")
> 
> from the pci tree and commit:
> 
>   68efd0386988 ("mwifiex: pcie: stop setting/clearing 'surprise_removed'")
> 
> from the net-next 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/wireless/marvell/mwifiex/pcie.c
> index 279adf124fc9,b53ecf1eddda..000000000000
> --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
> +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
> @@@ -361,48 -359,35 +361,46 @@@ static void mwifiex_pcie_reset_prepare(
>   	}
>   
>   	mwifiex_dbg(adapter, INFO,
>  -		    "%s: vendor=0x%4.04x device=0x%4.04x rev=%d %s\n",
>  -		    __func__, pdev->vendor, pdev->device,
>  -		    pdev->revision,
>  -		    prepare ? "Pre-FLR" : "Post-FLR");
>  -
>  -	if (prepare) {
>  -		/* Kernel would be performing FLR after this notification.
>  -		 * Cleanup all software without cleaning anything related to
>  -		 * PCIe and HW.
>  -		 */
>  -		mwifiex_shutdown_sw(adapter);
>  -		clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags);
>  -		clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags);
>  -	} else {
>  -		/* Kernel stores and restores PCIe function context before and
>  -		 * after performing FLR respectively. Reconfigure the software
>  -		 * and firmware including firmware redownload
>  -		 */
>  -		ret = mwifiex_reinit_sw(adapter);
>  -		if (ret) {
>  -			dev_err(&pdev->dev, "reinit failed: %d\n", ret);
>  -			return;
>  -		}
>  -	}
>  +		    "%s: vendor=0x%4.04x device=0x%4.04x rev=%d Pre-FLR\n",
>  +		    __func__, pdev->vendor, pdev->device, pdev->revision);
>  +
>  +	mwifiex_shutdown_sw(adapter);
> - 	adapter->surprise_removed = true;
>  +	clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags);
>  +	clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags);
>   	mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);
>   }
>   
>  -static const struct pci_error_handlers mwifiex_pcie_err_handler[] = {
>  -		{ .reset_notify = mwifiex_pcie_reset_notify, },
>  +/*
>  + * Kernel stores and restores PCIe function context before and after performing
>  + * FLR respectively. Reconfigure the software and firmware including firmware
>  + * redownload.
>  + */
>  +static void mwifiex_pcie_reset_done(struct pci_dev *pdev)
>  +{
>  +	struct pcie_service_card *card = pci_get_drvdata(pdev);
>  +	struct mwifiex_adapter *adapter = card->adapter;
>  +	int ret;
>  +
>  +	if (!adapter) {
>  +		dev_err(&pdev->dev, "%s: adapter structure is not valid\n",
>  +			__func__);
>  +		return;
>  +	}
>  +
>  +	mwifiex_dbg(adapter, INFO,
>  +		    "%s: vendor=0x%4.04x device=0x%4.04x rev=%d Post-FLR\n",
>  +		    __func__, pdev->vendor, pdev->device, pdev->revision);
>  +
> - 	adapter->surprise_removed = false;
>  +	ret = mwifiex_reinit_sw(adapter);
>  +	if (ret)
>  +		dev_err(&pdev->dev, "reinit failed: %d\n", ret);
>  +	else
>  +		mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);
>  +}
>  +
>  +static const struct pci_error_handlers mwifiex_pcie_err_handler = {
>  +	.reset_prepare		= mwifiex_pcie_reset_prepare,
>  +	.reset_done		= mwifiex_pcie_reset_done,
>   };
>   
>   #ifdef CONFIG_PM_SLEEP

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Kalle,

On Wed, 21 Jun 2017 16:29:29 +0300 Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Thanks, the fix looks good to me. I guess there's nothing I can do at
> the moment and Linus needs to fix this when he pulls from Dave (or
> Bjorn, whichever is the last)?

Right.

-- 
Cheers,
Stephen Rothwell

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

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the net-next tree got a conflict in:
>
>   drivers/net/wireless/marvell/mwifiex/pcie.c
>
> between commit:
>
>   c336cc0ee4eb ("PCI: Split ->reset_notify() method into
> ->reset_prepare() and ->reset_done()")
>
> from the pci tree and commit:
>
>   68efd0386988 ("mwifiex: pcie: stop setting/clearing 'surprise_removed'")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, the fix looks good to me. I guess there's nothing I can do at
the moment and Linus needs to fix this when he pulls from Dave (or
Bjorn, whichever is the last)?

-- 
Kalle Valo

linux-next: manual merge of the net-next tree with the pci tree

[Stephen Rothwell]

Hi all,

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

  drivers/net/wireless/marvell/mwifiex/pcie.c

between commit:

  c336cc0ee4eb ("PCI: Split ->reset_notify() method into ->reset_prepare() and ->reset_done()")

from the pci tree and commit:

  68efd0386988 ("mwifiex: pcie: stop setting/clearing 'surprise_removed'")

from the net-next 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/wireless/marvell/mwifiex/pcie.c
index 279adf124fc9,b53ecf1eddda..000000000000
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@@ -361,48 -359,35 +361,46 @@@ static void mwifiex_pcie_reset_prepare(
  	}
  
  	mwifiex_dbg(adapter, INFO,
 -		    "%s: vendor=0x%4.04x device=0x%4.04x rev=%d %s\n",
 -		    __func__, pdev->vendor, pdev->device,
 -		    pdev->revision,
 -		    prepare ? "Pre-FLR" : "Post-FLR");
 -
 -	if (prepare) {
 -		/* Kernel would be performing FLR after this notification.
 -		 * Cleanup all software without cleaning anything related to
 -		 * PCIe and HW.
 -		 */
 -		mwifiex_shutdown_sw(adapter);
 -		clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags);
 -		clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags);
 -	} else {
 -		/* Kernel stores and restores PCIe function context before and
 -		 * after performing FLR respectively. Reconfigure the software
 -		 * and firmware including firmware redownload
 -		 */
 -		ret = mwifiex_reinit_sw(adapter);
 -		if (ret) {
 -			dev_err(&pdev->dev, "reinit failed: %d\n", ret);
 -			return;
 -		}
 -	}
 +		    "%s: vendor=0x%4.04x device=0x%4.04x rev=%d Pre-FLR\n",
 +		    __func__, pdev->vendor, pdev->device, pdev->revision);
 +
 +	mwifiex_shutdown_sw(adapter);
- 	adapter->surprise_removed = true;
 +	clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags);
 +	clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags);
  	mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);
  }
  
 -static const struct pci_error_handlers mwifiex_pcie_err_handler[] = {
 -		{ .reset_notify = mwifiex_pcie_reset_notify, },
 +/*
 + * Kernel stores and restores PCIe function context before and after performing
 + * FLR respectively. Reconfigure the software and firmware including firmware
 + * redownload.
 + */
 +static void mwifiex_pcie_reset_done(struct pci_dev *pdev)
 +{
 +	struct pcie_service_card *card = pci_get_drvdata(pdev);
 +	struct mwifiex_adapter *adapter = card->adapter;
 +	int ret;
 +
 +	if (!adapter) {
 +		dev_err(&pdev->dev, "%s: adapter structure is not valid\n",
 +			__func__);
 +		return;
 +	}
 +
 +	mwifiex_dbg(adapter, INFO,
 +		    "%s: vendor=0x%4.04x device=0x%4.04x rev=%d Post-FLR\n",
 +		    __func__, pdev->vendor, pdev->device, pdev->revision);
 +
- 	adapter->surprise_removed = false;
 +	ret = mwifiex_reinit_sw(adapter);
 +	if (ret)
 +		dev_err(&pdev->dev, "reinit failed: %d\n", ret);
 +	else
 +		mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);
 +}
 +
 +static const struct pci_error_handlers mwifiex_pcie_err_handler = {
 +	.reset_prepare		= mwifiex_pcie_reset_prepare,
 +	.reset_done		= mwifiex_pcie_reset_done,
  };
  
  #ifdef CONFIG_PM_SLEEP

linux-next: manual merge of the net-next tree with the pci tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got conflicts in:

  drivers/pci/msi.c
  include/linux/pci.h

between commit:

  688769f643bf ("PCI/MSI: Make pci_msi_shutdown() and pci_msix_shutdown() static")

from the pci tree and commit:

  4244de1c64de ("PCI: remove pci_enable_msix")

from the net-next 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/msi.c
index 6b5eaf500a24,0042c365b29b..000000000000
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@@ -975,28 -973,7 +975,7 @@@ static int __pci_enable_msix(struct pci
  	return msix_capability_init(dev, entries, nvec, affd);
  }
  
- /**
-  * pci_enable_msix - configure device's MSI-X capability structure
-  * @dev: pointer to the pci_dev data structure of MSI-X device function
-  * @entries: pointer to an array of MSI-X entries (optional)
-  * @nvec: number of MSI-X irqs requested for allocation by device driver
-  *
-  * Setup the MSI-X capability structure of device function with the number
-  * of requested irqs upon its software driver call to request for
-  * MSI-X mode enabled on its hardware device function. A return of zero
-  * indicates the successful configuration of MSI-X capability structure
-  * with new allocated MSI-X irqs. A return of < 0 indicates a failure.
-  * Or a return of > 0 indicates that driver request is exceeding the number
-  * of irqs or MSI-X vectors available. Driver should use the returned value to
-  * re-send its request.
-  **/
- int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
- {
- 	return __pci_enable_msix(dev, entries, nvec, NULL);
- }
- EXPORT_SYMBOL(pci_enable_msix);
- 
 -void pci_msix_shutdown(struct pci_dev *dev)
 +static void pci_msix_shutdown(struct pci_dev *dev)
  {
  	struct msi_desc *entry;
  
diff --cc include/linux/pci.h
index 821627873de1,82dec36845e6..000000000000
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -1279,9 -1297,10 +1279,8 @@@ struct msix_entry 
  
  #ifdef CONFIG_PCI_MSI
  int pci_msi_vec_count(struct pci_dev *dev);
 -void pci_msi_shutdown(struct pci_dev *dev);
  void pci_disable_msi(struct pci_dev *dev);
  int pci_msix_vec_count(struct pci_dev *dev);
- int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec);
 -void pci_msix_shutdown(struct pci_dev *dev);
  void pci_disable_msix(struct pci_dev *dev);
  void pci_restore_msi_state(struct pci_dev *dev);
  int pci_msi_enabled(void);
@@@ -1307,11 -1326,10 +1306,8 @@@ int pci_irq_get_node(struct pci_dev *pd
  
  #else
  static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
 -static inline void pci_msi_shutdown(struct pci_dev *dev) { }
  static inline void pci_disable_msi(struct pci_dev *dev) { }
  static inline int pci_msix_vec_count(struct pci_dev *dev) { return -ENOSYS; }
- static inline int pci_enable_msix(struct pci_dev *dev,
- 				  struct msix_entry *entries, int nvec)
- { return -ENOSYS; }
 -static inline void pci_msix_shutdown(struct pci_dev *dev) { }
  static inline void pci_disable_msix(struct pci_dev *dev) { }
  static inline void pci_restore_msi_state(struct pci_dev *dev) { }
  static inline int pci_msi_enabled(void) { return 0; }

linux-next: manual merge of the net-next tree with the pci tree

[Stephen Rothwell]

Hi all,

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

  include/linux/pci_ids.h

between commit:

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

from the pci tree and commit:

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

from the net-next tree.

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

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

linux-next: manual merge of the net-next tree with the pci tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
include/linux/pci.h between commit f39d5b72913e ("PCI: Remove "extern"
from function declarations") from the pci tree and commit 5a8eb24292ff
("pci: Add SRIOV helper function to determine if VFs are assigned to
guest") from the net-next tree.

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

(I would have preferred that all these declarations were changed to have
"extern" added to ones that were missing it, but ...)

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

diff --cc include/linux/pci.h
index e73dfa3,43e45ac..0000000
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -1657,12 -1640,13 +1657,13 @@@ int pci_ext_cfg_avail(void)
  void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
  
  #ifdef CONFIG_PCI_IOV
 -extern int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
 -extern void pci_disable_sriov(struct pci_dev *dev);
 -extern irqreturn_t pci_sriov_migration(struct pci_dev *dev);
 -extern int pci_num_vf(struct pci_dev *dev);
 +int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
 +void pci_disable_sriov(struct pci_dev *dev);
 +irqreturn_t pci_sriov_migration(struct pci_dev *dev);
 +int pci_num_vf(struct pci_dev *dev);
+ int pci_vfs_assigned(struct pci_dev *dev);
 -extern int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
 -extern int pci_sriov_get_totalvfs(struct pci_dev *dev);
 +int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
 +int pci_sriov_get_totalvfs(struct pci_dev *dev);
  #else
  static inline int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn)
  {

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