---

yaml --- r: 342037 b: refs/heads/master c: c008413 h: refs/heads/master i: 342035: c19335e v: v3
git-mirror · Dec 6, 2012 · b5fa030 · b5fa030
1 parent a22a3ec
commit b5fa030
Show file tree

Hide file tree

Showing 294 changed files with 2,528 additions and 4,199 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c772dde343917b0961f75227cfb8c2b2f2b31d24
+refs/heads/master: c008413850d1d48cc02c940280bf2dcf76160f4c
diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt
@@ -44,7 +44,7 @@ neigh/default/unres_qlen - INTEGER
 	unresolved address by other network layers.
 	(deprecated in linux 3.3) : use unres_qlen_bytes instead.
 	Prior to linux 3.3, the default value is 3 which may cause
-	unexpected packet loss. The current default value is calculated
+	secluded packet loss. The current default value is calculated
 	according to default value of unres_qlen_bytes and true size of
 	packet.
 	Default: 31

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1674,9 +1674,10 @@ F:	drivers/net/ethernet/broadcom/tg3.*
 
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:	Brett Rudley <brudley@broadcom.com>
+M:	Roland Vossen <rvossen@broadcom.com>
 M:	Arend van Spriel <arend@broadcom.com>
 M:	Franky (Zhenhui) Lin <frankyl@broadcom.com>
-M:	Hante Meuleman <meuleman@broadcom.com>
+M:	Kan Yan	<kanyan@broadcom.com>
 L:	linux-wireless@vger.kernel.org
 L:	brcm80211-dev-list@broadcom.com
 S:	Supported

diff --git a/trunk/drivers/bcma/bcma_private.h b/trunk/drivers/bcma/bcma_private.h
@@ -84,8 +84,6 @@ extern void __exit bcma_host_pci_exit(void);
 /* driver_pci.c */
 u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address);
 
-extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc);
-
 #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
 bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);
 void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);

diff --git a/trunk/drivers/bcma/driver_chipcommon.c b/trunk/drivers/bcma/driver_chipcommon.c
@@ -4,15 +4,12 @@
  *
  * Copyright 2005, Broadcom Corporation
  * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
- * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de>
  *
  * Licensed under the GNU/GPL. See COPYING for details.
  */
 
 #include "bcma_private.h"
-#include <linux/bcm47xx_wdt.h>
 #include <linux/export.h>
-#include <linux/platform_device.h>
 #include <linux/bcma/bcma.h>
 
 static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
@@ -25,90 +22,6 @@ static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset,
 	return value;
 }
 
-static u32 bcma_chipco_alp_clock(struct bcma_drv_cc *cc)
-{
-	if (cc->capabilities & BCMA_CC_CAP_PMU)
-		return bcma_pmu_alp_clock(cc);
-
-	return 20000000;
-}
-
-static u32 bcma_chipco_watchdog_get_max_timer(struct bcma_drv_cc *cc)
-{
-	struct bcma_bus *bus = cc->core->bus;
-	u32 nb;
-
-	if (cc->capabilities & BCMA_CC_CAP_PMU) {
-		if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)
-			nb = 32;
-		else if (cc->core->id.rev < 26)
-			nb = 16;
-		else
-			nb = (cc->core->id.rev >= 37) ? 32 : 24;
-	} else {
-		nb = 28;
-	}
-	if (nb == 32)
-		return 0xffffffff;
-	else
-		return (1 << nb) - 1;
-}
-
-static u32 bcma_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt,
-					      u32 ticks)
-{
-	struct bcma_drv_cc *cc = bcm47xx_wdt_get_drvdata(wdt);
-
-	return bcma_chipco_watchdog_timer_set(cc, ticks);
-}
-
-static u32 bcma_chipco_watchdog_timer_set_ms_wdt(struct bcm47xx_wdt *wdt,
-						 u32 ms)
-{
-	struct bcma_drv_cc *cc = bcm47xx_wdt_get_drvdata(wdt);
-	u32 ticks;
-
-	ticks = bcma_chipco_watchdog_timer_set(cc, cc->ticks_per_ms * ms);
-	return ticks / cc->ticks_per_ms;
-}
-
-static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc)
-{
-	struct bcma_bus *bus = cc->core->bus;
-
-	if (cc->capabilities & BCMA_CC_CAP_PMU) {
-		if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)
-			/* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */
-			return bcma_chipco_alp_clock(cc) / 4000;
-		else
-			/* based on 32KHz ILP clock */
-			return 32;
-	} else {
-		return bcma_chipco_alp_clock(cc) / 1000;
-	}
-}
-
-int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc)
-{
-	struct bcm47xx_wdt wdt = {};
-	struct platform_device *pdev;
-
-	wdt.driver_data = cc;
-	wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt;
-	wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt;
-	wdt.max_timer_ms = bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;
-
-	pdev = platform_device_register_data(NULL, "bcm47xx-wdt",
-					     cc->core->bus->num, &wdt,
-					     sizeof(wdt));
-	if (IS_ERR(pdev))
-		return PTR_ERR(pdev);
-
-	cc->watchdog = pdev;
-
-	return 0;
-}
-
 void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)
 {
 	if (cc->early_setup_done)
@@ -156,33 +69,15 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)
 			((leddc_on << BCMA_CC_GPIOTIMER_ONTIME_SHIFT) |
 			 (leddc_off << BCMA_CC_GPIOTIMER_OFFTIME_SHIFT)));
 	}
