Jarkko Sakkinen
399235dc6e
tpm, tpm_tis: fix tpm_tis ACPI detection issue with TPM 2.0 ...
Both for FIFO and CRB interface TCG has decided to use the same HID
MSFT0101. They can be differentiated by looking at the start method from
TPM2 ACPI table. This patches makes necessary fixes to tpm_tis and
tpm_crb modules in order to correctly detect, which module should be
used.
For MSFT0101 we must use struct acpi_driver because struct pnp_driver
has a 7 character limitation.
It turned out that the root cause in b371616b8https://bugzilla.kernel.org/show_bug.cgi?id=98181 .
v2:
* One fixup was missing from v1: is_tpm2_fifo -> is_fifo
v3:
* Use pnp_driver for existing HIDs and acpi_driver only for MSFT0101 in
order ensure backwards compatibility.
v4:
* Check for FIFO before doing *anything* in crb_acpi_add().
* There was return immediately after acpi_bus_unregister_driver() in
cleanup_tis(). This caused pnp_unregister_driver() not to be called.
Cc: stable@kernel.org
Reported-by: Michael Saunders <mick.saunders@gmail.com>
Reported-by: Michael Marley <michael@michaelmarley.com>
Reported-by: Jethro Beekman <kernel@jbeekman.nl>
Reported-by: Matthew Garrett <mjg59@srcf.ucam.org>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Michael Marley <michael@michaelmarley.com>
Tested-by: Mimi Zohar <zohar@linux.vnet.ibm.com> (on TPM 1.2)
Reviewed-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
2015-10-19 01:01:14 +02:00
Merge branch 'acpi-ec'
2015-10-01 22:30:35 +02:00
mm: mark most vm_operations_struct const
2015-09-10 13:29:01 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-09-03 16:55:55 -07:00
solos-pci: Increase headroom on received packets
2015-09-17 21:29:07 -07:00
Merge branches 'pm-cpuidle', 'pm-opp' and 'pm-tools'
2015-10-01 22:30:47 +02:00
blk-mq: fix racy updates of rq->errors
2015-10-01 10:10:55 +02:00
Bluetooth: hci_bcm: Fix crash on suspend
2015-08-28 21:09:14 +02:00
regmap: Changes for v4.3
2015-09-08 16:48:55 -07:00
tpm, tpm_tis: fix tpm_tis ACPI detection issue with TPM 2.0
2015-10-19 01:01:14 +02:00
A few driver fixes for tegra, rockchip, and st SoCs and a two-liner
2015-09-19 20:17:40 -07:00
clocksource/drivers/keystone: Fix bad NO_IRQ usage
2015-09-29 14:33:51 +02:00
cpufreq: acpi-cpufreq: Use cpufreq_cpu_get_raw() in ->get()
2015-09-16 02:17:49 +02:00
Additional power management and ACPI material for v4.3-rc1
2015-09-11 19:11:06 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-09-26 21:05:23 -04:00
PM / devfreq: Fix incorrect type issue.
2015-09-11 14:23:30 +09:00
dmaengine fixes for 4.3-rc4
2015-10-02 14:46:15 -04:00
edac updates for v4.3-rc1
2015-09-11 16:21:12 -07:00
extcon: Fix attached value returned by is_extcon_changed
2015-09-21 15:07:19 +09:00
arm64/efi: Fix boot crash by not padding between EFI_MEMORY_RUNTIME regions
2015-10-01 12:51:28 +02:00
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-18 08:11:42 -07:00
drm/dp/mst: add some defines for logical/physical ports
2015-10-02 15:34:42 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-09-04 12:02:11 -07:00
mm: mark most vm_operations_struct const
2015-09-10 13:29:01 -07:00
Drivers: hv: vmbus: fix init_vp_index() for reloading hv_netvsc
2015-09-20 22:44:51 -07:00
hwmon: (pwm-fan) Fix module autoload for OF platform driver
2015-09-20 17:50:19 -07:00
hwtracing /coresight
Merge branch 'i2c/for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2015-09-08 16:16:26 -07:00
intel_idle: Skylake Client Support - updated
2015-09-10 14:03:44 -04:00
This is the bulk of GPIO changes for the v4.3 kernel cycle:
2015-09-04 10:07:45 -07:00
Changes for 4.3-rc4
2015-10-01 16:38:52 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-10-02 17:53:25 -04:00
Merge git://git.infradead.org/intel-iommu
2015-10-02 07:59:29 -04:00
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-10-04 11:40:09 +01:00
libnvdimm for 4.3:
2015-09-08 14:35:59 -07:00
leds:lp55xx: Correct Kconfig dependency for f/w user helper
2015-09-17 10:02:20 +02:00
powerpc updates for 4.3
2015-09-03 16:41:38 -07:00
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2015-09-05 18:11:04 -07:00
Assorted fixes for md in 4.3-rc
2015-10-04 11:47:28 +01:00
media updates for v4.3-rc1
2015-09-11 16:42:39 -07:00
IOMMU Updates for Linux v4.3
2015-09-08 17:22:35 -07:00
mptfusion: prevent some memory corruption
2015-08-26 07:11:45 -07:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
Char/Misc driver fixes for 4.3-rc3
2015-09-26 20:53:15 -04:00
mmc: core: fix dead loop of mmc_retune
2015-09-30 14:54:22 +02:00
UBI: return ENOSPC if no enough space available
2015-09-29 12:47:05 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-01 21:55:35 -04:00
This is the bulk of GPIO changes for the v4.3 kernel cycle:
2015-09-04 10:07:45 -07:00
NTB: Fix range check on memory window index
2015-09-07 15:27:12 -04:00
pmem: add proper fencing to pmem_rw_page()
2015-09-17 11:49:28 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-09-26 06:01:33 -04:00
PCI: Revert "PCI: Call pci_read_bridge_bases() from core instead of arch code"
2015-09-15 13:18:04 -05:00
Merge branches 'pm-pci' and 'acpi-pci'
2015-10-01 22:30:12 +02:00
pcmcia: soc_common: remove skt_dev_info's clk pointer
2015-09-03 16:01:03 +01:00
This is the bulk of GPIO changes for the v4.3 kernel cycle:
2015-09-04 10:07:45 -07:00
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-18 08:11:42 -07:00
platform-drivers-x86 for 4.3-2
2015-09-17 21:41:02 -07:00
power supply and reset fixes for the v4.3 series
2015-09-17 12:25:42 -07:00
powercap / RAPL: disable the 2nd power limit properly
2015-08-29 01:46:40 +02:00
pwm: Changes for v4.3-rc1
2015-09-09 10:55:32 -07:00
Merge commit 'b8c93646fd5c' into omap-for-v4.3/fixes
2015-09-24 16:23:20 -07:00
reset: ath79: Fix missing spin_lock_init
2015-09-01 14:48:40 +02:00
rtc: abx80x: fix RTC write bit
2015-09-05 19:37:31 +02:00
virtio: fixes on top of 4.3-rc1
2015-09-18 09:28:20 -07:00
blk-mq: fix racy updates of rq->errors
2015-10-01 10:10:55 +02:00
SH Drivers Updates for v4.3
2015-09-21 12:02:27 -07:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
Merge remote-tracking branches 'spi/fix/spidev' and 'spi/fix/xtfpga' into spi-linus
2015-09-22 09:48:41 -07:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
Staging driver fixes for 4.3-rc3
2015-09-26 20:56:50 -04:00
iscsi-target: Avoid OFMarker + IFMarker negotiation
2015-09-24 23:24:46 -07:00
thermal: avoid division by zero in power allocator
2015-10-01 21:42:35 -04:00
thunderbolt: Allow loading of module on recent Apple MacBooks with thunderbolt 2 controller
2015-09-20 15:20:11 -07:00
tty: serial: Add missing module license for 8250_base.ko
2015-09-22 09:09:15 -07:00
USB: whiteheat: fix potential null-deref at probe
2015-09-23 12:15:19 -07:00
virtio: fixes on top of 4.3-rc1
2015-09-18 09:28:20 -07:00
Merge branch 'akpm' (patches from Andrew)
2015-09-10 18:19:42 -07:00
virtio_balloon: do not change memory amount visible via /proc/meminfo
2015-09-08 13:32:11 +03:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-09-01 18:46:42 -07:00
watchdog: iTCO: Fix dependencies on I2C
2015-09-28 10:56:10 +02:00
Merge branch 'akpm' (patches from Andrew)
2015-09-10 18:19:42 -07:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2015-09-03 16:27:01 -07:00
This is the bulk of pin control changes for the v4.3 development
2015-09-04 10:22:09 -07:00
399235dc6e