Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24545cf1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  ipv6: Check dest prefix length on original route not copied one in rt6_alloc_cow().
  sch_gred: should not use GFP_KERNEL while holding a spinlock
  ipip, sit: copy parms.name after register_netdevice
  ipv6: Fix for adding multicast route for loopback device automatically.
  ssb: fix init regression with SoCs
  rtl8192{ce,cu,de,se}: avoid problems because of possible ERFOFF -> ERFSLEEP transition
  mac80211: fix another race in aggregation start
  fsl_pq_mdio: Clean up tbi address configuration
  ppp: fix pptp double release_sock in pptp_bind()
  net/fec: fix the use of pdev->id
  ath9k: fix check for antenna diversity support
  batman-adv: delete global entry in case of roaming
  batman-adv: in case of roaming mark the client with TT_CLIENT_ROAM
  Bluetooth: Correct version check in hci_setup
  btusb: fix a memory leak in btusb_send_frame()
  Bluetooth: bnep: Fix module reference
  Bluetooth: cmtp: Fix module reference
  Bluetooth: btmrvl: support Marvell Bluetooth device SD8797
parents c9a7fe96 bb3c3686

drivers/bluetooth/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ config BT_MRVL 
	  The core driver to support Marvell Bluetooth devices.



	  This driver is required if you want to support

	  Marvell Bluetooth devices, such as 8688/8787.

	  Marvell Bluetooth devices, such as 8688/8787/8797.



	  Say Y here to compile Marvell Bluetooth driver

	  into the kernel or say M to compile it as module.
@@ -201,8 +201,8 @@ config BT_MRVL_SDIO 
	  The driver for Marvell Bluetooth chipsets with SDIO interface.



	  This driver is required if you want to use Marvell Bluetooth

	  devices with SDIO interface. Currently SD8688/SD8787 chipsets are

	  supported.

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797

	  chipsets are supported.



	  Say Y here to compile support for Marvell BT-over-SDIO driver

	  into the kernel or say M to compile it as module.

drivers/bluetooth/btmrvl_sdio.c

+13 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_8688 = { 
	.io_port_1 = 0x01,

	.io_port_2 = 0x02,

};

static const struct btmrvl_sdio_card_reg btmrvl_reg_8787 = {

static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {

	.cfg = 0x00,

	.host_int_mask = 0x02,

	.host_intstatus = 0x03,
@@ -92,7 +92,14 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = { 
static const struct btmrvl_sdio_device btmrvl_sdio_sd8787 = {

	.helper		= NULL,

	.firmware	= "mrvl/sd8787_uapsta.bin",

	.reg		= &btmrvl_reg_8787,

	.reg		= &btmrvl_reg_87xx,

	.sd_blksz_fw_dl	= 256,

};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = {

	.helper		= NULL,

	.firmware	= "mrvl/sd8797_uapsta.bin",

	.reg		= &btmrvl_reg_87xx,

	.sd_blksz_fw_dl	= 256,

};
@@ -103,6 +110,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = { 
	/* Marvell SD8787 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x911A),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8787 },

	/* Marvell SD8797 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x912A),

			.driver_data = (unsigned long) &btmrvl_sdio_sd8797 },



	{ }	/* Terminating entry */

};
@@ -1076,3 +1086,4 @@ MODULE_LICENSE("GPL v2"); 
MODULE_FIRMWARE("sd8688_helper.bin");

MODULE_FIRMWARE("sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

drivers/bluetooth/btusb.c

+1 −2
Original line number Diff line number Diff line
@@ -777,9 +777,8 @@ static int btusb_send_frame(struct sk_buff *skb) 
		usb_mark_last_busy(data->udev);

	}



	usb_free_urb(urb);



done:

	usb_free_urb(urb);

	return err;

}

drivers/net/ethernet/freescale/fec.c

+7 −4
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ struct fec_enet_private { 
	struct	platform_device *pdev;



	int	opened;

	int	dev_id;



	/* Phylib and MDIO interface */

	struct	mii_bus *mii_bus;
@@ -837,7 +838,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev) 


	/* Adjust MAC if using macaddr */

	if (iap == macaddr)

		 ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->pdev->id;

		 ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->dev_id;

}



/* ------------------------------------------------------------------------- */
@@ -953,7 +954,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) 
	char mdio_bus_id[MII_BUS_ID_SIZE];

	char phy_name[MII_BUS_ID_SIZE + 3];

	int phy_id;

	int dev_id = fep->pdev->id;

	int dev_id = fep->dev_id;



	fep->phy_dev = NULL;
