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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

On Fri, 16 Jul 2021 13:37:38 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
> 
> 
> 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 instead
> +  *		   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;
>   };
>   
>   #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 = &modem_qcom_v1_mhiv_config,
>   	.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
>   	.dma_data_width = 32,
>  +	.mru_default = 32768
> + 	.sideband_wake = false,
>   };
>   
>   static const struct mhi_pci_dev_info mhi_qcom_sdx24_info = {
> @@@ -643,11 -686,13 +689,14 @@@ static int mhi_pci_probe(struct pci_de
>   	mhi_cntrl->status_cb = mhi_pci_status_cb;
>   	mhi_cntrl->runtime_get = mhi_pci_runtime_get;
>   	mhi_cntrl->runtime_put = mhi_pci_runtime_put;
> - 	mhi_cntrl->wake_get = mhi_pci_wake_get_nop;
> - 	mhi_cntrl->wake_put = mhi_pci_wake_put_nop;
> - 	mhi_cntrl->wake_toggle = mhi_pci_wake_toggle_nop;
>  +	mhi_cntrl->mru = info->mru_default;
>   
> + 	if (info->sideband_wake) {
> + 		mhi_cntrl->wake_get = mhi_pci_wake_get_nop;
> + 		mhi_cntrl->wake_put = mhi_pci_wake_put_nop;
> + 		mhi_cntrl->wake_toggle = mhi_pci_wake_toggle_nop;
> + 	}
> + 
>   	err = mhi_pci_claim(mhi_cntrl, info->bar_num, DMA_BIT_MASK(info->dma_data_width));
>   	if (err)
>   		return err;

This is now a conflict between the char-misc.current tree (where commit
156ffb7fb7eb is now 56f6f4c4eb2a) and the net-next tree.

-- 
Cheers,
Stephen Rothwell

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