2003 lines
63 KiB
Diff
2003 lines
63 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index b954cb21fddc7..003334dad3c3f 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,6 +1,6 @@
|
|
VERSION = 4
|
|
PATCHLEVEL = 4
|
|
-SUBLEVEL = 236
|
|
+SUBLEVEL = 237
|
|
EXTRAVERSION =
|
|
NAME = Blurry Fish Butt
|
|
|
|
diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
|
|
index cce9e50acf68a..b648b1b253c5e 100644
|
|
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
|
|
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
|
|
@@ -652,7 +652,7 @@
|
|
timer3: timer3@ffd00100 {
|
|
compatible = "snps,dw-apb-timer";
|
|
interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>;
|
|
- reg = <0xffd01000 0x100>;
|
|
+ reg = <0xffd00100 0x100>;
|
|
clocks = <&l4_sys_free_clk>;
|
|
clock-names = "timer";
|
|
};
|
|
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
|
|
index 596cbda9cb3d3..9d8bc19edc48e 100644
|
|
--- a/arch/mips/Kconfig
|
|
+++ b/arch/mips/Kconfig
|
|
@@ -817,6 +817,7 @@ config SNI_RM
|
|
select I8253
|
|
select I8259
|
|
select ISA
|
|
+ select MIPS_L1_CACHE_SHIFT_6
|
|
select SWAP_IO_SPACE if CPU_BIG_ENDIAN
|
|
select SYS_HAS_CPU_R4X00
|
|
select SYS_HAS_CPU_R5000
|
|
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
|
|
index f9407e1704762..c6af7047eb0d2 100644
|
|
--- a/arch/mips/sni/a20r.c
|
|
+++ b/arch/mips/sni/a20r.c
|
|
@@ -143,7 +143,10 @@ static struct platform_device sc26xx_pdev = {
|
|
},
|
|
};
|
|
|
|
-static u32 a20r_ack_hwint(void)
|
|
+/*
|
|
+ * Trigger chipset to update CPU's CAUSE IP field
|
|
+ */
|
|
+static u32 a20r_update_cause_ip(void)
|
|
{
|
|
u32 status = read_c0_status();
|
|
|
|
@@ -205,12 +208,14 @@ static void a20r_hwint(void)
|
|
int irq;
|
|
|
|
clear_c0_status(IE_IRQ0);
|
|
- status = a20r_ack_hwint();
|
|
+ status = a20r_update_cause_ip();
|
|
cause = read_c0_cause();
|
|
|
|
irq = ffs(((cause & status) >> 8) & 0xf8);
|
|
if (likely(irq > 0))
|
|
do_IRQ(SNI_A20R_IRQ_BASE + irq - 1);
|
|
+
|
|
+ a20r_update_cause_ip();
|
|
set_c0_status(IE_IRQ0);
|
|
}
|
|
|
|
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
|
|
index 8f94782eb9071..dc57fa11c687f 100644
|
|
--- a/arch/powerpc/configs/pasemi_defconfig
|
|
+++ b/arch/powerpc/configs/pasemi_defconfig
|
|
@@ -115,7 +115,6 @@ CONFIG_FB_NVIDIA=y
|
|
CONFIG_FB_NVIDIA_I2C=y
|
|
CONFIG_FB_RADEON=y
|
|
# CONFIG_LCD_CLASS_DEVICE is not set
|
|
-CONFIG_VGACON_SOFT_SCROLLBACK=y
|
|
CONFIG_LOGO=y
|
|
CONFIG_SOUND=y
|
|
CONFIG_SND=y
|
|
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
|
|
index e5d2c3dc07f1d..c82bda4d27df3 100644
|
|
--- a/arch/powerpc/configs/ppc6xx_defconfig
|
|
+++ b/arch/powerpc/configs/ppc6xx_defconfig
|
|
@@ -797,7 +797,6 @@ CONFIG_FB_TRIDENT=m
|
|
CONFIG_FB_SM501=m
|
|
CONFIG_FB_IBM_GXT4500=y
|
|
CONFIG_LCD_PLATFORM=m
|
|
-CONFIG_VGACON_SOFT_SCROLLBACK=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
|
|
CONFIG_LOGO=y
|
|
diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
|
|
index 41a7d9d49a5a3..3d3e8795e934f 100644
|
|
--- a/arch/powerpc/kernel/dma-iommu.c
|
|
+++ b/arch/powerpc/kernel/dma-iommu.c
|
|
@@ -99,7 +99,8 @@ static u64 dma_iommu_get_required_mask(struct device *dev)
|
|
if (!tbl)
|
|
return 0;
|
|
|
|
- mask = 1ULL < (fls_long(tbl->it_offset + tbl->it_size) - 1);
|
|
+ mask = 1ULL << (fls_long(tbl->it_offset + tbl->it_size) +
|
|
+ tbl->it_page_shift - 1);
|
|
mask += mask - 1;
|
|
|
|
return mask;
|
|
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig
|
|
index 028be48c88397..a628b2474e6d4 100644
|
|
--- a/arch/x86/configs/i386_defconfig
|
|
+++ b/arch/x86/configs/i386_defconfig
|
|
@@ -218,7 +218,6 @@ CONFIG_FB_MODE_HELPERS=y
|
|
CONFIG_FB_TILEBLITTING=y
|
|
CONFIG_FB_EFI=y
|
|
# CONFIG_LCD_CLASS_DEVICE is not set
|
|
-CONFIG_VGACON_SOFT_SCROLLBACK=y
|
|
CONFIG_LOGO=y
|
|
# CONFIG_LOGO_LINUX_MONO is not set
|
|
# CONFIG_LOGO_LINUX_VGA16 is not set
|
|
@@ -248,6 +247,7 @@ CONFIG_USB_HIDDEV=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
|
CONFIG_USB_MON=y
|
|
+CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_TT_NEWSCHED=y
|
|
CONFIG_USB_OHCI_HCD=y
|
|
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
|
|
index cb5b3ab5beecc..649f7d604b12a 100644
|
|
--- a/arch/x86/configs/x86_64_defconfig
|
|
+++ b/arch/x86/configs/x86_64_defconfig
|
|
@@ -212,7 +212,6 @@ CONFIG_FB_MODE_HELPERS=y
|
|
CONFIG_FB_TILEBLITTING=y
|
|
CONFIG_FB_EFI=y
|
|
# CONFIG_LCD_CLASS_DEVICE is not set
|
|
-CONFIG_VGACON_SOFT_SCROLLBACK=y
|
|
CONFIG_LOGO=y
|
|
# CONFIG_LOGO_LINUX_MONO is not set
|
|
# CONFIG_LOGO_LINUX_VGA16 is not set
|
|
@@ -242,6 +241,7 @@ CONFIG_USB_HIDDEV=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
|
CONFIG_USB_MON=y
|
|
+CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_TT_NEWSCHED=y
|
|
CONFIG_USB_OHCI_HCD=y
|
|
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
|
|
index 22da8f87bd641..6646edaa5123c 100644
|
|
--- a/arch/x86/kvm/vmx.c
|
|
+++ b/arch/x86/kvm/vmx.c
|
|
@@ -8235,6 +8235,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)
|
|
(exit_reason != EXIT_REASON_EXCEPTION_NMI &&
|
|
exit_reason != EXIT_REASON_EPT_VIOLATION &&
|
|
exit_reason != EXIT_REASON_PML_FULL &&
|
|
+ exit_reason != EXIT_REASON_APIC_ACCESS &&
|
|
exit_reason != EXIT_REASON_TASK_SWITCH)) {
|
|
vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
|
|
vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_DELIVERY_EV;
|
|
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
|
|
index 04b39d0da8681..70708608ab1e7 100644
|
|
--- a/drivers/atm/firestream.c
|
|
+++ b/drivers/atm/firestream.c
|
|
@@ -1009,6 +1009,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
|
|
error = make_rate (pcr, r, &tmc0, NULL);
|
|
if (error) {
|
|
kfree(tc);
|
|
+ kfree(vcc);
|
|
return error;
|
|
}
|
|
}
|
|
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
|
|
index e0699a20859f7..445ca973edd6d 100644
|
|
--- a/drivers/block/rbd.c
|
|
+++ b/drivers/block/rbd.c
|
|
@@ -3945,6 +3945,9 @@ static ssize_t rbd_image_refresh(struct device *dev,
|
|
struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
|
|
int ret;
|
|
|
|
+ if (!capable(CAP_SYS_ADMIN))
|
|
+ return -EPERM;
|
|
+
|
|
ret = rbd_dev_refresh(rbd_dev);
|
|
if (ret)
|
|
return ret;
|
|
@@ -5404,6 +5407,9 @@ static ssize_t do_rbd_add(struct bus_type *bus,
|
|
bool read_only;
|
|
int rc;
|
|
|
|
+ if (!capable(CAP_SYS_ADMIN))
|
|
+ return -EPERM;
|
|
+
|
|
if (!try_module_get(THIS_MODULE))
|
|
return -ENODEV;
|
|
|
|
@@ -5548,6 +5554,9 @@ static ssize_t do_rbd_remove(struct bus_type *bus,
|
|
bool already = false;
|
|
int ret;
|
|
|
|
+ if (!capable(CAP_SYS_ADMIN))
|
|
+ return -EPERM;
|
|
+
|
|
ret = kstrtoul(buf, 10, &ul);
|
|
if (ret)
|
|
return ret;
|
|
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
|
|
index 3a9db4626cb60..1886588b9ea3e 100644
|
|
--- a/drivers/i2c/algos/i2c-algo-pca.c
|
|
+++ b/drivers/i2c/algos/i2c-algo-pca.c
|
|
@@ -50,8 +50,22 @@ static void pca_reset(struct i2c_algo_pca_data *adap)
|
|
pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_IPRESET);
|
|
pca_outw(adap, I2C_PCA_IND, 0xA5);
|
|
pca_outw(adap, I2C_PCA_IND, 0x5A);
|
|
+
|
|
+ /*
|
|
+ * After a reset we need to re-apply any configuration
|
|
+ * (calculated in pca_init) to get the bus in a working state.
|
|
+ */
|
|
+ pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_IMODE);
|
|
+ pca_outw(adap, I2C_PCA_IND, adap->bus_settings.mode);
|
|
+ pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_ISCLL);
|
|
+ pca_outw(adap, I2C_PCA_IND, adap->bus_settings.tlow);
|
|
+ pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_ISCLH);
|
|
+ pca_outw(adap, I2C_PCA_IND, adap->bus_settings.thi);
|
|
+
|
|
+ pca_set_con(adap, I2C_PCA_CON_ENSIO);
|
|
} else {
|
|
adap->reset_chip(adap->data);
|
|
+ pca_set_con(adap, I2C_PCA_CON_ENSIO | adap->bus_settings.clock_freq);
|
|
}
|
|
}
|
|
|
|
@@ -435,13 +449,14 @@ static int pca_init(struct i2c_adapter *adap)
|
|
" Use the nominal frequency.\n", adap->name);
|
|
}
|
|
|
|
- pca_reset(pca_data);
|
|
-
|
|
clock = pca_clock(pca_data);
|
|
printk(KERN_INFO "%s: Clock frequency is %dkHz\n",
|
|
adap->name, freqs[clock]);
|
|
|
|
- pca_set_con(pca_data, I2C_PCA_CON_ENSIO | clock);
|
|
+ /* Store settings as these will be needed when the PCA chip is reset */
|
|
+ pca_data->bus_settings.clock_freq = clock;
|
|
+
|
|
+ pca_reset(pca_data);
|
|
} else {
|
|
int clock;
|
|
int mode;
|
|
@@ -508,19 +523,15 @@ static int pca_init(struct i2c_adapter *adap)
|
|
thi = tlow * min_thi / min_tlow;
|
|
}
|
|
|
|
+ /* Store settings as these will be needed when the PCA chip is reset */
|
|
+ pca_data->bus_settings.mode = mode;
|
|
+ pca_data->bus_settings.tlow = tlow;
|
|
+ pca_data->bus_settings.thi = thi;
|
|
+
|
|
pca_reset(pca_data);
|
|
|
|
printk(KERN_INFO
|
|
"%s: Clock frequency is %dHz\n", adap->name, clock * 100);
|
|
-
|
|
- pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_IMODE);
|
|
- pca_outw(pca_data, I2C_PCA_IND, mode);
|
|
- pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_ISCLL);
|
|
- pca_outw(pca_data, I2C_PCA_IND, tlow);
|
|
- pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_ISCLH);
|
|
- pca_outw(pca_data, I2C_PCA_IND, thi);
|
|
-
|
|
- pca_set_con(pca_data, I2C_PCA_CON_ENSIO);
|
|
}
|
|
udelay(500); /* 500 us for oscillator to stabilise */
|
|
|
|
diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
|
|
index ec7ddf8673497..e5e231b6476e7 100644
|
|
--- a/drivers/iio/accel/bmc150-accel-core.c
|
|
+++ b/drivers/iio/accel/bmc150-accel-core.c
|
|
@@ -198,6 +198,14 @@ struct bmc150_accel_data {
|
|
struct mutex mutex;
|
|
u8 fifo_mode, watermark;
|
|
s16 buffer[8];
|
|
+ /*
|
|
+ * Ensure there is sufficient space and correct alignment for
|
|
+ * the timestamp if enabled
|
|
+ */
|
|
+ struct {
|
|
+ __le16 channels[3];
|
|
+ s64 ts __aligned(8);
|
|
+ } scan;
|
|
u8 bw_bits;
|
|
u32 slope_dur;
|
|
u32 slope_thres;
|
|
@@ -924,15 +932,16 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
|
|
* now.
|
|
*/
|
|
for (i = 0; i < count; i++) {
|
|
- u16 sample[8];
|
|
int j, bit;
|
|
|
|
j = 0;
|
|
for_each_set_bit(bit, indio_dev->active_scan_mask,
|
|
indio_dev->masklength)
|
|
- memcpy(&sample[j++], &buffer[i * 3 + bit], 2);
|
|
+ memcpy(&data->scan.channels[j++], &buffer[i * 3 + bit],
|
|
+ sizeof(data->scan.channels[0]));
|
|
|
|
- iio_push_to_buffers_with_timestamp(indio_dev, sample, tstamp);
|
|
+ iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,
|
|
+ tstamp);
|
|
|
|
tstamp += sample_period;
|
|
}
|
|
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
|
|
index 1eccc2dcf14cd..d44c1b3a131cf 100644
|
|
--- a/drivers/iio/accel/mma8452.c
|
|
+++ b/drivers/iio/accel/mma8452.c
|
|
@@ -96,6 +96,12 @@ struct mma8452_data {
|
|
u8 ctrl_reg1;
|
|
u8 data_cfg;
|
|
const struct mma_chip_info *chip_info;
|
|
+
|
|
+ /* Ensure correct alignment of time stamp when present */
|
|
+ struct {
|
|
+ __be16 channels[3];
|
|
+ s64 ts __aligned(8);
|
|
+ } buffer;
|
|
};
|
|
|
|
/**
|
|
@@ -700,14 +706,13 @@ static irqreturn_t mma8452_trigger_handler(int irq, void *p)
|
|
struct iio_poll_func *pf = p;
|
|
struct iio_dev *indio_dev = pf->indio_dev;
|
|
struct mma8452_data *data = iio_priv(indio_dev);
|
|
- u8 buffer[16]; /* 3 16-bit channels + padding + ts */
|
|
int ret;
|
|
|
|
- ret = mma8452_read(data, (__be16 *)buffer);
|
|
+ ret = mma8452_read(data, data->buffer.channels);
|
|
if (ret < 0)
|
|
goto done;
|
|
|
|
- iio_push_to_buffers_with_timestamp(indio_dev, buffer,
|
|
+ iio_push_to_buffers_with_timestamp(indio_dev, &data->buffer,
|
|
iio_get_time_ns());
|
|
|
|
done:
|
|
diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
|
|
index 3555122008b44..26fc1021a2c27 100644
|
|
--- a/drivers/iio/adc/mcp3422.c
|
|
+++ b/drivers/iio/adc/mcp3422.c
|
|
@@ -98,16 +98,12 @@ static int mcp3422_update_config(struct mcp3422 *adc, u8 newconfig)
|
|
{
|
|
int ret;
|
|
|
|
- mutex_lock(&adc->lock);
|
|
-
|
|
ret = i2c_master_send(adc->i2c, &newconfig, 1);
|
|
if (ret > 0) {
|
|
adc->config = newconfig;
|
|
ret = 0;
|
|
}
|
|
|
|
- mutex_unlock(&adc->lock);
|
|
-
|
|
return ret;
|
|
}
|
|
|
|
@@ -140,6 +136,8 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
|
|
u8 config;
|
|
u8 req_channel = channel->channel;
|
|
|
|
+ mutex_lock(&adc->lock);
|
|
+
|
|
if (req_channel != MCP3422_CHANNEL(adc->config)) {
|
|
config = adc->config;
|
|
config &= ~MCP3422_CHANNEL_MASK;
|
|
@@ -147,12 +145,18 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
|
|
config &= ~MCP3422_PGA_MASK;
|
|
config |= MCP3422_PGA_VALUE(adc->pga[req_channel]);
|
|
ret = mcp3422_update_config(adc, config);
|
|
- if (ret < 0)
|
|
+ if (ret < 0) {
|
|
+ mutex_unlock(&adc->lock);
|
|
return ret;
|
|
+ }
|
|
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
|
|
}
|
|
|
|
- return mcp3422_read(adc, value, &config);
|
|
+ ret = mcp3422_read(adc, value, &config);
|
|
+
|
|
+ mutex_unlock(&adc->lock);
|
|
+
|
|
+ return ret;
|
|
}
|
|
|
|
static int mcp3422_read_raw(struct iio_dev *iio,
|
|
diff --git a/drivers/iio/light/ltr501.c b/drivers/iio/light/ltr501.c
|
|
index b9d1e5c58ec54..9f5825f4fc0ee 100644
|
|
--- a/drivers/iio/light/ltr501.c
|
|
+++ b/drivers/iio/light/ltr501.c
|
|
@@ -1218,13 +1218,16 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
|
|
struct iio_poll_func *pf = p;
|
|
struct iio_dev *indio_dev = pf->indio_dev;
|
|
struct ltr501_data *data = iio_priv(indio_dev);
|
|
- u16 buf[8];
|
|
+ struct {
|
|
+ u16 channels[3];
|
|
+ s64 ts __aligned(8);
|
|
+ } scan;
|
|
__le16 als_buf[2];
|
|
u8 mask = 0;
|
|
int j = 0;
|
|
int ret, psdata;
|
|
|
|
- memset(buf, 0, sizeof(buf));
|
|
+ memset(&scan, 0, sizeof(scan));
|
|
|
|
/* figure out which data needs to be ready */
|
|
if (test_bit(0, indio_dev->active_scan_mask) ||
|
|
@@ -1243,9 +1246,9 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
|
|
if (ret < 0)
|
|
return ret;
|
|
if (test_bit(0, indio_dev->active_scan_mask))
|
|
- buf[j++] = le16_to_cpu(als_buf[1]);
|
|
+ scan.channels[j++] = le16_to_cpu(als_buf[1]);
|
|
if (test_bit(1, indio_dev->active_scan_mask))
|
|
- buf[j++] = le16_to_cpu(als_buf[0]);
|
|
+ scan.channels[j++] = le16_to_cpu(als_buf[0]);
|
|
}
|
|
|
|
if (mask & LTR501_STATUS_PS_RDY) {
|
|
@@ -1253,10 +1256,10 @@ static irqreturn_t ltr501_trigger_handler(int irq, void *p)
|
|
&psdata, 2);
|
|
if (ret < 0)
|
|
goto done;
|
|
- buf[j++] = psdata & LTR501_PS_DATA_MASK;
|
|
+ scan.channels[j++] = psdata & LTR501_PS_DATA_MASK;
|
|
}
|
|
|
|
- iio_push_to_buffers_with_timestamp(indio_dev, buf, iio_get_time_ns());
|
|
+ iio_push_to_buffers_with_timestamp(indio_dev, &scan, iio_get_time_ns());
|
|
|
|
done:
|
|
iio_trigger_notify_done(indio_dev->trig);
|
|
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
|
|
index bdc42923523e8..e5799639fb544 100644
|
|
--- a/drivers/input/serio/i8042-x86ia64io.h
|
|
+++ b/drivers/input/serio/i8042-x86ia64io.h
|
|
@@ -552,6 +552,14 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
|
|
},
|
|
},
|
|
+ {
|
|
+ /* Entroware Proteus */
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
|
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
|
|
+ DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
|
|
+ },
|
|
+ },
|
|
{ }
|
|
};
|
|
|
|
@@ -752,6 +760,14 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
|
|
},
|
|
},
|
|
+ {
|
|
+ /* Entroware Proteus */
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
|
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
|
|
+ DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
|
|
+ },
|
|
+ },
|
|
{ }
|
|
};
|
|
|
|
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
|
|
index 3f20808b5ff82..f8ed079d8bc3e 100644
|
|
--- a/drivers/net/wan/hdlc_cisco.c
|
|
+++ b/drivers/net/wan/hdlc_cisco.c
|
|
@@ -377,6 +377,7 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr)
|
|
memcpy(&state(hdlc)->settings, &new_settings, size);
|
|
spin_lock_init(&state(hdlc)->lock);
|
|
dev->header_ops = &cisco_header_ops;
|
|
+ dev->hard_header_len = sizeof(struct hdlc_header);
|
|
dev->type = ARPHRD_CISCO;
|
|
netif_dormant_on(dev);
|
|
return 0;
|
|
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
|
|
index 6eb0f7a85e531..c6db9a4e7c457 100644
|
|
--- a/drivers/net/wan/lapbether.c
|
|
+++ b/drivers/net/wan/lapbether.c
|
|
@@ -213,6 +213,8 @@ static void lapbeth_data_transmit(struct net_device *ndev, struct sk_buff *skb)
|
|
|
|
skb->dev = dev = lapbeth->ethdev;
|
|
|
|
+ skb_reset_network_header(skb);
|
|
+
|
|
dev_hard_header(skb, dev, ETH_P_DEC, bcast_addr, NULL, 0);
|
|
|
|
dev_queue_xmit(skb);
|
|
@@ -343,6 +345,7 @@ static int lapbeth_new_device(struct net_device *dev)
|
|
*/
|
|
ndev->needed_headroom = -1 + 3 + 2 + dev->hard_header_len
|
|
+ dev->needed_headroom;
|
|
+ ndev->needed_tailroom = dev->needed_tailroom;
|
|
|
|
lapbeth = netdev_priv(ndev);
|
|
lapbeth->axdev = ndev;
|
|
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
|
|
index 3e3be57e9a1a1..4d0c1a40a6e65 100644
|
|
--- a/drivers/rapidio/Kconfig
|
|
+++ b/drivers/rapidio/Kconfig
|
|
@@ -25,7 +25,7 @@ config RAPIDIO_ENABLE_RX_TX_PORTS
|
|
config RAPIDIO_DMA_ENGINE
|
|
bool "DMA Engine support for RapidIO"
|
|
depends on RAPIDIO
|
|
- select DMADEVICES
|
|
+ depends on DMADEVICES
|
|
select DMA_ENGINE
|
|
help
|
|
Say Y here if you want to use DMA Engine frameork for RapidIO data
|
|
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
|
|
index 6f5e2720ffad1..68b33abeaa5fa 100644
|
|
--- a/drivers/scsi/libsas/sas_ata.c
|
|
+++ b/drivers/scsi/libsas/sas_ata.c
|
|
@@ -224,7 +224,10 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
|
|
task->num_scatter = si;
|
|
}
|
|
|
|
- task->data_dir = qc->dma_dir;
|
|
+ if (qc->tf.protocol == ATA_PROT_NODATA)
|
|
+ task->data_dir = DMA_NONE;
|
|
+ else
|
|
+ task->data_dir = qc->dma_dir;
|
|
task->scatter = qc->sg;
|
|
task->ata_task.retry_count = 1;
|
|
task->task_state_flags = SAS_TASK_STATE_PENDING;
|
|
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
|
|
index 315dd25a0c44e..5be938b47f48b 100644
|
|
--- a/drivers/scsi/lpfc/lpfc_els.c
|
|
+++ b/drivers/scsi/lpfc/lpfc_els.c
|
|
@@ -3841,7 +3841,9 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
|
|
out:
|
|
if (ndlp && NLP_CHK_NODE_ACT(ndlp) && shost) {
|
|
spin_lock_irq(shost->host_lock);
|
|
- ndlp->nlp_flag &= ~(NLP_ACC_REGLOGIN | NLP_RM_DFLT_RPI);
|
|
+ if (mbox)
|
|
+ ndlp->nlp_flag &= ~NLP_ACC_REGLOGIN;
|
|
+ ndlp->nlp_flag &= ~NLP_RM_DFLT_RPI;
|
|
spin_unlock_irq(shost->host_lock);
|
|
|
|
/* If the node is not being used by another discovery thread,
|
|
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
|
|
index 3862d8b1defe3..ee6c941123e10 100644
|
|
--- a/drivers/scsi/pm8001/pm8001_sas.c
|
|
+++ b/drivers/scsi/pm8001/pm8001_sas.c
|
|
@@ -792,7 +792,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha,
|
|
|
|
res = pm8001_tag_alloc(pm8001_ha, &ccb_tag);
|
|
if (res)
|
|
- return res;
|
|
+ goto ex_err;
|
|
ccb = &pm8001_ha->ccb_info[ccb_tag];
|
|
ccb->device = pm8001_dev;
|
|
ccb->ccb_tag = ccb_tag;
|
|
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
|
|
index 3903f681ef6c6..2772c7179a61f 100644
|
|
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
|
|
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
|
|
@@ -530,13 +530,8 @@ static void hfa384x_usb_defer(struct work_struct *data)
|
|
----------------------------------------------------------------*/
|
|
void hfa384x_create(hfa384x_t *hw, struct usb_device *usb)
|
|
{
|
|
- memset(hw, 0, sizeof(hfa384x_t));
|
|
hw->usb = usb;
|
|
|
|
- /* set up the endpoints */
|
|
- hw->endp_in = usb_rcvbulkpipe(usb, 1);
|
|
- hw->endp_out = usb_sndbulkpipe(usb, 2);
|
|
-
|
|
/* Set up the waitq */
|
|
init_waitqueue_head(&hw->cmdq);
|
|
|
|
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
|
|
index 6da5c66bb3d5c..f4276943dc972 100644
|
|
--- a/drivers/staging/wlan-ng/prism2usb.c
|
|
+++ b/drivers/staging/wlan-ng/prism2usb.c
|
|
@@ -60,23 +60,14 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
|
|
const struct usb_device_id *id)
|
|
{
|
|
struct usb_device *dev;
|
|
- const struct usb_endpoint_descriptor *epd;
|
|
- const struct usb_host_interface *iface_desc = interface->cur_altsetting;
|
|
+ struct usb_endpoint_descriptor *bulk_in, *bulk_out;
|
|
+ struct usb_host_interface *iface_desc = interface->cur_altsetting;
|
|
wlandevice_t *wlandev = NULL;
|
|
hfa384x_t *hw = NULL;
|
|
int result = 0;
|
|
|
|
- if (iface_desc->desc.bNumEndpoints != 2) {
|
|
- result = -ENODEV;
|
|
- goto failed;
|
|
- }
|
|
-
|
|
- result = -EINVAL;
|
|
- epd = &iface_desc->endpoint[1].desc;
|
|
- if (!usb_endpoint_is_bulk_in(epd))
|
|
- goto failed;
|
|
- epd = &iface_desc->endpoint[2].desc;
|
|
- if (!usb_endpoint_is_bulk_out(epd))
|
|
+ result = usb_find_common_endpoints(iface_desc, &bulk_in, &bulk_out, NULL, NULL);
|
|
+ if (result)
|
|
goto failed;
|
|
|
|
dev = interface_to_usbdev(interface);
|
|
@@ -95,6 +86,8 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
|
|
}
|
|
|
|
/* Initialize the hw data */
|
|
+ hw->endp_in = usb_rcvbulkpipe(dev, bulk_in->bEndpointAddress);
|
|
+ hw->endp_out = usb_sndbulkpipe(dev, bulk_out->bEndpointAddress);
|
|
hfa384x_create(hw, dev);
|
|
hw->wlandev = wlandev;
|
|
|
|
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
|
|
index 63e54beed196b..f10bcd0563c06 100644
|
|
--- a/drivers/target/iscsi/iscsi_target_login.c
|
|
+++ b/drivers/target/iscsi/iscsi_target_login.c
|
|
@@ -1139,7 +1139,7 @@ iscsit_conn_set_transport(struct iscsi_conn *conn, struct iscsit_transport *t)
|
|
}
|
|
|
|
void iscsi_target_login_sess_out(struct iscsi_conn *conn,
|
|
- struct iscsi_np *np, bool zero_tsih, bool new_sess)
|
|
+ bool zero_tsih, bool new_sess)
|
|
{
|
|
if (!new_sess)
|
|
goto old_sess_out;
|
|
@@ -1161,7 +1161,6 @@ void iscsi_target_login_sess_out(struct iscsi_conn *conn,
|
|
conn->sess = NULL;
|
|
|
|
old_sess_out:
|
|
- iscsi_stop_login_thread_timer(np);
|
|
/*
|
|
* If login negotiation fails check if the Time2Retain timer
|
|
* needs to be restarted.
|
|
@@ -1407,8 +1406,9 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
|
|
new_sess_out:
|
|
new_sess = true;
|
|
old_sess_out:
|
|
+ iscsi_stop_login_thread_timer(np);
|
|
tpg_np = conn->tpg_np;
|
|
- iscsi_target_login_sess_out(conn, np, zero_tsih, new_sess);
|
|
+ iscsi_target_login_sess_out(conn, zero_tsih, new_sess);
|
|
new_sess = false;
|
|
|
|
if (tpg) {
|
|
diff --git a/drivers/target/iscsi/iscsi_target_login.h b/drivers/target/iscsi/iscsi_target_login.h
|
|
index b597aa2c61a1c..e9daabbb4f545 100644
|
|
--- a/drivers/target/iscsi/iscsi_target_login.h
|
|
+++ b/drivers/target/iscsi/iscsi_target_login.h
|
|
@@ -14,8 +14,7 @@ extern int iscsit_put_login_tx(struct iscsi_conn *, struct iscsi_login *, u32);
|
|
extern void iscsit_free_conn(struct iscsi_np *, struct iscsi_conn *);
|
|
extern int iscsit_start_kthreads(struct iscsi_conn *);
|
|
extern void iscsi_post_login_handler(struct iscsi_np *, struct iscsi_conn *, u8);
|
|
-extern void iscsi_target_login_sess_out(struct iscsi_conn *, struct iscsi_np *,
|
|
- bool, bool);
|
|
+extern void iscsi_target_login_sess_out(struct iscsi_conn *, bool, bool);
|
|
extern int iscsi_target_login_thread(void *);
|
|
|
|
#endif /*** ISCSI_TARGET_LOGIN_H ***/
|
|
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
|
|
index 58c629aec73ca..31c3e37c41e52 100644
|
|
--- a/drivers/target/iscsi/iscsi_target_nego.c
|
|
+++ b/drivers/target/iscsi/iscsi_target_nego.c
|
|
@@ -547,12 +547,11 @@ static bool iscsi_target_sk_check_and_clear(struct iscsi_conn *conn, unsigned in
|
|
|
|
static void iscsi_target_login_drop(struct iscsi_conn *conn, struct iscsi_login *login)
|
|
{
|
|
- struct iscsi_np *np = login->np;
|
|
bool zero_tsih = login->zero_tsih;
|
|
|
|
iscsi_remove_failed_auth_entry(conn);
|
|
iscsi_target_nego_release(conn);
|
|
- iscsi_target_login_sess_out(conn, np, zero_tsih, true);
|
|
+ iscsi_target_login_sess_out(conn, zero_tsih, true);
|
|
}
|
|
|
|
static void iscsi_target_login_timeout(unsigned long data)
|
|
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
|
|
index b032add927224..72f6cde146b5c 100644
|
|
--- a/drivers/tty/serial/8250/8250_pci.c
|
|
+++ b/drivers/tty/serial/8250/8250_pci.c
|
|
@@ -5904,6 +5904,17 @@ static struct pci_device_id serial_pci_tbl[] = {
|
|
0,
|
|
0, pbn_exar_XR17V358 },
|
|
|
|
+ /*
|
|
+ * Realtek RealManage
|
|
+ */
|
|
+ { PCI_VENDOR_ID_REALTEK, 0x816a,
|
|
+ PCI_ANY_ID, PCI_ANY_ID,
|
|
+ 0, 0, pbn_b0_1_115200 },
|
|
+
|
|
+ { PCI_VENDOR_ID_REALTEK, 0x816b,
|
|
+ PCI_ANY_ID, PCI_ANY_ID,
|
|
+ 0, 0, pbn_b0_1_115200 },
|
|
+
|
|
/* Fintek PCI serial cards */
|
|
{ PCI_DEVICE(0x1c29, 0x1104), .driver_data = pbn_fintek_4 },
|
|
{ PCI_DEVICE(0x1c29, 0x1108), .driver_data = pbn_fintek_8 },
|
|
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
|
|
index c578d64edc153..71c2ae4b81067 100644
|
|
--- a/drivers/usb/class/usblp.c
|
|
+++ b/drivers/usb/class/usblp.c
|
|
@@ -840,6 +840,11 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t len, lo
|
|
if (rv < 0)
|
|
return rv;
|
|
|
|
+ if (!usblp->present) {
|
|
+ count = -ENODEV;
|
|
+ goto done;
|
|
+ }
|
|
+
|
|
if ((avail = usblp->rstatus) < 0) {
|
|
printk(KERN_ERR "usblp%d: error %d reading from printer\n",
|
|
usblp->minor, (int)avail);
|
|
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
|
|
index f083ecfddd1b1..e568325cb6e15 100644
|
|
--- a/drivers/usb/core/message.c
|
|
+++ b/drivers/usb/core/message.c
|
|
@@ -1141,6 +1141,34 @@ void usb_disable_interface(struct usb_device *dev, struct usb_interface *intf,
|
|
}
|
|
}
|
|
|
|
+/*
|
|
+ * usb_disable_device_endpoints -- Disable all endpoints for a device
|
|
+ * @dev: the device whose endpoints are being disabled
|
|
+ * @skip_ep0: 0 to disable endpoint 0, 1 to skip it.
|
|
+ */
|
|
+static void usb_disable_device_endpoints(struct usb_device *dev, int skip_ep0)
|
|
+{
|
|
+ struct usb_hcd *hcd = bus_to_hcd(dev->bus);
|
|
+ int i;
|
|
+
|
|
+ if (hcd->driver->check_bandwidth) {
|
|
+ /* First pass: Cancel URBs, leave endpoint pointers intact. */
|
|
+ for (i = skip_ep0; i < 16; ++i) {
|
|
+ usb_disable_endpoint(dev, i, false);
|
|
+ usb_disable_endpoint(dev, i + USB_DIR_IN, false);
|
|
+ }
|
|
+ /* Remove endpoints from the host controller internal state */
|
|
+ mutex_lock(hcd->bandwidth_mutex);
|
|
+ usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
|
|
+ mutex_unlock(hcd->bandwidth_mutex);
|
|
+ }
|
|
+ /* Second pass: remove endpoint pointers */
|
|
+ for (i = skip_ep0; i < 16; ++i) {
|
|
+ usb_disable_endpoint(dev, i, true);
|
|
+ usb_disable_endpoint(dev, i + USB_DIR_IN, true);
|
|
+ }
|
|
+}
|
|
+
|
|
/**
|
|
* usb_disable_device - Disable all the endpoints for a USB device
|
|
* @dev: the device whose endpoints are being disabled
|
|
@@ -1200,22 +1227,8 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
|
|
|
|
dev_dbg(&dev->dev, "%s nuking %s URBs\n", __func__,
|
|
skip_ep0 ? "non-ep0" : "all");
|
|
- if (hcd->driver->check_bandwidth) {
|
|
- /* First pass: Cancel URBs, leave endpoint pointers intact. */
|
|
- for (i = skip_ep0; i < 16; ++i) {
|
|
- usb_disable_endpoint(dev, i, false);
|
|
- usb_disable_endpoint(dev, i + USB_DIR_IN, false);
|
|
- }
|
|
- /* Remove endpoints from the host controller internal state */
|
|
- mutex_lock(hcd->bandwidth_mutex);
|
|
- usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
|
|
- mutex_unlock(hcd->bandwidth_mutex);
|
|
- /* Second pass: remove endpoint pointers */
|
|
- }
|
|
- for (i = skip_ep0; i < 16; ++i) {
|
|
- usb_disable_endpoint(dev, i, true);
|
|
- usb_disable_endpoint(dev, i + USB_DIR_IN, true);
|
|
- }
|
|
+
|
|
+ usb_disable_device_endpoints(dev, skip_ep0);
|
|
}
|
|
|
|
/**
|
|
@@ -1458,6 +1471,9 @@ EXPORT_SYMBOL_GPL(usb_set_interface);
|
|
* The caller must own the device lock.
|
|
*
|
|
* Return: Zero on success, else a negative error code.
|
|
+ *
|
|
+ * If this routine fails the device will probably be in an unusable state
|
|
+ * with endpoints disabled, and interfaces only partially enabled.
|
|
*/
|
|
int usb_reset_configuration(struct usb_device *dev)
|
|
{
|
|
@@ -1473,10 +1489,7 @@ int usb_reset_configuration(struct usb_device *dev)
|
|
* calls during probe() are fine
|
|
*/
|
|
|
|
- for (i = 1; i < 16; ++i) {
|
|
- usb_disable_endpoint(dev, i, true);
|
|
- usb_disable_endpoint(dev, i + USB_DIR_IN, true);
|
|
- }
|
|
+ usb_disable_device_endpoints(dev, 1); /* skip ep0*/
|
|
|
|
config = dev->actconfig;
|
|
retval = 0;
|
|
@@ -1489,34 +1502,10 @@ int usb_reset_configuration(struct usb_device *dev)
|
|
mutex_unlock(hcd->bandwidth_mutex);
|
|
return -ENOMEM;
|
|
}
|
|
- /* Make sure we have enough bandwidth for each alternate setting 0 */
|
|
- for (i = 0; i < config->desc.bNumInterfaces; i++) {
|
|
- struct usb_interface *intf = config->interface[i];
|
|
- struct usb_host_interface *alt;
|
|
|
|
- alt = usb_altnum_to_altsetting(intf, 0);
|
|
- if (!alt)
|
|
- alt = &intf->altsetting[0];
|
|
- if (alt != intf->cur_altsetting)
|
|
- retval = usb_hcd_alloc_bandwidth(dev, NULL,
|
|
- intf->cur_altsetting, alt);
|
|
- if (retval < 0)
|
|
- break;
|
|
- }
|
|
- /* If not, reinstate the old alternate settings */
|
|
+ /* xHCI adds all endpoints in usb_hcd_alloc_bandwidth */
|
|
+ retval = usb_hcd_alloc_bandwidth(dev, config, NULL, NULL);
|
|
if (retval < 0) {
|
|
-reset_old_alts:
|
|
- for (i--; i >= 0; i--) {
|
|
- struct usb_interface *intf = config->interface[i];
|
|
- struct usb_host_interface *alt;
|
|
-
|
|
- alt = usb_altnum_to_altsetting(intf, 0);
|
|
- if (!alt)
|
|
- alt = &intf->altsetting[0];
|
|
- if (alt != intf->cur_altsetting)
|
|
- usb_hcd_alloc_bandwidth(dev, NULL,
|
|
- alt, intf->cur_altsetting);
|
|
- }
|
|
usb_enable_lpm(dev);
|
|
mutex_unlock(hcd->bandwidth_mutex);
|
|
return retval;
|
|
@@ -1525,8 +1514,12 @@ reset_old_alts:
|
|
USB_REQ_SET_CONFIGURATION, 0,
|
|
config->desc.bConfigurationValue, 0,
|
|
NULL, 0, USB_CTRL_SET_TIMEOUT);
|
|
- if (retval < 0)
|
|
- goto reset_old_alts;
|
|
+ if (retval < 0) {
|
|
+ usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
|
|
+ usb_enable_lpm(dev);
|
|
+ mutex_unlock(hcd->bandwidth_mutex);
|
|
+ return retval;
|
|
+ }
|
|
mutex_unlock(hcd->bandwidth_mutex);
|
|
|
|
/* re-init hc/hcd interface/endpoint state */
|
|
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
|
index eed7c8d8e3d4f..dd72e85f2e176 100644
|
|
--- a/drivers/usb/core/quirks.c
|
|
+++ b/drivers/usb/core/quirks.c
|
|
@@ -236,6 +236,10 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|
/* Generic RTL8153 based ethernet adapters */
|
|
{ USB_DEVICE(0x0bda, 0x8153), .driver_info = USB_QUIRK_NO_LPM },
|
|
|
|
+ /* SONiX USB DEVICE Touchpad */
|
|
+ { USB_DEVICE(0x0c45, 0x7056), .driver_info =
|
|
+ USB_QUIRK_IGNORE_REMOTE_WAKEUP },
|
|
+
|
|
/* Action Semiconductor flash disk */
|
|
{ USB_DEVICE(0x10d6, 0x2200), .driver_info =
|
|
USB_QUIRK_STRING_FETCH_255 },
|
|
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
|
|
index 36e5098e4e6f6..415e9cf407ba5 100644
|
|
--- a/drivers/usb/core/usb.c
|
|
+++ b/drivers/usb/core/usb.c
|
|
@@ -76,6 +76,89 @@ MODULE_PARM_DESC(autosuspend, "default autosuspend delay");
|
|
#endif
|
|
|
|
|
|
+/**
|
|
+ * usb_find_common_endpoints() -- look up common endpoint descriptors
|
|
+ * @alt: alternate setting to search
|
|
+ * @bulk_in: pointer to descriptor pointer, or NULL
|
|
+ * @bulk_out: pointer to descriptor pointer, or NULL
|
|
+ * @int_in: pointer to descriptor pointer, or NULL
|
|
+ * @int_out: pointer to descriptor pointer, or NULL
|
|
+ *
|
|
+ * Search the alternate setting's endpoint descriptors for the first bulk-in,
|
|
+ * bulk-out, interrupt-in and interrupt-out endpoints and return them in the
|
|
+ * provided pointers (unless they are NULL).
|
|
+ *
|
|
+ * If a requested endpoint is not found, the corresponding pointer is set to
|
|
+ * NULL.
|
|
+ *
|
|
+ * Return: Zero if all requested descriptors were found, or -ENXIO otherwise.
|
|
+ */
|
|
+int usb_find_common_endpoints(struct usb_host_interface *alt,
|
|
+ struct usb_endpoint_descriptor **bulk_in,
|
|
+ struct usb_endpoint_descriptor **bulk_out,
|
|
+ struct usb_endpoint_descriptor **int_in,
|
|
+ struct usb_endpoint_descriptor **int_out)
|
|
+{
|
|
+ struct usb_endpoint_descriptor *epd;
|
|
+ int i;
|
|
+
|
|
+ if (bulk_in)
|
|
+ *bulk_in = NULL;
|
|
+ if (bulk_out)
|
|
+ *bulk_out = NULL;
|
|
+ if (int_in)
|
|
+ *int_in = NULL;
|
|
+ if (int_out)
|
|
+ *int_out = NULL;
|
|
+
|
|
+ for (i = 0; i < alt->desc.bNumEndpoints; ++i) {
|
|
+ epd = &alt->endpoint[i].desc;
|
|
+
|
|
+ switch (usb_endpoint_type(epd)) {
|
|
+ case USB_ENDPOINT_XFER_BULK:
|
|
+ if (usb_endpoint_dir_in(epd)) {
|
|
+ if (bulk_in && !*bulk_in) {
|
|
+ *bulk_in = epd;
|
|
+ break;
|
|
+ }
|
|
+ } else {
|
|
+ if (bulk_out && !*bulk_out) {
|
|
+ *bulk_out = epd;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ continue;
|
|
+ case USB_ENDPOINT_XFER_INT:
|
|
+ if (usb_endpoint_dir_in(epd)) {
|
|
+ if (int_in && !*int_in) {
|
|
+ *int_in = epd;
|
|
+ break;
|
|
+ }
|
|
+ } else {
|
|
+ if (int_out && !*int_out) {
|
|
+ *int_out = epd;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ continue;
|
|
+ default:
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if ((!bulk_in || *bulk_in) &&
|
|
+ (!bulk_out || *bulk_out) &&
|
|
+ (!int_in || *int_in) &&
|
|
+ (!int_out || *int_out)) {
|
|
+ return 0;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return -ENXIO;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(usb_find_common_endpoints);
|
|
+
|
|
/**
|
|
* usb_find_alt_setting() - Given a configuration, find the alternate setting
|
|
* for the given interface.
|
|
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
|
|
index f7661d9750fdc..330e05acf5f75 100644
|
|
--- a/drivers/usb/host/ehci-hcd.c
|
|
+++ b/drivers/usb/host/ehci-hcd.c
|
|
@@ -35,6 +35,7 @@
|
|
#include <linux/interrupt.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/hcd.h>
|
|
+#include <linux/usb/otg.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/debugfs.h>
|
|
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
|
|
index 086a7115d263c..4dc93547e9278 100644
|
|
--- a/drivers/usb/host/ehci-hub.c
|
|
+++ b/drivers/usb/host/ehci-hub.c
|
|
@@ -27,7 +27,6 @@
|
|
*/
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
-#include <linux/usb/otg.h>
|
|
|
|
#define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)
|
|
|
|
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
|
|
index 0afea511eb376..25e76d4c15054 100644
|
|
--- a/drivers/usb/serial/ftdi_sio.c
|
|
+++ b/drivers/usb/serial/ftdi_sio.c
|
|
@@ -708,6 +708,7 @@ static const struct usb_device_id id_table_combined[] = {
|
|
{ USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
|
|
{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
|
|
{ USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) },
|
|
+ { USB_DEVICE(XSENS_VID, XSENS_MTIUSBCONVERTER_PID) },
|
|
{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
|
|
{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
|
|
{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
|
|
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
|
|
index 32a40ab9a3852..c33e06752b5f0 100644
|
|
--- a/drivers/usb/serial/ftdi_sio_ids.h
|
|
+++ b/drivers/usb/serial/ftdi_sio_ids.h
|
|
@@ -159,6 +159,7 @@
|
|
#define XSENS_AWINDA_DONGLE_PID 0x0102
|
|
#define XSENS_MTW_PID 0x0200 /* Xsens MTw */
|
|
#define XSENS_MTDEVBOARD_PID 0x0300 /* Motion Tracker Development Board */
|
|
+#define XSENS_MTIUSBCONVERTER_PID 0x0301 /* MTi USB converter */
|
|
#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
|
|
|
|
/* Xsens devices using FTDI VID */
|
|
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
|
|
index 52b1092ed57ed..8cff50ef4fd14 100644
|
|
--- a/drivers/usb/serial/option.c
|
|
+++ b/drivers/usb/serial/option.c
|
|
@@ -1808,6 +1808,8 @@ static const struct usb_device_id option_ids[] = {
|
|
{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) }, /* Simcom SIM7500/SIM7600 MBIM mode */
|
|
{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff), /* Simcom SIM7500/SIM7600 RNDIS mode */
|
|
.driver_info = RSVD(7) },
|
|
+ { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */
|
|
+ { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */
|
|
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
|
|
.driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) },
|
|
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),
|
|
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
|
|
index 698ba127b6352..34dcd2e1b4fe9 100644
|
|
--- a/drivers/usb/storage/uas.c
|
|
+++ b/drivers/usb/storage/uas.c
|
|
@@ -646,8 +646,7 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
|
|
if (devinfo->resetting) {
|
|
cmnd->result = DID_ERROR << 16;
|
|
cmnd->scsi_done(cmnd);
|
|
- spin_unlock_irqrestore(&devinfo->lock, flags);
|
|
- return 0;
|
|
+ goto zombie;
|
|
}
|
|
|
|
/* Find a free uas-tag */
|
|
@@ -682,6 +681,16 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
|
|
cmdinfo->state &= ~(SUBMIT_DATA_IN_URB | SUBMIT_DATA_OUT_URB);
|
|
|
|
err = uas_submit_urbs(cmnd, devinfo, GFP_ATOMIC);
|
|
+ /*
|
|
+ * in case of fatal errors the SCSI layer is peculiar
|
|
+ * a command that has finished is a success for the purpose
|
|
+ * of queueing, no matter how fatal the error
|
|
+ */
|
|
+ if (err == -ENODEV) {
|
|
+ cmnd->result = DID_ERROR << 16;
|
|
+ cmnd->scsi_done(cmnd);
|
|
+ goto zombie;
|
|
+ }
|
|
if (err) {
|
|
/* If we did nothing, give up now */
|
|
if (cmdinfo->state & SUBMIT_STATUS_URB) {
|
|
@@ -692,6 +701,7 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
|
|
}
|
|
|
|
devinfo->cmnd[idx] = cmnd;
|
|
+zombie:
|
|
spin_unlock_irqrestore(&devinfo->lock, flags);
|
|
return 0;
|
|
}
|
|
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
|
|
index 38da6e2991491..c31715019cb43 100644
|
|
--- a/drivers/video/console/Kconfig
|
|
+++ b/drivers/video/console/Kconfig
|
|
@@ -22,31 +22,6 @@ config VGA_CONSOLE
|
|
|
|
Say Y.
|
|
|
|
-config VGACON_SOFT_SCROLLBACK
|
|
- bool "Enable Scrollback Buffer in System RAM"
|
|
- depends on VGA_CONSOLE
|
|
- default n
|
|
- help
|
|
- The scrollback buffer of the standard VGA console is located in
|
|
- the VGA RAM. The size of this RAM is fixed and is quite small.
|
|
- If you require a larger scrollback buffer, this can be placed in
|
|
- System RAM which is dynamically allocated during initialization.
|
|
- Placing the scrollback buffer in System RAM will slightly slow
|
|
- down the console.
|
|
-
|
|
- If you want this feature, say 'Y' here and enter the amount of
|
|
- RAM to allocate for this buffer. If unsure, say 'N'.
|
|
-
|
|
-config VGACON_SOFT_SCROLLBACK_SIZE
|
|
- int "Scrollback Buffer Size (in KB)"
|
|
- depends on VGACON_SOFT_SCROLLBACK
|
|
- range 1 1024
|
|
- default "64"
|
|
- help
|
|
- Enter the amount of System RAM to allocate for the scrollback
|
|
- buffer. Each 64KB will give you approximately 16 80x25
|
|
- screenfuls of scrollback buffer
|
|
-
|
|
config MDA_CONSOLE
|
|
depends on !M68K && !PARISC && ISA
|
|
tristate "MDA text console (dual-headed)"
|
|
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
|
|
index 05d1d36a56654..a7ab8323304da 100644
|
|
--- a/drivers/video/console/bitblit.c
|
|
+++ b/drivers/video/console/bitblit.c
|
|
@@ -234,7 +234,7 @@ static void bit_clear_margins(struct vc_data *vc, struct fb_info *info,
|
|
}
|
|
|
|
static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
- int softback_lines, int fg, int bg)
|
|
+ int fg, int bg)
|
|
{
|
|
struct fb_cursor cursor;
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
@@ -247,15 +247,6 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
|
|
cursor.set = 0;
|
|
|
|
- if (softback_lines) {
|
|
- if (y + softback_lines >= vc->vc_rows) {
|
|
- mode = CM_ERASE;
|
|
- ops->cursor_flash = 0;
|
|
- return;
|
|
- } else
|
|
- y += softback_lines;
|
|
- }
|
|
-
|
|
c = scr_readw((u16 *) vc->vc_pos);
|
|
attribute = get_attribute(info, c);
|
|
src = vc->vc_font.data + ((c & charmask) * (w * vc->vc_font.height));
|
|
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
|
|
index fe0663787b3c9..e57fa26bcff19 100644
|
|
--- a/drivers/video/console/fbcon.c
|
|
+++ b/drivers/video/console/fbcon.c
|
|
@@ -101,12 +101,6 @@ static int logo_lines;
|
|
/* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO
|
|
enums. */
|
|
static int logo_shown = FBCON_LOGO_CANSHOW;
|
|
-/* Software scrollback */
|
|
-static int fbcon_softback_size = 32768;
|
|
-static unsigned long softback_buf, softback_curr;
|
|
-static unsigned long softback_in;
|
|
-static unsigned long softback_top, softback_end;
|
|
-static int softback_lines;
|
|
/* console mappings */
|
|
static int first_fb_vc;
|
|
static int last_fb_vc = MAX_NR_CONSOLES - 1;
|
|
@@ -140,8 +134,6 @@ static int fbcon_has_sysfs;
|
|
|
|
static const struct consw fb_con;
|
|
|
|
-#define CM_SOFTBACK (8)
|
|
-
|
|
#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc->vc_size_row)
|
|
|
|
static int fbcon_set_origin(struct vc_data *);
|
|
@@ -171,7 +163,6 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
|
|
static int fbcon_switch(struct vc_data *vc);
|
|
static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch);
|
|
static int fbcon_set_palette(struct vc_data *vc, unsigned char *table);
|
|
-static int fbcon_scrolldelta(struct vc_data *vc, int lines);
|
|
|
|
/*
|
|
* Internal routines
|
|
@@ -350,18 +341,6 @@ static int get_color(struct vc_data *vc, struct fb_info *info,
|
|
return color;
|
|
}
|
|
|
|
-static void fbcon_update_softback(struct vc_data *vc)
|
|
-{
|
|
- int l = fbcon_softback_size / vc->vc_size_row;
|
|
-
|
|
- if (l > 5)
|
|
- softback_end = softback_buf + l * vc->vc_size_row;
|
|
- else
|
|
- /* Smaller scrollback makes no sense, and 0 would screw
|
|
- the operation totally */
|
|
- softback_top = 0;
|
|
-}
|
|
-
|
|
static void fb_flashcursor(struct work_struct *work)
|
|
{
|
|
struct fb_info *info = container_of(work, struct fb_info, queue);
|
|
@@ -391,7 +370,7 @@ static void fb_flashcursor(struct work_struct *work)
|
|
c = scr_readw((u16 *) vc->vc_pos);
|
|
mode = (!ops->cursor_flash || ops->cursor_state.enable) ?
|
|
CM_ERASE : CM_DRAW;
|
|
- ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
|
|
+ ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
|
|
get_color(vc, info, c, 0));
|
|
console_unlock();
|
|
}
|
|
@@ -451,13 +430,7 @@ static int __init fb_console_setup(char *this_opt)
|
|
}
|
|
|
|
if (!strncmp(options, "scrollback:", 11)) {
|
|
- options += 11;
|
|
- if (*options) {
|
|
- fbcon_softback_size = simple_strtoul(options, &options, 0);
|
|
- if (*options == 'k' || *options == 'K') {
|
|
- fbcon_softback_size *= 1024;
|
|
- }
|
|
- }
|
|
+ pr_warn("Ignoring scrollback size option\n");
|
|
continue;
|
|
}
|
|
|
|
@@ -962,31 +935,6 @@ static const char *fbcon_startup(void)
|
|
p->con_rotate = initial_rotation;
|
|
set_blitting_type(vc, info);
|
|
|
|
- if (info->fix.type != FB_TYPE_TEXT) {
|
|
- if (fbcon_softback_size) {
|
|
- if (!softback_buf) {
|
|
- softback_buf =
|
|
- (unsigned long)
|
|
- kmalloc(fbcon_softback_size,
|
|
- GFP_KERNEL);
|
|
- if (!softback_buf) {
|
|
- fbcon_softback_size = 0;
|
|
- softback_top = 0;
|
|
- }
|
|
- }
|
|
- } else {
|
|
- if (softback_buf) {
|
|
- kfree((void *) softback_buf);
|
|
- softback_buf = 0;
|
|
- softback_top = 0;
|
|
- }
|
|
- }
|
|
- if (softback_buf)
|
|
- softback_in = softback_top = softback_curr =
|
|
- softback_buf;
|
|
- softback_lines = 0;
|
|
- }
|
|
-
|
|
/* Setup default font */
|
|
if (!p->fontdata && !vc->vc_font.data) {
|
|
if (!fontname[0] || !(font = find_font(fontname)))
|
|
@@ -1149,9 +1097,6 @@ static void fbcon_init(struct vc_data *vc, int init)
|
|
if (logo)
|
|
fbcon_prepare_logo(vc, info, cols, rows, new_cols, new_rows);
|
|
|
|
- if (vc == svc && softback_buf)
|
|
- fbcon_update_softback(vc);
|
|
-
|
|
if (ops->rotate_font && ops->rotate_font(info, vc)) {
|
|
ops->rotate = FB_ROTATE_UR;
|
|
set_blitting_type(vc, info);
|
|
@@ -1311,7 +1256,6 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
|
|
{
|
|
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
- int y;
|
|
int c = scr_readw((u16 *) vc->vc_pos);
|
|
|
|
ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
|
|
@@ -1325,16 +1269,8 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
|
|
fbcon_add_cursor_timer(info);
|
|
|
|
ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;
|
|
- if (mode & CM_SOFTBACK) {
|
|
- mode &= ~CM_SOFTBACK;
|
|
- y = softback_lines;
|
|
- } else {
|
|
- if (softback_lines)
|
|
- fbcon_set_origin(vc);
|
|
- y = 0;
|
|
- }
|
|
|
|
- ops->cursor(vc, info, mode, y, get_color(vc, info, c, 1),
|
|
+ ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
|
|
get_color(vc, info, c, 0));
|
|
}
|
|
|
|
@@ -1405,8 +1341,6 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var,
|
|
|
|
if (CON_IS_VISIBLE(vc)) {
|
|
update_screen(vc);
|
|
- if (softback_buf)
|
|
- fbcon_update_softback(vc);
|
|
}
|
|
}
|
|
|
|
@@ -1544,99 +1478,6 @@ static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count)
|
|
scrollback_current = 0;
|
|
}
|
|
|
|
-static void fbcon_redraw_softback(struct vc_data *vc, struct display *p,
|
|
- long delta)
|
|
-{
|
|
- int count = vc->vc_rows;
|
|
- unsigned short *d, *s;
|
|
- unsigned long n;
|
|
- int line = 0;
|
|
-
|
|
- d = (u16 *) softback_curr;
|
|
- if (d == (u16 *) softback_in)
|
|
- d = (u16 *) vc->vc_origin;
|
|
- n = softback_curr + delta * vc->vc_size_row;
|
|
- softback_lines -= delta;
|
|
- if (delta < 0) {
|
|
- if (softback_curr < softback_top && n < softback_buf) {
|
|
- n += softback_end - softback_buf;
|
|
- if (n < softback_top) {
|
|
- softback_lines -=
|
|
- (softback_top - n) / vc->vc_size_row;
|
|
- n = softback_top;
|
|
- }
|
|
- } else if (softback_curr >= softback_top
|
|
- && n < softback_top) {
|
|
- softback_lines -=
|
|
- (softback_top - n) / vc->vc_size_row;
|
|
- n = softback_top;
|
|
- }
|
|
- } else {
|
|
- if (softback_curr > softback_in && n >= softback_end) {
|
|
- n += softback_buf - softback_end;
|
|
- if (n > softback_in) {
|
|
- n = softback_in;
|
|
- softback_lines = 0;
|
|
- }
|
|
- } else if (softback_curr <= softback_in && n > softback_in) {
|
|
- n = softback_in;
|
|
- softback_lines = 0;
|
|
- }
|
|
- }
|
|
- if (n == softback_curr)
|
|
- return;
|
|
- softback_curr = n;
|
|
- s = (u16 *) softback_curr;
|
|
- if (s == (u16 *) softback_in)
|
|
- s = (u16 *) vc->vc_origin;
|
|
- while (count--) {
|
|
- unsigned short *start;
|
|
- unsigned short *le;
|
|
- unsigned short c;
|
|
- int x = 0;
|
|
- unsigned short attr = 1;
|
|
-
|
|
- start = s;
|
|
- le = advance_row(s, 1);
|
|
- do {
|
|
- c = scr_readw(s);
|
|
- if (attr != (c & 0xff00)) {
|
|
- attr = c & 0xff00;
|
|
- if (s > start) {
|
|
- fbcon_putcs(vc, start, s - start,
|
|
- line, x);
|
|
- x += s - start;
|
|
- start = s;
|
|
- }
|
|
- }
|
|
- if (c == scr_readw(d)) {
|
|
- if (s > start) {
|
|
- fbcon_putcs(vc, start, s - start,
|
|
- line, x);
|
|
- x += s - start + 1;
|
|
- start = s + 1;
|
|
- } else {
|
|
- x++;
|
|
- start++;
|
|
- }
|
|
- }
|
|
- s++;
|
|
- d++;
|
|
- } while (s < le);
|
|
- if (s > start)
|
|
- fbcon_putcs(vc, start, s - start, line, x);
|
|
- line++;
|
|
- if (d == (u16 *) softback_end)
|
|
- d = (u16 *) softback_buf;
|
|
- if (d == (u16 *) softback_in)
|
|
- d = (u16 *) vc->vc_origin;
|
|
- if (s == (u16 *) softback_end)
|
|
- s = (u16 *) softback_buf;
|
|
- if (s == (u16 *) softback_in)
|
|
- s = (u16 *) vc->vc_origin;
|
|
- }
|
|
-}
|
|
-
|
|
static void fbcon_redraw_move(struct vc_data *vc, struct display *p,
|
|
int line, int count, int dy)
|
|
{
|
|
@@ -1776,31 +1617,6 @@ static void fbcon_redraw(struct vc_data *vc, struct display *p,
|
|
}
|
|
}
|
|
|
|
-static inline void fbcon_softback_note(struct vc_data *vc, int t,
|
|
- int count)
|
|
-{
|
|
- unsigned short *p;
|
|
-
|
|
- if (vc->vc_num != fg_console)
|
|
- return;
|
|
- p = (unsigned short *) (vc->vc_origin + t * vc->vc_size_row);
|
|
-
|
|
- while (count) {
|
|
- scr_memcpyw((u16 *) softback_in, p, vc->vc_size_row);
|
|
- count--;
|
|
- p = advance_row(p, 1);
|
|
- softback_in += vc->vc_size_row;
|
|
- if (softback_in == softback_end)
|
|
- softback_in = softback_buf;
|
|
- if (softback_in == softback_top) {
|
|
- softback_top += vc->vc_size_row;
|
|
- if (softback_top == softback_end)
|
|
- softback_top = softback_buf;
|
|
- }
|
|
- }
|
|
- softback_curr = softback_in;
|
|
-}
|
|
-
|
|
static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
|
|
int count)
|
|
{
|
|
@@ -1823,8 +1639,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
|
|
case SM_UP:
|
|
if (count > vc->vc_rows) /* Maximum realistic size */
|
|
count = vc->vc_rows;
|
|
- if (softback_top)
|
|
- fbcon_softback_note(vc, t, count);
|
|
if (logo_shown >= 0)
|
|
goto redraw_up;
|
|
switch (p->scrollmode) {
|
|
@@ -2129,7 +1943,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
|
|
struct fb_var_screeninfo var = info->var;
|
|
int x_diff, y_diff, virt_w, virt_h, virt_fw, virt_fh;
|
|
|
|
- if (ops->p && ops->p->userfont && FNTSIZE(vc->vc_font.data)) {
|
|
+ if (p->userfont && FNTSIZE(vc->vc_font.data)) {
|
|
int size;
|
|
int pitch = PITCH(vc->vc_font.width);
|
|
|
|
@@ -2195,14 +2009,6 @@ static int fbcon_switch(struct vc_data *vc)
|
|
info = registered_fb[con2fb_map[vc->vc_num]];
|
|
ops = info->fbcon_par;
|
|
|
|
- if (softback_top) {
|
|
- if (softback_lines)
|
|
- fbcon_set_origin(vc);
|
|
- softback_top = softback_curr = softback_in = softback_buf;
|
|
- softback_lines = 0;
|
|
- fbcon_update_softback(vc);
|
|
- }
|
|
-
|
|
if (logo_shown >= 0) {
|
|
struct vc_data *conp2 = vc_cons[logo_shown].d;
|
|
|
|
@@ -2536,9 +2342,6 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
|
|
int cnt;
|
|
char *old_data = NULL;
|
|
|
|
- if (CON_IS_VISIBLE(vc) && softback_lines)
|
|
- fbcon_set_origin(vc);
|
|
-
|
|
resize = (w != vc->vc_font.width) || (h != vc->vc_font.height);
|
|
if (p->userfont)
|
|
old_data = vc->vc_font.data;
|
|
@@ -2564,8 +2367,6 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
|
|
cols /= w;
|
|
rows /= h;
|
|
vc_resize(vc, cols, rows);
|
|
- if (CON_IS_VISIBLE(vc) && softback_buf)
|
|
- fbcon_update_softback(vc);
|
|
} else if (CON_IS_VISIBLE(vc)
|
|
&& vc->vc_mode == KD_TEXT) {
|
|
fbcon_clear_margins(vc, 0);
|
|
@@ -2723,19 +2524,7 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table)
|
|
|
|
static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
|
|
{
|
|
- unsigned long p;
|
|
- int line;
|
|
-
|
|
- if (vc->vc_num != fg_console || !softback_lines)
|
|
- return (u16 *) (vc->vc_origin + offset);
|
|
- line = offset / vc->vc_size_row;
|
|
- if (line >= softback_lines)
|
|
- return (u16 *) (vc->vc_origin + offset -
|
|
- softback_lines * vc->vc_size_row);
|
|
- p = softback_curr + offset;
|
|
- if (p >= softback_end)
|
|
- p += softback_buf - softback_end;
|
|
- return (u16 *) p;
|
|
+ return (u16 *) (vc->vc_origin + offset);
|
|
}
|
|
|
|
static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos,
|
|
@@ -2749,22 +2538,7 @@ static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos,
|
|
|
|
x = offset % vc->vc_cols;
|
|
y = offset / vc->vc_cols;
|
|
- if (vc->vc_num == fg_console)
|
|
- y += softback_lines;
|
|
ret = pos + (vc->vc_cols - x) * 2;
|
|
- } else if (vc->vc_num == fg_console && softback_lines) {
|
|
- unsigned long offset = pos - softback_curr;
|
|
-
|
|
- if (pos < softback_curr)
|
|
- offset += softback_end - softback_buf;
|
|
- offset /= 2;
|
|
- x = offset % vc->vc_cols;
|
|
- y = offset / vc->vc_cols;
|
|
- ret = pos + (vc->vc_cols - x) * 2;
|
|
- if (ret == softback_end)
|
|
- ret = softback_buf;
|
|
- if (ret == softback_in)
|
|
- ret = vc->vc_origin;
|
|
} else {
|
|
/* Should not happen */
|
|
x = y = 0;
|
|
@@ -2792,107 +2566,11 @@ static void fbcon_invert_region(struct vc_data *vc, u16 * p, int cnt)
|
|
a = ((a) & 0x88ff) | (((a) & 0x7000) >> 4) |
|
|
(((a) & 0x0700) << 4);
|
|
scr_writew(a, p++);
|
|
- if (p == (u16 *) softback_end)
|
|
- p = (u16 *) softback_buf;
|
|
- if (p == (u16 *) softback_in)
|
|
- p = (u16 *) vc->vc_origin;
|
|
}
|
|
}
|
|
|
|
-static int fbcon_scrolldelta(struct vc_data *vc, int lines)
|
|
-{
|
|
- struct fb_info *info = registered_fb[con2fb_map[fg_console]];
|
|
- struct fbcon_ops *ops = info->fbcon_par;
|
|
- struct display *disp = &fb_display[fg_console];
|
|
- int offset, limit, scrollback_old;
|
|
-
|
|
- if (softback_top) {
|
|
- if (vc->vc_num != fg_console)
|
|
- return 0;
|
|
- if (vc->vc_mode != KD_TEXT || !lines)
|
|
- return 0;
|
|
- if (logo_shown >= 0) {
|
|
- struct vc_data *conp2 = vc_cons[logo_shown].d;
|
|
-
|
|
- if (conp2->vc_top == logo_lines
|
|
- && conp2->vc_bottom == conp2->vc_rows)
|
|
- conp2->vc_top = 0;
|
|
- if (logo_shown == vc->vc_num) {
|
|
- unsigned long p, q;
|
|
- int i;
|
|
-
|
|
- p = softback_in;
|
|
- q = vc->vc_origin +
|
|
- logo_lines * vc->vc_size_row;
|
|
- for (i = 0; i < logo_lines; i++) {
|
|
- if (p == softback_top)
|
|
- break;
|
|
- if (p == softback_buf)
|
|
- p = softback_end;
|
|
- p -= vc->vc_size_row;
|
|
- q -= vc->vc_size_row;
|
|
- scr_memcpyw((u16 *) q, (u16 *) p,
|
|
- vc->vc_size_row);
|
|
- }
|
|
- softback_in = softback_curr = p;
|
|
- update_region(vc, vc->vc_origin,
|
|
- logo_lines * vc->vc_cols);
|
|
- }
|
|
- logo_shown = FBCON_LOGO_CANSHOW;
|
|
- }
|
|
- fbcon_cursor(vc, CM_ERASE | CM_SOFTBACK);
|
|
- fbcon_redraw_softback(vc, disp, lines);
|
|
- fbcon_cursor(vc, CM_DRAW | CM_SOFTBACK);
|
|
- return 0;
|
|
- }
|
|
-
|
|
- if (!scrollback_phys_max)
|
|
- return -ENOSYS;
|
|
-
|
|
- scrollback_old = scrollback_current;
|
|
- scrollback_current -= lines;
|
|
- if (scrollback_current < 0)
|
|
- scrollback_current = 0;
|
|
- else if (scrollback_current > scrollback_max)
|
|
- scrollback_current = scrollback_max;
|
|
- if (scrollback_current == scrollback_old)
|
|
- return 0;
|
|
-
|
|
- if (fbcon_is_inactive(vc, info))
|
|
- return 0;
|
|
-
|
|
- fbcon_cursor(vc, CM_ERASE);
|
|
-
|
|
- offset = disp->yscroll - scrollback_current;
|
|
- limit = disp->vrows;
|
|
- switch (disp->scrollmode) {
|
|
- case SCROLL_WRAP_MOVE:
|
|
- info->var.vmode |= FB_VMODE_YWRAP;
|
|
- break;
|
|
- case SCROLL_PAN_MOVE:
|
|
- case SCROLL_PAN_REDRAW:
|
|
- limit -= vc->vc_rows;
|
|
- info->var.vmode &= ~FB_VMODE_YWRAP;
|
|
- break;
|
|
- }
|
|
- if (offset < 0)
|
|
- offset += limit;
|
|
- else if (offset >= limit)
|
|
- offset -= limit;
|
|
-
|
|
- ops->var.xoffset = 0;
|
|
- ops->var.yoffset = offset * vc->vc_font.height;
|
|
- ops->update_start(info);
|
|
-
|
|
- if (!scrollback_current)
|
|
- fbcon_cursor(vc, CM_DRAW);
|
|
- return 0;
|
|
-}
|
|
-
|
|
static int fbcon_set_origin(struct vc_data *vc)
|
|
{
|
|
- if (softback_lines)
|
|
- fbcon_scrolldelta(vc, softback_lines);
|
|
return 0;
|
|
}
|
|
|
|
@@ -2956,8 +2634,6 @@ static void fbcon_modechanged(struct fb_info *info)
|
|
|
|
fbcon_set_palette(vc, color_table);
|
|
update_screen(vc);
|
|
- if (softback_buf)
|
|
- fbcon_update_softback(vc);
|
|
}
|
|
}
|
|
|
|
@@ -3378,7 +3054,6 @@ static const struct consw fb_con = {
|
|
.con_font_default = fbcon_set_def_font,
|
|
.con_font_copy = fbcon_copy_font,
|
|
.con_set_palette = fbcon_set_palette,
|
|
- .con_scrolldelta = fbcon_scrolldelta,
|
|
.con_set_origin = fbcon_set_origin,
|
|
.con_invert_region = fbcon_invert_region,
|
|
.con_screen_pos = fbcon_screen_pos,
|
|
@@ -3587,9 +3262,6 @@ static void fbcon_exit(void)
|
|
if (fbcon_has_exited)
|
|
return;
|
|
|
|
- kfree((void *)softback_buf);
|
|
- softback_buf = 0UL;
|
|
-
|
|
for (i = 0; i < FB_MAX; i++) {
|
|
int pending = 0;
|
|
|
|
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
|
|
index 7aaa4eabbba05..5ebdccd070eb8 100644
|
|
--- a/drivers/video/console/fbcon.h
|
|
+++ b/drivers/video/console/fbcon.h
|
|
@@ -62,7 +62,7 @@ struct fbcon_ops {
|
|
void (*clear_margins)(struct vc_data *vc, struct fb_info *info,
|
|
int bottom_only);
|
|
void (*cursor)(struct vc_data *vc, struct fb_info *info, int mode,
|
|
- int softback_lines, int fg, int bg);
|
|
+ int fg, int bg);
|
|
int (*update_start)(struct fb_info *info);
|
|
int (*rotate_font)(struct fb_info *info, struct vc_data *vc);
|
|
struct fb_var_screeninfo var; /* copy of the current fb_var_screeninfo */
|
|
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c
|
|
index 34da8bba9273a..5867027520058 100644
|
|
--- a/drivers/video/console/fbcon_ccw.c
|
|
+++ b/drivers/video/console/fbcon_ccw.c
|
|
@@ -219,7 +219,7 @@ static void ccw_clear_margins(struct vc_data *vc, struct fb_info *info,
|
|
}
|
|
|
|
static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
- int softback_lines, int fg, int bg)
|
|
+ int fg, int bg)
|
|
{
|
|
struct fb_cursor cursor;
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
@@ -236,15 +236,6 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
|
|
cursor.set = 0;
|
|
|
|
- if (softback_lines) {
|
|
- if (y + softback_lines >= vc->vc_rows) {
|
|
- mode = CM_ERASE;
|
|
- ops->cursor_flash = 0;
|
|
- return;
|
|
- } else
|
|
- y += softback_lines;
|
|
- }
|
|
-
|
|
c = scr_readw((u16 *) vc->vc_pos);
|
|
attribute = get_attribute(info, c);
|
|
src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.width));
|
|
diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c
|
|
index 0b552b3fc22ab..f5a1134049f83 100644
|
|
--- a/drivers/video/console/fbcon_cw.c
|
|
+++ b/drivers/video/console/fbcon_cw.c
|
|
@@ -202,7 +202,7 @@ static void cw_clear_margins(struct vc_data *vc, struct fb_info *info,
|
|
}
|
|
|
|
static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
- int softback_lines, int fg, int bg)
|
|
+ int fg, int bg)
|
|
{
|
|
struct fb_cursor cursor;
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
@@ -219,15 +219,6 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
|
|
cursor.set = 0;
|
|
|
|
- if (softback_lines) {
|
|
- if (y + softback_lines >= vc->vc_rows) {
|
|
- mode = CM_ERASE;
|
|
- ops->cursor_flash = 0;
|
|
- return;
|
|
- } else
|
|
- y += softback_lines;
|
|
- }
|
|
-
|
|
c = scr_readw((u16 *) vc->vc_pos);
|
|
attribute = get_attribute(info, c);
|
|
src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.width));
|
|
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c
|
|
index 7f62efe2da526..cf8dac9ca2bbf 100644
|
|
--- a/drivers/video/console/fbcon_ud.c
|
|
+++ b/drivers/video/console/fbcon_ud.c
|
|
@@ -249,7 +249,7 @@ static void ud_clear_margins(struct vc_data *vc, struct fb_info *info,
|
|
}
|
|
|
|
static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
- int softback_lines, int fg, int bg)
|
|
+ int fg, int bg)
|
|
{
|
|
struct fb_cursor cursor;
|
|
struct fbcon_ops *ops = info->fbcon_par;
|
|
@@ -267,15 +267,6 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
|
|
cursor.set = 0;
|
|
|
|
- if (softback_lines) {
|
|
- if (y + softback_lines >= vc->vc_rows) {
|
|
- mode = CM_ERASE;
|
|
- ops->cursor_flash = 0;
|
|
- return;
|
|
- } else
|
|
- y += softback_lines;
|
|
- }
|
|
-
|
|
c = scr_readw((u16 *) vc->vc_pos);
|
|
attribute = get_attribute(info, c);
|
|
src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.height));
|
|
diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c
|
|
index 15e8e1a89c45d..3c0b242dba5f0 100644
|
|
--- a/drivers/video/console/tileblit.c
|
|
+++ b/drivers/video/console/tileblit.c
|
|
@@ -80,7 +80,7 @@ static void tile_clear_margins(struct vc_data *vc, struct fb_info *info,
|
|
}
|
|
|
|
static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode,
|
|
- int softback_lines, int fg, int bg)
|
|
+ int fg, int bg)
|
|
{
|
|
struct fb_tilecursor cursor;
|
|
int use_sw = (vc->vc_cursor_type & 0x10);
|
|
diff --git a/drivers/video/fbdev/vga16fb.c b/drivers/video/fbdev/vga16fb.c
|
|
index 283d335a759fe..1acdb41a8a7c3 100644
|
|
--- a/drivers/video/fbdev/vga16fb.c
|
|
+++ b/drivers/video/fbdev/vga16fb.c
|
|
@@ -1122,7 +1122,7 @@ static void vga_8planes_imageblit(struct fb_info *info, const struct fb_image *i
|
|
char oldop = setop(0);
|
|
char oldsr = setsr(0);
|
|
char oldmask = selectmask();
|
|
- const char *cdat = image->data;
|
|
+ const unsigned char *cdat = image->data;
|
|
u32 dx = image->dx;
|
|
char __iomem *where;
|
|
int y;
|
|
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
|
|
index 91a45ef69152d..67366515a29d2 100644
|
|
--- a/fs/btrfs/ioctl.c
|
|
+++ b/fs/btrfs/ioctl.c
|
|
@@ -2129,7 +2129,8 @@ static noinline int search_ioctl(struct inode *inode,
|
|
key.offset = sk->min_offset;
|
|
|
|
while (1) {
|
|
- ret = fault_in_pages_writeable(ubuf, *buf_size - sk_offset);
|
|
+ ret = fault_in_pages_writeable(ubuf + sk_offset,
|
|
+ *buf_size - sk_offset);
|
|
if (ret)
|
|
break;
|
|
|
|
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
|
|
index ca1702cefb852..64d15c2662db6 100644
|
|
--- a/fs/nfs/nfs4proc.c
|
|
+++ b/fs/nfs/nfs4proc.c
|
|
@@ -6171,7 +6171,12 @@ int nfs4_lock_delegation_recall(struct file_lock *fl, struct nfs4_state *state,
|
|
err = nfs4_set_lock_state(state, fl);
|
|
if (err != 0)
|
|
return err;
|
|
- err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW);
|
|
+ do {
|
|
+ err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW);
|
|
+ if (err != -NFS4ERR_DELAY)
|
|
+ break;
|
|
+ ssleep(1);
|
|
+ } while (err == -NFS4ERR_DELAY);
|
|
return nfs4_handle_delegation_recall_error(server, state, stateid, fl, err);
|
|
}
|
|
|
|
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
|
|
index 445a3f2f871fb..da8747b870df3 100644
|
|
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
|
|
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
|
|
@@ -514,8 +514,8 @@ xfs_attr_shortform_create(xfs_da_args_t *args)
|
|
ASSERT(ifp->if_flags & XFS_IFINLINE);
|
|
}
|
|
xfs_idata_realloc(dp, sizeof(*hdr), XFS_ATTR_FORK);
|
|
- hdr = (xfs_attr_sf_hdr_t *)ifp->if_u1.if_data;
|
|
- hdr->count = 0;
|
|
+ hdr = (struct xfs_attr_sf_hdr *)ifp->if_u1.if_data;
|
|
+ memset(hdr, 0, sizeof(*hdr));
|
|
hdr->totsize = cpu_to_be16(sizeof(*hdr));
|
|
xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_ADATA);
|
|
}
|
|
diff --git a/include/linux/i2c-algo-pca.h b/include/linux/i2c-algo-pca.h
|
|
index a3c3ecd59f08c..7a43afd273655 100644
|
|
--- a/include/linux/i2c-algo-pca.h
|
|
+++ b/include/linux/i2c-algo-pca.h
|
|
@@ -52,6 +52,20 @@
|
|
#define I2C_PCA_CON_SI 0x08 /* Serial Interrupt */
|
|
#define I2C_PCA_CON_CR 0x07 /* Clock Rate (MASK) */
|
|
|
|
+/**
|
|
+ * struct pca_i2c_bus_settings - The configured PCA i2c bus settings
|
|
+ * @mode: Configured i2c bus mode
|
|
+ * @tlow: Configured SCL LOW period
|
|
+ * @thi: Configured SCL HIGH period
|
|
+ * @clock_freq: The configured clock frequency
|
|
+ */
|
|
+struct pca_i2c_bus_settings {
|
|
+ int mode;
|
|
+ int tlow;
|
|
+ int thi;
|
|
+ int clock_freq;
|
|
+};
|
|
+
|
|
struct i2c_algo_pca_data {
|
|
void *data; /* private low level data */
|
|
void (*write_byte) (void *data, int reg, int val);
|
|
@@ -63,6 +77,7 @@ struct i2c_algo_pca_data {
|
|
* For PCA9665, use the frequency you want here. */
|
|
unsigned int i2c_clock;
|
|
unsigned int chip;
|
|
+ struct pca_i2c_bus_settings bus_settings;
|
|
};
|
|
|
|
int i2c_pca_add_bus(struct i2c_adapter *);
|
|
diff --git a/include/linux/usb.h b/include/linux/usb.h
|
|
index 55ea5d625cdf3..6ea595997df25 100644
|
|
--- a/include/linux/usb.h
|
|
+++ b/include/linux/usb.h
|
|
@@ -97,6 +97,41 @@ enum usb_interface_condition {
|
|
USB_INTERFACE_UNBINDING,
|
|
};
|
|
|
|
+int __must_check
|
|
+usb_find_common_endpoints(struct usb_host_interface *alt,
|
|
+ struct usb_endpoint_descriptor **bulk_in,
|
|
+ struct usb_endpoint_descriptor **bulk_out,
|
|
+ struct usb_endpoint_descriptor **int_in,
|
|
+ struct usb_endpoint_descriptor **int_out);
|
|
+
|
|
+static inline int __must_check
|
|
+usb_find_bulk_in_endpoint(struct usb_host_interface *alt,
|
|
+ struct usb_endpoint_descriptor **bulk_in)
|
|
+{
|
|
+ return usb_find_common_endpoints(alt, bulk_in, NULL, NULL, NULL);
|
|
+}
|
|
+
|
|
+static inline int __must_check
|
|
+usb_find_bulk_out_endpoint(struct usb_host_interface *alt,
|
|
+ struct usb_endpoint_descriptor **bulk_out)
|
|
+{
|
|
+ return usb_find_common_endpoints(alt, NULL, bulk_out, NULL, NULL);
|
|
+}
|
|
+
|
|
+static inline int __must_check
|
|
+usb_find_int_in_endpoint(struct usb_host_interface *alt,
|
|
+ struct usb_endpoint_descriptor **int_in)
|
|
+{
|
|
+ return usb_find_common_endpoints(alt, NULL, NULL, int_in, NULL);
|
|
+}
|
|
+
|
|
+static inline int __must_check
|
|
+usb_find_int_out_endpoint(struct usb_host_interface *alt,
|
|
+ struct usb_endpoint_descriptor **int_out)
|
|
+{
|
|
+ return usb_find_common_endpoints(alt, NULL, NULL, NULL, int_out);
|
|
+}
|
|
+
|
|
/**
|
|
* struct usb_interface - what usb device drivers talk to
|
|
* @altsetting: array of interface structures, one for each alternate
|
|
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c
|
|
index 46a18e72bce61..6d5ef6220afe7 100644
|
|
--- a/kernel/gcov/gcc_4_7.c
|
|
+++ b/kernel/gcov/gcc_4_7.c
|
|
@@ -18,7 +18,9 @@
|
|
#include <linux/vmalloc.h>
|
|
#include "gcov.h"
|
|
|
|
-#if (__GNUC__ >= 7)
|
|
+#if (__GNUC__ >= 10)
|
|
+#define GCOV_COUNTERS 8
|
|
+#elif (__GNUC__ >= 7)
|
|
#define GCOV_COUNTERS 9
|
|
#elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
|
|
#define GCOV_COUNTERS 10
|
|
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
|
|
index c89626b2afffb..696381a516341 100644
|
|
--- a/net/sunrpc/rpcb_clnt.c
|
|
+++ b/net/sunrpc/rpcb_clnt.c
|
|
@@ -977,8 +977,8 @@ static int rpcb_dec_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr,
|
|
p = xdr_inline_decode(xdr, len);
|
|
if (unlikely(p == NULL))
|
|
goto out_fail;
|
|
- dprintk("RPC: %5u RPCB_%s reply: %s\n", req->rq_task->tk_pid,
|
|
- req->rq_task->tk_msg.rpc_proc->p_name, (char *)p);
|
|
+ dprintk("RPC: %5u RPCB_%s reply: %*pE\n", req->rq_task->tk_pid,
|
|
+ req->rq_task->tk_msg.rpc_proc->p_name, len, (char *)p);
|
|
|
|
if (rpc_uaddr2sockaddr(req->rq_xprt->xprt_net, (char *)p, len,
|
|
sap, sizeof(address)) == 0)
|
|
diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c
|
|
index e361024eabb63..020ec48f39048 100644
|
|
--- a/sound/hda/hdac_device.c
|
|
+++ b/sound/hda/hdac_device.c
|
|
@@ -123,6 +123,8 @@ EXPORT_SYMBOL_GPL(snd_hdac_device_init);
|
|
void snd_hdac_device_exit(struct hdac_device *codec)
|
|
{
|
|
pm_runtime_put_noidle(&codec->dev);
|
|
+ /* keep balance of runtime PM child_count in parent device */
|
|
+ pm_runtime_set_suspended(&codec->dev);
|
|
snd_hdac_bus_remove_device(codec->bus, codec);
|
|
kfree(codec->vendor_name);
|
|
kfree(codec->chip_name);
|
|
diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c
|
|
index b776831ceeeac..4ca6d4dc86612 100644
|
|
--- a/tools/perf/tests/pmu.c
|
|
+++ b/tools/perf/tests/pmu.c
|
|
@@ -169,6 +169,7 @@ int test__pmu(void)
|
|
ret = 0;
|
|
} while (0);
|
|
|
|
+ perf_pmu__del_formats(&formats);
|
|
test_format_dir_put(format);
|
|
return ret;
|
|
}
|
|
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
|
|
index 5245fbd091067..8d99b6d9c36ae 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -921,6 +921,17 @@ void perf_pmu__set_format(unsigned long *bits, long from, long to)
|
|
set_bit(b, bits);
|
|
}
|
|
|
|
+void perf_pmu__del_formats(struct list_head *formats)
|
|
+{
|
|
+ struct perf_pmu_format *fmt, *tmp;
|
|
+
|
|
+ list_for_each_entry_safe(fmt, tmp, formats, list) {
|
|
+ list_del(&fmt->list);
|
|
+ free(fmt->name);
|
|
+ free(fmt);
|
|
+ }
|
|
+}
|
|
+
|
|
static int sub_non_neg(int a, int b)
|
|
{
|
|
if (b > a)
|
|
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
|
|
index 5d7e84466bee5..6789b1efc7d6e 100644
|
|
--- a/tools/perf/util/pmu.h
|
|
+++ b/tools/perf/util/pmu.h
|
|
@@ -66,6 +66,7 @@ int perf_pmu__new_format(struct list_head *list, char *name,
|
|
int config, unsigned long *bits);
|
|
void perf_pmu__set_format(unsigned long *bits, long from, long to);
|
|
int perf_pmu__format_parse(char *dir, struct list_head *head);
|
|
+void perf_pmu__del_formats(struct list_head *formats);
|
|
|
|
struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu);
|
|
|