From f47c378113182db6aac2cfd5dd79381882fa3d16 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Tue, 9 May 2023 13:58:37 +0200 Subject: [PATCH] bcm63xx: 5.15: comment unused macronix_nand_block_protection_support Comment unused macronix_nand_block_protection_support due to workaround needed to fix booting Fix compilation warning: drivers/mtd/nand/raw/nand_macronix.c:220:13: error: 'macronix_nand_block_protection_support' defined but not used [-Werror=unused-function] 220 | static void macronix_nand_block_protection_support(struct nand_chip *chip) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi --- ...and-macronix-comment-unused-function.patch | 154 ++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 target/linux/bcm63xx/patches-5.15/111-drivers-mtd-nand-macronix-comment-unused-function.patch diff --git a/target/linux/bcm63xx/patches-5.15/111-drivers-mtd-nand-macronix-comment-unused-function.patch b/target/linux/bcm63xx/patches-5.15/111-drivers-mtd-nand-macronix-comment-unused-function.patch new file mode 100644 index 0000000000..38f3b8bc77 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.15/111-drivers-mtd-nand-macronix-comment-unused-function.patch @@ -0,0 +1,154 @@ +From 00cf359b486a3d14c29014e9d57d92ab81972866 Mon Sep 17 00:00:00 2001 +From: Christian Marangi +Date: Tue, 9 May 2023 14:03:08 +0200 +Subject: [PATCH] drivers: mtd: nand: macronix: comment unused function + +Comment unused function since macronix_nand_block_protection_support +cause booting problems. + +Signed-off-by: Christian Marangi +--- + drivers/mtd/nand/raw/nand_macronix.c | 132 +++++++++++++-------------- + 1 file changed, 66 insertions(+), 66 deletions(-) + +--- a/drivers/mtd/nand/raw/nand_macronix.c ++++ b/drivers/mtd/nand/raw/nand_macronix.c +@@ -179,72 +179,72 @@ static void macronix_nand_fix_broken_get + ONFI_FEATURE_ADDR_TIMING_MODE, 1); + } + +-/* +- * Macronix NAND supports Block Protection by Protectoin(PT) pin; +- * active high at power-on which protects the entire chip even the #WP is +- * disabled. Lock/unlock protection area can be partition according to +- * protection bits, i.e. upper 1/2 locked, upper 1/4 locked and so on. +- */ +-static int mxic_nand_lock(struct nand_chip *chip, loff_t ofs, uint64_t len) +-{ +- u8 feature[ONFI_SUBFEATURE_PARAM_LEN]; +- int ret; +- +- feature[0] = MXIC_BLOCK_PROTECTION_ALL_LOCK; +- nand_select_target(chip, 0); +- ret = nand_set_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION, +- feature); +- nand_deselect_target(chip); +- if (ret) +- pr_err("%s all blocks failed\n", __func__); +- +- return ret; +-} +- +-static int mxic_nand_unlock(struct nand_chip *chip, loff_t ofs, uint64_t len) +-{ +- u8 feature[ONFI_SUBFEATURE_PARAM_LEN]; +- int ret; +- +- feature[0] = MXIC_BLOCK_PROTECTION_ALL_UNLOCK; +- nand_select_target(chip, 0); +- ret = nand_set_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION, +- feature); +- nand_deselect_target(chip); +- if (ret) +- pr_err("%s all blocks failed\n", __func__); +- +- return ret; +-} +- +-static void macronix_nand_block_protection_support(struct nand_chip *chip) +-{ +- u8 feature[ONFI_SUBFEATURE_PARAM_LEN]; +- int ret; +- +- bitmap_set(chip->parameters.get_feature_list, +- ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1); +- +- feature[0] = MXIC_BLOCK_PROTECTION_ALL_UNLOCK; +- nand_select_target(chip, 0); +- ret = nand_get_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION, +- feature); +- nand_deselect_target(chip); +- if (ret || feature[0] != MXIC_BLOCK_PROTECTION_ALL_LOCK) { +- if (ret) +- pr_err("Block protection check failed\n"); +- +- bitmap_clear(chip->parameters.get_feature_list, +- ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1); +- return; +- } +- +- bitmap_set(chip->parameters.set_feature_list, +- ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1); +- +- chip->ops.lock_area = mxic_nand_lock; +- chip->ops.unlock_area = mxic_nand_unlock; +-} ++// /* ++// * Macronix NAND supports Block Protection by Protectoin(PT) pin; ++// * active high at power-on which protects the entire chip even the #WP is ++// * disabled. Lock/unlock protection area can be partition according to ++// * protection bits, i.e. upper 1/2 locked, upper 1/4 locked and so on. ++// */ ++// static int mxic_nand_lock(struct nand_chip *chip, loff_t ofs, uint64_t len) ++// { ++// u8 feature[ONFI_SUBFEATURE_PARAM_LEN]; ++// int ret; ++ ++// feature[0] = MXIC_BLOCK_PROTECTION_ALL_LOCK; ++// nand_select_target(chip, 0); ++// ret = nand_set_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION, ++// feature); ++// nand_deselect_target(chip); ++// if (ret) ++// pr_err("%s all blocks failed\n", __func__); ++ ++// return ret; ++// } ++ ++// static int mxic_nand_unlock(struct nand_chip *chip, loff_t ofs, uint64_t len) ++// { ++// u8 feature[ONFI_SUBFEATURE_PARAM_LEN]; ++// int ret; ++ ++// feature[0] = MXIC_BLOCK_PROTECTION_ALL_UNLOCK; ++// nand_select_target(chip, 0); ++// ret = nand_set_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION, ++// feature); ++// nand_deselect_target(chip); ++// if (ret) ++// pr_err("%s all blocks failed\n", __func__); ++ ++// return ret; ++// } ++ ++// static void macronix_nand_block_protection_support(struct nand_chip *chip) ++// { ++// u8 feature[ONFI_SUBFEATURE_PARAM_LEN]; ++// int ret; ++ ++// bitmap_set(chip->parameters.get_feature_list, ++// ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1); ++ ++// feature[0] = MXIC_BLOCK_PROTECTION_ALL_UNLOCK; ++// nand_select_target(chip, 0); ++// ret = nand_get_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION, ++// feature); ++// nand_deselect_target(chip); ++// if (ret || feature[0] != MXIC_BLOCK_PROTECTION_ALL_LOCK) { ++// if (ret) ++// pr_err("Block protection check failed\n"); ++ ++// bitmap_clear(chip->parameters.get_feature_list, ++// ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1); ++// return; ++// } ++ ++// bitmap_set(chip->parameters.set_feature_list, ++// ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1); ++ ++// chip->ops.lock_area = mxic_nand_lock; ++// chip->ops.unlock_area = mxic_nand_unlock; ++// } + + static int nand_power_down_op(struct nand_chip *chip) + { -- 2.30.2