[PATCH 10/10] ocxl: Conditionally bind SCM devices to the generic OCXL driver

[Frederic Barrat]

Le 25/10/2019 à 06:47, Alastair D'Silva a écrit :
> From: Alastair D'Silva <alastair at d-silva.org>
> 
> This patch allows the user to bind OpenCAPI SCM devices to the generic OCXL
> driver.
> 
> Signed-off-by: Alastair D'Silva <alastair at d-silva.org>
> ---


I'm wondering if we should upstream this. Is it of any use outside of 
some serious debug session for a developer?
Also we would now have 2 drivers picking up the same device ID, since 
the SCM driver is always registering for that ID, irrespective of 
CONFIG_OCXL_SCM_GENERIC

   Fred


>   drivers/misc/ocxl/Kconfig | 7 +++++++
>   drivers/misc/ocxl/pci.c   | 3 +++
>   2 files changed, 10 insertions(+)
> 
> diff --git a/drivers/misc/ocxl/Kconfig b/drivers/misc/ocxl/Kconfig
> index 1916fa65f2f2..8a683715c97c 100644
> --- a/drivers/misc/ocxl/Kconfig
> +++ b/drivers/misc/ocxl/Kconfig
> @@ -29,3 +29,10 @@ config OCXL
>   	  dedicated OpenCAPI link, and don't follow the same protocol.
>   
>   	  If unsure, say N.
> +
> +config OCXL_SCM_GENERIC
> +	bool "Treat OpenCAPI Storage Class Memory as a generic OpenCAPI device"
> +	default n
> +	help
> +	  Select this option to treat OpenCAPI Storage Class Memory
> +	  devices an generic OpenCAPI devices.
> diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c
> index cb920aa88d3a..7137055c1883 100644
> --- a/drivers/misc/ocxl/pci.c
> +++ b/drivers/misc/ocxl/pci.c
> @@ -10,6 +10,9 @@
>    */
>   static const struct pci_device_id ocxl_pci_tbl[] = {
>   	{ PCI_DEVICE(PCI_VENDOR_ID_IBM, 0x062B), },
> +#ifdef CONFIG_OCXL_SCM_GENERIC
> +	{ PCI_DEVICE(PCI_VENDOR_ID_IBM, 0x0625), },
> +#endif
>   	{ }
>   };
>   MODULE_DEVICE_TABLE(pci, ocxl_pci_tbl);
>