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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c

between commit:

  7ed5dce55fa83 ("wifi: brcmfmac: map msgbuf RX packet IDs bidirectional")

from the net tree and commit:

  09063ccd75da0 ("wifi: brcmfmac: Add BCM4388 support")

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

diff --combined drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
index ff47d4827722e,5ad46d7ec663f..0000000000000
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
@@@ -12,6 -12,7 +12,7 @@@
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
  
+ #include <brcm_hw_ids.h>
  #include <brcmu_utils.h>
  #include <brcmu_wifi.h>
  
@@@ -47,9 -48,11 +48,11 @@@
  #define MSGBUF_TYPE_RX_CMPLT			0x12
  #define MSGBUF_TYPE_LPBK_DMAXFER		0x13
  #define MSGBUF_TYPE_LPBK_DMAXFER_CMPLT		0x14
+ #define MSGBUF_TYPE_H2D_MAILBOX_DATA		0x23
+ #define MSGBUF_TYPE_D2H_MAILBOX_DATA		0x24
  
  #define NR_TX_PKTIDS				2048
- #define NR_RX_PKTIDS				1024
+ #define NR_RX_PKTIDS				2048
  
  #define BRCMF_IOCTL_REQ_PKTID			0xFFFE
  
@@@ -218,6 -221,19 +221,19 @@@ struct msgbuf_flowring_flush_resp 
  	__le32				rsvd0[3];
  };
  
+ struct msgbuf_h2d_mailbox_data {
+ 	struct msgbuf_common_hdr	msg;
+ 	__le32				data;
+ 	__le32				rsvd0[7];
+ };
+ 
+ struct msgbuf_d2h_mailbox_data {
+ 	struct msgbuf_common_hdr	msg;
+ 	struct msgbuf_completion_hdr	compl_hdr;
+ 	__le32				data;
+ 	__le32				rsvd0[2];
+ };
+ 
  struct brcmf_msgbuf_work_item {
  	struct list_head queue;
  	u32 flowid;
@@@ -315,7 -331,6 +331,6 @@@ brcmf_msgbuf_init_pktids(u32 nr_array_e
  	return pktids;
  }
  
- 
  static int
  brcmf_msgbuf_alloc_pktid(struct device *dev,
  			 struct brcmf_msgbuf_pktids *pktids,
@@@ -1319,6 -1334,15 +1334,15 @@@ brcmf_msgbuf_process_flow_ring_delete_r
  	brcmf_msgbuf_remove_flowring(msgbuf, flowid);
  }
  
+ static void brcmf_msgbuf_process_d2h_mailbox_data(struct brcmf_msgbuf *msgbuf,
+ 						  void *buf)
+ {
+ 	struct msgbuf_d2h_mailbox_data *d2h_mb_data = buf;
+ 
+ 	brcmf_bus_d2h_mb_rx(msgbuf->drvr->bus_if,
+ 			    le32_to_cpu(d2h_mb_data->data));
+ }
+ 
  
  static void brcmf_msgbuf_process_msgtype(struct brcmf_msgbuf *msgbuf, void *buf)
  {
@@@ -1362,6 -1386,10 +1386,10 @@@
  		brcmf_dbg(MSGBUF, "MSGBUF_TYPE_RX_CMPLT\n");
  		brcmf_msgbuf_process_rx_complete(msgbuf, buf);
  		break;
+ 	case MSGBUF_TYPE_D2H_MAILBOX_DATA:
+ 		brcmf_dbg(MSGBUF, "MSGBUF_TYPE_D2H_MAILBOX_DATA\n");
+ 		brcmf_msgbuf_process_d2h_mailbox_data(msgbuf, buf);
+ 		break;
  	default:
  		bphy_err(drvr, "Unsupported msgtype %d\n", msg->msgtype);
  		break;
@@@ -1500,6 -1528,35 +1528,35 @@@ void brcmf_msgbuf_delete_flowring(struc
  	}
  }
  
+ int brcmf_msgbuf_h2d_mb_write(struct brcmf_pub *drvr, u32 data)
+ {
+ 	struct brcmf_msgbuf *msgbuf = (struct brcmf_msgbuf *)drvr->proto->pd;
+ 	struct brcmf_commonring *commonring;
+ 	struct msgbuf_h2d_mailbox_data *request;
+ 	void *ret_ptr;
+ 	int err;
+ 
+ 	commonring = msgbuf->commonrings[BRCMF_H2D_MSGRING_CONTROL_SUBMIT];
+ 	brcmf_commonring_lock(commonring);
+ 	ret_ptr = brcmf_commonring_reserve_for_write(commonring);
+ 	if (!ret_ptr) {
+ 		bphy_err(drvr, "Failed to reserve space in commonring\n");
+ 		brcmf_commonring_unlock(commonring);
+ 		return -ENOMEM;
+ 	}
+ 
+ 	request = (struct msgbuf_h2d_mailbox_data *)ret_ptr;
+ 	memset(request, 0, sizeof(*request));
+ 	request->msg.msgtype = MSGBUF_TYPE_H2D_MAILBOX_DATA;
+ 	request->msg.ifidx = 0xff;
+ 	request->data = cpu_to_le32(data);
+ 
+ 	err = brcmf_commonring_write_complete(commonring);
+ 	brcmf_commonring_unlock(commonring);
+ 
+ 	return err;
+ }
+ 
  #ifdef DEBUG
  static int brcmf_msgbuf_stats_read(struct seq_file *seq, void *data)
  {
@@@ -1638,8 -1695,10 +1695,8 @@@ int brcmf_proto_msgbuf_attach(struct br
  						     DMA_TO_DEVICE);
  	if (!msgbuf->tx_pktids)
  		goto fail;
 -	/* BCM4388 firmware also reads from posted RX buffers. */
  	msgbuf->rx_pktids = brcmf_msgbuf_init_pktids(NR_RX_PKTIDS,
 -			drvr->bus_if->chip == BRCM_CC_4388_CHIP_ID ?
 -			DMA_BIDIRECTIONAL : DMA_FROM_DEVICE);
 +						     DMA_BIDIRECTIONAL);
  	if (!msgbuf->rx_pktids)
  		goto fail;
  

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