powerpc/pseries: remove memory "re-add" implementation (4abe60c6) · Commits · 戴 / test

arch/powerpc/include/asm/rtas.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,6 @@ inline uint16_t pseries_errorlog_length(struct pseries_errorlog *sect)

		#define PSERIES_HP_ELOG_ACTION_ADD 1
		#define PSERIES_HP_ELOG_ACTION_REMOVE 2
		#define PSERIES_HP_ELOG_ACTION_READD 3

		#define PSERIES_HP_ELOG_ID_DRC_NAME 1
		#define PSERIES_HP_ELOG_ID_DRC_INDEX 2

+0 −42

Original line number	Diff line number	Diff line
		@@ -487,40 +487,6 @@ static int dlpar_memory_remove_by_index(u32 drc_index)
		return rc;
		}

		static int dlpar_memory_readd_by_index(u32 drc_index)
		{
		struct drmem_lmb *lmb;
		int lmb_found;
		int rc;

		pr_info("Attempting to update LMB, drc index %x\n", drc_index);

		lmb_found = 0;
		for_each_drmem_lmb(lmb) {
		if (lmb->drc_index == drc_index) {
		lmb_found = 1;
		rc = dlpar_remove_lmb(lmb);
		if (!rc) {
		rc = dlpar_add_lmb(lmb);
		if (rc)
		dlpar_release_drc(lmb->drc_index);
		}
		break;
		}
		}

		if (!lmb_found)
		rc = -EINVAL;

		if (rc)
		pr_info("Failed to update memory at %llx\n",
		lmb->base_addr);
		else
		pr_info("Memory at %llx was updated\n", lmb->base_addr);

		return rc;
		}

		static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index)
		{
		struct drmem_lmb lmb, start_lmb, *end_lmb;
		@@ -617,10 +583,6 @@ static int dlpar_memory_remove_by_index(u32 drc_index)
		{
		return -EOPNOTSUPP;
		}
		static int dlpar_memory_readd_by_index(u32 drc_index)
		{
		return -EOPNOTSUPP;
		}

		static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index)
		{
		@@ -902,10 +864,6 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
		break;
		}

		break;
		case PSERIES_HP_ELOG_ACTION_READD:
		drc_index = hp_elog->_drc_u.drc_index;
		rc = dlpar_memory_readd_by_index(drc_index);
		break;
		default:
		pr_err("Invalid action (%d) specified\n", hp_elog->action);