Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2e2217b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.4.137 into android-4.4 



Changes in 4.4.137
	tpm: do not suspend/resume if power stays on
	tpm: self test failure should not cause suspend to fail
	mmap: introduce sane default mmap limits
	mmap: relax file size limit for regular files
	kconfig: Avoid format overflow warning from GCC 8.1
	xfs: fix incorrect log_flushed on fsync
	drm: set FMODE_UNSIGNED_OFFSET for drm files
	brcmfmac: Fix check for ISO3166 code
	bnx2x: use the right constant
	dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()
	enic: set DMA mask to 47 bit
	ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds
	ipv4: remove warning in ip_recv_error
	isdn: eicon: fix a missing-check bug
	netdev-FAQ: clarify DaveM's position for stable backports
	net/packet: refine check for priv area size
	net: usb: cdc_mbim: add flag FLAG_SEND_ZLP
	packet: fix reserve calculation
	qed: Fix mask for physical address in ILT entry
	net/mlx4: Fix irq-unsafe spinlock usage
	team: use netdev_features_t instead of u32
	rtnetlink: validate attributes in do_setlink()
	net: phy: broadcom: Fix bcm_write_exp()
	net: metrics: add proper netlink validation
	Linux 4.4.137

Change-Id: I247cc9905e330810546f7105bdf723bf84c3308f
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e4798d7f ed90fd0c

Documentation/networking/netdev-FAQ.txt

+9 −0
Original line number Diff line number Diff line
@@ -168,6 +168,15 @@ A: No. See above answer. In short, if you think it really belongs in 
   dash marker line as described in Documentation/SubmittingPatches to

   temporarily embed that information into the patch that you send.



Q: Are all networking bug fixes backported to all stable releases?



A: Due to capacity, Dave could only take care of the backports for the last

   2 stable releases. For earlier stable releases, each stable branch maintainer

   is supposed to take care of them. If you find any patch is missing from an

   earlier stable branch, please notify stable@vger.kernel.org with either a

   commit ID or a formal patch backported, and CC Dave and other relevant

   networking developers.



Q: Someone said that the comment style and coding convention is different

   for the networking content.  Is this true?

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 136

SUBLEVEL = 137

EXTRAVERSION =

NAME = Blurry Fish Butt

drivers/char/tpm/tpm-chip.c

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/spinlock.h>

#include <linux/freezer.h>

#include <linux/major.h>

#include <linux/of.h>

#include "tpm.h"

#include "tpm_eventlog.h"
@@ -324,8 +325,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip) 
 */

int tpm_chip_register(struct tpm_chip *chip)

{

#ifdef CONFIG_OF

	struct device_node *np;

#endif

	int rc;



#ifdef CONFIG_OF

	np = of_find_node_by_name(NULL, "vtpm");

	if (np) {

		if (of_property_read_bool(np, "powered-while-suspended"))

			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;

	}

	of_node_put(np);

#endif



	rc = tpm1_chip_register(chip);

	if (rc)

		return rc;

drivers/char/tpm/tpm-interface.c

+7 −0
Original line number Diff line number Diff line
@@ -787,6 +787,10 @@ int tpm_do_selftest(struct tpm_chip *chip) 
	loops = jiffies_to_msecs(duration) / delay_msec;



	rc = tpm_continue_selftest(chip);

	if (rc == TPM_ERR_INVALID_POSTINIT) {

		chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;

		dev_info(&chip->dev, "TPM not ready (%d)\n", rc);

	}

	/* This may fail if there was no TPM driver during a suspend/resume

	 * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST)

	 */
@@ -931,6 +935,9 @@ int tpm_pm_suspend(struct device *dev) 
	if (chip == NULL)

		return -ENODEV;



	if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED)

		return 0;



	if (chip->flags & TPM_CHIP_FLAG_TPM2) {

		tpm2_shutdown(chip, TPM2_SU_STATE);

		return 0;

drivers/char/tpm/tpm.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ struct tpm_vendor_specific { 
enum tpm_chip_flags {

	TPM_CHIP_FLAG_REGISTERED	= BIT(0),

	TPM_CHIP_FLAG_TPM2		= BIT(1),

	TPM_CHIP_FLAG_ALWAYS_POWERED	= BIT(5),

};



struct tpm_chip {