From: Denis Orlov <denorl2009@gmail.com> To: barebox@lists.infradead.org Cc: Denis Orlov <denorl2009@gmail.com> Subject: [PATCH 05/16] ata: ahci: do not ignore dma handles Date: Wed, 4 May 2022 12:25:42 +0300 [thread overview] Message-ID: <20220504092553.27961-5-denorl2009@gmail.com> (raw) In-Reply-To: <20220504092553.27961-1-denorl2009@gmail.com> They represent addresses from the device side and should be used instead of cpu side ones when populating device registers than hold addresses. Signed-off-by: Denis Orlov <denorl2009@gmail.com> --- drivers/ata/ahci.c | 21 ++++++++++++--------- drivers/ata/ahci.h | 3 +++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 026f83046c..095eb93a08 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -117,7 +117,7 @@ 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((unsigned long)ahci_port->cmd_tbl & 0xffffffff); + cpu_to_le32(ahci_port->cmd_tbl_dma & 0xffffffff); ahci_port->cmd_slot->tbl_addr_hi = 0; } @@ -292,7 +292,7 @@ static int ahci_init_port(struct ahci_port *ahci_port) * 32 bytes each in size */ ahci_port->cmd_slot = dma_alloc_coherent(AHCI_CMD_SLOT_SZ * 32, - DMA_ADDRESS_BROKEN); + &ahci_port->cmd_slot_dma); if (!ahci_port->cmd_slot) { ret = -ENOMEM; goto err_alloc; @@ -304,7 +304,7 @@ static int ahci_init_port(struct ahci_port *ahci_port) * Second item: Received-FIS area */ ahci_port->rx_fis = (unsigned long)dma_alloc_coherent(AHCI_RX_FIS_SZ, - DMA_ADDRESS_BROKEN); + &ahci_port->rx_fis_dma); if (!ahci_port->rx_fis) { ret = -ENOMEM; goto err_alloc1; @@ -315,7 +315,7 @@ static int ahci_init_port(struct ahci_port *ahci_port) * and its scatter-gather table */ ahci_port->cmd_tbl = dma_alloc_coherent(AHCI_CMD_TBL_SZ, - DMA_ADDRESS_BROKEN); + &ahci_port->cmd_tbl_dma); if (!ahci_port->cmd_tbl) { ret = -ENOMEM; goto err_alloc2; @@ -325,8 +325,8 @@ 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, (u32)ahci_port->cmd_slot); - ahci_port_write_f(ahci_port, PORT_FIS_ADDR, ahci_port->rx_fis); + 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); /* * Add the spinup command to whatever mode bits may @@ -410,11 +410,14 @@ static int ahci_init_port(struct ahci_port *ahci_port) ret = -ENODEV; err_init: - dma_free_coherent(ahci_port->cmd_tbl, 0, AHCI_CMD_TBL_SZ); + dma_free_coherent(ahci_port->cmd_tbl, ahci_port->cmd_tbl_dma, + AHCI_CMD_TBL_SZ); err_alloc2: - dma_free_coherent((void *)ahci_port->rx_fis, 0, AHCI_RX_FIS_SZ); + dma_free_coherent((void *)ahci_port->rx_fis, ahci_port->rx_fis_dma, + AHCI_RX_FIS_SZ); err_alloc1: - dma_free_coherent(ahci_port->cmd_slot, 0, AHCI_CMD_SLOT_SZ * 32); + dma_free_coherent(ahci_port->cmd_slot, ahci_port->cmd_slot_dma, + AHCI_CMD_SLOT_SZ * 32); err_alloc: return ret; } diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 5a187fd2e1..3ca64c3d70 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -151,9 +151,12 @@ struct ahci_port { unsigned flags; void __iomem *port_mmio; struct ahci_cmd_hdr *cmd_slot; + dma_addr_t cmd_slot_dma; struct ahci_sg *cmd_tbl_sg; void *cmd_tbl; + dma_addr_t cmd_tbl_dma; u32 rx_fis; + dma_addr_t rx_fis_dma; }; struct ahci_device { -- 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:42 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 ` Denis Orlov [this message] 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 ` [PATCH 11/16] ata: ahci: use 64-bit addressing if available Denis Orlov 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-5-denorl2009@gmail.com \ --to=denorl2009@gmail.com \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH 05/16] ata: ahci: do not ignore dma handles' \ /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