-	cc->ticks_per_ms = bcma_chipco_watchdog_ticks_per_ms(cc);
 
 	cc->setup_done = true;
 }
 
 /* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
-u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks)
+void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks)
 {
-	u32 maxt;
-	enum bcma_clkmode clkmode;
-
-	maxt = bcma_chipco_watchdog_get_max_timer(cc);
-	if (cc->capabilities & BCMA_CC_CAP_PMU) {
-		if (ticks == 1)
-			ticks = 2;
-		else if (ticks > maxt)
-			ticks = maxt;
-		bcma_cc_write32(cc, BCMA_CC_PMU_WATCHDOG, ticks);
-	} else {
-		clkmode = ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC;
-		bcma_core_set_clockmode(cc->core, clkmode);
-		if (ticks > maxt)
-			ticks = maxt;
-		/* instant NMI */
-		bcma_cc_write32(cc, BCMA_CC_WATCHDOG, ticks);
-	}
-	return ticks;
+	/* instant NMI */
+	bcma_cc_write32(cc, BCMA_CC_WATCHDOG, ticks);
 }
 
 void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value)
@@ -236,7 +131,8 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
 	struct bcma_serial_port *ports = cc->serial_ports;
 
 	if (ccrev >= 11 && ccrev != 15) {
-		baud_base = bcma_chipco_alp_clock(cc);
+		/* Fixed ALP clock */
+		baud_base = bcma_pmu_alp_clock(cc);
 		if (ccrev >= 21) {
 			/* Turn off UART clock before switching clocksource. */
 			bcma_cc_write32(cc, BCMA_CC_CORECTL,

diff --git a/trunk/drivers/bcma/driver_pci_host.c b/trunk/drivers/bcma/driver_pci_host.c
@@ -538,7 +538,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_pcibridge);
 static void bcma_core_pci_fixup_addresses(struct pci_dev *dev)
 {
 	struct resource *res;
-	int pos, err;
+	int pos;
 
 	if (dev->bus->ops->read != bcma_core_pci_hostmode_read_config) {
 		/* This is not a device on the PCI-core bridge. */
@@ -551,12 +551,8 @@ static void bcma_core_pci_fixup_addresses(struct pci_dev *dev)
 
 	for (pos = 0; pos < 6; pos++) {
 		res = &dev->resource[pos];
-		if (res->flags & (IORESOURCE_IO | IORESOURCE_MEM)) {
-			err = pci_assign_resource(dev, pos);
-			if (err)
-				pr_err("PCI: Problem fixing up the addresses on %s\n",
-				       pci_name(dev));
-		}
+		if (res->flags & (IORESOURCE_IO | IORESOURCE_MEM))
+			pci_assign_resource(dev, pos);
 	}
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, bcma_core_pci_fixup_addresses);

diff --git a/trunk/drivers/bcma/main.c b/trunk/drivers/bcma/main.c
@@ -165,12 +165,6 @@ static int bcma_register_cores(struct bcma_bus *bus)
 	}
 #endif
 
-	if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
-		err = bcma_chipco_watchdog_register(&bus->drv_cc);
-		if (err)
-			bcma_err(bus, "Error registering watchdog driver\n");
-	}
-
 	return 0;
 }
 
