litmus-rt.git - The LITMUS^RT kernel.

diff options

Diffstat (limited to 'net/ipv4/tcp_output.c')

-rw-r--r--

1 files changed, 20 insertions, 35 deletions

  * packet to the list.  This won't be called frequently, I hope.
  * Remember, these are still headerless SKBs at this point.
  */
-static int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss_now)
+int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss_now)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         struct sk_buff *buff;
-        int nsize;
+        int nsize, old_factor;
         u16 flags;
         nsize = skb_headlen(skb) - len;
                 tp->left_out -= tcp_skb_pcount(skb);
         }
+        old_factor = tcp_skb_pcount(skb);
         /* Fix up tso_factor for both original and new SKB.  */
         tcp_set_skb_tso_segs(sk, skb, mss_now);
         tcp_set_skb_tso_segs(sk, buff, mss_now);
-        if (TCP_SKB_CB(skb)->sacked & TCPCB_LOST) {
+        /* If this packet has been sent out already, we must
-                tp->lost_out += tcp_skb_pcount(skb);
+         * adjust the various packet counters.
-                tp->left_out += tcp_skb_pcount(skb);
+         */
-        }
+        if (after(tp->snd_nxt, TCP_SKB_CB(buff)->end_seq)) {
+                int diff = old_factor - tcp_skb_pcount(skb) -
+                        tcp_skb_pcount(buff);
-        if (TCP_SKB_CB(buff)->sacked&TCPCB_LOST) {
+                tp->packets_out -= diff;
-                tp->lost_out += tcp_skb_pcount(buff);
+                if (TCP_SKB_CB(skb)->sacked & TCPCB_LOST) {
-                tp->left_out += tcp_skb_pcount(buff);
+                        tp->lost_out -= diff;
+                        tp->left_out -= diff;
+                }
+                if (diff > 0) {
+                        tp->fackets_out -= diff;
+                        if ((int)tp->fackets_out < 0)
+                                tp->fackets_out = 0;
+                }
         }
         /* Link BUFF into the send queue. */
         if (before(TCP_SKB_CB(skb)->seq, tp->snd_una)) {
                 if (before(TCP_SKB_CB(skb)->end_seq, tp->snd_una))
                         BUG();
-                if (sk->sk_route_caps & NETIF_F_TSO) {
-                        sk->sk_route_caps &= ~NETIF_F_TSO;
-                        sock_set_flag(sk, SOCK_NO_LARGESEND);
-                }
                 if (tcp_trim_head(sk, skb, tp->snd_una - TCP_SKB_CB(skb)->seq))
                         return -ENOMEM;
         }
                 return -EAGAIN;
         if (skb->len > cur_mss) {
-                int old_factor = tcp_skb_pcount(skb);
-                int diff;
                 if (tcp_fragment(sk, skb, cur_mss, cur_mss))
                         return -ENOMEM; /* We'll try again later. */
-                /* New SKB created, account for it. */
-                diff = old_factor - tcp_skb_pcount(skb) -
-                       tcp_skb_pcount(skb->next);
-                tp->packets_out -= diff;
-                if (diff > 0) {
-                        tp->fackets_out -= diff;
-                        if ((int)tp->fackets_out < 0)
-                                tp->fackets_out = 0;
-                }
         }
         /* Collapse two adjacent packets if worthwhile and we can. */
                                 TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_PSH;
                                 if (tcp_fragment(sk, skb, seg_size, mss))
                                         return -1;
-                                /* SWS override triggered forced fragmentation.
-                                 * Disable TSO, the connection is too sick. */
-                                if (sk->sk_route_caps & NETIF_F_TSO) {
-                                        sock_set_flag(sk, SOCK_NO_LARGESEND);
-                                        sk->sk_route_caps &= ~NETIF_F_TSO;
-                                }
                         } else if (!tcp_skb_pcount(skb))
                                 tcp_set_skb_tso_segs(sk, skb, mss);

498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551

