* [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd()
@ 2015-09-17 8:45 Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] regmap: regcache-rbtree: Clean new present bits on present bitmap resize Jiri Slaby
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Bart Van Assche, Vasu Dev, James Bottomley, Jiri Slaby
From: Bart Van Assche <bart.vanassche@sandisk.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 8f2777f53e3d5ad8ef2a176a4463a5c8e1a16431 upstream.
Since fc_fcp_cleanup_cmd() can sleep this function must not
be called while holding a spinlock. This patch avoids that
fc_fcp_cleanup_each_cmd() triggers the following bug:
BUG: scheduling while atomic: sg_reset/1512/0x00000202
1 lock held by sg_reset/1512:
#0: (&(&fsp->scsi_pkt_lock)->rlock){+.-...}, at: [<ffffffffc0225cd5>] fc_fcp_cleanup_each_cmd.isra.21+0xa5/0x150 [libfc]
Preemption disabled at:[<ffffffffc0225cd5>] fc_fcp_cleanup_each_cmd.isra.21+0xa5/0x150 [libfc]
Call Trace:
[<ffffffff816c612c>] dump_stack+0x4f/0x7b
[<ffffffff810828bc>] __schedule_bug+0x6c/0xd0
[<ffffffff816c87aa>] __schedule+0x71a/0xa10
[<ffffffff816c8ad2>] schedule+0x32/0x80
[<ffffffffc0217eac>] fc_seq_set_resp+0xac/0x100 [libfc]
[<ffffffffc0218b11>] fc_exch_done+0x41/0x60 [libfc]
[<ffffffffc0225cff>] fc_fcp_cleanup_each_cmd.isra.21+0xcf/0x150 [libfc]
[<ffffffffc0225f43>] fc_eh_device_reset+0x1c3/0x270 [libfc]
[<ffffffff814a2cc9>] scsi_try_bus_device_reset+0x29/0x60
[<ffffffff814a3908>] scsi_ioctl_reset+0x258/0x2d0
[<ffffffff814a2650>] scsi_ioctl+0x150/0x440
[<ffffffff814b3a9d>] sd_ioctl+0xad/0x120
[<ffffffff8132f266>] blkdev_ioctl+0x1b6/0x810
[<ffffffff811da608>] block_ioctl+0x38/0x40
[<ffffffff811b4e08>] do_vfs_ioctl+0x2f8/0x530
[<ffffffff811b50c1>] SyS_ioctl+0x81/0xa0
[<ffffffff816cf8b2>] system_call_fastpath+0x16/0x7a
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Vasu Dev <vasu.dev@intel.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/scsi/libfc/fc_fcp.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 5fd0f1fbe586..5fec5db1e329 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -1039,11 +1039,26 @@ restart:
fc_fcp_pkt_hold(fsp);
spin_unlock_irqrestore(&si->scsi_queue_lock, flags);
- if (!fc_fcp_lock_pkt(fsp)) {
+ spin_lock_bh(&fsp->scsi_pkt_lock);
+ if (!(fsp->state & FC_SRB_COMPL)) {
+ fsp->state |= FC_SRB_COMPL;
+ /*
+ * TODO: dropping scsi_pkt_lock and then reacquiring
+ * again around fc_fcp_cleanup_cmd() is required,
+ * since fc_fcp_cleanup_cmd() calls into
+ * fc_seq_set_resp() and that func preempts cpu using
+ * schedule. May be schedule and related code should be
+ * removed instead of unlocking here to avoid scheduling
+ * while atomic bug.
+ */
+ spin_unlock_bh(&fsp->scsi_pkt_lock);
+
fc_fcp_cleanup_cmd(fsp, error);
+
+ spin_lock_bh(&fsp->scsi_pkt_lock);
fc_io_compl(fsp);
- fc_fcp_unlock_pkt(fsp);
}
+ spin_unlock_bh(&fsp->scsi_pkt_lock);
fc_fcp_pkt_release(fsp);
spin_lock_irqsave(&si->scsi_queue_lock, flags);
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] regmap: regcache-rbtree: Clean new present bits on present bitmap resize
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] crypto: caam - fix memory corruption in ahash_final_ctx Jiri Slaby
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Guenter Roeck, Mark Brown, Jiri Slaby
From: Guenter Roeck <linux@roeck-us.net>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 8ef9724bf9718af81cfc5132253372f79c71b7e2 upstream.
When inserting a new register into a block, the present bit map size is
increased using krealloc. krealloc does not clear the additionally
allocated memory, leaving it filled with random values. Result is that
some registers are considered cached even though this is not the case.
Fix the problem by clearing the additionally allocated memory. Also, if
the bitmap size does not increase, do not reallocate the bitmap at all
to reduce overhead.
Fixes: 3f4ff561bc88 ("regmap: rbtree: Make cache_present bitmap per node")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/base/regmap/regcache-rbtree.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 2b946bc4212d..f3f71369adc7 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -302,11 +302,20 @@ static int regcache_rbtree_insert_to_block(struct regmap *map,
if (!blk)
return -ENOMEM;
- present = krealloc(rbnode->cache_present,
- BITS_TO_LONGS(blklen) * sizeof(*present), GFP_KERNEL);
- if (!present) {
- kfree(blk);
- return -ENOMEM;
+ if (BITS_TO_LONGS(blklen) > BITS_TO_LONGS(rbnode->blklen)) {
+ present = krealloc(rbnode->cache_present,
+ BITS_TO_LONGS(blklen) * sizeof(*present),
+ GFP_KERNEL);
+ if (!present) {
+ kfree(blk);
+ return -ENOMEM;
+ }
+
+ memset(present + BITS_TO_LONGS(rbnode->blklen), 0,
+ (BITS_TO_LONGS(blklen) - BITS_TO_LONGS(rbnode->blklen))
+ * sizeof(*present));
+ } else {
+ present = rbnode->cache_present;
}
/* insert the register value in the correct place in the rbnode block */
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] crypto: caam - fix memory corruption in ahash_final_ctx
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] regmap: regcache-rbtree: Clean new present bits on present bitmap resize Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] arm64: KVM: Fix host crash when injecting a fault into a 32bit guest Jiri Slaby
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Horia Geant?, Herbert Xu, Jiri Slaby
From: Horia Geant? <horia.geanta@freescale.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit b310c178e6d897f82abb9da3af1cd7c02b09f592 upstream.
When doing pointer operation for accessing the HW S/G table,
a value representing number of entries (and not number of bytes)
must be used.
Fixes: 045e36780f115 ("crypto: caam - ahash hmac support")
Signed-off-by: Horia Geant? <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/crypto/caam/caamhash.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index af351f478b14..92d2116bf1ad 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -897,13 +897,14 @@ static int ahash_final_ctx(struct ahash_request *req)
state->buflen_1;
u32 *sh_desc = ctx->sh_desc_fin, *desc;
dma_addr_t ptr = ctx->sh_desc_fin_dma;
- int sec4_sg_bytes;
+ int sec4_sg_bytes, sec4_sg_src_index;
int digestsize = crypto_ahash_digestsize(ahash);
struct ahash_edesc *edesc;
int ret = 0;
int sh_len;
- sec4_sg_bytes = (1 + (buflen ? 1 : 0)) * sizeof(struct sec4_sg_entry);
+ sec4_sg_src_index = 1 + (buflen ? 1 : 0);
+ sec4_sg_bytes = sec4_sg_src_index * sizeof(struct sec4_sg_entry);
/* allocate space for base edesc and hw desc commands, link tables */
edesc = kmalloc(sizeof(struct ahash_edesc) + DESC_JOB_IO_LEN +
@@ -930,7 +931,7 @@ static int ahash_final_ctx(struct ahash_request *req)
state->buf_dma = try_buf_map_to_sec4_sg(jrdev, edesc->sec4_sg + 1,
buf, state->buf_dma, buflen,
last_buflen);
- (edesc->sec4_sg + sec4_sg_bytes - 1)->len |= SEC4_SG_LEN_FIN;
+ (edesc->sec4_sg + sec4_sg_src_index - 1)->len |= SEC4_SG_LEN_FIN;
append_seq_in_ptr(desc, edesc->sec4_sg_dma, ctx->ctx_len + buflen,
LDST_SGF);
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] arm64: KVM: Fix host crash when injecting a fault into a 32bit guest
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] regmap: regcache-rbtree: Clean new present bits on present bitmap resize Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] crypto: caam - fix memory corruption in ahash_final_ctx Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] DRM - radeon: Don't link train DisplayPort on HPD until we get the dpcd Jiri Slaby
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Marc Zyngier, Will Deacon, Jiri Slaby
From: Marc Zyngier <marc.zyngier@arm.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 126c69a0bd0e441bf6766a5d9bf20de011be9f68 upstream.
When injecting a fault into a misbehaving 32bit guest, it seems
rather idiotic to also inject a 64bit fault that is only going
to corrupt the guest state. This leads to a situation where we
perform an illegal exception return at EL2 causing the host
to crash instead of killing the guest.
Just fix the stupid bug that has been there from day 1.
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
arch/arm64/kvm/inject_fault.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
index 81a02a8762b0..86825f8883de 100644
--- a/arch/arm64/kvm/inject_fault.c
+++ b/arch/arm64/kvm/inject_fault.c
@@ -168,8 +168,8 @@ void kvm_inject_dabt(struct kvm_vcpu *vcpu, unsigned long addr)
{
if (!(vcpu->arch.hcr_el2 & HCR_RW))
inject_abt32(vcpu, false, addr);
-
- inject_abt64(vcpu, false, addr);
+ else
+ inject_abt64(vcpu, false, addr);
}
/**
@@ -184,8 +184,8 @@ void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr)
{
if (!(vcpu->arch.hcr_el2 & HCR_RW))
inject_abt32(vcpu, true, addr);
-
- inject_abt64(vcpu, true, addr);
+ else
+ inject_abt64(vcpu, true, addr);
}
/**
@@ -198,6 +198,6 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu)
{
if (!(vcpu->arch.hcr_el2 & HCR_RW))
inject_undef32(vcpu);
-
- inject_undef64(vcpu);
+ else
+ inject_undef64(vcpu);
}
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] DRM - radeon: Don't link train DisplayPort on HPD until we get the dpcd
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (2 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] arm64: KVM: Fix host crash when injecting a fault into a 32bit guest Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] drm/qxl: validate monitors config modes Jiri Slaby
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Stephen Chandler Paul, Alex Deucher, Jiri Slaby
From: Stephen Chandler Paul <cpaul@redhat.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 924f92bf12bfbef3662619e3ed24a1cea7c1cbcd upstream.
Most of the time this isn't an issue since hotplugging an adaptor will
trigger a crtc mode change which in turn, causes the driver to probe
every DisplayPort for a dpcd. However, in cases where hotplugging
doesn't cause a mode change (specifically when one unplugs a monitor
from a DisplayPort connector, then plugs that same monitor back in
seconds later on the same port without any other monitors connected), we
never probe for the dpcd before starting the initial link training. What
happens from there looks like this:
- GPU has only one monitor connected. It's connected via
DisplayPort, and does not go through an adaptor of any sort.
- User unplugs DisplayPort connector from GPU.
- Change in HPD is detected by the driver, we probe every
DisplayPort for a possible connection.
- Probe the port the user originally had the monitor connected
on for it's dpcd. This fails, and we clear the first (and only
the first) byte of the dpcd to indicate we no longer have a
dpcd for this port.
- User plugs the previously disconnected monitor back into the
same DisplayPort.
- radeon_connector_hotplug() is called before everyone else,
and tries to handle the link training. Since only the first
byte of the dpcd is zeroed, the driver is able to complete
link training but does so against the wrong dpcd, causing it
to initialize the link with the wrong settings.
- Display stays blank (usually), dpcd is probed after the
initial link training, and the driver prints no obvious
messages to the log.
In theory, since only one byte of the dpcd is chopped off (specifically,
the byte that contains the revision information for DisplayPort), it's
not entirely impossible that this bug may not show on certain monitors.
For instance, the only reason this bug was visible on my ASUS PB238
monitor was due to the fact that this monitor using the enhanced framing
symbol sequence, the flag for which is ignored if the radeon driver
thinks that the DisplayPort version is below 1.1.
Signed-off-by: Stephen Chandler Paul <cpaul@redhat.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/gpu/drm/radeon/radeon_connectors.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index fe90b3e28d88..02cd9585ff83 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -78,6 +78,11 @@ void radeon_connector_hotplug(struct drm_connector *connector)
if (!radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) {
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
} else if (radeon_dp_needs_link_train(radeon_connector)) {
+ /* Don't try to start link training before we
+ * have the dpcd */
+ if (!radeon_dp_getdpcd(radeon_connector))
+ return;
+
/* set it to OFF so that drm_helper_connector_dpms()
* won't return immediately since the current state
* is ON at this point.
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] drm/qxl: validate monitors config modes
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (3 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] DRM - radeon: Don't link train DisplayPort on HPD until we get the dpcd Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required Jiri Slaby
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Jonathon Jongsma, Dave Airlie, Jiri Slaby
From: Jonathon Jongsma <jjongsma@redhat.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit bd3e1c7c6de9f5f70d97cdb6c817151c0477c5e3 upstream.
Due to some recent changes in
drm_helper_probe_single_connector_modes_merge_bits(), old custom modes
were not being pruned properly. In current kernels,
drm_mode_validate_basic() is called to sanity-check each mode in the
list. If the sanity-check passes, the mode's status gets set to to
MODE_OK. In older kernels this check was not done, so old custom modes
would still have a status of MODE_UNVERIFIED at this point, and would
therefore be pruned later in the function.
As a result of this new behavior, the list of modes for a device always
includes every custom mode ever configured for the device, with the
largest one listed first. Since desktop environments usually choose the
first preferred mode when a hotplug event is emitted, this had the
result of making it very difficult for the user to reduce the size of
the display.
The qxl driver did implement the mode_valid connector function, but it
was empty. In order to restore the old behavior where old custom modes
are pruned, we implement a proper mode_valid function for the qxl
driver. This function now checks each mode against the last configured
custom mode and the list of standard modes. If the mode doesn't match
any of these, its status is set to MODE_BAD so that it will be pruned as
expected.
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/gpu/drm/qxl/qxl_display.c | 66 ++++++++++++++++++++++++---------------
drivers/gpu/drm/qxl/qxl_drv.h | 2 ++
2 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 5f79e511c2a6..ea0904875c74 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -127,37 +127,40 @@ static int qxl_add_monitors_config_modes(struct drm_connector *connector)
false);
mode->type |= DRM_MODE_TYPE_PREFERRED;
drm_mode_probed_add(connector, mode);
+ /* remember the last custom size for mode validation */
+ qdev->monitors_config_width = mode->hdisplay;
+ qdev->monitors_config_height = mode->vdisplay;
return 1;
}
+static struct mode_size {
+ int w;
+ int h;
+} common_modes[] = {
+ { 640, 480},
+ { 720, 480},
+ { 800, 600},
+ { 848, 480},
+ {1024, 768},
+ {1152, 768},
+ {1280, 720},
+ {1280, 800},
+ {1280, 854},
+ {1280, 960},
+ {1280, 1024},
+ {1440, 900},
+ {1400, 1050},
+ {1680, 1050},
+ {1600, 1200},
+ {1920, 1080},
+ {1920, 1200}
+};
+
static int qxl_add_common_modes(struct drm_connector *connector)
{
struct drm_device *dev = connector->dev;
struct drm_display_mode *mode = NULL;
int i;
- struct mode_size {
- int w;
- int h;
- } common_modes[] = {
- { 640, 480},
- { 720, 480},
- { 800, 600},
- { 848, 480},
- {1024, 768},
- {1152, 768},
- {1280, 720},
- {1280, 800},
- {1280, 854},
- {1280, 960},
- {1280, 1024},
- {1440, 900},
- {1400, 1050},
- {1680, 1050},
- {1600, 1200},
- {1920, 1080},
- {1920, 1200}
- };
-
for (i = 0; i < ARRAY_SIZE(common_modes); i++) {
if (common_modes[i].w < 320 || common_modes[i].h < 200)
continue;
@@ -736,11 +739,22 @@ static int qxl_conn_get_modes(struct drm_connector *connector)
static int qxl_conn_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode)
{
+ struct drm_device *ddev = connector->dev;
+ struct qxl_device *qdev = ddev->dev_private;
+ int i;
+
/* TODO: is this called for user defined modes? (xrandr --add-mode)
* TODO: check that the mode fits in the framebuffer */
- DRM_DEBUG("%s: %dx%d status=%d\n", mode->name, mode->hdisplay,
- mode->vdisplay, mode->status);
- return MODE_OK;
+
+ if(qdev->monitors_config_width == mode->hdisplay &&
+ qdev->monitors_config_height == mode->vdisplay)
+ return MODE_OK;
+
+ for (i = 0; i < ARRAY_SIZE(common_modes); i++) {
+ if (common_modes[i].w == mode->hdisplay && common_modes[i].h == mode->vdisplay)
+ return MODE_OK;
+ }
+ return MODE_BAD;
}
static struct drm_encoder *qxl_best_encoder(struct drm_connector *connector)
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index f7c9adde46a0..9cfafd7a1af6 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -323,6 +323,8 @@ struct qxl_device {
struct work_struct gc_work;
struct work_struct fb_work;
+ int monitors_config_width;
+ int monitors_config_height;
};
/* forward declaration for QXL_INFO_IO */
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (4 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] drm/qxl: validate monitors config modes Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: Add inverse unit conversion macros Jiri Slaby
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Markus Pargmann, Jonathan Cameron, Jiri Slaby
From: Markus Pargmann <mpa@pengutronix.de>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 06d2f6ca5a38abe92f1f3a132b331eee773868c3 upstream.
This patch adds selects for IIO_BUFFER and IIO_TRIGGERED_BUFFER. Without
IIO_BUFFER, the driver does not compile.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/iio/gyro/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig
index ac2d69e34c8c..6f64c5cc5387 100644
--- a/drivers/iio/gyro/Kconfig
+++ b/drivers/iio/gyro/Kconfig
@@ -93,7 +93,8 @@ config IIO_ST_GYRO_SPI_3AXIS
config ITG3200
tristate "InvenSense ITG3200 Digital 3-Axis Gyroscope I2C driver"
depends on I2C
- select IIO_TRIGGERED_BUFFER if IIO_BUFFER
+ select IIO_BUFFER
+ select IIO_TRIGGERED_BUFFER
help
Say yes here to add support for the InvenSense ITG3200 digital
3-axis gyroscope sensor.
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] iio: Add inverse unit conversion macros
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (5 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: adis16480: Fix scale factors Jiri Slaby
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Lars-Peter Clausen, Jonathan Cameron, Jiri Slaby
From: Lars-Peter Clausen <lars@metafoo.de>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit c689a923c867eac40ed3826c1d9328edea8b6bc7 upstream.
Add inverse unit conversion macro to convert from standard IIO units to
units that might be used by some devices.
Those are useful in combination with scale factors that are specified as
IIO_VAL_FRACTIONAL. Typically the denominator for those specifications will
contain the maximum raw value the sensor will generate and the numerator
the value it maps to in a specific unit. Sometimes datasheets specify those
in different units than the standard IIO units (e.g. degree/s instead of
rad/s) and so we need to do a unit conversion.
>From a mathematical point of view it does not make a difference whether we
apply the unit conversion to the numerator or the inverse unit conversion
to the denominator since (x / y) / z = x / (y * z). But as the denominator
is typically a larger value and we are rounding both the numerator and
denominator to integer values using the later method gives us a better
precision (E.g. the relative error is smaller if we round 8000.3 to 8000
rather than rounding 8.3 to 8).
This is where in inverse unit conversion macros will be used.
Marked for stable as used by some upcoming fixes.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
include/linux/iio/iio.h | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 2103cc32a5fb..e94d165a1053 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -623,6 +623,15 @@ int iio_str_to_fixpoint(const char *str, int fract_mult, int *integer,
#define IIO_DEGREE_TO_RAD(deg) (((deg) * 314159ULL + 9000000ULL) / 18000000ULL)
/**
+ * IIO_RAD_TO_DEGREE() - Convert rad to degree
+ * @rad: A value in rad
+ *
+ * Returns the given value converted from rad to degree
+ */
+#define IIO_RAD_TO_DEGREE(rad) \
+ (((rad) * 18000000ULL + 314159ULL / 2) / 314159ULL)
+
+/**
* IIO_G_TO_M_S_2() - Convert g to meter / second**2
* @g: A value in g
*
@@ -630,4 +639,12 @@ int iio_str_to_fixpoint(const char *str, int fract_mult, int *integer,
*/
#define IIO_G_TO_M_S_2(g) ((g) * 980665ULL / 100000ULL)
+/**
+ * IIO_M_S_2_TO_G() - Convert meter / second**2 to g
+ * @ms2: A value in meter / second**2
+ *
+ * Returns the given value converted from meter / second**2 to g
+ */
+#define IIO_M_S_2_TO_G(ms2) (((ms2) * 100000ULL + 980665ULL / 2) / 980665ULL)
+
#endif /* _INDUSTRIAL_IO_H_ */
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] iio: adis16480: Fix scale factors
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (6 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: Add inverse unit conversion macros Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] clk: versatile: off by one in clk_sp810_timerclken_of_get() Jiri Slaby
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Lars-Peter Clausen, Jonathan Cameron, Jiri Slaby
From: Lars-Peter Clausen <lars@metafoo.de>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 7abad1063deb0f77d275c61f58863ec319c58c5c upstream.
The different devices support by the adis16480 driver have slightly
different scales for the gyroscope and accelerometer channels.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/iio/imu/adis16480.c | 39 +++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index dd4206cac62d..5e1b117d4e3b 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -110,6 +110,10 @@
struct adis16480_chip_info {
unsigned int num_channels;
const struct iio_chan_spec *channels;
+ unsigned int gyro_max_val;
+ unsigned int gyro_max_scale;
+ unsigned int accel_max_val;
+ unsigned int accel_max_scale;
};
struct adis16480 {
@@ -533,19 +537,21 @@ static int adis16480_set_filter_freq(struct iio_dev *indio_dev,
static int adis16480_read_raw(struct iio_dev *indio_dev,
const struct iio_chan_spec *chan, int *val, int *val2, long info)
{
+ struct adis16480 *st = iio_priv(indio_dev);
+
switch (info) {
case IIO_CHAN_INFO_RAW:
return adis_single_conversion(indio_dev, chan, 0, val);
case IIO_CHAN_INFO_SCALE:
switch (chan->type) {
case IIO_ANGL_VEL:
- *val = 0;
- *val2 = IIO_DEGREE_TO_RAD(20000); /* 0.02 degree/sec */
- return IIO_VAL_INT_PLUS_MICRO;
+ *val = st->chip_info->gyro_max_scale;
+ *val2 = st->chip_info->gyro_max_val;
+ return IIO_VAL_FRACTIONAL;
case IIO_ACCEL:
- *val = 0;
- *val2 = IIO_G_TO_M_S_2(800); /* 0.8 mg */
- return IIO_VAL_INT_PLUS_MICRO;
+ *val = st->chip_info->accel_max_scale;
+ *val2 = st->chip_info->accel_max_val;
+ return IIO_VAL_FRACTIONAL;
case IIO_MAGN:
*val = 0;
*val2 = 100; /* 0.0001 gauss */
@@ -702,18 +708,39 @@ static const struct adis16480_chip_info adis16480_chip_info[] = {
[ADIS16375] = {
.channels = adis16485_channels,
.num_channels = ARRAY_SIZE(adis16485_channels),
+ /*
+ * storing the value in rad/degree and the scale in degree
+ * gives us the result in rad and better precession than
+ * storing the scale directly in rad.
+ */
+ .gyro_max_val = IIO_RAD_TO_DEGREE(22887),
+ .gyro_max_scale = 300,
+ .accel_max_val = IIO_M_S_2_TO_G(21973),
+ .accel_max_scale = 18,
},
[ADIS16480] = {
.channels = adis16480_channels,
.num_channels = ARRAY_SIZE(adis16480_channels),
+ .gyro_max_val = IIO_RAD_TO_DEGREE(22500),
+ .gyro_max_scale = 450,
+ .accel_max_val = IIO_M_S_2_TO_G(12500),
+ .accel_max_scale = 5,
},
[ADIS16485] = {
.channels = adis16485_channels,
.num_channels = ARRAY_SIZE(adis16485_channels),
+ .gyro_max_val = IIO_RAD_TO_DEGREE(22500),
+ .gyro_max_scale = 450,
+ .accel_max_val = IIO_M_S_2_TO_G(20000),
+ .accel_max_scale = 5,
},
[ADIS16488] = {
.channels = adis16480_channels,
.num_channels = ARRAY_SIZE(adis16480_channels),
+ .gyro_max_val = IIO_RAD_TO_DEGREE(22500),
+ .gyro_max_scale = 450,
+ .accel_max_val = IIO_M_S_2_TO_G(22500),
+ .accel_max_scale = 18,
},
};
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] clk: versatile: off by one in clk_sp810_timerclken_of_get()
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (7 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: adis16480: Fix scale factors Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] PCI: Fix TI816X class code quirk Jiri Slaby
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Dan Carpenter, Stephen Boyd, Jiri Slaby
From: Dan Carpenter <dan.carpenter@oracle.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 3294bee87091be5f179474f6c39d1d87769635e2 upstream.
The ">" should be ">=" or we end up reading beyond the end of the array.
Fixes: 6e973d2c4385 ('clk: vexpress: Add separate SP810 driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/clk/versatile/clk-sp810.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/versatile/clk-sp810.c b/drivers/clk/versatile/clk-sp810.c
index bf9b15a585e1..b9e05bde0c06 100644
--- a/drivers/clk/versatile/clk-sp810.c
+++ b/drivers/clk/versatile/clk-sp810.c
@@ -128,8 +128,8 @@ struct clk *clk_sp810_timerclken_of_get(struct of_phandle_args *clkspec,
{
struct clk_sp810 *sp810 = data;
- if (WARN_ON(clkspec->args_count != 1 || clkspec->args[0] >
- ARRAY_SIZE(sp810->timerclken)))
+ if (WARN_ON(clkspec->args_count != 1 ||
+ clkspec->args[0] >= ARRAY_SIZE(sp810->timerclken)))
return NULL;
return sp810->timerclken[clkspec->args[0]].clk;
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] PCI: Fix TI816X class code quirk
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (8 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] clk: versatile: off by one in clk_sp810_timerclken_of_get() Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] USB: symbolserial: Use usb_get_serial_port_data Jiri Slaby
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Bjorn Helgaas, Hemant Pedanekar, Jiri Slaby
From: Bjorn Helgaas <bhelgaas@google.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit d1541dc977d376406f4584d8eb055488655c98ec upstream.
In fixup_ti816x_class(), we assigned "class = PCI_CLASS_MULTIMEDIA_VIDEO".
But PCI_CLASS_MULTIMEDIA_VIDEO is only the two-byte base class/sub-class
and needs to be shifted to make space for the low-order interface byte.
Shift PCI_CLASS_MULTIMEDIA_VIDEO to set the correct class code.
Fixes: 63c4408074cb ("PCI: Add quirk for setting valid class for TI816X Endpoint")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Hemant Pedanekar <hemantp@ti.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/pci/quirks.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 877bfbb4e55c..eee40430b0b0 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2803,12 +2803,15 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors);
static void fixup_ti816x_class(struct pci_dev *dev)
{
+ u32 class = dev->class;
+
/* TI 816x devices do not have class code set when in PCIe boot mode */
- dev_info(&dev->dev, "Setting PCI class for 816x PCIe device\n");
- dev->class = PCI_CLASS_MULTIMEDIA_VIDEO;
+ dev->class = PCI_CLASS_MULTIMEDIA_VIDEO << 8;
+ dev_info(&dev->dev, "PCI class overridden (%#08x -> %#08x)\n",
+ class, dev->class);
}
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_TI, 0xb800,
- PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class);
+ PCI_CLASS_NOT_DEFINED, 0, fixup_ti816x_class);
/* Some PCIe devices do not work reliably with the claimed maximum
* payload size supported.
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] USB: symbolserial: Use usb_get_serial_port_data
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (9 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] PCI: Fix TI816X class code quirk Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] USB: ftdi_sio: Added custom PID for CustomWare products Jiri Slaby
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Philipp Hachtmann, Jiri Slaby
From: Philipp Hachtmann <hachti@hachti.de>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 951d3793bbfc0a441d791d820183aa3085c83ea9 upstream.
The driver used usb_get_serial_data(port->serial) which compiled but resulted
in a NULL pointer being returned (and subsequently used). I did not go deeper
into this but I guess this is a regression.
Signed-off-by: Philipp Hachtmann <hachti@hachti.de>
Fixes: a85796ee5149 ("USB: symbolserial: move private-data allocation to
port_probe")
Acked-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/usb/serial/symbolserial.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 9b1648945e7a..1e2d86d4f539 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -97,7 +97,7 @@ exit:
static int symbol_open(struct tty_struct *tty, struct usb_serial_port *port)
{
- struct symbol_private *priv = usb_get_serial_data(port->serial);
+ struct symbol_private *priv = usb_get_serial_port_data(port);
unsigned long flags;
int result = 0;
@@ -123,7 +123,7 @@ static void symbol_close(struct usb_serial_port *port)
static void symbol_throttle(struct tty_struct *tty)
{
struct usb_serial_port *port = tty->driver_data;
- struct symbol_private *priv = usb_get_serial_data(port->serial);
+ struct symbol_private *priv = usb_get_serial_port_data(port);
spin_lock_irq(&priv->lock);
priv->throttled = true;
@@ -133,7 +133,7 @@ static void symbol_throttle(struct tty_struct *tty)
static void symbol_unthrottle(struct tty_struct *tty)
{
struct usb_serial_port *port = tty->driver_data;
- struct symbol_private *priv = usb_get_serial_data(port->serial);
+ struct symbol_private *priv = usb_get_serial_port_data(port);
int result;
bool was_throttled;
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] USB: ftdi_sio: Added custom PID for CustomWare products
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (10 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] USB: symbolserial: Use usb_get_serial_port_data Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] usb: dwc3: ep0: Fix mem corruption on OUT transfers of more than 512 bytes Jiri Slaby
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Matthijs Kooijman, Johan Hovold, Jiri Slaby
From: Matthijs Kooijman <matthijs@stdin.nl>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 1fb8dc36384ae1140ee6ccc470de74397606a9d5 upstream.
CustomWare uses the FTDI VID with custom PIDs for their ShipModul MiniPlex
products.
Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/usb/serial/ftdi_sio.c | 4 ++++
drivers/usb/serial/ftdi_sio_ids.h | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 75260b2ee420..beb96e997951 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -619,6 +619,10 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2WI_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX3_PID) },
/*
* ELV devices:
*/
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 792e054126de..2943b97b2a83 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -568,6 +568,14 @@
*/
#define FTDI_SYNAPSE_SS200_PID 0x9090 /* SS200 - SNAP Stick 200 */
+/*
+ * CustomWare / ShipModul NMEA multiplexers product ids (FTDI_VID)
+ */
+#define FTDI_CUSTOMWARE_MINIPLEX_PID 0xfd48 /* MiniPlex first generation NMEA Multiplexer */
+#define FTDI_CUSTOMWARE_MINIPLEX2_PID 0xfd49 /* MiniPlex-USB and MiniPlex-2 series */
+#define FTDI_CUSTOMWARE_MINIPLEX2WI_PID 0xfd4a /* MiniPlex-2Wi */
+#define FTDI_CUSTOMWARE_MINIPLEX3_PID 0xfd4b /* MiniPlex-3 series */
+
/********************************/
/** third-party VID/PID combos **/
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] usb: dwc3: ep0: Fix mem corruption on OUT transfers of more than 512 bytes
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (11 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] USB: ftdi_sio: Added custom PID for CustomWare products Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] usb: host: ehci-sys: delete useless bus_to_hcd conversion Jiri Slaby
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Kishon Vijay Abraham I, Felipe Balbi, Jiri Slaby
From: Kishon Vijay Abraham I <kishon@ti.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit b2fb5b1a0f50d3ebc12342c8d8dead245e9c9d4e upstream.
DWC3 uses bounce buffer to handle non max packet aligned OUT transfers and
the size of bounce buffer is 512 bytes. However if the host initiates OUT
transfers of size more than 512 bytes (and non max packet aligned), the
driver throws a WARN dump but still programs the TRB to receive more than
512 bytes. This will cause bounce buffer to overflow and corrupt the
adjacent memory locations which can be fatal.
Fix it by programming the TRB to receive a maximum of DWC3_EP0_BOUNCE_SIZE
(512) bytes.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/usb/dwc3/ep0.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 657c51cf2109..fb78796b0c26 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -793,6 +793,11 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
unsigned maxp = ep0->endpoint.maxpacket;
transfer_size += (maxp - (transfer_size % maxp));
+
+ /* Maximum of DWC3_EP0_BOUNCE_SIZE can only be received */
+ if (transfer_size > DWC3_EP0_BOUNCE_SIZE)
+ transfer_size = DWC3_EP0_BOUNCE_SIZE;
+
transferred = min_t(u32, ur->length,
transfer_size - length);
memcpy(ur->buf, dwc->ep0_bounce, transferred);
@@ -905,11 +910,14 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
return;
}
- WARN_ON(req->request.length > DWC3_EP0_BOUNCE_SIZE);
-
maxpacket = dep->endpoint.maxpacket;
transfer_size = roundup(req->request.length, maxpacket);
+ if (transfer_size > DWC3_EP0_BOUNCE_SIZE) {
+ dev_WARN(dwc->dev, "bounce buf can't handle req len\n");
+ transfer_size = DWC3_EP0_BOUNCE_SIZE;
+ }
+
dwc->ep0_bounced = true;
/*
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] usb: host: ehci-sys: delete useless bus_to_hcd conversion
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (12 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] usb: dwc3: ep0: Fix mem corruption on OUT transfers of more than 512 bytes Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] serial: 8250: don't bind to SMSC IrCC IR port Jiri Slaby
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Peter Chen, Jiri Slaby
From: Peter Chen <peter.chen@freescale.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 0521cfd06e1ebcd575e7ae36aab068b38df23850 upstream.
The ehci platform device's drvdata is the pointer of struct usb_hcd
already, so we doesn't need to call bus_to_hcd conversion again.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/usb/host/ehci-sysfs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c
index 14ced00ba220..0659024290af 100644
--- a/drivers/usb/host/ehci-sysfs.c
+++ b/drivers/usb/host/ehci-sysfs.c
@@ -29,7 +29,7 @@ static ssize_t show_companion(struct device *dev,
int count = PAGE_SIZE;
char *ptr = buf;
- ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));
+ ehci = hcd_to_ehci(dev_get_drvdata(dev));
nports = HCS_N_PORTS(ehci->hcs_params);
for (index = 0; index < nports; ++index) {
@@ -54,7 +54,7 @@ static ssize_t store_companion(struct device *dev,
struct ehci_hcd *ehci;
int portnum, new_owner;
- ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));
+ ehci = hcd_to_ehci(dev_get_drvdata(dev));
new_owner = PORT_OWNER; /* Owned by companion */
if (sscanf(buf, "%d", &portnum) != 1)
return -EINVAL;
@@ -85,7 +85,7 @@ static ssize_t show_uframe_periodic_max(struct device *dev,
struct ehci_hcd *ehci;
int n;
- ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));
+ ehci = hcd_to_ehci(dev_get_drvdata(dev));
n = scnprintf(buf, PAGE_SIZE, "%d\n", ehci->uframe_periodic_max);
return n;
}
@@ -102,7 +102,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
unsigned long flags;
ssize_t ret;
- ehci = hcd_to_ehci(bus_to_hcd(dev_get_drvdata(dev)));
+ ehci = hcd_to_ehci(dev_get_drvdata(dev));
if (kstrtouint(buf, 0, &uframe_periodic_max) < 0)
return -EINVAL;
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] serial: 8250: don't bind to SMSC IrCC IR port
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (13 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] usb: host: ehci-sys: delete useless bus_to_hcd conversion Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] crypto: ghash-clmulni: specify context size for ghash async algorithm Jiri Slaby
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Maciej S. Szmigiero, Jiri Slaby
From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit ffa34de03bcfbfa88d8352942bc238bb48e94e2d upstream.
SMSC IrCC SIR/FIR port should not be bound to by
(legacy) serial driver so its own driver (smsc-ircc2)
can bind to it.
Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/serial/8250/8250_pnp.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index 35d9ab95c5cb..91b14202b90b 100644
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
@@ -365,6 +365,11 @@ static const struct pnp_device_id pnp_dev_table[] = {
/* Winbond CIR port, should not be probed. We should keep track
of it to prevent the legacy serial driver from probing it */
{ "WEC1022", CIR_PORT },
+ /*
+ * SMSC IrCC SIR/FIR port, should not be probed by serial driver
+ * as well so its own driver can bind to it.
+ */
+ { "SMCF010", CIR_PORT },
{ "", 0 }
};
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] crypto: ghash-clmulni: specify context size for ghash async algorithm
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (14 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] serial: 8250: don't bind to SMSC IrCC IR port Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] KVM: MMU: fix validation of mmio page fault Jiri Slaby
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Andrey Ryabinin, Herbert Xu, Jiri Slaby
From: Andrey Ryabinin <aryabinin@odin.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 71c6da846be478a61556717ef1ee1cea91f5d6a8 upstream.
Currently context size (cra_ctxsize) doesn't specified for
ghash_async_alg. Which means it's zero. Thus crypto_create_tfm()
doesn't allocate needed space for ghash_async_ctx, so any
read/write to ctx (e.g. in ghash_async_init_tfm()) is not valid.
Signed-off-by: Andrey Ryabinin <aryabinin@odin.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
arch/x86/crypto/ghash-clmulni-intel_glue.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c
index a8d6f69f92a3..4bcf841e4701 100644
--- a/arch/x86/crypto/ghash-clmulni-intel_glue.c
+++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c
@@ -291,6 +291,7 @@ static struct ahash_alg ghash_async_alg = {
.cra_name = "ghash",
.cra_driver_name = "ghash-clmulni",
.cra_priority = 400,
+ .cra_ctxsize = sizeof(struct ghash_async_ctx),
.cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_ASYNC,
.cra_blocksize = GHASH_BLOCK_SIZE,
.cra_type = &crypto_ahash_type,
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (15 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] crypto: ghash-clmulni: specify context size for ghash async algorithm Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] KVM: MMU: fix validation of mmio page fault Jiri Slaby
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Don Zickus, Jiri Kosina, Jiri Slaby
From: Don Zickus <dzickus@redhat.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 3af4e5a95184d6d3c1c6a065f163faa174a96a1d upstream.
It was reported that after 10-20 reboots, a usb keyboard plugged
into a docking station would not work unless it was replugged in.
Using usbmon, it turns out the interrupt URBs were streaming with
callback errors of -71 for some reason. The hid-core.c::hid_io_error was
supposed to retry and then reset, but the reset wasn't really happening.
The check for HID_NO_BANDWIDTH was inverted. Fix was simple.
Tested by reporter and locally by me by unplugging a keyboard halfway until I
could recreate a stream of errors but no disconnect.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/hid/usbhid/hid-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index bcc3193d297c..f44be51e261d 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -180,7 +180,7 @@ static void hid_io_error(struct hid_device *hid)
if (time_after(jiffies, usbhid->stop_retry)) {
/* Retries failed, so do a port reset unless we lack bandwidth*/
- if (test_bit(HID_NO_BANDWIDTH, &usbhid->iofl)
+ if (!test_bit(HID_NO_BANDWIDTH, &usbhid->iofl)
&& !test_and_set_bit(HID_RESET_PENDING, &usbhid->iofl)) {
schedule_work(&usbhid->reset_work);
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [patch added to the 3.12 stable tree] KVM: MMU: fix validation of mmio page fault
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
` (16 preceding siblings ...)
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error Jiri Slaby
@ 2015-09-17 8:45 ` Jiri Slaby
17 siblings, 0 replies; 19+ messages in thread
From: Jiri Slaby @ 2015-09-17 8:45 UTC (permalink / raw
To: stable; +Cc: Xiao Guangrong, Paolo Bonzini, Jiri Slaby
From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 6f691251c0350ac52a007c54bf3ef62e9d8cdc5e upstream.
We got the bug that qemu complained with "KVM: unknown exit, hardware
reason 31" and KVM shown these info:
[84245.284948] EPT: Misconfiguration.
[84245.285056] EPT: GPA: 0xfeda848
[84245.285154] ept_misconfig_inspect_spte: spte 0x5eaef50107 level 4
[84245.285344] ept_misconfig_inspect_spte: spte 0x5f5fadc107 level 3
[84245.285532] ept_misconfig_inspect_spte: spte 0x5141d18107 level 2
[84245.285723] ept_misconfig_inspect_spte: spte 0x52e40dad77 level 1
This is because we got a mmio #PF and the handler see the mmio spte becomes
normal (points to the ram page)
However, this is valid after introducing fast mmio spte invalidation which
increases the generation-number instead of zapping mmio sptes, a example
is as follows:
1. QEMU drops mmio region by adding a new memslot
2. invalidate all mmio sptes
3.
VCPU 0 VCPU 1
access the invalid mmio spte
access the region originally was MMIO before
set the spte to the normal ram map
mmio #PF
check the spte and see it becomes normal ram mapping !!!
This patch fixes the bug just by dropping the check in mmio handler, it's
good for backport. Full check will be introduced in later patches
Reported-by: Pavel Shirshov <ru.pchel@gmail.com>
Tested-by: Pavel Shirshov <ru.pchel@gmail.com>
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
arch/x86/kvm/mmu.c | 45 ---------------------------------------------
1 file changed, 45 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index b759853d78fe..caff13e0c993 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -381,12 +381,6 @@ static u64 __get_spte_lockless(u64 *sptep)
{
return ACCESS_ONCE(*sptep);
}
-
-static bool __check_direct_spte_mmio_pf(u64 spte)
-{
- /* It is valid if the spte is zapped. */
- return spte == 0ull;
-}
#else
union split_spte {
struct {
@@ -502,23 +496,6 @@ retry:
return spte.spte;
}
-
-static bool __check_direct_spte_mmio_pf(u64 spte)
-{
- union split_spte sspte = (union split_spte)spte;
- u32 high_mmio_mask = shadow_mmio_mask >> 32;
-
- /* It is valid if the spte is zapped. */
- if (spte == 0ull)
- return true;
-
- /* It is valid if the spte is being zapped. */
- if (sspte.spte_low == 0ull &&
- (sspte.spte_high & high_mmio_mask) == high_mmio_mask)
- return true;
-
- return false;
-}
#endif
static bool spte_is_locklessly_modifiable(u64 spte)
@@ -3219,21 +3196,6 @@ static bool quickly_check_mmio_pf(struct kvm_vcpu *vcpu, u64 addr, bool direct)
return vcpu_match_mmio_gva(vcpu, addr);
}
-
-/*
- * On direct hosts, the last spte is only allows two states
- * for mmio page fault:
- * - It is the mmio spte
- * - It is zapped or it is being zapped.
- *
- * This function completely checks the spte when the last spte
- * is not the mmio spte.
- */
-static bool check_direct_spte_mmio_pf(u64 spte)
-{
- return __check_direct_spte_mmio_pf(spte);
-}
-
static u64 walk_shadow_page_get_mmio_spte(struct kvm_vcpu *vcpu, u64 addr)
{
struct kvm_shadow_walk_iterator iterator;
@@ -3276,13 +3238,6 @@ int handle_mmio_page_fault_common(struct kvm_vcpu *vcpu, u64 addr, bool direct)
}
/*
- * It's ok if the gva is remapped by other cpus on shadow guest,
- * it's a BUG if the gfn is not a mmio page.
- */
- if (direct && !check_direct_spte_mmio_pf(spte))
- return RET_MMIO_PF_BUG;
-
- /*
* If the page table is zapped by other cpus, let CPU fault again on
* the address.
*/
--
2.5.2
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2015-09-17 8:46 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-17 8:45 [patch added to the 3.12 stable tree] libfc: Fix fc_fcp_cleanup_each_cmd() Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] regmap: regcache-rbtree: Clean new present bits on present bitmap resize Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] crypto: caam - fix memory corruption in ahash_final_ctx Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] arm64: KVM: Fix host crash when injecting a fault into a 32bit guest Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] DRM - radeon: Don't link train DisplayPort on HPD until we get the dpcd Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] drm/qxl: validate monitors config modes Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: Add inverse unit conversion macros Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] iio: adis16480: Fix scale factors Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] clk: versatile: off by one in clk_sp810_timerclken_of_get() Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] PCI: Fix TI816X class code quirk Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] USB: symbolserial: Use usb_get_serial_port_data Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] USB: ftdi_sio: Added custom PID for CustomWare products Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] usb: dwc3: ep0: Fix mem corruption on OUT transfers of more than 512 bytes Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] usb: host: ehci-sys: delete useless bus_to_hcd conversion Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] serial: 8250: don't bind to SMSC IrCC IR port Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] crypto: ghash-clmulni: specify context size for ghash async algorithm Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error Jiri Slaby
2015-09-17 8:45 ` [patch added to the 3.12 stable tree] KVM: MMU: fix validation of mmio page fault Jiri Slaby
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.