@@ -183,8 +177,6 @@ static void bcma_unregister_cores(struct bcma_bus *bus)
 		if (core->dev_registered)
 			device_unregister(&core->dev);
 	}
-	if (bus->hosttype == BCMA_HOSTTYPE_SOC)
-		platform_device_unregister(bus->drv_cc.watchdog);
 }
 
 int __devinit bcma_bus_register(struct bcma_bus *bus)

diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -615,9 +615,15 @@ static int bond_check_dev_link(struct bonding *bond,
 		return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;
 
 	/* Try to get link status using Ethtool first. */
-	if (slave_dev->ethtool_ops->get_link)
-		return slave_dev->ethtool_ops->get_link(slave_dev) ?
-			BMSR_LSTATUS : 0;
+	if (slave_dev->ethtool_ops) {
+		if (slave_dev->ethtool_ops->get_link) {
+			u32 link;
+
+			link = slave_dev->ethtool_ops->get_link(slave_dev);
+
+			return link ? BMSR_LSTATUS : 0;
+		}
+	}
 
 	/* Ethtool can't be used, fallback to MII ioctls. */
 	ioctl = slave_ops->ndo_do_ioctl;
@@ -1504,9 +1510,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 	int link_reporting;
 	int res = 0;
 
-	if (!bond->params.use_carrier &&
-	    slave_dev->ethtool_ops->get_link == NULL &&
-	    slave_ops->ndo_do_ioctl == NULL) {
+	if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL &&
+		slave_ops->ndo_do_ioctl == NULL) {
 		pr_warning("%s: Warning: no link monitoring support for %s\n",
 			   bond_dev->name, slave_dev->name);
 	}

diff --git a/trunk/drivers/net/can/c_can/c_can_pci.c b/trunk/drivers/net/can/c_can/c_can_pci.c
@@ -64,7 +64,7 @@ static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv,
 }
 
 static int c_can_pci_probe(struct pci_dev *pdev,
-			   const struct pci_device_id *ent)
+				     const struct pci_device_id *ent)
 {
 	struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
 	struct c_can_priv *priv;

diff --git a/trunk/drivers/net/can/cc770/cc770_platform.c b/trunk/drivers/net/can/cc770/cc770_platform.c
@@ -76,7 +76,7 @@ static void cc770_platform_write_reg(const struct cc770_priv *priv, int reg,
 }
 
 static int cc770_get_of_node_data(struct platform_device *pdev,
-				  struct cc770_priv *priv)
+					    struct cc770_priv *priv)
 {
 	struct device_node *np = pdev->dev.of_node;
 	const u32 *prop;
@@ -149,7 +149,7 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
 }
 
 static int cc770_get_platform_data(struct platform_device *pdev,
-				   struct cc770_priv *priv)
+					     struct cc770_priv *priv)
 {
 
 	struct cc770_platform_data *pdata = pdev->dev.platform_data;

diff --git a/trunk/drivers/net/can/mscan/mpc5xxx_can.c b/trunk/drivers/net/can/mscan/mpc5xxx_can.c
@@ -49,7 +49,8 @@ static struct of_device_id mpc52xx_cdm_ids[] = {
 };
 
 static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
-				 const char *clock_name, int *mscan_clksrc)
+					   const char *clock_name,
+					   int *mscan_clksrc)
 {
 	unsigned int pvr;
 	struct mpc52xx_cdm  __iomem *cdm;
@@ -101,7 +102,8 @@ static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
 }
 #else /* !CONFIG_PPC_MPC52xx */
 static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
-				 const char *clock_name, int *mscan_clksrc)
+					   const char *clock_name,
+					   int *mscan_clksrc)
 {
 	return 0;
 }
@@ -128,7 +130,8 @@ static struct of_device_id mpc512x_clock_ids[] = {
 };
 
 static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
