Commit af9cae9f authored by Dan Williams's avatar Dan Williams
Browse files

cxl/pci: Rename pci.h to cxlpci.h 



Similar to the mem.h rename, if the core wants to reuse definitions from
drivers/cxl/pci.h it is unable to use <pci.h> as that collides with
archs that have an arch/$arch/include/asm/pci.h, like MIPS.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Acked-by: default avatarBen Widawsky <ben.widawsky@intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/164298422510.3018233.14693126572756675563.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent c978f1b1

drivers/cxl/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
#include <linux/kernel.h>

#include <linux/acpi.h>

#include <linux/pci.h>

#include "cxlpci.h"

#include "cxl.h"

#include "pci.h"



/* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */

#define CFMWS_INTERLEAVE_WAYS(x)	(1 << (x)->interleave_ways)

drivers/cxl/core/regs.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <linux/slab.h>

#include <linux/pci.h>

#include <cxlmem.h>

#include <pci.h>

#include <cxlpci.h>



/**

 * DOC: cxl registers

drivers/cxl/pci.h→drivers/cxl/cxlpci.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright(c) 2020 Intel Corporation. All rights reserved. */

#ifndef __CXL_PCI_H__

#define __CXL_PCI_H__

#include "cxl.h"



#define CXL_MEMORY_PROGIF	0x10

drivers/cxl/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/pci.h>

#include <linux/io.h>

#include "cxlmem.h"

#include "pci.h"

#include "cxlpci.h"

#include "cxl.h"



/**