[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <a9511b97feab5d3963c6e98391176c5c782277d5.1497939166.git.jerry.hoemann@hpe.com>
Date: Tue, 20 Jun 2017 10:51:26 -0600
From: Jerry Hoemann <jerry.hoemann@....com>
To: dan.j.williams@...el.com
Cc: linux-nvdimm@...ts.01.org, linux-kernel@...r.kernel.org,
Jerry Hoemann <jerry.hoemann@....com>
Subject: [PATCH v2 7/7] acpi, nfit: override mask
Add module parameter override_dsm_mask_root for overriding
the dsm_mask like we do for non-root dsm calls.
Signed-off-by: Jerry Hoemann <jerry.hoemann@....com>
---
drivers/acpi/nfit/core.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index f133b3e..456fcc2 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1624,6 +1624,7 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc)
struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc;
const u8 *uuid = to_nfit_uuid(NFIT_DEV_BUS);
struct acpi_device *adev;
+ unsigned long dsm_mask;
int i;
nd_desc->cmd_mask = acpi_desc->bus_cmd_force_en;
@@ -1635,7 +1636,11 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc)
if (acpi_check_dsm(adev->handle, uuid, 1, 1ULL << i))
set_bit(i, &nd_desc->cmd_mask);
set_bit(ND_CMD_CALL, &nd_desc->cmd_mask);
- for (i = 0; i < ND_CMD_CALL; i++)
+
+ dsm_mask = 0x3bf;
+ if (override_dsm_mask)
+ dsm_mask = override_dsm_mask;
+ for_each_set_bit(i, &dsm_mask, BITS_PER_LONG)
if (acpi_check_dsm(adev->handle, uuid, 1, 1ULL << i))
set_bit(i, &nd_desc->bus_dsm_mask);
}
--
1.8.5.6
Powered by blists - more mailing lists