@@ -1031,7 +1032,7 @@ static int fec_enet_mii_init(struct platform_device *pdev) 
	 * mdio interface in board design, and need to be configured by

	 * fec0 mii_bus.

	 */

	if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id > 0) {

	if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && fep->dev_id > 0) {

		/* fec1 uses fec0 mii_bus */

		fep->mii_bus = fec0_mii_bus;

		return 0;
@@ -1063,7 +1064,7 @@ static int fec_enet_mii_init(struct platform_device *pdev) 
	fep->mii_bus->read = fec_enet_mdio_read;

	fep->mii_bus->write = fec_enet_mdio_write;

	fep->mii_bus->reset = fec_enet_mdio_reset;

	snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id + 1);

	snprintf(fep->mii_bus->id, MII_BUS_ID_SIZE, "%x", fep->dev_id + 1);

	fep->mii_bus->priv = fep;

	fep->mii_bus->parent = &pdev->dev;
@@ -1521,6 +1522,7 @@ fec_probe(struct platform_device *pdev) 
	int i, irq, ret = 0;

	struct resource *r;

	const struct of_device_id *of_id;

	static int dev_id;



	of_id = of_match_device(fec_dt_ids, &pdev->dev);

	if (of_id)
@@ -1548,6 +1550,7 @@ fec_probe(struct platform_device *pdev) 


	fep->hwp = ioremap(r->start, resource_size(r));

	fep->pdev = pdev;

	fep->dev_id = dev_id++;



	if (!fep->hwp) {

		ret = -ENOMEM;

drivers/net/ethernet/freescale/fsl_pq_mdio.c

+8 −45
Original line number Diff line number Diff line
@@ -183,28 +183,10 @@ void fsl_pq_mdio_bus_name(char *name, struct device_node *np) 
}

EXPORT_SYMBOL_GPL(fsl_pq_mdio_bus_name);



/* Scan the bus in reverse, looking for an empty spot */

static int fsl_pq_mdio_find_free(struct mii_bus *new_bus)

{

	int i;



	for (i = PHY_MAX_ADDR; i > 0; i--) {

		u32 phy_id;



		if (get_phy_id(new_bus, i, &phy_id))

			return -1;



		if (phy_id == 0xffffffff)

			break;

	}



	return i;

}





#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)

static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs, struct device_node *np)

{

#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)

	struct gfar __iomem *enet_regs;



	/*
@@ -220,15 +202,15 @@ static u32 __iomem *get_gfar_tbipa(struct fsl_pq_mdio __iomem *regs, struct devi 
	} else if (of_device_is_compatible(np, "fsl,etsec2-mdio") ||

			of_device_is_compatible(np, "fsl,etsec2-tbi")) {

		return of_iomap(np, 1);

	} else

		return NULL;

	}

#endif

	return NULL;

}





#if defined(CONFIG_UCC_GETH) || defined(CONFIG_UCC_GETH_MODULE)

static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id)

{

#if defined(CONFIG_UCC_GETH) || defined(CONFIG_UCC_GETH_MODULE)

	struct device_node *np = NULL;

	int err = 0;
@@ -261,9 +243,10 @@ static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id) 
		return err;

	else

		return -EINVAL;

}

#else

	return -ENODEV;

#endif



}



static int fsl_pq_mdio_probe(struct platform_device *ofdev)

{
@@ -339,19 +322,13 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 
			of_device_is_compatible(np, "fsl,etsec2-mdio") ||

			of_device_is_compatible(np, "fsl,etsec2-tbi") ||

			of_device_is_compatible(np, "gianfar")) {

#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)

		tbipa = get_gfar_tbipa(regs, np);

		if (!tbipa) {

			err = -EINVAL;

			goto err_free_irqs;

		}

#else

		err = -ENODEV;

		goto err_free_irqs;

#endif

	} else if (of_device_is_compatible(np, "fsl,ucc-mdio") ||

			of_device_is_compatible(np, "ucc_geth_phy")) {

#if defined(CONFIG_UCC_GETH) || defined(CONFIG_UCC_GETH_MODULE)

		u32 id;

		static u32 mii_mng_master;
@@ -364,10 +341,6 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 
			mii_mng_master = id;

			ucc_set_qe_mux_mii_mng(id - 1);

		}

#else

		err = -ENODEV;

		goto err_free_irqs;

#endif

	} else {

		err = -ENODEV;

		goto err_free_irqs;
@@ -386,16 +359,6 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 
	}



	if (tbiaddr == -1) {

		out_be32(tbipa, 0);



		tbiaddr = fsl_pq_mdio_find_free(new_bus);

	}



	/*

	 * We define TBIPA at 0 to be illegal, opting to fail for boards that

	 * have PHYs at 1-31, rather than change tbipa and rescan.

	 */

	if (tbiaddr == 0) {

		err = -EBUSY;



		goto err_free_irqs;