Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88fcd562 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: make PMP support optional 



Make PMP support optional by adding CONFIG_SATA_PMP and leaving out
libata-pmp.c if it isn't set.  PMP helpers return constant values if
PMP support is not enabled and PMP declarations alias non-PMP
counterparts.  This makes the compiler to leave out PMP related part
out and LLDs to use non-PMP counterparts automatically.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent 071f44b1

drivers/ata/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ config ATA_ACPI 
	  You can disable this at kernel boot time by using the

	  option libata.noacpi=1



config SATA_PMP

	bool "SATA Port Multiplier support"

	default y

	help

	  This option adds support for SATA Port Multipliers.



config SATA_AHCI

	tristate "AHCI SATA support"

	depends on PCI

drivers/ata/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ obj-$(CONFIG_ATA_GENERIC) += ata_generic.o 
# Should be last libata driver

obj-$(CONFIG_PATA_LEGACY)	+= pata_legacy.o



libata-objs	:= libata-core.o libata-scsi.o libata-eh.o libata-pmp.o

libata-objs	:= libata-core.o libata-scsi.o libata-eh.o

libata-$(CONFIG_ATA_SFF)	+= libata-sff.o

libata-$(CONFIG_SATA_PMP)	+= libata-pmp.o

libata-$(CONFIG_ATA_ACPI)	+= libata-acpi.o

drivers/ata/libata.h

+17 −0
Original line number Diff line number Diff line
@@ -203,9 +203,26 @@ extern int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, 
extern void ata_eh_finish(struct ata_port *ap);



/* libata-pmp.c */

#ifdef CONFIG_SATA_PMP

extern int sata_pmp_scr_read(struct ata_link *link, int reg, u32 *val);

extern int sata_pmp_scr_write(struct ata_link *link, int reg, u32 val);

extern int sata_pmp_attach(struct ata_device *dev);

#else /* CONFIG_SATA_PMP */

static inline int sata_pmp_scr_read(struct ata_link *link, int reg, u32 *val)

{

	return -EINVAL;

}



static inline int sata_pmp_scr_write(struct ata_link *link, int reg, u32 val)

{

	return -EINVAL;

}



static inline int sata_pmp_attach(struct ata_device *dev)

{

	return -EINVAL;

}

#endif /* CONFIG_SATA_PMP */



/* libata-sff.c */

#ifdef CONFIG_ATA_SFF

include/linux/libata.h

+27 −0
Original line number Diff line number Diff line
@@ -1092,6 +1092,7 @@ extern const struct ata_port_operations sata_port_ops; 
/*

 * PMP helpers

 */

#ifdef CONFIG_SATA_PMP

static inline bool sata_pmp_supported(struct ata_port *ap)

{

	return ap->flags & ATA_FLAG_PMP;
@@ -1106,6 +1107,22 @@ static inline int ata_is_host_link(const struct ata_link *link) 
{

	return link == &link->ap->link;

}

#else /* CONFIG_SATA_PMP */

static inline bool sata_pmp_supported(struct ata_port *ap)

{

	return false;

}



static inline bool sata_pmp_attached(struct ata_port *ap)

{

	return false;

}



static inline int ata_is_host_link(const struct ata_link *link)

{

	return 1;

}

#endif /* CONFIG_SATA_PMP */



static inline int sata_srst_pmp(struct ata_link *link)

{
@@ -1369,11 +1386,21 @@ static inline struct ata_port *ata_shost_to_port(struct Scsi_Host *host) 
/**************************************************************************

 * PMP - drivers/ata/libata-pmp.c

 */

#ifdef CONFIG_SATA_PMP



extern const struct ata_port_operations sata_pmp_port_ops;



extern int sata_pmp_qc_defer_cmd_switch(struct ata_queued_cmd *qc);

extern void sata_pmp_error_handler(struct ata_port *ap);



#else /* CONFIG_SATA_PMP */



#define sata_pmp_port_ops		sata_port_ops

#define sata_pmp_qc_defer_cmd_switch	ata_std_qc_defer

#define sata_pmp_error_handler		ata_std_error_handler



#endif /* CONFIG_SATA_PMP */





/**************************************************************************

 * SFF - drivers/ata/libata-sff.c