Commit 60958b3a authored by Krishna Kurapati's avatar Krishna Kurapati Committed by Greg Kroah-Hartman
Browse files

usb: xhci: Move extcaps related macros to respective header file 



DWC3 driver needs access to XHCI Extended Capabilities registers to
read number of usb2 ports and usb3 ports present on multiport controller.
Since the extcaps header is sufficient to parse this info, move port_count
related macros and structure from xhci.h to xhci-ext-caps.h.

Signed-off-by: default avatarKrishna Kurapati <quic_kriskura@quicinc.com>
Link: https://lore.kernel.org/r/20230828133033.11988-4-quic_kriskura@quicinc.com


Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb3f1d9e

drivers/usb/host/xhci-ext-caps.h

+27 −0
Original line number Diff line number Diff line
@@ -79,6 +79,33 @@ 
/* true: Controller Not Ready to accept doorbell or op reg writes after reset */

#define XHCI_STS_CNR		(1 << 11)



/**

 * struct xhci_protocol_caps

 * @revision:		major revision, minor revision, capability ID,

 *			and next capability pointer.

 * @name_string:	Four ASCII characters to say which spec this xHC

 *			follows, typically "USB ".

 * @port_info:		Port offset, count, and protocol-defined information.

 */

struct xhci_protocol_caps {

	u32	revision;

	u32	name_string;

	u32	port_info;

};



#define	XHCI_EXT_PORT_MAJOR(x)	(((x) >> 24) & 0xff)

#define	XHCI_EXT_PORT_MINOR(x)	(((x) >> 16) & 0xff)

#define	XHCI_EXT_PORT_PSIC(x)	(((x) >> 28) & 0x0f)

#define	XHCI_EXT_PORT_OFF(x)	((x) & 0xff)

#define	XHCI_EXT_PORT_COUNT(x)	(((x) >> 8) & 0xff)



#define	XHCI_EXT_PORT_PSIV(x)	(((x) >> 0) & 0x0f)

#define	XHCI_EXT_PORT_PSIE(x)	(((x) >> 4) & 0x03)

#define	XHCI_EXT_PORT_PLT(x)	(((x) >> 6) & 0x03)

#define	XHCI_EXT_PORT_PFD(x)	(((x) >> 8) & 0x01)

#define	XHCI_EXT_PORT_LP(x)	(((x) >> 14) & 0x03)

#define	XHCI_EXT_PORT_PSIM(x)	(((x) >> 16) & 0xffff)



#include <linux/io.h>



/**

drivers/usb/host/xhci.h

+0 −27
Original line number Diff line number Diff line
@@ -558,33 +558,6 @@ struct xhci_doorbell_array { 
#define DB_VALUE(ep, stream)	((((ep) + 1) & 0xff) | ((stream) << 16))

#define DB_VALUE_HOST		0x00000000



/**

 * struct xhci_protocol_caps

 * @revision:		major revision, minor revision, capability ID,

 *			and next capability pointer.

 * @name_string:	Four ASCII characters to say which spec this xHC

 *			follows, typically "USB ".

 * @port_info:		Port offset, count, and protocol-defined information.

 */

struct xhci_protocol_caps {

	u32	revision;

	u32	name_string;

	u32	port_info;

};



#define	XHCI_EXT_PORT_MAJOR(x)	(((x) >> 24) & 0xff)

#define	XHCI_EXT_PORT_MINOR(x)	(((x) >> 16) & 0xff)

#define	XHCI_EXT_PORT_PSIC(x)	(((x) >> 28) & 0x0f)

#define	XHCI_EXT_PORT_OFF(x)	((x) & 0xff)

#define	XHCI_EXT_PORT_COUNT(x)	(((x) >> 8) & 0xff)



#define	XHCI_EXT_PORT_PSIV(x)	(((x) >> 0) & 0x0f)

#define	XHCI_EXT_PORT_PSIE(x)	(((x) >> 4) & 0x03)

#define	XHCI_EXT_PORT_PLT(x)	(((x) >> 6) & 0x03)

#define	XHCI_EXT_PORT_PFD(x)	(((x) >> 8) & 0x01)

#define	XHCI_EXT_PORT_LP(x)	(((x) >> 14) & 0x03)

#define	XHCI_EXT_PORT_PSIM(x)	(((x) >> 16) & 0xffff)



#define PLT_MASK        (0x03 << 6)

#define PLT_SYM         (0x00 << 6)

#define PLT_ASYM_RX     (0x02 << 6)