From: Jerry Hoemann <jerry.hoemann@hpe.com>
To: dan.j.williams@intel.com
Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org,
Jerry Hoemann <jerry.hoemann@hpe.com>
Subject: [PATCH v3 7/7] acpi, nfit: override mask
Date: Thu, 29 Jun 2017 10:56:32 -0600 [thread overview]
Message-ID: <4dfd04a55324c2bdb6c9e8e65adf3cd8c0f324c9.1498754314.git.jerry.hoemann@hpe.com> (raw)
In-Reply-To: <cover.1498754314.git.jerry.hoemann@hpe.com>
In-Reply-To: <cover.1498754314.git.jerry.hoemann@hpe.com>
Have module parameter override_dsm_mask override the dsm_mask for
root calls like it does for non-root dsm calls.
Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.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 7d2f1a0..87acaf2 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1627,6 +1627,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;
@@ -1638,7 +1639,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
next prev parent reply other threads:[~2017-06-29 16:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-29 16:56 [PATCH v3 0/7] Enable DSM pass thru for root functions Jerry Hoemann
2017-06-29 16:56 ` [PATCH v3 1/7] libnvdimm: passthru functions clear to send Jerry Hoemann
2017-06-29 16:56 ` [PATCH v3 2/7] acpi, nfit: Enable DSM pass thru for root functions Jerry Hoemann
2017-06-29 16:56 ` [PATCH v3 3/7] libnvdimm: Add bus level dsm mask Jerry Hoemann
2017-06-29 21:23 ` Dan Williams
2017-06-29 16:56 ` [PATCH v3 4/7] acpi, nfit: Use bus_dsm_mask for passthru Jerry Hoemann
2017-06-29 21:35 ` Dan Williams
2017-06-29 21:47 ` Jerry Hoemann
2017-06-29 21:55 ` Dan Williams
2017-06-29 23:26 ` Jerry Hoemann
2017-06-30 1:26 ` Dan Williams
2017-06-29 16:56 ` [PATCH v3 5/7] acpi, nfit: Show bus_dsm_mask in sysfs Jerry Hoemann
2017-06-29 16:56 ` [PATCH v3 6/7] libnvdimm: New ACPI 6.2 DSM functions Jerry Hoemann
2017-06-29 16:56 ` Jerry Hoemann [this message]
2017-06-29 21:16 ` [PATCH v3 7/7] acpi, nfit: override mask Dan Williams
2017-06-29 22:18 ` Jerry Hoemann
2017-06-29 22:50 ` Dan Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4dfd04a55324c2bdb6c9e8e65adf3cd8c0f324c9.1498754314.git.jerry.hoemann@hpe.com \
--to=jerry.hoemann@hpe.com \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).