ata: libahci_platform: move port_map parameters into the AHCI structure
This patch moves force_port_map and mask_port_map into the ahci_host_priv structure. This allows to modify them into the AHCI framework. This is needed by the new dt bindings representing ports as the port_map mask is computed automatically. Parameters modifying force_port_map, mask_port_map and flags have been removed from the ahci_platform_init_host() function, and inputs in the ahci_host_priv structure are now directly filed. Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:

committed by
Tejun Heo

parent
e8f781836d
commit
725c7b570f
@@ -316,8 +316,12 @@ struct ahci_port_priv {
|
||||
};
|
||||
|
||||
struct ahci_host_priv {
|
||||
void __iomem * mmio; /* bus-independent mem map */
|
||||
/* Input fields */
|
||||
unsigned int flags; /* AHCI_HFLAG_* */
|
||||
u32 force_port_map; /* force port map */
|
||||
u32 mask_port_map; /* mask out particular bits */
|
||||
|
||||
void __iomem * mmio; /* bus-independent mem map */
|
||||
u32 cap; /* cap to use */
|
||||
u32 cap2; /* cap2 to use */
|
||||
u32 port_map; /* port map to use */
|
||||
@@ -361,9 +365,7 @@ unsigned int ahci_dev_classify(struct ata_port *ap);
|
||||
void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,
|
||||
u32 opts);
|
||||
void ahci_save_initial_config(struct device *dev,
|
||||
struct ahci_host_priv *hpriv,
|
||||
unsigned int force_port_map,
|
||||
unsigned int mask_port_map);
|
||||
struct ahci_host_priv *hpriv);
|
||||
void ahci_init_controller(struct ata_host *host);
|
||||
int ahci_reset_controller(struct ata_host *host);
|
||||
|
||||
|
Reference in New Issue
Block a user