aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kvm/Kconfig1
-rw-r--r--arch/powerpc/boot/dts/mpc8569mds.dts47
-rw-r--r--arch/powerpc/configs/ppc64_defconfig1
-rw-r--r--arch/powerpc/configs/ps3_defconfig1
-rw-r--r--arch/powerpc/kvm/Kconfig1
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_mds.c24
-rw-r--r--arch/s390/kvm/Kconfig1
-rw-r--r--arch/sparc/kernel/sys_sparc32.c1
-rw-r--r--arch/x86/kvm/Kconfig1
-rw-r--r--arch/xtensa/platforms/iss/network.c2
10 files changed, 71 insertions, 9 deletions
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index ef3e7be29caf..01c75797119c 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -47,6 +47,7 @@ config KVM_INTEL
47 Provides support for KVM on Itanium 2 processors equipped with the VT 47 Provides support for KVM on Itanium 2 processors equipped with the VT
48 extensions. 48 extensions.
49 49
50source drivers/vhost/Kconfig
50source drivers/virtio/Kconfig 51source drivers/virtio/Kconfig
51 52
52endif # VIRTUALIZATION 53endif # VIRTUALIZATION
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts
index 795eb362fcf9..8b72eaff5b03 100644
--- a/arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -535,6 +535,7 @@
535 rx-clock-name = "none"; 535 rx-clock-name = "none";
536 tx-clock-name = "clk12"; 536 tx-clock-name = "clk12";
537 pio-handle = <&pio1>; 537 pio-handle = <&pio1>;
538 tbi-handle = <&tbi1>;
538 phy-handle = <&qe_phy0>; 539 phy-handle = <&qe_phy0>;
539 phy-connection-type = "rgmii-id"; 540 phy-connection-type = "rgmii-id";
540 }; 541 };
@@ -579,7 +580,7 @@
579 reg = <0x6>; 580 reg = <0x6>;
580 device_type = "ethernet-phy"; 581 device_type = "ethernet-phy";
581 }; 582 };
582 tbi-phy@11 { 583 tbi1: tbi-phy@11 {
583 reg = <0x11>; 584 reg = <0x11>;
584 device_type = "tbi-phy"; 585 device_type = "tbi-phy";
585 }; 586 };
@@ -590,7 +591,7 @@
590 reg = <0x3520 0x18>; 591 reg = <0x3520 0x18>;
591 compatible = "fsl,ucc-mdio"; 592 compatible = "fsl,ucc-mdio";
592 593
593 tbi0: tbi-phy@15 { 594 tbi6: tbi-phy@15 {
594 reg = <0x15>; 595 reg = <0x15>;
595 device_type = "tbi-phy"; 596 device_type = "tbi-phy";
596 }; 597 };
@@ -600,7 +601,7 @@
600 #size-cells = <0>; 601 #size-cells = <0>;
601 reg = <0x3720 0x38>; 602 reg = <0x3720 0x38>;
602 compatible = "fsl,ucc-mdio"; 603 compatible = "fsl,ucc-mdio";
603 tbi1: tbi-phy@17 { 604 tbi8: tbi-phy@17 {
604 reg = <0x17>; 605 reg = <0x17>;
605 device_type = "tbi-phy"; 606 device_type = "tbi-phy";
606 }; 607 };
@@ -617,10 +618,22 @@
617 rx-clock-name = "none"; 618 rx-clock-name = "none";
618 tx-clock-name = "clk12"; 619 tx-clock-name = "clk12";
619 pio-handle = <&pio3>; 620 pio-handle = <&pio3>;
621 tbi-handle = <&tbi3>;
620 phy-handle = <&qe_phy2>; 622 phy-handle = <&qe_phy2>;
621 phy-connection-type = "rgmii-id"; 623 phy-connection-type = "rgmii-id";
622 }; 624 };
623 625
626 mdio@2320 {
627 #address-cells = <1>;
628 #size-cells = <0>;
629 reg = <0x2320 0x18>;
630 compatible = "fsl,ucc-mdio";
631 tbi3: tbi-phy@11 {
632 reg = <0x11>;
633 device_type = "tbi-phy";
634 };
635 };
636
624 enet1: ucc@3000 { 637 enet1: ucc@3000 {
625 device_type = "network"; 638 device_type = "network";
626 compatible = "ucc_geth"; 639 compatible = "ucc_geth";
@@ -632,10 +645,22 @@
632 rx-clock-name = "none"; 645 rx-clock-name = "none";
633 tx-clock-name = "clk17"; 646 tx-clock-name = "clk17";
634 pio-handle = <&pio2>; 647 pio-handle = <&pio2>;
648 tbi-handle = <&tbi2>;
635 phy-handle = <&qe_phy1>; 649 phy-handle = <&qe_phy1>;
636 phy-connection-type = "rgmii-id"; 650 phy-connection-type = "rgmii-id";
637 }; 651 };
638 652
653 mdio@3120 {
654 #address-cells = <1>;
655 #size-cells = <0>;
656 reg = <0x3120 0x18>;
657 compatible = "fsl,ucc-mdio";
658 tbi2: tbi-phy@11 {
659 reg = <0x11>;
660 device_type = "tbi-phy";
661 };
662 };
663
639 enet3: ucc@3200 { 664 enet3: ucc@3200 {
640 device_type = "network"; 665 device_type = "network";
641 compatible = "ucc_geth"; 666 compatible = "ucc_geth";
@@ -647,10 +672,22 @@
647 rx-clock-name = "none"; 672 rx-clock-name = "none";
648 tx-clock-name = "clk17"; 673 tx-clock-name = "clk17";
649 pio-handle = <&pio4>; 674 pio-handle = <&pio4>;
675 tbi-handle = <&tbi4>;
650 phy-handle = <&qe_phy3>; 676 phy-handle = <&qe_phy3>;
651 phy-connection-type = "rgmii-id"; 677 phy-connection-type = "rgmii-id";
652 }; 678 };
653 679
680 mdio@3320 {
681 #address-cells = <1>;
682 #size-cells = <0>;
683 reg = <0x3320 0x18>;
684 compatible = "fsl,ucc-mdio";
685 tbi4: tbi-phy@11 {
686 reg = <0x11>;
687 device_type = "tbi-phy";
688 };
689 };
690
654 enet5: ucc@3400 { 691 enet5: ucc@3400 {
655 device_type = "network"; 692 device_type = "network";
656 compatible = "ucc_geth"; 693 compatible = "ucc_geth";
@@ -661,7 +698,7 @@
661 local-mac-address = [ 00 00 00 00 00 00 ]; 698 local-mac-address = [ 00 00 00 00 00 00 ];
662 rx-clock-name = "none"; 699 rx-clock-name = "none";
663 tx-clock-name = "none"; 700 tx-clock-name = "none";
664 tbi-handle = <&tbi0>; 701 tbi-handle = <&tbi6>;
665 phy-handle = <&qe_phy5>; 702 phy-handle = <&qe_phy5>;
666 phy-connection-type = "sgmii"; 703 phy-connection-type = "sgmii";
667 }; 704 };
@@ -676,7 +713,7 @@
676 local-mac-address = [ 00 00 00 00 00 00 ]; 713 local-mac-address = [ 00 00 00 00 00 00 ];
677 rx-clock-name = "none"; 714 rx-clock-name = "none";
678 tx-clock-name = "none"; 715 tx-clock-name = "none";
679 tbi-handle = <&tbi1>; 716 tbi-handle = <&tbi8>;
680 phy-handle = <&qe_phy7>; 717 phy-handle = <&qe_phy7>;
681 phy-connection-type = "sgmii"; 718 phy-connection-type = "sgmii";
682 }; 719 };
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index b5b259960794..12980d544654 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1004,7 +1004,6 @@ CONFIG_TIGON3=y
1004CONFIG_SPIDER_NET=m 1004CONFIG_SPIDER_NET=m
1005CONFIG_GELIC_NET=m 1005CONFIG_GELIC_NET=m
1006CONFIG_GELIC_WIRELESS=y 1006CONFIG_GELIC_WIRELESS=y
1007# CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE is not set
1008# CONFIG_QLA3XXX is not set 1007# CONFIG_QLA3XXX is not set
1009# CONFIG_ATL1 is not set 1008# CONFIG_ATL1 is not set
1010# CONFIG_ATL1E is not set 1009# CONFIG_ATL1E is not set
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 7de127e4ceef..32f7058bb173 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -593,7 +593,6 @@ CONFIG_MII=m
593CONFIG_NETDEV_1000=y 593CONFIG_NETDEV_1000=y
594CONFIG_GELIC_NET=y 594CONFIG_GELIC_NET=y
595CONFIG_GELIC_WIRELESS=y 595CONFIG_GELIC_WIRELESS=y
596# CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE is not set
597# CONFIG_NETDEV_10000 is not set 596# CONFIG_NETDEV_10000 is not set
598 597
599# 598#
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 6fb6e8aa3890..fe037fdaf1b3 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -75,6 +75,7 @@ config KVM_E500
75 75
76 If unsure, say N. 76 If unsure, say N.
77 77
78source drivers/vhost/Kconfig
78source drivers/virtio/Kconfig 79source drivers/virtio/Kconfig
79 80
80endif # VIRTUALIZATION 81endif # VIRTUALIZATION
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 04d105d689f1..f0684c8ac960 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -237,6 +237,8 @@ static void __init mpc85xx_mds_setup_arch(void)
237 } else if (machine_is(mpc8569_mds)) { 237 } else if (machine_is(mpc8569_mds)) {
238#define BCSR7_UCC12_GETHnRST (0x1 << 2) 238#define BCSR7_UCC12_GETHnRST (0x1 << 2)
239#define BCSR8_UEM_MARVELL_RST (0x1 << 1) 239#define BCSR8_UEM_MARVELL_RST (0x1 << 1)
240#define BCSR_UCC_RGMII (0x1 << 6)
241#define BCSR_UCC_RTBI (0x1 << 5)
240 /* 242 /*
241 * U-Boot mangles interrupt polarity for Marvell PHYs, 243 * U-Boot mangles interrupt polarity for Marvell PHYs,
242 * so reset built-in and UEM Marvell PHYs, this puts 244 * so reset built-in and UEM Marvell PHYs, this puts
@@ -247,6 +249,28 @@ static void __init mpc85xx_mds_setup_arch(void)
247 249
248 setbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST); 250 setbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST);
249 clrbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST); 251 clrbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST);
252
253 for (np = NULL; (np = of_find_compatible_node(np,
254 "network",
255 "ucc_geth")) != NULL;) {
256 const unsigned int *prop;
257 int ucc_num;
258
259 prop = of_get_property(np, "cell-index", NULL);
260 if (prop == NULL)
261 continue;
262
263 ucc_num = *prop - 1;
264
265 prop = of_get_property(np, "phy-connection-type", NULL);
266 if (prop == NULL)
267 continue;
268
269 if (strcmp("rtbi", (const char *)prop) == 0)
270 clrsetbits_8(&bcsr_regs[7 + ucc_num],
271 BCSR_UCC_RGMII, BCSR_UCC_RTBI);
272 }
273
250 } 274 }
251 iounmap(bcsr_regs); 275 iounmap(bcsr_regs);
252 } 276 }
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index 6ee55ae84ce2..a7251580891c 100644
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -35,6 +35,7 @@ config KVM
35 35
36# OK, it's a little counter-intuitive to do this, but it puts it neatly under 36# OK, it's a little counter-intuitive to do this, but it puts it neatly under
37# the virtualization menu. 37# the virtualization menu.
38source drivers/vhost/Kconfig
38source drivers/virtio/Kconfig 39source drivers/virtio/Kconfig
39 40
40endif # VIRTUALIZATION 41endif # VIRTUALIZATION
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index dc0ac197e7e2..daded3b96398 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -43,7 +43,6 @@
43#include <linux/security.h> 43#include <linux/security.h>
44#include <linux/compat.h> 44#include <linux/compat.h>
45#include <linux/vfs.h> 45#include <linux/vfs.h>
46#include <linux/netfilter_ipv4/ip_tables.h>
47#include <linux/ptrace.h> 46#include <linux/ptrace.h>
48 47
49#include <asm/types.h> 48#include <asm/types.h>
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 4cd498332466..3c4d0109ad20 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -65,6 +65,7 @@ config KVM_AMD
65 65
66# OK, it's a little counter-intuitive to do this, but it puts it neatly under 66# OK, it's a little counter-intuitive to do this, but it puts it neatly under
67# the virtualization menu. 67# the virtualization menu.
68source drivers/vhost/Kconfig
68source drivers/lguest/Kconfig 69source drivers/lguest/Kconfig
69source drivers/virtio/Kconfig 70source drivers/virtio/Kconfig
70 71
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c
index 2f0b86b37cf9..87e218f98ef4 100644
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@ -560,7 +560,7 @@ static void iss_net_set_multicast_list(struct net_device *dev)
560#if 0 560#if 0
561 if (dev->flags & IFF_PROMISC) 561 if (dev->flags & IFF_PROMISC)
562 return; 562 return;
563 else if (dev->mc_count) 563 else if (!netdev_mc_empty(dev))
564 dev->flags |= IFF_ALLMULTI; 564 dev->flags |= IFF_ALLMULTI;
565 else 565 else
566 dev->flags &= ~IFF_ALLMULTI; 566 dev->flags &= ~IFF_ALLMULTI;
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-03 06:25:29 -0500