Hi Tony,
On Thu, 22 Feb 2018 11:58:11 -0800, Tony Luck wrote:
> This just covers the topology function of the EDAC driver.
> We locate which DIMM slots are populated with NVDIMMs and
> query the NFIT and SMBIOS tables to get the size.
>
> Signed-off-by: Tony Luck <tony.l...@intel.com>
> ---
> drivers/edac/Kconfig | 5 +++-
> drivers/edac/skx_edac.c | 68
> ++++++++++++++++++++++++++++++++++++++++++++-----
> 2 files changed, 66 insertions(+), 7 deletions(-)
> (...)
> +static int get_nvdimm_info(struct dimm_info *dimm, struct skx_imc *imc,
> + int chan, int dimmno)
> +{
> + int smbios_handle;
> + u32 dev_handle;
> + u16 flags;
> + u64 size = 0;
> +
> + dev_handle = ACPI_NFIT_BUILD_DEVICE_HANDLE(dimmno, chan, imc->lmc,
> + imc->src_id, 0);
> +
> + smbios_handle = nfit_get_smbios_id(dev_handle, &flags);
> + if (smbios_handle == -EOPNOTSUPP) {
> + pr_warn_once("skx_edac: can't find size of NVDIMM. Try enabling
> CONFIG_ACPI_NFIT\n");
> + goto unknown_size;
I'm curious why you continue in this (worse) error case, but stop on
all other (some presumably less critical) error cases? Specifically I
can't see how an unknown size returned by the dmi subsystem can be worse
than not being able to query the size at all.
> + }
> + if (smbios_handle < 0) {
> + skx_printk(KERN_ERR, "Can't find handle for NVDIMM ADR=%x\n",
> dev_handle);
> + return 0;
> + }
> +
> + if (flags & ACPI_NFIT_MEM_MAP_FAILED) {
> + skx_printk(KERN_ERR, "NVDIMM ADR=%x is not mapped\n",
> dev_handle);
> + return 0;
> + }
> +
> + size = dmi_memdev_size(smbios_handle);
> + if (size == ~0ul) {
If you agree with my comment on previous patch then this becomes ~0ull.
> + skx_printk(KERN_ERR, "Can't find size for NVDIMM
> ADR=%x/SMBIOS=%x\n",
> + dev_handle, smbios_handle);
> + return 0;
> + }
> +
> +unknown_size:
> + edac_dbg(0, "mc#%d: channel %d, dimm %d, %lld Mb (%lld pages)\n",
%llu instead of %lld (twice)?
> + imc->mc, chan, dimmno, size >> 20, size >> PAGE_SHIFT);
> +
> + dimm->nr_pages = size >> PAGE_SHIFT;
If you moved the debug print after, you wouldn't have to do the shift
twice.
> + dimm->grain = 32;
> + dimm->dtype = DEV_UNKNOWN;
> + dimm->mtype = MEM_NVDIMM;
> + dimm->edac_mode = EDAC_SECDED; /* likely better than this */
> +
> + snprintf(dimm->label, sizeof(dimm->label),
> "CPU_SrcID#%u_MC#%u_Chan#%u_DIMM#%u",
> + imc->src_id, imc->lmc, chan, dimmno);
> +
> + return 1;
> +}
--
Jean Delvare
SUSE L3 Support
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
