From: Denis Orlov <denorl2009@gmail.com> To: barebox@lists.infradead.org Cc: Denis Orlov <denorl2009@gmail.com> Subject: [PATCH 11/16] ata: ahci: use 64-bit addressing if available Date: Wed, 4 May 2022 12:25:48 +0300 [thread overview] Message-ID: <20220504092553.27961-11-denorl2009@gmail.com> (raw) In-Reply-To: <20220504092553.27961-1-denorl2009@gmail.com> Signed-off-by: Denis Orlov <denorl2009@gmail.com> --- drivers/ata/ahci.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index ff9093c7b7..d423da3a48 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -117,8 +117,10 @@ static void ahci_fill_cmd_slot(struct ahci_port *ahci_port, u32 opts) ahci_port->cmd_slot->opts = cpu_to_le32(opts); ahci_port->cmd_slot->status = 0; ahci_port->cmd_slot->tbl_addr = - cpu_to_le32(ahci_port->cmd_tbl_dma & 0xffffffff); - ahci_port->cmd_slot->tbl_addr_hi = 0; + cpu_to_le32(lower_32_bits(ahci_port->cmd_tbl_dma)); + if (ahci_port->ahci->cap & HOST_CAP_64) + ahci_port->cmd_slot->tbl_addr_hi = + cpu_to_le32(upper_32_bits(ahci_port->cmd_tbl_dma)); } static int ahci_fill_sg(struct ahci_port *ahci_port, dma_addr_t buf_dma, int buf_len) @@ -133,8 +135,9 @@ static int ahci_fill_sg(struct ahci_port *ahci_port, dma_addr_t buf_dma, int buf while (buf_len) { unsigned int now = min(AHCI_MAX_DATA_BYTE_COUNT, buf_len); - ahci_sg->addr = cpu_to_le32(buf_dma); - ahci_sg->addr_hi = 0; + ahci_sg->addr = cpu_to_le32(lower_32_bits(buf_dma)); + if (ahci_port->ahci->cap & HOST_CAP_64) + ahci_sg->addr_hi = cpu_to_le32(upper_32_bits(buf_dma)); ahci_sg->flags_size = cpu_to_le32(now - 1); buf_len -= now; @@ -327,8 +330,12 @@ static int ahci_init_port(struct ahci_port *ahci_port) ahci_port->cmd_tbl_sg = ahci_port->cmd_tbl + AHCI_CMD_TBL_HDR_SZ; - ahci_port_write_f(ahci_port, PORT_LST_ADDR, ahci_port->cmd_slot_dma); - ahci_port_write_f(ahci_port, PORT_FIS_ADDR, ahci_port->rx_fis_dma); + ahci_port_write_f(ahci_port, PORT_LST_ADDR, lower_32_bits(ahci_port->cmd_slot_dma)); + if (ahci_port->ahci->cap & HOST_CAP_64) + ahci_port_write_f(ahci_port, PORT_LST_ADDR_HI, upper_32_bits(ahci_port->cmd_slot_dma)); + ahci_port_write_f(ahci_port, PORT_FIS_ADDR, lower_32_bits(ahci_port->rx_fis_dma)); + if (ahci_port->ahci->cap & HOST_CAP_64) + ahci_port_write_f(ahci_port, PORT_FIS_ADDR_HI, upper_32_bits(ahci_port->rx_fis_dma)); /* * Add the spinup command to whatever mode bits may -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2022-05-04 9:43 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-04 9:25 [PATCH 01/16] ata: ahci: use abstract read/write functions uniformly Denis Orlov 2022-05-04 9:25 ` [PATCH 02/16] ata: ahci: replace magic numbers with named constants Denis Orlov 2022-05-04 9:25 ` [PATCH 03/16] ata: ahci: fix missing whitespace in ahci_add_host() Denis Orlov 2022-05-04 9:25 ` [PATCH 04/16] ata: ahci: simplify fis structure creation Denis Orlov 2022-05-04 9:25 ` [PATCH 05/16] ata: ahci: do not ignore dma handles Denis Orlov 2022-05-04 9:25 ` [PATCH 06/16] ata: ahci: adjust debug messages in ahci_init_port() Denis Orlov 2022-05-04 9:25 ` [PATCH 07/16] ata: ahci: correct named constants values and names Denis Orlov 2022-05-04 9:25 ` [PATCH 08/16] ata: ahci: properly fill scatter/gather table Denis Orlov 2022-05-04 9:25 ` [PATCH 09/16] ata: ahci: use named constants for capabilities bits Denis Orlov 2022-05-04 9:25 ` [PATCH 10/16] ata: ahci: map buffers properly Denis Orlov 2022-05-04 9:25 ` Denis Orlov [this message] 2022-05-04 9:25 ` [PATCH 12/16] ata: ahci: make rx_fis field in ahci_port of type void* Denis Orlov 2022-05-04 9:25 ` [PATCH 13/16] ata: ahci: add missing capability in ahci_print_info() Denis Orlov 2022-05-04 9:25 ` [PATCH 14/16] ata: ahci: remove redundant cast in ahci_io() Denis Orlov 2022-05-04 9:25 ` [PATCH 15/16] ata: ahci: register only implemented ports Denis Orlov 2022-05-04 9:25 ` [PATCH 16/16] ata: ahci: allocate memory in one call in ahci_init_port() Denis Orlov 2022-05-05 7:48 ` [PATCH 01/16] ata: ahci: use abstract read/write functions uniformly Sascha Hauer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220504092553.27961-11-denorl2009@gmail.com \ --to=denorl2009@gmail.com \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH 11/16] ata: ahci: use 64-bit addressing if available' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox