Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 16 Jul 2021 13:37:38 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc:     Bhaumik Bhatt <bbhatt@codeaurora.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Manivannan Sadhasivam <mani@kernel.org>,
        Richard Laing <richard.laing@alliedtelesis.co.nz>
Subject: linux-next: manual merge of the mhi tree with the net-next tree
Message-ID: <20210716133738.0d163701@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/L_qhwSo=RcXGM8bDaEoaq=F";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/L_qhwSo=RcXGM8bDaEoaq=F
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/bus/mhi/pci_generic.c

between commit:

  5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU")

from the net-next tree and commit:

  156ffb7fb7eb ("bus: mhi: pci_generic: Apply no-op for wake using sideband=
 wake boolean")

from the mhi 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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/bus/mhi/pci_generic.c
index 19413daa0917,8bc6149249e3..000000000000
--- a/drivers/bus/mhi/pci_generic.c
+++ b/drivers/bus/mhi/pci_generic.c
@@@ -32,7 -32,8 +32,9 @@@
   * @edl: emergency download mode firmware path (if any)
   * @bar_num: PCI base address register to use for MHI MMIO register space
   * @dma_data_width: DMA transfer word size (32 or 64 bits)
 + * @mru_default: default MRU size for MBIM network packets
+  * @sideband_wake: Devices using dedicated sideband GPIO for wakeup inste=
ad
+  *		   of inband wake support (such as sdx24)
   */
  struct mhi_pci_dev_info {
  	const struct mhi_controller_config *config;
@@@ -41,7 -42,7 +43,8 @@@
  	const char *edl;
  	unsigned int bar_num;
  	unsigned int dma_data_width;
 +	unsigned int mru_default;
+ 	bool sideband_wake;
  };
 =20
  #define MHI_CHANNEL_CONFIG_UL(ch_num, ch_name, el_count, ev_ring) \
@@@ -254,7 -256,7 +258,8 @@@ static const struct mhi_pci_dev_info mh
  	.config =3D &modem_qcom_v1_mhiv_config,
  	.bar_num =3D MHI_PCI_DEFAULT_BAR_NUM,
  	.dma_data_width =3D 32,
 +	.mru_default =3D 32768
+ 	.sideband_wake =3D false,
  };
 =20
  static const struct mhi_pci_dev_info mhi_qcom_sdx24_info =3D {
@@@ -643,11 -686,13 +689,14 @@@ static int mhi_pci_probe(struct pci_de
  	mhi_cntrl->status_cb =3D mhi_pci_status_cb;
  	mhi_cntrl->runtime_get =3D mhi_pci_runtime_get;
  	mhi_cntrl->runtime_put =3D mhi_pci_runtime_put;
- 	mhi_cntrl->wake_get =3D mhi_pci_wake_get_nop;
- 	mhi_cntrl->wake_put =3D mhi_pci_wake_put_nop;
- 	mhi_cntrl->wake_toggle =3D mhi_pci_wake_toggle_nop;
 +	mhi_cntrl->mru =3D info->mru_default;
 =20
+ 	if (info->sideband_wake) {
+ 		mhi_cntrl->wake_get =3D mhi_pci_wake_get_nop;
+ 		mhi_cntrl->wake_put =3D mhi_pci_wake_put_nop;
+ 		mhi_cntrl->wake_toggle =3D mhi_pci_wake_toggle_nop;
+ 	}
+=20
  	err =3D mhi_pci_claim(mhi_cntrl, info->bar_num, DMA_BIT_MASK(info->dma_d=
ata_width));
  	if (err)
  		return err;

--Sig_/L_qhwSo=RcXGM8bDaEoaq=F
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDw/wIACgkQAVBC80lX
0GxvrwgAhHs+4N4xz7OCN/fwodR13D40FT3TthtaQmP9kl/G644J+8n/jjJ1kh3K
59/z7+EwkIDIquM6sB3pk8mCLTLaRwqbGCJcceAQwmCEVuyBqDgQJjzW2vCcGSsK
2jVj6dTpojPU4opGijTtB1qwQ8fz0HbpUvXfuUWGaM/USXmWHsORQJUVZG60zvMg
yZC6uSMTuEIdQEPdzlfLH6Gd+jp9Cwrzt8zI8wFbdDcDfkew7yqbJxFSh3TMrEuQ
jeLFGoOW9a01t0oAEPAxEBWdcc7ZLnFchAxeeAbjiVZq0RSwxJR9+VOL27h837L2
gysI3uDmQS9rc2WtURw1FjEmWIzE1g==
=wHNW
-----END PGP SIGNATURE-----

--Sig_/L_qhwSo=RcXGM8bDaEoaq=F--