summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/linux/sibyte/patches/000-honuor_config_cmdline.patch14
-rw-r--r--target/linux/sibyte/patches/001-rhone_physmap.patch6
-rw-r--r--target/linux/sibyte/patches/002-sbmac_net_device_opts.patch49
-rw-r--r--target/linux/sibyte/patches/003-fix_locking.patch74
4 files changed, 140 insertions, 3 deletions
diff --git a/target/linux/sibyte/patches/000-honuor_config_cmdline.patch b/target/linux/sibyte/patches/000-honuor_config_cmdline.patch
new file mode 100644
index 0000000..b2af916
--- /dev/null
+++ b/target/linux/sibyte/patches/000-honuor_config_cmdline.patch
@@ -0,0 +1,14 @@
+--- a/arch/mips/sibyte/cfe/setup.c
++++ b/arch/mips/sibyte/cfe/setup.c
+@@ -293,7 +293,11 @@ void __init prom_init(void)
+ * It's OK for direct boot to not provide a
+ * command line
+ */
++#ifdef CONFIG_CMDLINE
++ strlcpy(arcs_cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
++#else
+ strcpy(arcs_cmdline, "root=/dev/ram0 ");
++#endif
+ } else {
+ /* The loader should have set the command line */
+ /* too early for panic to do any good */
diff --git a/target/linux/sibyte/patches/001-rhone_physmap.patch b/target/linux/sibyte/patches/001-rhone_physmap.patch
index fbadaf6..e724a41 100644
--- a/target/linux/sibyte/patches/001-rhone_physmap.patch
+++ b/target/linux/sibyte/patches/001-rhone_physmap.patch
@@ -1,6 +1,6 @@
---- a/arch/mips/sibyte/swarm/platform.c 2009-04-30 06:48:16.000000000 +0200
-+++ b/arch/mips/sibyte/swarm/platform.c 2009-05-01 20:54:50.000000000 +0200
-@@ -83,3 +83,61 @@
+--- a/arch/mips/sibyte/swarm/platform.c
++++ b/arch/mips/sibyte/swarm/platform.c
+@@ -83,3 +83,61 @@ static int __init swarm_pata_init(void)
device_initcall(swarm_pata_init);
#endif /* defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_LITTLESUR) */
diff --git a/target/linux/sibyte/patches/002-sbmac_net_device_opts.patch b/target/linux/sibyte/patches/002-sbmac_net_device_opts.patch
new file mode 100644
index 0000000..8171ef3
--- /dev/null
+++ b/target/linux/sibyte/patches/002-sbmac_net_device_opts.patch
@@ -0,0 +1,49 @@
+--- a/drivers/net/sb1250-mac.c
++++ b/drivers/net/sb1250-mac.c
+@@ -2271,6 +2271,22 @@ static int sb1250_change_mtu(struct net_
+ return 0;
+ }
+
++static const struct net_device_ops sbmac_netdev_ops = {
++ .ndo_open = sbmac_open,
++ .ndo_stop = sbmac_close,
++ .ndo_start_xmit = sbmac_start_tx,
++ .ndo_tx_timeout = sbmac_tx_timeout,
++ .ndo_do_ioctl = sbmac_mii_ioctl,
++ .ndo_set_multicast_list = sbmac_set_rx_mode,
++ .ndo_change_mtu = sb1250_change_mtu,
++ .ndo_validate_addr = eth_validate_addr,
++ .ndo_set_mac_address = eth_mac_addr,
++
++#ifdef CONFIG_NET_POLL_CONTROLLER
++ .ndo_poll_controller = sbmac_netpoll,
++#endif
++};
++
+ /**********************************************************************
+ * SBMAC_INIT(dev)
+ *
+@@ -2327,21 +2343,12 @@ static int sbmac_init(struct platform_de
+
+ spin_lock_init(&(sc->sbm_lock));
+
+- dev->open = sbmac_open;
+- dev->hard_start_xmit = sbmac_start_tx;
+- dev->stop = sbmac_close;
+- dev->set_multicast_list = sbmac_set_rx_mode;
+- dev->do_ioctl = sbmac_mii_ioctl;
+- dev->tx_timeout = sbmac_tx_timeout;
++ dev->netdev_ops = &sbmac_netdev_ops;
++
+ dev->watchdog_timeo = TX_TIMEOUT;
+
+ netif_napi_add(dev, &sc->napi, sbmac_poll, 16);
+
+- dev->change_mtu = sb1250_change_mtu;
+-#ifdef CONFIG_NET_POLL_CONTROLLER
+- dev->poll_controller = sbmac_netpoll;
+-#endif
+-
+ dev->irq = UNIT_INT(idx);
+
+ /* This is needed for PASS2 for Rx H/W checksum feature */
diff --git a/target/linux/sibyte/patches/003-fix_locking.patch b/target/linux/sibyte/patches/003-fix_locking.patch
new file mode 100644
index 0000000..eaa70f6
--- /dev/null
+++ b/target/linux/sibyte/patches/003-fix_locking.patch
@@ -0,0 +1,74 @@
+Locking of irq_desc is now done in irq_set_affinity; Don't lock it
+again in chip specific set_affinity function.
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
+---
+
+ arch/mips/sibyte/bcm1480/irq.c | 7 ++-----
+ arch/mips/sibyte/sb1250/irq.c | 7 ++-----
+ 2 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
+index 352352b..c147c4b 100644
+--- a/arch/mips/sibyte/bcm1480/irq.c
++++ b/arch/mips/sibyte/bcm1480/irq.c
+@@ -113,7 +113,6 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
+ {
+ int i = 0, old_cpu, cpu, int_on, k;
+ u64 cur_ints;
+- struct irq_desc *desc = irq_desc + irq;
+ unsigned long flags;
+ unsigned int irq_dirty;
+
+@@ -127,8 +126,7 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
+ cpu = cpu_logical_map(i);
+
+ /* Protect against other affinity changers and IMR manipulation */
+- spin_lock_irqsave(&desc->lock, flags);
+- spin_lock(&bcm1480_imr_lock);
++ spin_lock_irqsave(&bcm1480_imr_lock, flags);
+
+ /* Swizzle each CPU's IMR (but leave the IP selection alone) */
+ old_cpu = bcm1480_irq_owner[irq];
+@@ -153,8 +151,7 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
+ ____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
+ }
+ }
+- spin_unlock(&bcm1480_imr_lock);
+- spin_unlock_irqrestore(&desc->lock, flags);
++ spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
+ }
+ #endif
+
+diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
+index c08ff58..38cb998 100644
+--- a/arch/mips/sibyte/sb1250/irq.c
++++ b/arch/mips/sibyte/sb1250/irq.c
+@@ -107,7 +107,6 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
+ {
+ int i = 0, old_cpu, cpu, int_on;
+ u64 cur_ints;
+- struct irq_desc *desc = irq_desc + irq;
+ unsigned long flags;
+
+ i = cpumask_first(mask);
+@@ -121,8 +120,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
+ cpu = cpu_logical_map(i);
+
+ /* Protect against other affinity changers and IMR manipulation */
+- spin_lock_irqsave(&desc->lock, flags);
+- spin_lock(&sb1250_imr_lock);
++ spin_lock_irqsave(&sb1250_imr_lock, flags);
+
+ /* Swizzle each CPU's IMR (but leave the IP selection alone) */
+ old_cpu = sb1250_irq_owner[irq];
+@@ -144,8 +142,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
+ ____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
+ R_IMR_INTERRUPT_MASK));
+ }
+- spin_unlock(&sb1250_imr_lock);
+- spin_unlock_irqrestore(&desc->lock, flags);
++ spin_unlock_irqrestore(&sb1250_imr_lock, flags);
+ }
+ #endif
+