-				 const char *clock_name, int *mscan_clksrc)
+					   const char *clock_name,
+					   int *mscan_clksrc)
 {
 	struct mpc512x_clockctl __iomem *clockctl;
 	struct device_node *np_clock;
@@ -237,7 +240,8 @@ static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
 }
 #else /* !CONFIG_PPC_MPC512x */
 static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
-				 const char *clock_name, int *mscan_clksrc)
+					   const char *clock_name,
+					   int *mscan_clksrc)
 {
 	return 0;
 }

diff --git a/trunk/drivers/net/can/sja1000/ems_pci.c b/trunk/drivers/net/can/sja1000/ems_pci.c
@@ -221,7 +221,7 @@ static void ems_pci_card_reset(struct ems_pci_card *card)
  * CAN channel to SJA1000 Socket-CAN subsystem.
  */
 static int ems_pci_add_card(struct pci_dev *pdev,
-			    const struct pci_device_id *ent)
+					const struct pci_device_id *ent)
 {
 	struct sja1000_priv *priv;
 	struct net_device *dev;

diff --git a/trunk/drivers/net/can/sja1000/ems_pcmcia.c b/trunk/drivers/net/can/sja1000/ems_pcmcia.c
@@ -166,7 +166,8 @@ static void ems_pcmcia_del_card(struct pcmcia_device *pdev)
  * Probe PCI device for EMS CAN signature and register each available
  * CAN channel to SJA1000 Socket-CAN subsystem.
  */
-static int ems_pcmcia_add_card(struct pcmcia_device *pdev, unsigned long base)
+static int ems_pcmcia_add_card(struct pcmcia_device *pdev,
+					 unsigned long base)
 {
 	struct sja1000_priv *priv;
 	struct net_device *dev;

diff --git a/trunk/drivers/net/can/sja1000/kvaser_pci.c b/trunk/drivers/net/can/sja1000/kvaser_pci.c
@@ -291,7 +291,7 @@ static int kvaser_pci_add_chan(struct pci_dev *pdev, int channel,
 }
 
 static int kvaser_pci_init_one(struct pci_dev *pdev,
-			       const struct pci_device_id *ent)
+					 const struct pci_device_id *ent)
 {
 	int err;
 	struct net_device *master_dev = NULL;

diff --git a/trunk/drivers/net/can/sja1000/peak_pci.c b/trunk/drivers/net/can/sja1000/peak_pci.c
@@ -551,7 +551,8 @@ static void peak_pci_post_irq(const struct sja1000_priv *priv)
 		writew(chan->icr_mask, chan->cfg_base + PITA_ICR);
 }
 
-static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int peak_pci_probe(struct pci_dev *pdev,
+				    const struct pci_device_id *ent)
 {
 	struct sja1000_priv *priv;
 	struct peak_pci_chan *chan;

diff --git a/trunk/drivers/net/can/sja1000/plx_pci.c b/trunk/drivers/net/can/sja1000/plx_pci.c
@@ -485,7 +485,7 @@ static void plx_pci_del_card(struct pci_dev *pdev)
  * available CAN channel to SJA1000 Socket-CAN subsystem.
  */
 static int plx_pci_add_card(struct pci_dev *pdev,
-			    const struct pci_device_id *ent)
+				      const struct pci_device_id *ent)
 {
 	struct sja1000_priv *priv;
 	struct net_device *dev;

diff --git a/trunk/drivers/net/can/softing/softing_cs.c b/trunk/drivers/net/can/softing/softing_cs.c
@@ -193,7 +193,8 @@ static int softingcs_enable_irq(struct platform_device *pdev, int v)
 /*
  * pcmcia check
  */
-static int softingcs_probe_config(struct pcmcia_device *pcmcia, void *priv_data)
+static int softingcs_probe_config(struct pcmcia_device *pcmcia,
+		void *priv_data)
 {
 	struct softing_platform_data *pdat = priv_data;
 	struct resource *pres;

diff --git a/trunk/drivers/net/can/softing/softing_main.c b/trunk/drivers/net/can/softing/softing_main.c
@@ -646,7 +646,7 @@ static const struct can_bittiming_const softing_btr_const = {
 
 
 static struct net_device *softing_netdev_create(struct softing *card,
-						uint16_t chip_id)
+		uint16_t chip_id)
 {
 	struct net_device *netdev;
 	struct softing_priv *priv;