aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120-2.6
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-06-17 14:05:59 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-06-17 14:05:59 +0000
commitfe01ca174555970662ae730574cb484566df60e6 (patch)
tree2faaf050c4ed9ede36e0327ba0f9218a6b5fc5fa /target/linux/adm5120-2.6
parent2c847dc6482912e8c3c1483924acde706e496091 (diff)
downloadupstream-fe01ca174555970662ae730574cb484566df60e6.tar.gz
upstream-fe01ca174555970662ae730574cb484566df60e6.tar.bz2
upstream-fe01ca174555970662ae730574cb484566df60e6.zip
Resync kernel config, preliminary bandwidth control mgmt for the adm5120 switch
SVN-Revision: 7655
Diffstat (limited to 'target/linux/adm5120-2.6')
-rw-r--r--target/linux/adm5120-2.6/config/default5
-rw-r--r--target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c38
-rw-r--r--target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h4
3 files changed, 42 insertions, 5 deletions
diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index 227eacc9b0..eae47ce5ab 100644
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -3,7 +3,6 @@ CONFIG_32BIT=y
# CONFIG_64BIT_PHYS_ADDR is not set
CONFIG_ADM5120_GPIO=y
CONFIG_ADM5120_NR_UARTS=2
-# CONFIG_ATM_DRIVERS is not set
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_BASE_SMALL=0
@@ -97,7 +96,6 @@ CONFIG_JFFS2_SUMMARY=y
# CONFIG_JOLIET is not set
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_MACH_ALCHEMY is not set
# CONFIG_MACH_DECSTATION is not set
# CONFIG_MACH_JAZZ is not set
# CONFIG_MACH_VR41XX is not set
@@ -177,9 +175,7 @@ CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
CONFIG_MTD_NAND_RB100=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_OBSOLETE_CHIPS is not set
@@ -203,7 +199,6 @@ CONFIG_NET_KEY=y
# CONFIG_NET_PKTGEN is not set
CONFIG_NET_SCH_FIFO=y
# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NETDEV_1000 is not set
# CONFIG_PAGE_SIZE_16KB is not set
CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_64KB is not set
diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
index 33489e50f0..dfc030ea1c 100644
--- a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
+++ b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
@@ -40,6 +40,11 @@ static unsigned char vlan_matrix[SW_DEVS] = {
0x41, 0x42, 0x44, 0x48, 0x50, 0x60
};
+/* default settings - unlimited TX and RX on all ports, default shaper mode */
+static unsigned char bw_matrix[SW_DEVS] = {
+ 0, 0, 0, 0, 0, 0
+};
+
static int adm5120_nrdevs;
static struct net_device *adm5120_devs[SW_DEVS];
@@ -205,6 +210,26 @@ static void adm5120_set_vlan(char *matrix)
adm5120_set_reg(ADM5120_VLAN_GII, val);
}
+static void adm5120_set_bw(char *matrix)
+{
+ unsigned long val;
+
+ /* Port 0 to 3 are set using the bandwidth control 0 register */
+ val = matrix[0] + (matrix[1]<<8) + (matrix[2]<<16) + (matrix[3]<<24);
+ adm5120_set_reg(ADM5120_BW_CTL0, val);
+
+ /* Port 4 and 5 are set using the bandwidth control 1 register */
+ val = matrix[4];
+ if (matrix[5] == 1)
+ adm5120_set_reg(ADM5120_BW_CTL1, val | 0x80000000);
+ else
+ adm5120_set_reg(ADM5120_BW_CTL1, val & ~0x8000000);
+
+ printk(KERN_DEBUG "D: ctl0 0x%x, ctl1 0x%x\n",
+ adm5120_get_reg(ADM5120_BW_CTL0),
+ adm5120_get_reg(ADM5120_BW_CTL1));
+}
+
static int adm5120_sw_open(struct net_device *dev)
{
if (!adm5120_if_open++)
@@ -346,6 +371,19 @@ static int adm5120_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
if (err)
return -EFAULT;
break;
+ case SIOCGETBW:
+ err = copy_to_user(rq->ifr_data, bw_matrix, sizeof(bw_matrix));
+ if (err)
+ return -EFAULT;
+ break;
+ case SIOCSETBW:
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+ err = copy_from_user(bw_matrix, rq->ifr_data, sizeof(bw_matrix));
+ if (err)
+ return -EFAULT;
+ adm5120_set_bw(bw_matrix);
+ break;
default:
return -EOPNOTSUPP;
}
diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
index ed9836e224..35e7876c25 100644
--- a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
+++ b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
@@ -38,6 +38,8 @@
#define ADM5120_MAC_WRITE_DONE 0x00000002
#define ADM5120_VLAN_EN 0x00000040
#define ADM5120_MAC_WT1 0x5c
+#define ADM5120_BW_CTL0 0x60 /* Bandwidth control 0 */
+#define ADM5120_BW_CTL1 0x64 /* Bandwidth control 1 */
#define ADM5120_PHY_CNTL2 0x7c
#define ADM5120_AUTONEG 0x0000001f /* Auto negotiate */
#define ADM5120_NORMAL 0x01f00000 /* PHY normal mode */
@@ -95,6 +97,8 @@ struct adm5120_sw {
#define SIOCSMATRIX SIOCDEVPRIVATE
#define SIOCGMATRIX SIOCDEVPRIVATE+1
#define SIOCGADMINFO SIOCDEVPRIVATE+2
+#define SIOCGETBW SIOCDEVPRIVATE+3
+#define SIOCSETBW SIOCDEVPRIVATE+4
struct adm5120_sw_info {
u16 magic;