From 8d735d271059dc11c20d83d410d7709ebe0a974e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 9 Feb 2020 15:58:50 +0100 Subject: [PATCH] 4.19-stable patches added patches: drm-msm-mdp4-adjust-indentation-in-mdp4_dsi_encoder_enable.patch ext2-adjust-indentation-in-ext2_fill_super.patch net-smc911x-adjust-indentation-in-smc911x_phy_configure.patch net-tulip-adjust-indentation-in-dmfe-uli526x-_init_module.patch nfc-pn544-adjust-indentation-in-pn544_hci_check_presence.patch phy-qualcomm-adjust-indentation-in-read_poll_timeout.patch powerpc-44x-adjust-indentation-in-ibm4xx_denali_fixup_memsize.patch ppp-adjust-indentation-into-ppp_async_input.patch scsi-csiostor-adjust-indentation-in-csio_device_reset.patch scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type.patch scsi-qla4xxx-adjust-indentation-in-qla4xxx_mem_free.patch scsi-ufs-recheck-bkops-level-if-bkops-is-disabled.patch --- ...dentation-in-mdp4_dsi_encoder_enable.patch | 47 ++++++++++ ...djust-indentation-in-ext2_fill_super.patch | 50 +++++++++++ ...indentation-in-smc911x_phy_configure.patch | 47 ++++++++++ ...ntation-in-dmfe-uli526x-_init_module.patch | 87 +++++++++++++++++++ ...entation-in-pn544_hci_check_presence.patch | 45 ++++++++++ ...ust-indentation-in-read_poll_timeout.patch | 48 ++++++++++ ...ation-in-ibm4xx_denali_fixup_memsize.patch | 46 ++++++++++ ...ust-indentation-into-ppp_async_input.patch | 61 +++++++++++++ ...ust-indentation-in-csio_device_reset.patch | 48 ++++++++++ ...-the-qla82xx_get_fw_size-return-type.patch | 60 +++++++++++++ ...just-indentation-in-qla4xxx_mem_free.patch | 50 +++++++++++ ...eck-bkops-level-if-bkops-is-disabled.patch | 55 ++++++++++++ queue-4.19/series | 12 +++ 13 files changed, 656 insertions(+) create mode 100644 queue-4.19/drm-msm-mdp4-adjust-indentation-in-mdp4_dsi_encoder_enable.patch create mode 100644 queue-4.19/ext2-adjust-indentation-in-ext2_fill_super.patch create mode 100644 queue-4.19/net-smc911x-adjust-indentation-in-smc911x_phy_configure.patch create mode 100644 queue-4.19/net-tulip-adjust-indentation-in-dmfe-uli526x-_init_module.patch create mode 100644 queue-4.19/nfc-pn544-adjust-indentation-in-pn544_hci_check_presence.patch create mode 100644 queue-4.19/phy-qualcomm-adjust-indentation-in-read_poll_timeout.patch create mode 100644 queue-4.19/powerpc-44x-adjust-indentation-in-ibm4xx_denali_fixup_memsize.patch create mode 100644 queue-4.19/ppp-adjust-indentation-into-ppp_async_input.patch create mode 100644 queue-4.19/scsi-csiostor-adjust-indentation-in-csio_device_reset.patch create mode 100644 queue-4.19/scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type.patch create mode 100644 queue-4.19/scsi-qla4xxx-adjust-indentation-in-qla4xxx_mem_free.patch create mode 100644 queue-4.19/scsi-ufs-recheck-bkops-level-if-bkops-is-disabled.patch diff --git a/queue-4.19/drm-msm-mdp4-adjust-indentation-in-mdp4_dsi_encoder_enable.patch b/queue-4.19/drm-msm-mdp4-adjust-indentation-in-mdp4_dsi_encoder_enable.patch new file mode 100644 index 00000000000..34be6d6e474 --- /dev/null +++ b/queue-4.19/drm-msm-mdp4-adjust-indentation-in-mdp4_dsi_encoder_enable.patch @@ -0,0 +1,47 @@ +From 251e3cb1418ff3f5061ee31335e346e852b16573 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Mon, 9 Dec 2019 13:32:30 -0700 +Subject: drm: msm: mdp4: Adjust indentation in mdp4_dsi_encoder_enable + +From: Nathan Chancellor + +commit 251e3cb1418ff3f5061ee31335e346e852b16573 upstream. + +Clang warns: + +../drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c:124:3: warning: +misleading indentation; statement is not part of the previous 'if' +[-Wmisleading-indentation] + mdp4_crtc_set_config(encoder->crtc, + ^ +../drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c:121:2: note: +previous statement is here + if (mdp4_dsi_encoder->enabled) + ^ + +This warning occurs because there is a space after the tab on this line. +Remove it so that the indentation is consistent with the Linux kernel +coding style and clang no longer warns. + +Fixes: 776638e73a19 ("drm/msm/dsi: Add a mdp4 encoder for DSI") +Link: https://github.com/ClangBuiltLinux/linux/issues/792 +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Rob Clark +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c ++++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c +@@ -139,7 +139,7 @@ static void mdp4_dsi_encoder_enable(stru + if (mdp4_dsi_encoder->enabled) + return; + +- mdp4_crtc_set_config(encoder->crtc, ++ mdp4_crtc_set_config(encoder->crtc, + MDP4_DMA_CONFIG_PACK_ALIGN_MSB | + MDP4_DMA_CONFIG_DEFLKR_EN | + MDP4_DMA_CONFIG_DITHER_EN | diff --git a/queue-4.19/ext2-adjust-indentation-in-ext2_fill_super.patch b/queue-4.19/ext2-adjust-indentation-in-ext2_fill_super.patch new file mode 100644 index 00000000000..18bae273bb1 --- /dev/null +++ b/queue-4.19/ext2-adjust-indentation-in-ext2_fill_super.patch @@ -0,0 +1,50 @@ +From d9e9866803f7b6c3fdd35d345e97fb0b2908bbbc Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Tue, 17 Dec 2019 20:19:31 -0700 +Subject: ext2: Adjust indentation in ext2_fill_super + +From: Nathan Chancellor + +commit d9e9866803f7b6c3fdd35d345e97fb0b2908bbbc upstream. + +Clang warns: + +../fs/ext2/super.c:1076:3: warning: misleading indentation; statement is +not part of the previous 'if' [-Wmisleading-indentation] + sbi->s_groups_count = ((le32_to_cpu(es->s_blocks_count) - + ^ +../fs/ext2/super.c:1074:2: note: previous statement is here + if (EXT2_BLOCKS_PER_GROUP(sb) == 0) + ^ +1 warning generated. + +This warning occurs because there is a space before the tab on this +line. Remove it so that the indentation is consistent with the Linux +kernel coding style and clang no longer warns. + +Fixes: 41f04d852e35 ("[PATCH] ext2: fix mounts at 16T") +Link: https://github.com/ClangBuiltLinux/linux/issues/827 +Link: https://lore.kernel.org/r/20191218031930.31393-1-natechancellor@gmail.com +Signed-off-by: Nathan Chancellor +Signed-off-by: Jan Kara +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ext2/super.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/fs/ext2/super.c ++++ b/fs/ext2/super.c +@@ -1093,9 +1093,9 @@ static int ext2_fill_super(struct super_ + + if (EXT2_BLOCKS_PER_GROUP(sb) == 0) + goto cantfind_ext2; +- sbi->s_groups_count = ((le32_to_cpu(es->s_blocks_count) - +- le32_to_cpu(es->s_first_data_block) - 1) +- / EXT2_BLOCKS_PER_GROUP(sb)) + 1; ++ sbi->s_groups_count = ((le32_to_cpu(es->s_blocks_count) - ++ le32_to_cpu(es->s_first_data_block) - 1) ++ / EXT2_BLOCKS_PER_GROUP(sb)) + 1; + db_count = (sbi->s_groups_count + EXT2_DESC_PER_BLOCK(sb) - 1) / + EXT2_DESC_PER_BLOCK(sb); + sbi->s_group_desc = kmalloc_array (db_count, diff --git a/queue-4.19/net-smc911x-adjust-indentation-in-smc911x_phy_configure.patch b/queue-4.19/net-smc911x-adjust-indentation-in-smc911x_phy_configure.patch new file mode 100644 index 00000000000..5d564866f25 --- /dev/null +++ b/queue-4.19/net-smc911x-adjust-indentation-in-smc911x_phy_configure.patch @@ -0,0 +1,47 @@ +From 5c61e223004b3b5c3f1dd25718e979bc17a3b12d Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Mon, 9 Dec 2019 14:50:27 -0700 +Subject: net: smc911x: Adjust indentation in smc911x_phy_configure + +From: Nathan Chancellor + +commit 5c61e223004b3b5c3f1dd25718e979bc17a3b12d upstream. + +Clang warns: + +../drivers/net/ethernet/smsc/smc911x.c:939:3: warning: misleading +indentation; statement is not part of the previous 'if' +[-Wmisleading-indentation] + if (!lp->ctl_rfduplx) + ^ +../drivers/net/ethernet/smsc/smc911x.c:936:2: note: previous statement +is here + if (lp->ctl_rspeed != 100) + ^ +1 warning generated. + +This warning occurs because there is a space after the tab on this line. +Remove it so that the indentation is consistent with the Linux kernel +coding style and clang no longer warns. + +Fixes: 0a0c72c9118c ("[PATCH] RE: [PATCH 1/1] net driver: Add support for SMSC LAN911x line of ethernet chips") +Link: https://github.com/ClangBuiltLinux/linux/issues/796 +Signed-off-by: Nathan Chancellor +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/smsc/smc911x.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/smsc/smc911x.c ++++ b/drivers/net/ethernet/smsc/smc911x.c +@@ -947,7 +947,7 @@ static void smc911x_phy_configure(struct + if (lp->ctl_rspeed != 100) + my_ad_caps &= ~(ADVERTISE_100BASE4|ADVERTISE_100FULL|ADVERTISE_100HALF); + +- if (!lp->ctl_rfduplx) ++ if (!lp->ctl_rfduplx) + my_ad_caps &= ~(ADVERTISE_100FULL|ADVERTISE_10FULL); + + /* Update our Auto-Neg Advertisement Register */ diff --git a/queue-4.19/net-tulip-adjust-indentation-in-dmfe-uli526x-_init_module.patch b/queue-4.19/net-tulip-adjust-indentation-in-dmfe-uli526x-_init_module.patch new file mode 100644 index 00000000000..7563c7b5b76 --- /dev/null +++ b/queue-4.19/net-tulip-adjust-indentation-in-dmfe-uli526x-_init_module.patch @@ -0,0 +1,87 @@ +From fe06bf3d83ef0d92f35a24e03297172e92ce9ce3 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Mon, 9 Dec 2019 14:16:23 -0700 +Subject: net: tulip: Adjust indentation in {dmfe, uli526x}_init_module + +From: Nathan Chancellor + +commit fe06bf3d83ef0d92f35a24e03297172e92ce9ce3 upstream. + +Clang warns: + +../drivers/net/ethernet/dec/tulip/uli526x.c:1812:3: warning: misleading +indentation; statement is not part of the previous 'if' +[-Wmisleading-indentation] + switch (mode) { + ^ +../drivers/net/ethernet/dec/tulip/uli526x.c:1809:2: note: previous +statement is here + if (cr6set) + ^ +1 warning generated. + +../drivers/net/ethernet/dec/tulip/dmfe.c:2217:3: warning: misleading +indentation; statement is not part of the previous 'if' +[-Wmisleading-indentation] + switch(mode) { + ^ +../drivers/net/ethernet/dec/tulip/dmfe.c:2214:2: note: previous +statement is here + if (cr6set) + ^ +1 warning generated. + +This warning occurs because there is a space before the tab on these +lines. Remove them so that the indentation is consistent with the Linux +kernel coding style and clang no longer warns. + +While we are here, adjust the default block in dmfe_init_module to have +a proper break between the label and assignment and add a space between +the switch and opening parentheses to avoid a checkpatch warning. + +Fixes: e1c3e5014040 ("[PATCH] initialisation cleanup for ULI526x-net-driver") +Link: https://github.com/ClangBuiltLinux/linux/issues/795 +Signed-off-by: Nathan Chancellor +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/dec/tulip/dmfe.c | 7 ++++--- + drivers/net/ethernet/dec/tulip/uli526x.c | 4 ++-- + 2 files changed, 6 insertions(+), 5 deletions(-) + +--- a/drivers/net/ethernet/dec/tulip/dmfe.c ++++ b/drivers/net/ethernet/dec/tulip/dmfe.c +@@ -2222,15 +2222,16 @@ static int __init dmfe_init_module(void) + if (cr6set) + dmfe_cr6_user_set = cr6set; + +- switch(mode) { +- case DMFE_10MHF: ++ switch (mode) { ++ case DMFE_10MHF: + case DMFE_100MHF: + case DMFE_10MFD: + case DMFE_100MFD: + case DMFE_1M_HPNA: + dmfe_media_mode = mode; + break; +- default:dmfe_media_mode = DMFE_AUTO; ++ default: ++ dmfe_media_mode = DMFE_AUTO; + break; + } + +--- a/drivers/net/ethernet/dec/tulip/uli526x.c ++++ b/drivers/net/ethernet/dec/tulip/uli526x.c +@@ -1817,8 +1817,8 @@ static int __init uli526x_init_module(vo + if (cr6set) + uli526x_cr6_user_set = cr6set; + +- switch (mode) { +- case ULI526X_10MHF: ++ switch (mode) { ++ case ULI526X_10MHF: + case ULI526X_100MHF: + case ULI526X_10MFD: + case ULI526X_100MFD: diff --git a/queue-4.19/nfc-pn544-adjust-indentation-in-pn544_hci_check_presence.patch b/queue-4.19/nfc-pn544-adjust-indentation-in-pn544_hci_check_presence.patch new file mode 100644 index 00000000000..40aa496aa85 --- /dev/null +++ b/queue-4.19/nfc-pn544-adjust-indentation-in-pn544_hci_check_presence.patch @@ -0,0 +1,45 @@ +From 5080832627b65e3772a35d1dced68c64e2b24442 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Tue, 17 Dec 2019 18:21:52 -0700 +Subject: NFC: pn544: Adjust indentation in pn544_hci_check_presence + +From: Nathan Chancellor + +commit 5080832627b65e3772a35d1dced68c64e2b24442 upstream. + +Clang warns + +../drivers/nfc/pn544/pn544.c:696:4: warning: misleading indentation; +statement is not part of the previous 'if' [-Wmisleading-indentation] + return nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE, + ^ +../drivers/nfc/pn544/pn544.c:692:3: note: previous statement is here + if (target->nfcid1_len != 4 && target->nfcid1_len != 7 && + ^ +1 warning generated. + +This warning occurs because there is a space after the tab on this line. +Remove it so that the indentation is consistent with the Linux kernel +coding style and clang no longer warns. + +Fixes: da052850b911 ("NFC: Add pn544 presence check for different targets") +Link: https://github.com/ClangBuiltLinux/linux/issues/814 +Signed-off-by: Nathan Chancellor +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/nfc/pn544/pn544.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/nfc/pn544/pn544.c ++++ b/drivers/nfc/pn544/pn544.c +@@ -704,7 +704,7 @@ static int pn544_hci_check_presence(stru + target->nfcid1_len != 10) + return -EOPNOTSUPP; + +- return nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE, ++ return nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE, + PN544_RF_READER_CMD_ACTIVATE_NEXT, + target->nfcid1, target->nfcid1_len, NULL); + } else if (target->supported_protocols & (NFC_PROTO_JEWEL_MASK | diff --git a/queue-4.19/phy-qualcomm-adjust-indentation-in-read_poll_timeout.patch b/queue-4.19/phy-qualcomm-adjust-indentation-in-read_poll_timeout.patch new file mode 100644 index 00000000000..30e77ef2747 --- /dev/null +++ b/queue-4.19/phy-qualcomm-adjust-indentation-in-read_poll_timeout.patch @@ -0,0 +1,48 @@ +From a89806c998ee123bb9c0f18526e55afd12c0c0ab Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Tue, 17 Dec 2019 18:36:37 -0700 +Subject: phy: qualcomm: Adjust indentation in read_poll_timeout + +From: Nathan Chancellor + +commit a89806c998ee123bb9c0f18526e55afd12c0c0ab upstream. + +Clang warns: + +../drivers/phy/qualcomm/phy-qcom-apq8064-sata.c:83:4: warning: +misleading indentation; statement is not part of the previous 'if' +[-Wmisleading-indentation] + usleep_range(DELAY_INTERVAL_US, DELAY_INTERVAL_US + 50); + ^ +../drivers/phy/qualcomm/phy-qcom-apq8064-sata.c:80:3: note: previous +statement is here + if (readl_relaxed(addr) & mask) + ^ +1 warning generated. + +This warning occurs because there is a space after the tab on this line. +Remove it so that the indentation is consistent with the Linux kernel +coding style and clang no longer warns. + +Fixes: 1de990d8a169 ("phy: qcom: Add driver for QCOM APQ8064 SATA PHY") +Link: https://github.com/ClangBuiltLinux/linux/issues/816 +Signed-off-by: Nathan Chancellor +Reviewed-by: Bjorn Andersson +Signed-off-by: Kishon Vijay Abraham I +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c ++++ b/drivers/phy/qualcomm/phy-qcom-apq8064-sata.c +@@ -88,7 +88,7 @@ static int read_poll_timeout(void __iome + if (readl_relaxed(addr) & mask) + return 0; + +- usleep_range(DELAY_INTERVAL_US, DELAY_INTERVAL_US + 50); ++ usleep_range(DELAY_INTERVAL_US, DELAY_INTERVAL_US + 50); + } while (!time_after(jiffies, timeout)); + + return (readl_relaxed(addr) & mask) ? 0 : -ETIMEDOUT; diff --git a/queue-4.19/powerpc-44x-adjust-indentation-in-ibm4xx_denali_fixup_memsize.patch b/queue-4.19/powerpc-44x-adjust-indentation-in-ibm4xx_denali_fixup_memsize.patch new file mode 100644 index 00000000000..0ee97a2dd1f --- /dev/null +++ b/queue-4.19/powerpc-44x-adjust-indentation-in-ibm4xx_denali_fixup_memsize.patch @@ -0,0 +1,46 @@ +From c3aae14e5d468d18dbb5d7c0c8c7e2968cc14aad Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Mon, 9 Dec 2019 13:03:38 -0700 +Subject: powerpc/44x: Adjust indentation in ibm4xx_denali_fixup_memsize + +From: Nathan Chancellor + +commit c3aae14e5d468d18dbb5d7c0c8c7e2968cc14aad upstream. + +Clang warns: + +../arch/powerpc/boot/4xx.c:231:3: warning: misleading indentation; +statement is not part of the previous 'else' [-Wmisleading-indentation] + val = SDRAM0_READ(DDR0_42); + ^ +../arch/powerpc/boot/4xx.c:227:2: note: previous statement is here + else + ^ + +This is because there is a space at the beginning of this line; remove +it so that the indentation is consistent according to the Linux kernel +coding style and clang no longer warns. + +Fixes: d23f5099297c ("[POWERPC] 4xx: Adds decoding of 440SPE memory size to boot wrapper library") +Signed-off-by: Nathan Chancellor +Reviewed-by: Nick Desaulniers +Signed-off-by: Michael Ellerman +Link: https://github.com/ClangBuiltLinux/linux/issues/780 +Link: https://lore.kernel.org/r/20191209200338.12546-1-natechancellor@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/boot/4xx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/powerpc/boot/4xx.c ++++ b/arch/powerpc/boot/4xx.c +@@ -232,7 +232,7 @@ void ibm4xx_denali_fixup_memsize(void) + dpath = 8; /* 64 bits */ + + /* get address pins (rows) */ +- val = SDRAM0_READ(DDR0_42); ++ val = SDRAM0_READ(DDR0_42); + + row = DDR_GET_VAL(val, DDR_APIN, DDR_APIN_SHIFT); + if (row > max_row) diff --git a/queue-4.19/ppp-adjust-indentation-into-ppp_async_input.patch b/queue-4.19/ppp-adjust-indentation-into-ppp_async_input.patch new file mode 100644 index 00000000000..57a025f163b --- /dev/null +++ b/queue-4.19/ppp-adjust-indentation-into-ppp_async_input.patch @@ -0,0 +1,61 @@ +From 08cbc75f96029d3092664213a844a5e25523aa35 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Mon, 9 Dec 2019 15:38:59 -0700 +Subject: ppp: Adjust indentation into ppp_async_input + +From: Nathan Chancellor + +commit 08cbc75f96029d3092664213a844a5e25523aa35 upstream. + +Clang warns: + +../drivers/net/ppp/ppp_async.c:877:6: warning: misleading indentation; +statement is not part of the previous 'if' [-Wmisleading-indentation] + ap->rpkt = skb; + ^ +../drivers/net/ppp/ppp_async.c:875:5: note: previous statement is here + if (!skb) + ^ +1 warning generated. + +This warning occurs because there is a space before the tab on this +line. Clean up this entire block's indentation so that it is consistent +with the Linux kernel coding style and clang no longer warns. + +Fixes: 6722e78c9005 ("[PPP]: handle misaligned accesses") +Link: https://github.com/ClangBuiltLinux/linux/issues/800 +Signed-off-by: Nathan Chancellor +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ppp/ppp_async.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +--- a/drivers/net/ppp/ppp_async.c ++++ b/drivers/net/ppp/ppp_async.c +@@ -878,15 +878,15 @@ ppp_async_input(struct asyncppp *ap, con + skb = dev_alloc_skb(ap->mru + PPP_HDRLEN + 2); + if (!skb) + goto nomem; +- ap->rpkt = skb; +- } +- if (skb->len == 0) { +- /* Try to get the payload 4-byte aligned. +- * This should match the +- * PPP_ALLSTATIONS/PPP_UI/compressed tests in +- * process_input_packet, but we do not have +- * enough chars here to test buf[1] and buf[2]. +- */ ++ ap->rpkt = skb; ++ } ++ if (skb->len == 0) { ++ /* Try to get the payload 4-byte aligned. ++ * This should match the ++ * PPP_ALLSTATIONS/PPP_UI/compressed tests in ++ * process_input_packet, but we do not have ++ * enough chars here to test buf[1] and buf[2]. ++ */ + if (buf[0] != PPP_ALLSTATIONS) + skb_reserve(skb, 2 + (buf[0] & 1)); + } diff --git a/queue-4.19/scsi-csiostor-adjust-indentation-in-csio_device_reset.patch b/queue-4.19/scsi-csiostor-adjust-indentation-in-csio_device_reset.patch new file mode 100644 index 00000000000..70a9ac10bca --- /dev/null +++ b/queue-4.19/scsi-csiostor-adjust-indentation-in-csio_device_reset.patch @@ -0,0 +1,48 @@ +From a808a04c861782e31fc30e342a619c144aaee14a Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Tue, 17 Dec 2019 18:47:26 -0700 +Subject: scsi: csiostor: Adjust indentation in csio_device_reset + +From: Nathan Chancellor + +commit a808a04c861782e31fc30e342a619c144aaee14a upstream. + +Clang warns: + +../drivers/scsi/csiostor/csio_scsi.c:1386:3: warning: misleading +indentation; statement is not part of the previous 'if' +[-Wmisleading-indentation] + csio_lnodes_exit(hw, 1); + ^ +../drivers/scsi/csiostor/csio_scsi.c:1382:2: note: previous statement is +here + if (*buf != '1') + ^ +1 warning generated. + +This warning occurs because there is a space after the tab on this +line. Remove it so that the indentation is consistent with the Linux +kernel coding style and clang no longer warns. + +Fixes: a3667aaed569 ("[SCSI] csiostor: Chelsio FCoE offload driver") +Link: https://github.com/ClangBuiltLinux/linux/issues/818 +Link: https://lore.kernel.org/r/20191218014726.8455-1-natechancellor@gmail.com +Signed-off-by: Nathan Chancellor +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/csiostor/csio_scsi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/csiostor/csio_scsi.c ++++ b/drivers/scsi/csiostor/csio_scsi.c +@@ -1383,7 +1383,7 @@ csio_device_reset(struct device *dev, + return -EINVAL; + + /* Delete NPIV lnodes */ +- csio_lnodes_exit(hw, 1); ++ csio_lnodes_exit(hw, 1); + + /* Block upper IOs */ + csio_lnodes_block_request(hw); diff --git a/queue-4.19/scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type.patch b/queue-4.19/scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type.patch new file mode 100644 index 00000000000..5861a3e8f65 --- /dev/null +++ b/queue-4.19/scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type.patch @@ -0,0 +1,60 @@ +From 3f5f7335e5e234e340b48ecb24c2aba98a61f934 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Wed, 18 Dec 2019 16:49:05 -0800 +Subject: scsi: qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type + +From: Bart Van Assche + +commit 3f5f7335e5e234e340b48ecb24c2aba98a61f934 upstream. + +Since qla82xx_get_fw_size() returns a number in CPU-endian format, change +its return type from __le32 into u32. This patch does not change any +functionality. + +Fixes: 9c2b297572bf ("[SCSI] qla2xxx: Support for loading Unified ROM Image (URI) format firmware file.") +Cc: Himanshu Madhani +Cc: Quinn Tran +Cc: Martin Wilck +Cc: Daniel Wagner +Cc: Roman Bolshakov +Link: https://lore.kernel.org/r/20191219004905.39586-1-bvanassche@acm.org +Reviewed-by: Daniel Wagner +Reviewed-by: Roman Bolshakov +Signed-off-by: Bart Van Assche +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/qla2xxx/qla_nx.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/drivers/scsi/qla2xxx/qla_nx.c ++++ b/drivers/scsi/qla2xxx/qla_nx.c +@@ -1605,8 +1605,7 @@ qla82xx_get_bootld_offset(struct qla_hw_ + return (u8 *)&ha->hablob->fw->data[offset]; + } + +-static __le32 +-qla82xx_get_fw_size(struct qla_hw_data *ha) ++static u32 qla82xx_get_fw_size(struct qla_hw_data *ha) + { + struct qla82xx_uri_data_desc *uri_desc = NULL; + +@@ -1617,7 +1616,7 @@ qla82xx_get_fw_size(struct qla_hw_data * + return cpu_to_le32(uri_desc->size); + } + +- return cpu_to_le32(*(u32 *)&ha->hablob->fw->data[FW_SIZE_OFFSET]); ++ return get_unaligned_le32(&ha->hablob->fw->data[FW_SIZE_OFFSET]); + } + + static u8 * +@@ -1808,7 +1807,7 @@ qla82xx_fw_load_from_blob(struct qla_hw_ + } + + flashaddr = FLASH_ADDR_START; +- size = (__force u32)qla82xx_get_fw_size(ha) / 8; ++ size = qla82xx_get_fw_size(ha) / 8; + ptr64 = (u64 *)qla82xx_get_fw_offs(ha); + + for (i = 0; i < size; i++) { diff --git a/queue-4.19/scsi-qla4xxx-adjust-indentation-in-qla4xxx_mem_free.patch b/queue-4.19/scsi-qla4xxx-adjust-indentation-in-qla4xxx_mem_free.patch new file mode 100644 index 00000000000..73615fed0e8 --- /dev/null +++ b/queue-4.19/scsi-qla4xxx-adjust-indentation-in-qla4xxx_mem_free.patch @@ -0,0 +1,50 @@ +From aa8679736a82386551eb9f3ea0e6ebe2c0e99104 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Tue, 17 Dec 2019 18:52:52 -0700 +Subject: scsi: qla4xxx: Adjust indentation in qla4xxx_mem_free + +From: Nathan Chancellor + +commit aa8679736a82386551eb9f3ea0e6ebe2c0e99104 upstream. + +Clang warns: + +../drivers/scsi/qla4xxx/ql4_os.c:4148:3: warning: misleading +indentation; statement is not part of the previous 'if' +[-Wmisleading-indentation] + if (ha->fw_dump) + ^ +../drivers/scsi/qla4xxx/ql4_os.c:4144:2: note: previous statement is +here + if (ha->queues) + ^ +1 warning generated. + +This warning occurs because there is a space after the tab on this +line. Remove it so that the indentation is consistent with the Linux +kernel coding style and clang no longer warns. + +Fixes: 068237c87c64 ("[SCSI] qla4xxx: Capture minidump for ISP82XX on firmware failure") +Link: https://github.com/ClangBuiltLinux/linux/issues/819 +Link: https://lore.kernel.org/r/20191218015252.20890-1-natechancellor@gmail.com +Acked-by: Manish Rangankar +Reviewed-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/qla4xxx/ql4_os.c ++++ b/drivers/scsi/qla4xxx/ql4_os.c +@@ -4146,7 +4146,7 @@ static void qla4xxx_mem_free(struct scsi + dma_free_coherent(&ha->pdev->dev, ha->queues_len, ha->queues, + ha->queues_dma); + +- if (ha->fw_dump) ++ if (ha->fw_dump) + vfree(ha->fw_dump); + + ha->queues_len = 0; diff --git a/queue-4.19/scsi-ufs-recheck-bkops-level-if-bkops-is-disabled.patch b/queue-4.19/scsi-ufs-recheck-bkops-level-if-bkops-is-disabled.patch new file mode 100644 index 00000000000..13811d6dd9b --- /dev/null +++ b/queue-4.19/scsi-ufs-recheck-bkops-level-if-bkops-is-disabled.patch @@ -0,0 +1,55 @@ +From 24366c2afbb0539fb14eff330d4e3a5db5c0a3ef Mon Sep 17 00:00:00 2001 +From: Asutosh Das +Date: Mon, 25 Nov 2019 22:53:30 -0800 +Subject: scsi: ufs: Recheck bkops level if bkops is disabled + +From: Asutosh Das + +commit 24366c2afbb0539fb14eff330d4e3a5db5c0a3ef upstream. + +bkops level should be rechecked upon receiving an exception. Currently the +level is being cached and never updated. + +Update bkops each time the level is checked. Also do not use the cached +bkops level value if it is disabled and then enabled. + +Fixes: afdfff59a0e0 (scsi: ufs: handle non spec compliant bkops behaviour by device) +Link: https://lore.kernel.org/r/1574751214-8321-2-git-send-email-cang@qti.qualcomm.com +Reviewed-by: Bean Huo +Reviewed-by: Alim Akhtar +Tested-by: Alim Akhtar +Signed-off-by: Asutosh Das +Signed-off-by: Can Guo +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/ufs/ufshcd.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/scsi/ufs/ufshcd.c ++++ b/drivers/scsi/ufs/ufshcd.c +@@ -5044,6 +5044,7 @@ static int ufshcd_disable_auto_bkops(str + + hba->auto_bkops_enabled = false; + trace_ufshcd_auto_bkops_state(dev_name(hba->dev), "Disabled"); ++ hba->is_urgent_bkops_lvl_checked = false; + out: + return err; + } +@@ -5068,6 +5069,7 @@ static void ufshcd_force_reset_auto_bkop + hba->ee_ctrl_mask &= ~MASK_EE_URGENT_BKOPS; + ufshcd_disable_auto_bkops(hba); + } ++ hba->is_urgent_bkops_lvl_checked = false; + } + + static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status) +@@ -5114,6 +5116,7 @@ static int ufshcd_bkops_ctrl(struct ufs_ + err = ufshcd_enable_auto_bkops(hba); + else + err = ufshcd_disable_auto_bkops(hba); ++ hba->urgent_bkops_lvl = curr_status; + out: + return err; + } diff --git a/queue-4.19/series b/queue-4.19/series index d8eec0cae23..9b82c0aa795 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -142,3 +142,15 @@ kvm-s390-do-not-clobber-registers-during-guest-reset-store-status.patch clk-tegra-mark-fuse-clock-as-critical.patch drm-amd-dm-mst-ignore-payload-update-failures.patch percpu-separate-decrypted-varaibles-anytime-encryption-can-be-enabled.patch +scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type.patch +scsi-csiostor-adjust-indentation-in-csio_device_reset.patch +scsi-qla4xxx-adjust-indentation-in-qla4xxx_mem_free.patch +scsi-ufs-recheck-bkops-level-if-bkops-is-disabled.patch +phy-qualcomm-adjust-indentation-in-read_poll_timeout.patch +ext2-adjust-indentation-in-ext2_fill_super.patch +powerpc-44x-adjust-indentation-in-ibm4xx_denali_fixup_memsize.patch +drm-msm-mdp4-adjust-indentation-in-mdp4_dsi_encoder_enable.patch +nfc-pn544-adjust-indentation-in-pn544_hci_check_presence.patch +ppp-adjust-indentation-into-ppp_async_input.patch +net-smc911x-adjust-indentation-in-smc911x_phy_configure.patch +net-tulip-adjust-indentation-in-dmfe-uli526x-_init_module.patch -- 2.47.3