/* * f75375s.c - driver for the Fintek F75375/SP, F75373 and * F75387SG/RG hardware monitoring features * Copyright (C) 2006-2007 Riku Voipio * * Datasheets available at: * * f75375: * http://www.fintek.com.tw/files/productfiles/F75375_V026P.pdf * * f75373: * http://www.fintek.com.tw/files/productfiles/F75373_V025P.pdf * * f75387: * http://www.fintek.com.tw/files/productfiles/F75387_V027P.pdf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ #include <linux/module.h> #include <linux/jiffies.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/i2c.h> #include <linux/err.h> #include <linux/mutex.h> #include <linux/f75375s.h> #include <linux/slab.h> /* Addresses to scan */ static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END }; enum chips { f75373, f75375, f75387 }; /* Fintek F75375 registers */ #define F75375_REG_CONFIG0 0x0 #define F75375_REG_CONFIG1 0x1 #define F75375_REG_CONFIG2 0x2 #define F75375_REG_CONFIG3 0x3 #define F75375_REG_ADDR 0x4 #define F75375_REG_INTR 0x31 #define F75375_CHIP_ID 0x5A #define F75375_REG_VERSION 0x5C #define F75375_REG_VENDOR 0x5D #define F75375_REG_FAN_TIMER 0x60 #define F75375_REG_VOLT(nr) (0x10 + (nr)) #define F75375_REG_VOLT_HIGH(nr) (0x20 + (nr) * 2) #define F75375_REG_VOLT_LOW(nr) (0x21 + (nr) * 2) #define F75375_REG_TEMP(nr) (0x14 + (nr)) #define F75387_REG_TEMP11_LSB(nr) (0x1a + (nr)) #define F75375_REG_TEMP_HIGH(nr) (0x28 + (nr) * 2) #define F75375_REG_TEMP_HYST(nr) (0x29 + (nr) * 2) #define F75375_REG_FAN(nr) (0x16 + (nr) * 2) #define F75375_REG_FAN_MIN(nr) (0x2C + (nr) * 2) #define F75375_REG_FAN_FULL(nr) (0x70 + (nr) * 0x10) #define F75375_REG_FAN_PWM_DUTY(nr) (0x76 + (nr) * 0x10) #define F75375_REG_FAN_PWM_CLOCK(nr) (0x7D + (nr) * 0x10) #define F75375_REG_FAN_EXP(nr) (0x74 + (nr) * 0x10) #define F75375_REG_FAN_B_TEMP(nr, step) ((0xA0 + (nr) * 0x10) + (step)) #define F75375_REG_FAN_B_SPEED(nr, step) \ ((0xA5 + (nr) * 0x10) + (step) * 2) #define F75375_REG_PWM1_RAISE_DUTY 0x69 #define F75375_REG_PWM2_RAISE_DUTY 0x6A #define F75375_REG_PWM1_DROP_DUTY 0x6B #define F75375_REG_PWM2_DROP_DUTY 0x6C #define F75375_FAN_CTRL_LINEAR(nr) (4 + nr) #define F75387_FAN_CTRL_LINEAR(nr) (1 + ((nr) * 4)) #define FAN_CTRL_MODE(nr) (4 + ((nr) * 2)) #define F75387_FAN_DUTY_MODE(nr) (2 + ((nr) * 4)) #define F75387_FAN_MANU_MODE(nr) ((nr) * 4) /* * Data structures and manipulation thereof */ struct f75375_data { unsigned short addr; struct device *hwmon_dev; const char *name; int kind; struct mutex update_lock; /* protect register access */ char valid; unsigned long last_updated; /* In jiffies */ unsigned long last_limits; /* In jiffies */ /* Register values */ u8 in[4]; u8 in_max[4]; u8 in_min[4]; u16 fan[2]; u16 fan_min[2]; u16 fan_max[2]; u16 fan_target[2]; u8 fan_timer; u8 pwm[2]; u8 pwm_mode[2]; u8 pwm_enable[2]; /* * f75387: For remote temperature reading, it uses signed 11-bit * values with LSB = 0.125 degree Celsius, left-justified in 16-bit * registers. For original 8-bit temp readings, the LSB just is 0. */ s16 temp11[2]; s8 temp_high[2]; s8 temp_max_hyst[2]; }; static int f75375_detect(struct i2c_client *client, struct i2c_board_info *info); static int f75375_probe(struct i2c_client *client, const struct i2c_device_id *id); static int f75375_remove(struct i2c_client *client); static const struct i2c_device_id f75375_id[] = { { "f75373", f75373 }, { "f75375", f75375 }, { "f75387", f75387 }, { } }; MODULE_DEVICE_TABLE(i2c, f75375_id); static struct i2c_driver f75375_driver = { .class = I2C_CLASS_HWMON, .driver = { .name = "f75375", }, .probe = f75375_probe, .remove = f75375_remove, .id_table = f75375_id, .detect = f75375_detect, .address_list = normal_i2c, }; static inline int f75375_read8(struct i2c_client *client, u8 reg) { return i2c_smbus_read_byte_data(client, reg); } /* in most cases, should be called while holding update_lock */ static inline u16 f75375_read16(struct i2c_client *client, u8 reg) { return (i2c_smbus_read_byte_data(client, reg) << 8) | i2c_smbus_read_byte_data(client, reg + 1); } static inline void f75375_write8(struct i2c_client *client, u8 reg, u8 value) { i2c_smbus_write_byte_data(client, reg, value); } static inline void f75375_write16(struct i2c_client *client, u8 reg, u16 value) { int err = i2c_smbus_write_byte_data(client, reg, (value >> 8)); if (err) return; i2c_smbus_write_byte_data(client, reg + 1, (value & 0xFF)); } static void f75375_write_pwm(struct i2c_client *client, int nr) { struct f75375_data *data = i2c_get_clientdata(client); if (data->kind == f75387) f75375_write16(client, F75375_REG_FAN_EXP(nr), data->pwm[nr]); else f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr), data->pwm[nr]); } static struct f75375_data *f75375_update_device(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); struct f75375_data *data = i2c_get_clientdata(client); int nr; mutex_lock(&data->update_lock); /* Limit registers cache is refreshed after 60 seconds */ if (time_after(jiffies, data->last_limits + 60 * HZ) || !data->valid) { for (nr = 0; nr < 2; nr++) { data->temp_high[nr] = f75375_read8(client, F75375_REG_TEMP_HIGH(nr)); data->temp_max_hyst[nr] = f75375_read8(client, F75375_REG_TEMP_HYST(nr)); data->fan_max[nr] = f75375_read16(client, F75375_REG_FAN_FULL(nr)); data->fan_min[nr] = f75375_read16(client, F75375_REG_FAN_MIN(nr)); data->fan_target[nr] = f75375_read16(client, F75375_REG_FAN_EXP(nr)); } for (nr = 0; nr < 4; nr++) { data->in_max[nr] = f75375_read8(client, F75375_REG_VOLT_HIGH(nr)); data->in_min[nr] = f75375_read8(client, F75375_REG_VOLT_LOW(nr)); } data->fan_timer = f75375_read8(client, F75375_REG_FAN_TIMER); data->last_limits = jiffies; } /* Measurement registers cache is refreshed after 2 second */ if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) { for (nr = 0; nr < 2; nr++) { data->pwm[nr] = f75375_read8(client, F75375_REG_FAN_PWM_DUTY(nr)); /* assign MSB, therefore shift it by 8 bits */ data->temp11[nr] = f75375_read8(client, F75375_REG_TEMP(nr)) << 8; if (data->kind == f75387) /* merge F75387's temperature LSB (11-bit) */ data->temp11[nr] |= f75375_read8(client, F75387_REG_TEMP11_LSB(nr)); data->fan[nr] = f75375_read16(client, F75375_REG_FAN(nr)); } for (nr = 0; nr < 4; nr++) data->in[nr] = f75375_read8(client, F75375_REG_VOLT(nr)); data->last_updated = jiffies; data->valid = 1; } mutex_unlock(&data->update_lock); return data; } static inline u16 rpm_from_reg(u16 reg) { if (reg == 0 || reg == 0xffff) return 0; return 1500000 / reg; } static inline u16 rpm_to_reg(int rpm) { if (rpm < 367 || rpm > 0xffff) return 0xffff; return 1500000 / rpm; } static bool duty_mode_enabled(u8 pwm_enable) { switch (pwm_enable) { case 0: /* Manual, duty mode (full speed) */ case 1: /* Manual, duty mode */ case 4: /* Auto, duty mode */ return true; case 2: /* Auto, speed mode */ case 3: /* Manual, speed mode */ return false; default: BUG(); return true; } } static bool auto_mode_enabled(u8 pwm_enable) { switch (pwm_enable) { case 0: /* Manual, duty mode (full speed) */ case 1: /* Manual, duty mode */ case 3: /* Manual, speed mode */ return false; case 2: /* Auto, speed mode */ case 4: /* Auto, duty mode */ return true; default: BUG(); return false; } } static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { int nr = to_sensor_dev_attr(attr)->index; struct i2c_client *client = to_i2c_client(dev); struct f75375_data *data = i2c_get_clientdata(client); unsigned long val; int err; err = kstrtoul(buf, 10, &val); if (err < 0) return err; mutex_lock(&data->update_lock); data->fan_min[nr] = rpm_to_reg(val); f75375_write16(client, F75375_REG_FAN_MIN(nr), data->fan_min[nr]); mutex_unlock(&data->update_lock); return count; } static ssize_t set_fan_target(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { int nr = to_sensor_dev_attr(attr)->index; struct i2c_client *client = to_i2c_client(dev); struct f75375_data *data = i2c_get_clientdata(client); unsigned long val; int err; err = kstrtoul(buf, 10, &val); if (err < 0) return err; if (auto_mode_enabled(data->pwm_enable[nr])) return -EINVAL; if (data->kind == f75387 && duty_mode_enabled(data->pwm_enable[nr])) return -EINVAL; mutex_lock(&data->update_lock); data->fan_target[nr] = rpm_to_reg(val); f75375_write16(client, F75375_REG_FAN_EXP(nr), data->fan_target[nr]); mutex_unlock(&data->update_lock); return count; } static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { int nr = to_sensor_dev_attr(attr)->index; struct i2c_client *client = to_i2c_client(dev); struct f75375_data *data = i2c_get_clientdata(client); unsigned long val; int err; err = kstrtoul(buf, 10, &val); if (err < 0) return err;


context:
space:
mode: