diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:28:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:28:47 -0700 |
| commit | 5147a136f3ade69b9ce12afc022b1c37d43cf5d8 (patch) | |
| tree | a33af1b06f2000ab82cc0527442de108c668843c | |
| parent | eea487fa0daadea3dbe2c25b9db5881976643e09 (diff) | |
| parent | 470ec5b9affc1625ee67df9e74701e51973d7cdf (diff) | |
| download | patches-5147a136f3ade69b9ce12afc022b1c37d43cf5d8.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Conflicts:
series
12 files changed, 1189 insertions, 4 deletions
diff --git a/driver-core/add-packet-hub-driver-for-topcliff-platform-controller-hub.patch b/driver-core/add-packet-hub-driver-for-topcliff-platform-controller-hub.patch new file mode 100644 index 00000000000000..ba8985b5631623 --- /dev/null +++ b/driver-core/add-packet-hub-driver-for-topcliff-platform-controller-hub.patch @@ -0,0 +1,797 @@ +From masa-korg@dsn.okisemi.com Wed Sep 1 17:59:25 2010 +Message-ID: <4C7E441E.4090006@dsn.okisemi.com> +Date: Wed, 01 Sep 2010 21:16:30 +0900 +From: Masayuki Ohtak <masa-korg@dsn.okisemi.com> +To: meego-dev@meego.com, LKML <linux-kernel@vger.kernel.org>, + gregkh@suse.de +Cc: yong.y.wang@intel.com, qi.wang@intel.com, + andrew.chih.howe.khor@intel.com, arjan@linux.intel.com, + alan@linux.intel.com, margie.foster@intel.com, + Tomoya MORINAGA <morinaga526@dsn.okisemi.com> +Subject: add Packet hub driver for Topcliff Platform controller hub + +Packet hub driver of Topcliff PCH + +Topcliff PCH is the platform controller hub that is going to be used in +Intel's upcoming general embedded platform. All IO peripherals in +Topcliff PCH are actually devices sitting on AMBA bus. Packet hub is +a special converter device in Topcliff PCH that translate AMBA transactions +to PCI Express transactions and vice versa. Thus packet hub helps present +all IO peripherals in Topcliff PCH as PCIE devices to IA system. +Topcliff PCH has MAC address and Option ROM data. +These data are in SROM which is connected to PCIE bus. +Packet hub driver of Topcliff PCH can access MAC address and Option ROM data in +SROM via sysfs interface. + + +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + Documentation/ABI/testing/sysfs-module | 12 + drivers/misc/Kconfig | 12 + drivers/misc/Makefile | 1 + drivers/misc/pch_phub.c | 717 +++++++++++++++++++++++++++++++++ + 4 files changed, 742 insertions(+) + +--- /dev/null ++++ b/Documentation/ABI/testing/sysfs-module +@@ -0,0 +1,12 @@ ++What: /sys/module/pch_phub/drivers/.../pch_mac ++Date: August 2010 ++KernelVersion: 2.6.35 ++Contact: masa-korg@dsn.okisemi.com ++Description: Write/read GbE MAC address. ++ ++What: /sys/module/pch_phub/drivers/.../pch_firmware ++Date: August 2010 ++KernelVersion: 2.6.35 ++Contact: masa-korg@dsn.okisemi.com ++Description: Write/read Option ROM data. ++ +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig +@@ -390,6 +390,18 @@ config BMP085 + To compile this driver as a module, choose M here: the + module will be called bmp085. + ++config PCH_PHUB ++ tristate "PCH Packet Hub of Intel Topcliff" ++ depends on PCI ++ help ++ This driver is for PCH(Platform controller Hub) PHUB(Packet Hub) of ++ Intel Topcliff which is an IOH(Input/Output Hub) for x86 embedded ++ processor. The Topcliff has MAC address and Option ROM data in SROM. ++ This driver can access MAC address and Option ROM data in SROM. ++ ++ To compile this driver as a module, choose M here: the module will ++ be called pch_phub. ++ + source "drivers/misc/c2port/Kconfig" + source "drivers/misc/eeprom/Kconfig" + source "drivers/misc/cb710/Kconfig" +--- a/drivers/misc/Makefile ++++ b/drivers/misc/Makefile +@@ -35,3 +35,4 @@ obj-y += eeprom/ + obj-y += cb710/ + obj-$(CONFIG_VMWARE_BALLOON) += vmware_balloon.o + obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o ++obj-$(CONFIG_PCH_PHUB) += pch_phub.o +--- /dev/null ++++ b/drivers/misc/pch_phub.c +@@ -0,0 +1,717 @@ ++/* ++ * Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD. ++ * ++ * 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; version 2 of the License. ++ * ++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ */ ++ ++#include <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/types.h> ++#include <linux/fs.h> ++#include <linux/uaccess.h> ++#include <linux/string.h> ++#include <linux/pci.h> ++#include <linux/io.h> ++#include <linux/delay.h> ++#include <linux/mutex.h> ++#include <linux/if_ether.h> ++#include <linux/ctype.h> ++ ++#define PHUB_STATUS 0x00 /* Status Register offset */ ++#define PHUB_CONTROL 0x04 /* Control Register offset */ ++#define PHUB_TIMEOUT 0x05 /* Time out value for Status Register */ ++#define PCH_PHUB_ROM_WRITE_ENABLE 0x01 /* Enabling for writing ROM */ ++#define PCH_PHUB_ROM_WRITE_DISABLE 0x00 /* Disabling for writing ROM */ ++#define PCH_PHUB_ROM_START_ADDR 0x14 /* ROM data area start address offset */ ++ ++/* MAX number of INT_REDUCE_CONTROL registers */ ++#define MAX_NUM_INT_REDUCE_CONTROL_REG 128 ++#define PCI_DEVICE_ID_PCH1_PHUB 0x8801 ++#define PCH_MINOR_NOS 1 ++#define CLKCFG_CAN_50MHZ 0x12000000 ++#define CLKCFG_CANCLK_MASK 0xFF000000 ++ ++/* SROM ACCESS Macro */ ++#define PCH_WORD_ADDR_MASK (~((1 << 2) - 1)) ++ ++/* Registers address offset */ ++#define PCH_PHUB_ID_REG 0x0000 ++#define PCH_PHUB_QUEUE_PRI_VAL_REG 0x0004 ++#define PCH_PHUB_RC_QUEUE_MAXSIZE_REG 0x0008 ++#define PCH_PHUB_BRI_QUEUE_MAXSIZE_REG 0x000C ++#define PCH_PHUB_COMP_RESP_TIMEOUT_REG 0x0010 ++#define PCH_PHUB_BUS_SLAVE_CONTROL_REG 0x0014 ++#define PCH_PHUB_DEADLOCK_AVOID_TYPE_REG 0x0018 ++#define PCH_PHUB_INTPIN_REG_WPERMIT_REG0 0x0020 ++#define PCH_PHUB_INTPIN_REG_WPERMIT_REG1 0x0024 ++#define PCH_PHUB_INTPIN_REG_WPERMIT_REG2 0x0028 ++#define PCH_PHUB_INTPIN_REG_WPERMIT_REG3 0x002C ++#define PCH_PHUB_INT_REDUCE_CONTROL_REG_BASE 0x0040 ++#define CLKCFG_REG_OFFSET 0x500 ++ ++#define PCH_PHUB_OROM_SIZE 15360 ++ ++/** ++ * struct pch_phub_reg - PHUB register structure ++ * @phub_id_reg: PHUB_ID register val ++ * @q_pri_val_reg: QUEUE_PRI_VAL register val ++ * @rc_q_maxsize_reg: RC_QUEUE_MAXSIZE register val ++ * @bri_q_maxsize_reg: BRI_QUEUE_MAXSIZE register val ++ * @comp_resp_timeout_reg: COMP_RESP_TIMEOUT register val ++ * @bus_slave_control_reg: BUS_SLAVE_CONTROL_REG register val ++ * @deadlock_avoid_type_reg: DEADLOCK_AVOID_TYPE register val ++ * @intpin_reg_wpermit_reg0: INTPIN_REG_WPERMIT register 0 val ++ * @intpin_reg_wpermit_reg1: INTPIN_REG_WPERMIT register 1 val ++ * @intpin_reg_wpermit_reg2: INTPIN_REG_WPERMIT register 2 val ++ * @intpin_reg_wpermit_reg3: INTPIN_REG_WPERMIT register 3 val ++ * @int_reduce_control_reg: INT_REDUCE_CONTROL registers val ++ * @clkcfg_reg: CLK CFG register val ++ * @pch_phub_base_address: Register base address ++ * @pch_phub_extrom_base_address: external rom base address ++ */ ++struct pch_phub_reg { ++ u32 phub_id_reg; ++ u32 q_pri_val_reg; ++ u32 rc_q_maxsize_reg; ++ u32 bri_q_maxsize_reg; ++ u32 comp_resp_timeout_reg; ++ u32 bus_slave_control_reg; ++ u32 deadlock_avoid_type_reg; ++ u32 intpin_reg_wpermit_reg0; ++ u32 intpin_reg_wpermit_reg1; ++ u32 intpin_reg_wpermit_reg2; ++ u32 intpin_reg_wpermit_reg3; ++ u32 int_reduce_control_reg[MAX_NUM_INT_REDUCE_CONTROL_REG]; ++ u32 clkcfg_reg; ++ void __iomem *pch_phub_base_address; ++ void __iomem *pch_phub_extrom_base_address; ++}; ++ ++/* SROM SPEC for MAC address assignment offset */ ++static const int pch_phub_mac_offset[ETH_ALEN] = {0x3, 0x2, 0x1, 0x0, 0xb, 0xa}; ++ ++static DEFINE_MUTEX(pch_phub_mutex); ++ ++/** ++ * pch_phub_read_modify_write_reg() - Reading modifying and writing register ++ * @reg_addr_offset: Register offset address value. ++ * @data: Writing value. ++ * @mask: Mask value. ++ */ ++static void pch_phub_read_modify_write_reg(struct pch_phub_reg *chip, ++ unsigned int reg_addr_offset, ++ unsigned int data, unsigned int mask) ++{ ++ void __iomem *reg_addr = chip->pch_phub_base_address + reg_addr_offset; ++ iowrite32(((ioread32(reg_addr) & ~mask)) | data, reg_addr); ++} ++ ++/* pch_phub_save_reg_conf - saves register configuration */ ++static void pch_phub_save_reg_conf(struct pci_dev *pdev) ++{ ++ unsigned int i; ++ struct pch_phub_reg *chip = pci_get_drvdata(pdev); ++ ++ void __iomem *p = chip->pch_phub_base_address; ++ ++ chip->phub_id_reg = ioread32(p + PCH_PHUB_ID_REG); ++ chip->q_pri_val_reg = ioread32(p + PCH_PHUB_QUEUE_PRI_VAL_REG); ++ chip->rc_q_maxsize_reg = ioread32(p + PCH_PHUB_RC_QUEUE_MAXSIZE_REG); ++ chip->bri_q_maxsize_reg = ioread32(p + PCH_PHUB_BRI_QUEUE_MAXSIZE_REG); ++ chip->comp_resp_timeout_reg = ++ ioread32(p + PCH_PHUB_COMP_RESP_TIMEOUT_REG); ++ chip->bus_slave_control_reg = ++ ioread32(p + PCH_PHUB_BUS_SLAVE_CONTROL_REG); ++ chip->deadlock_avoid_type_reg = ++ ioread32(p + PCH_PHUB_DEADLOCK_AVOID_TYPE_REG); ++ chip->intpin_reg_wpermit_reg0 = ++ ioread32(p + PCH_PHUB_INTPIN_REG_WPERMIT_REG0); ++ chip->intpin_reg_wpermit_reg1 = ++ ioread32(p + PCH_PHUB_INTPIN_REG_WPERMIT_REG1); ++ chip->intpin_reg_wpermit_reg2 = ++ ioread32(p + PCH_PHUB_INTPIN_REG_WPERMIT_REG2); ++ chip->intpin_reg_wpermit_reg3 = ++ ioread32(p + PCH_PHUB_INTPIN_REG_WPERMIT_REG3); ++ dev_dbg(&pdev->dev, "%s : " ++ "chip->phub_id_reg=%x, " ++ "chip->q_pri_val_reg=%x, " ++ "chip->rc_q_maxsize_reg=%x, " ++ "chip->bri_q_maxsize_reg=%x, " ++ "chip->comp_resp_timeout_reg=%x, " ++ "chip->bus_slave_control_reg=%x, " ++ "chip->deadlock_avoid_type_reg=%x, " ++ "chip->intpin_reg_wpermit_reg0=%x, " ++ "chip->intpin_reg_wpermit_reg1=%x, " ++ "chip->intpin_reg_wpermit_reg2=%x, " ++ "chip->intpin_reg_wpermit_reg3=%x\n", __func__, ++ chip->phub_id_reg, ++ chip->q_pri_val_reg, ++ chip->rc_q_maxsize_reg, ++ chip->bri_q_maxsize_reg, ++ chip->comp_resp_timeout_reg, ++ chip->bus_slave_control_reg, ++ chip->deadlock_avoid_type_reg, ++ chip->intpin_reg_wpermit_reg0, ++ chip->intpin_reg_wpermit_reg1, ++ chip->intpin_reg_wpermit_reg2, ++ chip->intpin_reg_wpermit_reg3); ++ for (i = 0; i < MAX_NUM_INT_REDUCE_CONTROL_REG; i++) { ++ chip->int_reduce_control_reg[i] = ++ ioread32(p + PCH_PHUB_INT_REDUCE_CONTROL_REG_BASE + 4 * i); ++ dev_dbg(&pdev->dev, "%s : " ++ "chip->int_reduce_control_reg[%d]=%x\n", ++ __func__, i, chip->int_reduce_control_reg[i]); ++ } ++ chip->clkcfg_reg = ioread32(p + CLKCFG_REG_OFFSET); ++} ++ ++/* pch_phub_restore_reg_conf - restore register configuration */ ++static void pch_phub_restore_reg_conf(struct pci_dev *pdev) ++{ ++ unsigned int i; ++ struct pch_phub_reg *chip = pci_get_drvdata(pdev); ++ void __iomem *p; ++ p = chip->pch_phub_base_address; ++ ++ iowrite32(chip->phub_id_reg, p + PCH_PHUB_ID_REG); ++ iowrite32(chip->q_pri_val_reg, p + PCH_PHUB_QUEUE_PRI_VAL_REG); ++ iowrite32(chip->rc_q_maxsize_reg, p + PCH_PHUB_RC_QUEUE_MAXSIZE_REG); ++ iowrite32(chip->bri_q_maxsize_reg, p + PCH_PHUB_BRI_QUEUE_MAXSIZE_REG); ++ iowrite32(chip->comp_resp_timeout_reg, ++ p + PCH_PHUB_COMP_RESP_TIMEOUT_REG); ++ iowrite32(chip->bus_slave_control_reg, ++ p + PCH_PHUB_BUS_SLAVE_CONTROL_REG); ++ iowrite32(chip->deadlock_avoid_type_reg, ++ p + PCH_PHUB_DEADLOCK_AVOID_TYPE_REG); ++ iowrite32(chip->intpin_reg_wpermit_reg0, ++ p + PCH_PHUB_INTPIN_REG_WPERMIT_REG0); ++ iowrite32(chip->intpin_reg_wpermit_reg1, ++ p + PCH_PHUB_INTPIN_REG_WPERMIT_REG1); ++ iowrite32(chip->intpin_reg_wpermit_reg2, ++ p + PCH_PHUB_INTPIN_REG_WPERMIT_REG2); ++ iowrite32(chip->intpin_reg_wpermit_reg3, ++ p + PCH_PHUB_INTPIN_REG_WPERMIT_REG3); ++ dev_dbg(&pdev->dev, "%s : " ++ "chip->phub_id_reg=%x, " ++ "chip->q_pri_val_reg=%x, " ++ "chip->rc_q_maxsize_reg=%x, " ++ "chip->bri_q_maxsize_reg=%x, " ++ "chip->comp_resp_timeout_reg=%x, " ++ "chip->bus_slave_control_reg=%x, " ++ "chip->deadlock_avoid_type_reg=%x, " ++ "chip->intpin_reg_wpermit_reg0=%x, " ++ "chip->intpin_reg_wpermit_reg1=%x, " ++ "chip->intpin_reg_wpermit_reg2=%x, " ++ "chip->intpin_reg_wpermit_reg3=%x\n", __func__, ++ chip->phub_id_reg, ++ chip->q_pri_val_reg, ++ chip->rc_q_maxsize_reg, ++ chip->bri_q_maxsize_reg, ++ chip->comp_resp_timeout_reg, ++ chip->bus_slave_control_reg, ++ chip->deadlock_avoid_type_reg, ++ chip->intpin_reg_wpermit_reg0, ++ chip->intpin_reg_wpermit_reg1, ++ chip->intpin_reg_wpermit_reg2, ++ chip->intpin_reg_wpermit_reg3); ++ for (i = 0; i < MAX_NUM_INT_REDUCE_CONTROL_REG; i++) { ++ iowrite32(chip->int_reduce_control_reg[i], ++ p + PCH_PHUB_INT_REDUCE_CONTROL_REG_BASE + 4 * i); ++ dev_dbg(&pdev->dev, "%s : " ++ "chip->int_reduce_control_reg[%d]=%x\n", ++ __func__, i, chip->int_reduce_control_reg[i]); ++ } ++ ++ iowrite32(chip->clkcfg_reg, p + CLKCFG_REG_OFFSET); ++} ++ ++/** ++ * pch_phub_read_serial_rom() - Reading Serial ROM ++ * @offset_address: Serial ROM offset address to read. ++ * @data: Read buffer for specified Serial ROM value. ++ */ ++static void pch_phub_read_serial_rom(struct pch_phub_reg *chip, ++ unsigned int offset_address, u8 *data) ++{ ++ void __iomem *mem_addr = chip->pch_phub_extrom_base_address + ++ offset_address; ++ ++ *data = ioread8(mem_addr); ++} ++ ++/** ++ * pch_phub_write_serial_rom() - Writing Serial ROM ++ * @offset_address: Serial ROM offset address. ++ * @data: Serial ROM value to write. ++ */ ++static int pch_phub_write_serial_rom(struct pch_phub_reg *chip, ++ unsigned int offset_address, u8 data) ++{ ++ void __iomem *mem_addr = chip->pch_phub_extrom_base_address + ++ (offset_address & PCH_WORD_ADDR_MASK); ++ int i; ++ unsigned int word_data; ++ unsigned int pos; ++ unsigned int mask; ++ pos = (offset_address % 4) * 8; ++ mask = ~(0xFF << pos); ++ ++ iowrite32(PCH_PHUB_ROM_WRITE_ENABLE, ++ chip->pch_phub_extrom_base_address + PHUB_CONTROL); ++ ++ word_data = ioread32(mem_addr); ++ iowrite32((word_data & mask) | (u32)data << pos, mem_addr); ++ ++ i = 0; ++ while (ioread8(chip->pch_phub_extrom_base_address + ++ PHUB_STATUS) != 0x00) { ++ msleep(1); ++ if (i == PHUB_TIMEOUT) ++ return -ETIMEDOUT; ++ i++; ++ } ++ ++ iowrite32(PCH_PHUB_ROM_WRITE_DISABLE, ++ chip->pch_phub_extrom_base_address + PHUB_CONTROL); ++ ++ return 0; ++} ++ ++/** ++ * pch_phub_read_serial_rom_val() - Read Serial ROM value ++ * @offset_address: Serial ROM address offset value. ++ * @data: Serial ROM value to read. ++ */ ++static void pch_phub_read_serial_rom_val(struct pch_phub_reg *chip, ++ unsigned int offset_address, u8 *data) ++{ ++ unsigned int mem_addr; ++ ++ mem_addr = PCH_PHUB_ROM_START_ADDR + ++ pch_phub_mac_offset[offset_address]; ++ ++ pch_phub_read_serial_rom(chip, mem_addr, data); ++} ++ ++/** ++ * pch_phub_write_serial_rom_val() - writing Serial ROM value ++ * @offset_address: Serial ROM address offset value. ++ * @data: Serial ROM value. ++ */ ++static int pch_phub_write_serial_rom_val(struct pch_phub_reg *chip, ++ unsigned int offset_address, u8 data) ++{ ++ int retval; ++ unsigned int mem_addr; ++ ++ mem_addr = PCH_PHUB_ROM_START_ADDR + ++ pch_phub_mac_offset[offset_address]; ++ ++ retval = pch_phub_write_serial_rom(chip, mem_addr, data); ++ ++ return retval; ++} ++ ++/* pch_phub_gbe_serial_rom_conf - makes Serial ROM header format configuration ++ * for Gigabit Ethernet MAC address ++ */ ++static int pch_phub_gbe_serial_rom_conf(struct pch_phub_reg *chip) ++{ ++ int retval; ++ ++ retval = pch_phub_write_serial_rom(chip, 0x0b, 0xbc); ++ retval |= pch_phub_write_serial_rom(chip, 0x0a, 0x10); ++ retval |= pch_phub_write_serial_rom(chip, 0x09, 0x01); ++ retval |= pch_phub_write_serial_rom(chip, 0x08, 0x02); ++ ++ retval |= pch_phub_write_serial_rom(chip, 0x0f, 0x00); ++ retval |= pch_phub_write_serial_rom(chip, 0x0e, 0x00); ++ retval |= pch_phub_write_serial_rom(chip, 0x0d, 0x00); ++ retval |= pch_phub_write_serial_rom(chip, 0x0c, 0x80); ++ ++ retval |= pch_phub_write_serial_rom(chip, 0x13, 0xbc); ++ retval |= pch_phub_write_serial_rom(chip, 0x12, 0x10); ++ retval |= pch_phub_write_serial_rom(chip, 0x11, 0x01); ++ retval |= pch_phub_write_serial_rom(chip, 0x10, 0x18); ++ ++ retval |= pch_phub_write_serial_rom(chip, 0x1b, 0xbc); ++ retval |= pch_phub_write_serial_rom(chip, 0x1a, 0x10); ++ retval |= pch_phub_write_serial_rom(chip, 0x19, 0x01); ++ retval |= pch_phub_write_serial_rom(chip, 0x18, 0x19); ++ ++ retval |= pch_phub_write_serial_rom(chip, 0x23, 0xbc); ++ retval |= pch_phub_write_serial_rom(chip, 0x22, 0x10); ++ retval |= pch_phub_write_serial_rom(chip, 0x21, 0x01); ++ retval |= pch_phub_write_serial_rom(chip, 0x20, 0x3a); ++ ++ retval |= pch_phub_write_serial_rom(chip, 0x27, 0x01); ++ retval |= pch_phub_write_serial_rom(chip, 0x26, 0x00); ++ retval |= pch_phub_write_serial_rom(chip, 0x25, 0x00); ++ retval |= pch_phub_write_serial_rom(chip, 0x24, 0x00); ++ ++ return retval; ++} ++ ++/** ++ * pch_phub_read_gbe_mac_addr() - Read Gigabit Ethernet MAC address ++ * @offset_address: Gigabit Ethernet MAC address offset value. ++ * @data: Buffer of the Gigabit Ethernet MAC address value. ++ */ ++static void pch_phub_read_gbe_mac_addr(struct pch_phub_reg *chip, u8 *data) ++{ ++ int i; ++ for (i = 0; i < ETH_ALEN; i++) ++ pch_phub_read_serial_rom_val(chip, i, &data[i]); ++} ++ ++/** ++ * pch_phub_write_gbe_mac_addr() - Write MAC address ++ * @offset_address: Gigabit Ethernet MAC address offset value. ++ * @data: Gigabit Ethernet MAC address value. ++ */ ++static int pch_phub_write_gbe_mac_addr(struct pch_phub_reg *chip, u8 *data) ++{ ++ int retval; ++ int i; ++ ++ retval = pch_phub_gbe_serial_rom_conf(chip); ++ if (retval) ++ return retval; ++ ++ for (i = 0; i < ETH_ALEN; i++) { ++ retval = pch_phub_write_serial_rom_val(chip, i, data[i]); ++ if (retval) ++ return retval; ++ } ++ ++ return retval; ++} ++ ++static ssize_t pch_phub_bin_read(struct file *filp, struct kobject *kobj, ++ struct bin_attribute *attr, char *buf, ++ loff_t off, size_t count) ++{ ++ unsigned int rom_signature; ++ unsigned char rom_length; ++ unsigned int tmp; ++ unsigned int addr_offset; ++ unsigned int orom_size; ++ int ret; ++ int err; ++ ++ struct pch_phub_reg *chip = ++ dev_get_drvdata(container_of(kobj, struct device, kobj)); ++ ++ ret = mutex_lock_interruptible(&pch_phub_mutex); ++ if (ret) { ++ err = -ERESTARTSYS; ++ goto return_err_nomutex; ++ } ++ ++ /* Get Rom signature */ ++ pch_phub_read_serial_rom(chip, 0x80, (unsigned char *)&rom_signature); ++ rom_signature &= 0xff; ++ pch_phub_read_serial_rom(chip, 0x81, (unsigned char *)&tmp); ++ rom_signature |= (tmp & 0xff) << 8; ++ if (rom_signature == 0xAA55) { ++ pch_phub_read_serial_rom(chip, 0x82, &rom_length); ++ orom_size = rom_length * 512; ++ if (orom_size < off) { ++ addr_offset = 0; ++ goto return_ok; ++ } ++ if (orom_size < count) { ++ addr_offset = 0; ++ goto return_ok; ++ } ++ ++ for (addr_offset = 0; addr_offset < count; addr_offset++) { ++ pch_phub_read_serial_rom(chip, 0x80 + addr_offset + off, ++ &buf[addr_offset]); ++ } ++ } else { ++ err = -ENODATA; ++ goto return_err; ++ } ++return_ok: ++ mutex_unlock(&pch_phub_mutex); ++ return addr_offset; ++ ++return_err: ++ mutex_unlock(&pch_phub_mutex); ++return_err_nomutex: ++ return err; ++} ++ ++static ssize_t pch_phub_bin_write(struct file *filp, struct kobject *kobj, ++ struct bin_attribute *attr, ++ char *buf, loff_t off, size_t count) ++{ ++ int err; ++ unsigned int addr_offset; ++ int ret; ++ struct pch_phub_reg *chip = ++ dev_get_drvdata(container_of(kobj, struct device, kobj)); ++ ++ ret = mutex_lock_interruptible(&pch_phub_mutex); ++ if (ret) ++ return -ERESTARTSYS; ++ ++ if (off > PCH_PHUB_OROM_SIZE) { ++ addr_offset = 0; ++ goto return_ok; ++ } ++ if (count > PCH_PHUB_OROM_SIZE) { ++ addr_offset = 0; ++ goto return_ok; ++ } ++ ++ for (addr_offset = 0; addr_offset < count; addr_offset++) { ++ if (PCH_PHUB_OROM_SIZE < off + addr_offset) ++ goto return_ok; ++ ++ ret = pch_phub_write_serial_rom(chip, 0x80 + addr_offset + off, ++ buf[addr_offset]); ++ if (ret) { ++ err = ret; ++ goto return_err; ++ } ++ } ++ ++return_ok: ++ mutex_unlock(&pch_phub_mutex); ++ return addr_offset; ++ ++return_err: ++ mutex_unlock(&pch_phub_mutex); ++ return err; ++} ++ ++static ssize_t show_pch_mac(struct device *dev, struct device_attribute *attr, ++ char *buf) ++{ ++ u8 mac[8]; ++ struct pch_phub_reg *chip = dev_get_drvdata(dev); ++ ++ pch_phub_read_gbe_mac_addr(chip, mac); ++ ++ return sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x\n", ++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ++} ++ ++static ssize_t store_pch_mac(struct device *dev, struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ u8 mac[6]; ++ struct pch_phub_reg *chip = dev_get_drvdata(dev); ++ ++ if (count != 18) ++ return -EINVAL; ++ ++ sscanf(buf, "%02x:%02x:%02x:%02x:%02x:%02x", ++ (u32 *)&mac[0], (u32 *)&mac[1], (u32 *)&mac[2], (u32 *)&mac[3], ++ (u32 *)&mac[4], (u32 *)&mac[5]); ++ ++ pch_phub_write_gbe_mac_addr(chip, mac); ++ ++ return count; ++} ++ ++static DEVICE_ATTR(pch_mac, S_IRUGO | S_IWUSR, show_pch_mac, store_pch_mac); ++ ++static struct bin_attribute pch_bin_attr = { ++ .attr = { ++ .name = "pch_firmware", ++ .mode = S_IRUGO | S_IWUSR, ++ }, ++ .size = PCH_PHUB_OROM_SIZE + 1, ++ .read = pch_phub_bin_read, ++ .write = pch_phub_bin_write, ++}; ++ ++static int __devinit pch_phub_probe(struct pci_dev *pdev, ++ const struct pci_device_id *id) ++{ ++ int retval; ++ ++ int ret; ++ unsigned int rom_size; ++ struct pch_phub_reg *chip; ++ ++ chip = kzalloc(sizeof(struct pch_phub_reg), GFP_KERNEL); ++ if (chip == NULL) ++ return -ENOMEM; ++ ++ ret = pci_enable_device(pdev); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "%s : pci_enable_device FAILED(ret=%d)", __func__, ret); ++ goto err_pci_enable_dev; ++ } ++ dev_dbg(&pdev->dev, "%s : pci_enable_device returns %d\n", __func__, ++ ret); ++ ++ ret = pci_request_regions(pdev, KBUILD_MODNAME); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "%s : pci_request_regions FAILED(ret=%d)", __func__, ret); ++ goto err_req_regions; ++ } ++ dev_dbg(&pdev->dev, "%s : " ++ "pci_request_regions returns %d\n", __func__, ret); ++ ++ chip->pch_phub_base_address = pci_iomap(pdev, 1, 0); ++ ++ ++ if (chip->pch_phub_base_address == 0) { ++ dev_err(&pdev->dev, "%s : pci_iomap FAILED", __func__); ++ ret = -ENOMEM; ++ goto err_pci_iomap; ++ } ++ dev_dbg(&pdev->dev, "%s : pci_iomap SUCCESS and value " ++ "in pch_phub_base_address variable is 0x%08x\n", __func__, ++ (unsigned int)chip->pch_phub_base_address); ++ chip->pch_phub_extrom_base_address = pci_map_rom(pdev, &rom_size); ++ ++ if (chip->pch_phub_extrom_base_address == 0) { ++ dev_err(&pdev->dev, "%s : pci_map_rom FAILED", __func__); ++ ret = -ENOMEM; ++ goto err_pci_map; ++ } ++ dev_dbg(&pdev->dev, "%s : " ++ "pci_map_rom SUCCESS and value in " ++ "pch_phub_extrom_base_address variable is 0x%08x\n", __func__, ++ (unsigned int)chip->pch_phub_extrom_base_address); ++ ++ pci_set_drvdata(pdev, chip); ++ ++ retval = sysfs_create_file(&pdev->dev.kobj, &dev_attr_pch_mac.attr); ++ if (retval) ++ goto err_sysfs_create; ++ ++ retval = sysfs_create_bin_file(&pdev->dev.kobj, &pch_bin_attr); ++ if (retval) ++ goto exit_bin_attr; ++ ++ pch_phub_read_modify_write_reg(chip, (unsigned int)CLKCFG_REG_OFFSET, ++ CLKCFG_CAN_50MHZ, CLKCFG_CANCLK_MASK); ++ ++ /* set the prefech value */ ++ iowrite32(0x000affaa, chip->pch_phub_base_address + 0x14); ++ /* set the interrupt delay value */ ++ iowrite32(0x25, chip->pch_phub_base_address + 0x44); ++ ++ return 0; ++exit_bin_attr: ++ sysfs_remove_file(&pdev->dev.kobj, &dev_attr_pch_mac.attr); ++ ++err_sysfs_create: ++ pci_unmap_rom(pdev, chip->pch_phub_extrom_base_address); ++err_pci_map: ++ pci_iounmap(pdev, chip->pch_phub_base_address); ++err_pci_iomap: ++ pci_release_regions(pdev); ++err_req_regions: ++ pci_disable_device(pdev); ++err_pci_enable_dev: ++ kfree(chip); ++ dev_err(&pdev->dev, "%s returns %d\n", __func__, ret); ++ return ret; ++} ++ ++static void __devexit pch_phub_remove(struct pci_dev *pdev) ++{ ++ struct pch_phub_reg *chip = pci_get_drvdata(pdev); ++ ++ sysfs_remove_file(&pdev->dev.kobj, &dev_attr_pch_mac.attr); ++ sysfs_remove_bin_file(&pdev->dev.kobj, &pch_bin_attr); ++ pci_unmap_rom(pdev, chip->pch_phub_extrom_base_address); ++ pci_iounmap(pdev, chip->pch_phub_base_address); ++ pci_release_regions(pdev); ++ pci_disable_device(pdev); ++ kfree(chip); ++} ++ ++#ifdef CONFIG_PM ++ ++static int pch_phub_suspend(struct pci_dev *pdev, pm_message_t state) ++{ ++ int ret; ++ ++ pch_phub_save_reg_conf(pdev); ++ ret = pci_save_state(pdev); ++ if (ret) { ++ dev_err(&pdev->dev, ++ " %s -pci_save_state returns %d\n", __func__, ret); ++ return ret; ++ } ++ pci_enable_wake(pdev, PCI_D3hot, 0); ++ pci_disable_device(pdev); ++ pci_set_power_state(pdev, pci_choose_state(pdev, state)); ++ ++ return 0; ++} ++ ++static int pch_phub_resume(struct pci_dev *pdev) ++{ ++ int ret; ++ ++ pci_set_power_state(pdev, PCI_D0); ++ pci_restore_state(pdev); ++ ret = pci_enable_device(pdev); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "%s-pci_enable_device failed(ret=%d) ", __func__, ret); ++ return ret; ++ } ++ ++ pci_enable_wake(pdev, PCI_D3hot, 0); ++ pch_phub_restore_reg_conf(pdev); ++ ++ return 0; ++} ++#else ++#define pch_phub_suspend NULL ++#define pch_phub_resume NULL ++#endif /* CONFIG_PM */ ++ ++static struct pci_device_id pch_phub_pcidev_id[] = { ++ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_PCH1_PHUB)}, ++ {0,} ++}; ++ ++static struct pci_driver pch_phub_driver = { ++ .name = "pch_phub", ++ .id_table = pch_phub_pcidev_id, ++ .probe = pch_phub_probe, ++ .remove = __devexit_p(pch_phub_remove), ++ .suspend = pch_phub_suspend, ++ .resume = pch_phub_resume ++}; ++ ++static int __init pch_phub_pci_init(void) ++{ ++ return pci_register_driver(&pch_phub_driver); ++} ++ ++static void __exit pch_phub_pci_exit(void) ++{ ++ pci_unregister_driver(&pch_phub_driver); ++} ++ ++module_init(pch_phub_pci_init); ++module_exit(pch_phub_pci_exit); ++ ++MODULE_DESCRIPTION("PCH Packet Hub PCI Driver"); ++MODULE_LICENSE("GPL"); diff --git a/driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch b/driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch index 9e8f4adde4c9dc..493ef623f4025e 100644 --- a/driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch +++ b/driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch @@ -6,6 +6,7 @@ Subject: Dynamic Debug: Introduce global fake module param module.ddebug Date: Fri, 6 Aug 2010 16:11:04 +0200 Message-Id: <1281103864-18860-5-git-send-email-trenn@suse.de> + Dynamic Debug allows enabling of pr_debug or KERN_DEBUG messages at runtime. This is controlled via /sys/kernel/debug/dynamic_debug/control. One major drawback is that the whole initialization of a module cannot be @@ -151,7 +152,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> args = next_arg(args, ¶m, &val); + + if (parameq(param, "ddebug")) { -+ snprintf(ddebug, "module %s +p", name, 1024); ++ snprintf(ddebug, 1024, "module %s +p", name); + ddebug_exec_query(ddebug); + continue; + } diff --git a/driver-core/pch_phub-fix-build-warnings.patch b/driver-core/pch_phub-fix-build-warnings.patch new file mode 100644 index 00000000000000..ca9ca611360cf5 --- /dev/null +++ b/driver-core/pch_phub-fix-build-warnings.patch @@ -0,0 +1,48 @@ +From foo@baz Wed Sep 1 18:06:09 PDT 2010 +Date: Wed, 01 Sep 2010 18:06:09 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: pch_phub: fix build warnings + +This patch fixes up all of the build warnings for the pch_phub driver. + +Cc: Masayuki Ohtake <masa-korg@dsn.okisemi.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/misc/pch_phub.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/misc/pch_phub.c ++++ b/drivers/misc/pch_phub.c +@@ -546,7 +546,7 @@ static int __devinit pch_phub_probe(stru + int retval; + + int ret; +- unsigned int rom_size; ++ ssize_t rom_size; + struct pch_phub_reg *chip; + + chip = kzalloc(sizeof(struct pch_phub_reg), GFP_KERNEL); +@@ -580,8 +580,8 @@ static int __devinit pch_phub_probe(stru + goto err_pci_iomap; + } + dev_dbg(&pdev->dev, "%s : pci_iomap SUCCESS and value " +- "in pch_phub_base_address variable is 0x%08x\n", __func__, +- (unsigned int)chip->pch_phub_base_address); ++ "in pch_phub_base_address variable is %p\n", __func__, ++ chip->pch_phub_base_address); + chip->pch_phub_extrom_base_address = pci_map_rom(pdev, &rom_size); + + if (chip->pch_phub_extrom_base_address == 0) { +@@ -591,8 +591,8 @@ static int __devinit pch_phub_probe(stru + } + dev_dbg(&pdev->dev, "%s : " + "pci_map_rom SUCCESS and value in " +- "pch_phub_extrom_base_address variable is 0x%08x\n", __func__, +- (unsigned int)chip->pch_phub_extrom_base_address); ++ "pch_phub_extrom_base_address variable is %p\n", __func__, ++ chip->pch_phub_extrom_base_address); + + pci_set_drvdata(pdev, chip); + @@ -17,6 +17,7 @@ tty.current/vt-fix-console-corruption-on-driver-hand-over.patch tty.current/maintainers-orphan-isicom.patch tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch +tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch # after patches sent to linus tty.current/serial-amba-pl010-fix-set_ldisc.patch @@ -39,6 +40,10 @@ usb.current/usb-serial-mos7840-add-usb-id-to-support-the-b-b-electronics-usoptl4 usb.current/usb-cdc-acm-adding-second-acm-channel-support-for-various-nokia-and-one-samsung-phones.patch usb.current/usb-serial-mos7840-add-usb-ids-to-support-more-b-b-usb-rs485-converters.patch usb.current/usb-cxacru-use-a-bulk-int-urb-to-access-the-command-endpoint.patch +usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch +usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch +usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch + ################################# @@ -48,6 +53,7 @@ staging.current/staging-hv-fix-missing-functions-for-net_device_ops.patch staging.current/staging-hv-fixed-bounce-kmap-problem-by-using-correct-index.patch staging.current/staging-hv-fixed-the-value-of-the-64bit-hole-inside-ring-buffer.patch staging.current/staging-hv-increased-storvsc-ringbuffer-and-max_io_requests.patch +staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch staging.current/staging-spectra-needs-linux-slab.h.patch staging.current/staging-comedi-das08_cs.c-fix-io_req_t-conversion.patch staging.current/staging-rt2870sta-add-more-device-ids-from-vendor-drivers.patch @@ -74,6 +80,8 @@ driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch driver-core/driver-core-platform-use-drv-driver.bus-instead-of-assuming-platform_bus_type.patch driver-core/uio-do-not-use-pci-resources-before-pci_enable_device.patch driver-core/driver-core-platform_bus-allow-runtime-override-of-dev_pm_ops.patch +driver-core/add-packet-hub-driver-for-topcliff-platform-controller-hub.patch +driver-core/pch_phub-fix-build-warnings.patch # can we really almost drop it? please let it happen this time... driver-core/driver-core-remove-config_sysfs_deprecated_v2-but-keep-it-for-block-devices.patch @@ -130,6 +138,7 @@ usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_configuration.patch usb/init.h-add-some-more-documentation-to-__ref-tags.patch usb/usb-gadget-amd5536udc.c-remove-double-test.patch usb/usb-output-an-error-message-when-the-pipe-type-doesn-t-match-the-endpoint-type.patch +usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch usb/usb-g_file_storage-don-t-generate-automatic-serial-string.patch # staging stuff for next is now in the staging-next tree on git.kernel.org diff --git a/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch b/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch new file mode 100644 index 00000000000000..256133629f8cab --- /dev/null +++ b/staging.current/staging-hv-fixed-lockup-problem-with-bounce_buffer-scatter-list.patch @@ -0,0 +1,66 @@ +From hjanssen@sailtheuniverse.com Thu Sep 2 13:06:54 2010 +Message-ID: <4C7E9721.2050405@sailtheuniverse.com> +Date: Wed, 01 Sep 2010 11:10:41 -0700 +From: Hank Janssen <hjanssen@microsoft.com> +To: hjanssen@microsoft.com, gregkh@suse.de, + devel@driverdev.osuosl.org, virtualization@lists.osdl.org, + linux-kernel@vger.kernel.org, Haiyang Zhang <haiyangz@microsoft.com> +Cc: Joe Perches <joe@perches.com> +Subject: staging: hv: Fixed lockup problem with bounce_buffer scatter list + +From: Hank Janssen <hjanssen@microsoft.com> + +Fixed lockup problem with bounce_buffer scatter list which caused +crashes in heavy loads. And minor code indentation cleanup in effected +area. + +Removed whitespace and noted minor indentation changes in description as +pointed out by Joe Perches. (Thanks for reviewing Joe) + +Signed-off-by: Hank Janssen <hjanssen@microsoft.com> +Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/staging/hv/storvsc_drv.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/staging/hv/storvsc_drv.c ++++ b/drivers/staging/hv/storvsc_drv.c +@@ -615,6 +615,7 @@ static int storvsc_queuecommand(struct s + unsigned int request_size = 0; + int i; + struct scatterlist *sgl; ++ unsigned int sg_count = 0; + + DPRINT_DBG(STORVSC_DRV, "scmnd %p dir %d, use_sg %d buf %p len %d " + "queue depth %d tagged %d", scmnd, scmnd->sc_data_direction, +@@ -697,6 +698,7 @@ static int storvsc_queuecommand(struct s + request->DataBuffer.Length = scsi_bufflen(scmnd); + if (scsi_sg_count(scmnd)) { + sgl = (struct scatterlist *)scsi_sglist(scmnd); ++ sg_count = scsi_sg_count(scmnd); + + /* check if we need to bounce the sgl */ + if (do_bounce_buffer(sgl, scsi_sg_count(scmnd)) != -1) { +@@ -731,15 +733,16 @@ static int storvsc_queuecommand(struct s + scsi_sg_count(scmnd)); + + sgl = cmd_request->bounce_sgl; ++ sg_count = cmd_request->bounce_sgl_count; + } + + request->DataBuffer.Offset = sgl[0].offset; + +- for (i = 0; i < scsi_sg_count(scmnd); i++) { ++ for (i = 0; i < sg_count; i++) { + DPRINT_DBG(STORVSC_DRV, "sgl[%d] len %d offset %d\n", + i, sgl[i].length, sgl[i].offset); + request->DataBuffer.PfnArray[i] = +- page_to_pfn(sg_page((&sgl[i]))); ++ page_to_pfn(sg_page((&sgl[i]))); + } + } else if (scsi_sglist(scmnd)) { + /* ASSERT(scsi_bufflen(scmnd) <= PAGE_SIZE); */ diff --git a/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch b/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch new file mode 100644 index 00000000000000..a78df7ba8772a7 --- /dev/null +++ b/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch @@ -0,0 +1,44 @@ +From nathael.pajani@ed3l.fr Thu Sep 2 13:03:44 2010 +Message-ID: <4C7FAF58.9030700@ed3l.fr> +Date: Thu, 02 Sep 2010 16:06:16 +0200 +From: Nathael Pajani <nathael.pajani@ed3l.fr> +To: gregkh@suse.de, linux-kernel@vger.kernel.org +Cc: <torvalds@linux-foundation.org> +Subject: tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver + +I found a bug "by chance" in drivers/char/tty_io.c + +I mean "by chance" because I was just reading the code of the +tty_find_polling_driver() to make a new tty_find_by_name() function. + +In tty_find_polling_driver() the driver actually test "tty_line <= +p->num" while num refers to the number of struct tty_struct pointers +allocated for the p->ttys (p is a tty_driver), and tty_line is scanned +in a tty name, which can be for example ttyS2. Then tty_line equals 2. +And if p->num is 2, we have only p->ttys[0] and p->ttys[1], but no +p->ttys[2]. + +This is actually unharmful, for tty_find_polling_driver() is used only +in drivers/serial/kgdboc.c, and there's a test over there to find a +console with a matching index, which will never happen. + +This is still a bug anyway. + +Signed-off-by: Nathael Pajani <nathael.pajani@ed3l.fr> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/char/tty_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/char/tty_io.c ++++ b/drivers/char/tty_io.c +@@ -355,7 +355,7 @@ struct tty_driver *tty_find_polling_driv + if (*stp == '\0') + stp = NULL; + +- if (tty_line >= 0 && tty_line <= p->num && p->ops && ++ if (tty_line >= 0 && tty_line < p->num && p->ops && + p->ops->poll_init && !p->ops->poll_init(p, tty_line, stp)) { + res = tty_driver_kref_get(p); + *line = tty_line; diff --git a/tty/serial-add-console_poll-support-for-uartlite.patch b/tty/serial-add-console_poll-support-for-uartlite.patch index c03313ffac5323..814685da208830 100644 --- a/tty/serial-add-console_poll-support-for-uartlite.patch +++ b/tty/serial-add-console_poll-support-for-uartlite.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#ifdef CONFIG_CONSOLE_POLL +static int ulite_get_poll_char(struct uart_port *port) +{ -+ while (!(ioread32be(port->membase + ULITE_STATUS) ++ if (!(ioread32be(port->membase + ULITE_STATUS) + & ULITE_STATUS_RXVALID)) + return NO_POLL_CHAR; + diff --git a/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch b/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch new file mode 100644 index 00000000000000..812dd12c87b6cc --- /dev/null +++ b/usb.current/usb-cdc-acm-add-pseudo-modem-without-at-command-capabilities.patch @@ -0,0 +1,37 @@ +From linux-usb-owner@vger.kernel.org Wed Sep 1 18:10:45 2010 +Date: Tue, 31 Aug 2010 19:31:32 +0200 +Message-ID: <AANLkTinezH-sqVzfzCZ8qjXrmaDXuwBRvRWYSN2Jw72+@mail.gmail.com> +Subject: USB: cdc-acm: Add pseudo modem without AT command capabilities +From: Philippe Corbes <philippe.corbes@gmail.com> +To: linux-usb@vger.kernel.org + +From: Philippe Corbes <philippe.corbes@gmail.com> + +cdc-acm.c : Manage pseudo-modem without AT commands capabilities + Enable to drive electronic simple gadgets based on microcontrolers. + The Interface descriptor is like this: + bInterfaceClass 2 Communications + bInterfaceSubClass 2 Abstract (modem) + bInterfaceProtocol 0 None + +Signed-off-by: Philippe Corbes <philippe.corbes@gmail.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/class/cdc-acm.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -1615,6 +1615,10 @@ static const struct usb_device_id acm_id + .driver_info = NOT_A_MODEM, + }, + ++ /* control interfaces without any protocol set */ ++ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, ++ USB_CDC_PROTO_NONE) }, ++ + /* control interfaces with various AT-command sets */ + { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, + USB_CDC_ACM_PROTO_AT_V25TER) }, diff --git a/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch b/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch new file mode 100644 index 00000000000000..48c80391d2dc16 --- /dev/null +++ b/usb.current/usb-cdc-acm-fixing-crash-when-acm-probing-interfaces-with-no-endpoint-descriptors.patch @@ -0,0 +1,40 @@ +From toby.gray@realvnc.com Thu Sep 2 13:02:31 2010 +From: Toby Gray <toby.gray@realvnc.com> +To: Oliver Neukum <oliver@neukum.name> +Cc: Greg Kroah-Hartman <gregkh@suse.de>, stable@kernel.org, + linux-usb@vger.kernel.org, Toby Gray <toby.gray@realvnc.com> +Subject: USB: cdc-acm: Fixing crash when ACM probing interfaces with no endpoint descriptors. +Date: Thu, 2 Sep 2010 10:46:20 +0100 +Message-Id: <1283420780-13510-1-git-send-email-toby.gray@realvnc.com> + +Certain USB devices, such as the Nokia X6 mobile phone, don't expose any +endpoint descriptors on some of their interfaces. If the ACM driver is forced +to probe all interfaces on a device the a NULL pointer dereference will occur +when the ACM driver attempts to use the endpoint of the alternative settings. +One way to get the ACM driver to probe all the interfaces is by using the +/sys/bus/usb/drivers/cdc_acm/new_id interface. + +This patch checks that the endpoint pointer for the current alternate settings +is non-NULL before using it. + +Signed-off-by: Toby Gray <toby.gray@realvnc.com> +Cc: Oliver Neukum <oliver@neukum.name> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/class/cdc-acm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -965,7 +965,8 @@ static int acm_probe(struct usb_interfac + } + + if (!buflen) { +- if (intf->cur_altsetting->endpoint->extralen && ++ if (intf->cur_altsetting->endpoint && ++ intf->cur_altsetting->endpoint->extralen && + intf->cur_altsetting->endpoint->extra) { + dev_dbg(&intf->dev, + "Seeking extra descriptors on endpoint\n"); diff --git a/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch b/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch new file mode 100644 index 00000000000000..3b9ea5d45e268f --- /dev/null +++ b/usb.current/usb-ftdi_sio-added-custom-pids-for-chamsys-products.patch @@ -0,0 +1,58 @@ +From luke@chamsys.co.uk Thu Sep 2 13:03:00 2010 +From: Luke Lowrey <luke@chamsys.co.uk> +To: gregkh@suse.de +Cc: jhovold@gmail.com, andi@lisas.de, linux-usb@vger.kernel.org, + linux-kernel@vger.kernel.org, Luke Lowrey <luke@chamsys.co.uk> +Subject: USB: ftdi_sio: Added custom PIDs for ChamSys products +Date: Thu, 2 Sep 2010 11:39:49 +0100 +Message-Id: <1283423989-5710-1-git-send-email-luke@chamsys.co.uk> + +Added the 0xDAF8 to 0xDAFF PID range for ChamSys limited USB interface/wing products + +Signed-off-by: Luke Lowrey <luke@chamsys.co.uk> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/ftdi_sio.c | 8 ++++++++ + drivers/usb/serial/ftdi_sio_ids.h | 12 ++++++++++++ + 2 files changed, 20 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -753,6 +753,14 @@ static struct usb_device_id id_table_com + { USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) }, + { USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_24_MASTER_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_PC_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_USB_DMX_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MIDI_TIMECODE_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MINI_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) }, ++ { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) }, + { }, /* Optional parameter entry */ + { } /* Terminating entry */ + }; +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -135,6 +135,18 @@ + #define FTDI_NDI_AURORA_SCU_PID 0xDA74 /* NDI Aurora SCU */ + + /* ++ * ChamSys Limited (www.chamsys.co.uk) USB wing/interface product IDs ++ */ ++#define FTDI_CHAMSYS_24_MASTER_WING_PID 0xDAF8 ++#define FTDI_CHAMSYS_PC_WING_PID 0xDAF9 ++#define FTDI_CHAMSYS_USB_DMX_PID 0xDAFA ++#define FTDI_CHAMSYS_MIDI_TIMECODE_PID 0xDAFB ++#define FTDI_CHAMSYS_MINI_WING_PID 0xDAFC ++#define FTDI_CHAMSYS_MAXI_WING_PID 0xDAFD ++#define FTDI_CHAMSYS_MEDIA_WING_PID 0xDAFE ++#define FTDI_CHAMSYS_WING_PID 0xDAFF ++ ++/* + * Westrex International devices submitted by Cory Lee + */ + #define FTDI_WESTREX_MODEL_777_PID 0xDC00 /* Model 777 */ diff --git a/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch b/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch index 779a690b66869c..7acafd62337a40 100644 --- a/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch +++ b/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch @@ -15,7 +15,6 @@ This fixes many section mismatches reported by modpost. Signed-off-by: Michał Nazarewicz <m.nazarewicz@samsung.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - --- drivers/usb/gadget/audio.c | 3 +-- drivers/usb/gadget/cdc2.c | 3 +-- @@ -25,11 +24,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/gadget/hid.c | 3 +-- drivers/usb/gadget/mass_storage.c | 3 +-- drivers/usb/gadget/multi.c | 3 +-- + drivers/usb/gadget/nokia.c | 3 +-- drivers/usb/gadget/serial.c | 3 +-- drivers/usb/gadget/webcam.c | 3 +-- drivers/usb/gadget/zero.c | 3 +-- include/linux/usb/composite.h | 19 +++++-------------- - 12 files changed, 26 insertions(+), 38 deletions(-) + 13 files changed, 27 insertions(+), 40 deletions(-) --- a/drivers/usb/gadget/audio.c +++ b/drivers/usb/gadget/audio.c @@ -216,6 +216,23 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } module_init(multi_init); +--- a/drivers/usb/gadget/nokia.c ++++ b/drivers/usb/gadget/nokia.c +@@ -241,13 +241,12 @@ static struct usb_composite_driver nokia + .name = "g_nokia", + .dev = &device_desc, + .strings = dev_strings, +- .bind = nokia_bind, + .unbind = __exit_p(nokia_unbind), + }; + + static int __init nokia_init(void) + { +- return usb_composite_register(&nokia_driver); ++ return usb_composite_probe(&nokia_driver, nokia_bind); + } + module_init(nokia_init); + --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c @@ -242,7 +242,6 @@ static struct usb_composite_driver gseri diff --git a/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch b/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch new file mode 100644 index 00000000000000..fcdce57534c3c3 --- /dev/null +++ b/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch @@ -0,0 +1,68 @@ +From jkosina@suse.cz Thu Sep 2 13:04:41 2010 +Date: Thu, 2 Sep 2010 16:34:36 +0200 (CEST) +From: Jiri Kosina <jkosina@suse.cz> +To: Greg KH <greg@kroah.com> +Cc: Stephen Rothwell <sfr@canb.auug.org.au>, + linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, + JiebingLi <jiebing.li@intel.com>, Joe Perches <joe@perches.com> +Subject: USB: langwell: Remove unnecessary return's from void functions +Message-ID: <alpine.LNX.2.00.1009021633020.26813@pobox.suse.cz> + +From: Joe Perches <joe@perches.com> + +There are about 2500 void functions in drivers/usb +Only a few used return; at end of function. + +Standardize them a bit. + +Signed-off-by: Joe Perches <joe@perches.com> +Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Cc: Stephen Rothwell <sfr@canb.auug.org.au> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/gadget/langwell_udc.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/drivers/usb/gadget/langwell_udc.c ++++ b/drivers/usb/gadget/langwell_udc.c +@@ -254,7 +254,6 @@ static void ep0_reset(struct langwell_ud + } + + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -1502,7 +1501,6 @@ static void langwell_udc_start(struct la + writel(usbcmd, &dev->op_regs->usbcmd); + + dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -1525,7 +1523,6 @@ static void langwell_udc_stop(struct lan + writel(usbcmd, &dev->op_regs->usbcmd); + + dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -2417,7 +2414,6 @@ delegate: + } + end: + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -2633,7 +2629,6 @@ static void handle_trans_complete(struct + } + done: + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + |